diff --git a/applications/test/CompactListList/CompactListListTest.C b/applications/test/CompactListList/CompactListListTest.C
deleted file mode 100644
index 8bf7fd982..000000000
--- a/applications/test/CompactListList/CompactListListTest.C
+++ /dev/null
@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    CompactListListTest
-
-Description
-    Simple demonstration and test application for the CompactListList class.
-
-\*---------------------------------------------------------------------------*/
-
-#include "CompactListList.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    CompactListList<label> cll1;
-
-    List<List<label> > lll(5);
-    lll[0].setSize(3, 0);
-    lll[1].setSize(2, 1);
-    lll[2].setSize(6, 2);
-    lll[3].setSize(0, 3);
-    lll[4].setSize(1, 4);
-
-    CompactListList<label> cll2(lll);
-
-    Info<< "cll2  = " << cll2 << endl;
-
-    forAll(cll2, i)
-    {
-        Info<< cll2[i] << endl;
-    }
-
-    Info<< endl;
-
-    Info<< "cll2(2, 3) = " << cll2(2, 3) << nl << endl;
-
-    Info<< "cll2 as List<List<label > > " << cll2() << endl;
-
-    cll2.setSize(3);
-
-    Info<< "cll2  = " << cll2 << endl;
-
-
-    List<label> rowSizes(5);
-    rowSizes[0] = 2;
-    rowSizes[1] = 0;
-    rowSizes[2] = 1;
-    rowSizes[3] = 3;
-    rowSizes[4] = 2;
-
-    CompactListList<label> cll3(rowSizes, 1);
-
-    Info<< "cll3 = " << cll3 << endl;
-
-    CompactListList<label> cll4;
-
-    cll4.transfer(cll3);
-
-    Info<< "cll3 = " << cll3 << endl;
-    Info<< "cll4 = " << cll4 << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/CompactListList/Make/files b/applications/test/CompactListList/Make/files
deleted file mode 100644
index 12178dd46..000000000
--- a/applications/test/CompactListList/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-CompactListListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/CompactListListTest
diff --git a/applications/test/DLList/DLListTest.C b/applications/test/DLList/DLListTest.C
deleted file mode 100644
index a04f7870b..000000000
--- a/applications/test/DLList/DLListTest.C
+++ /dev/null
@@ -1,128 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "OSspecific.H"
-
-#include "IOstreams.H"
-#include "DLList.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    DLList<scalar> myList;
-
-    for (int i = 0; i<10; i++)
-    {
-        myList.append(1.3*i);
-    }
-
-    myList.append(100.3);
-
-    myList.append(500.3);
-
-    Info<< nl << "And again using STL iterator: " << nl << endl;
-
-    for
-    (
-        DLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
-    {
-        Info<< "element:" << *iter << endl;
-    }
-
-
-    Info<< nl << "And again using the same STL iterator: " << nl << endl;
-
-    for
-    (
-        DLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
-    {
-        Info<< "Removing " << myList.remove(iter) << endl;
-    }
-
-    myList.append(500.3);
-    myList.append(100.3);
-
-
-    Info<< nl << "And again using STL const_iterator: " << nl << endl;
-
-    const DLList<scalar>& const_myList = myList;
-
-    for
-    (
-        DLList<scalar>::const_iterator iter = const_myList.begin();
-        iter != const_myList.end();
-        ++iter
-    )
-    {
-        Info<< "element:" << *iter << endl;
-    }
-
-    myList.swapUp(myList.DLListBase::first());
-    myList.swapUp(myList.DLListBase::last());
-
-    for
-    (
-        DLList<scalar>::const_iterator iter = const_myList.begin();
-        iter != const_myList.end();
-        ++iter
-    )
-    {
-        Info<< "element:" << *iter << endl;
-    }
-
-    myList.swapDown(myList.DLListBase::first());
-    myList.swapDown(myList.DLListBase::last());
-
-    for
-    (
-        DLList<scalar>::const_iterator iter = const_myList.begin();
-        iter != const_myList.end();
-        ++iter
-    )
-    {
-        Info<< "element:" << *iter << endl;
-    }
-
-    Info<< nl << "Bye." << endl;
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/DLList/Make/files b/applications/test/DLList/Make/files
deleted file mode 100644
index c2641f6e2..000000000
--- a/applications/test/DLList/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-DLListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/DLListTest
diff --git a/applications/test/DLList/Make/options b/applications/test/DLList/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/Dictionary/DictionaryTest.C b/applications/test/Dictionary/DictionaryTest.C
deleted file mode 100644
index 94ba6efce..000000000
--- a/applications/test/Dictionary/DictionaryTest.C
+++ /dev/null
@@ -1,116 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "OSspecific.H"
-
-#include "IOstreams.H"
-#include "Dictionary.H"
-
-using namespace Foam;
-
-class ent
-:
-    public Dictionary<ent>::link
-{
-    word keyword_;
-    int i_;
-
-public:
-
-    ent(const word& keyword, int i)
-    :
-        keyword_(keyword),
-        i_(i)
-    {}
-
-    const word& keyword() const
-    {
-        return keyword_;
-    }
-
-    friend Ostream& operator<<(Ostream& os, const ent& e)
-    {
-        os << e.keyword_ << ' ' << e.i_ << endl;
-        return os;
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    Dictionary<ent>* dictPtr = new Dictionary<ent>;
-    Dictionary<ent>& dict = *dictPtr;
-
-    for (int i = 0; i<10; i++)
-    {
-        ent* ePtr = new ent(word("ent") + name(i), i);
-        dict.append(ePtr->keyword(), ePtr);
-        dict.swapUp(ePtr);
-    }
-
-    Info<< dict << endl;
-
-    dict.swapDown(dict.first());
-
-    for
-    (
-        Dictionary<ent>::const_iterator iter = dict.begin();
-        iter != dict.end();
-        ++iter
-    )
-    {
-        Info<< "element : " << *iter;
-    }
-
-    Info<< dict.toc() << endl;
-
-    delete dictPtr;
-
-    dictPtr = new Dictionary<ent>;
-    Dictionary<ent>& dict2 = *dictPtr;
-
-    for (int i = 0; i<10; i++)
-    {
-        ent* ePtr = new ent(word("ent") + name(i), i);
-        dict2.append(ePtr->keyword(), ePtr);
-        dict2.swapUp(ePtr);
-    }
-
-    Info<< dict2 << endl;
-
-    Info<< nl << "Bye." << endl;
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/Dictionary/Make/files b/applications/test/Dictionary/Make/files
deleted file mode 100644
index ab30b8bb5..000000000
--- a/applications/test/Dictionary/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-DictionaryTest.C
-
-EXE = $(FOAM_USER_APPBIN)/DictionaryTest
diff --git a/applications/test/Dictionary/Make/options b/applications/test/Dictionary/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/DimensionedField/DimensionedFieldTest.C b/applications/test/DimensionedField/DimensionedFieldTest.C
deleted file mode 100644
index 97080ed3e..000000000
--- a/applications/test/DimensionedField/DimensionedFieldTest.C
+++ /dev/null
@@ -1,133 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "Time.H"
-#include "DimensionedFields.H"
-#include "DimensionedSphericalTensorField.H"
-#include "vector.H"
-#include "tensor.H"
-#include "GeoMesh.H"
-
-using namespace Foam;
-
-namespace Foam
-{
-
-class vMesh
-{
-
-public:
-
-    vMesh()
-    {}
-
-    label size() const
-    {
-        return 10;
-    }
-};
-
-};
-
-template<>
-const word Foam::DimensionedField<scalar, GeoMesh<vMesh> >::typeName
-(
-    "dimenionedScalarField"
-);
-
-template<>
-const word Foam::DimensionedField<vector, GeoMesh<vMesh> >::typeName
-(
-    "dimenionedVectorField"
-);
-
-template<>
-const word Foam::DimensionedField<tensor, GeoMesh<vMesh> >::typeName
-(
-    "dimenionedTensorField"
-);
-
-template<>
-const word Foam::DimensionedField<sphericalTensor, GeoMesh<vMesh> >::typeName
-(
-    "dimenionedSphericalTensorField"
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-#   include "createTime.H"
-
-    vMesh vm;
-
-    DimensionedField<scalar, GeoMesh<vMesh> > dsf
-    (
-        IOobject
-        (
-            "dsf",
-            runTime.timeName(),
-            runTime,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        ),
-        vm
-    );
-
-    Info<< dsf << endl;
-    dsf += dsf;
-    dsf -= dimensionedScalar("5", dsf.dimensions(), 5.0);
-    Info<< dsf << endl;
-
-    Info<< sqr(dsf + dsf) - sqr(dsf + dsf) << endl;
-
-    DimensionedField<vector, GeoMesh<vMesh> > dvf
-    (
-        IOobject
-        (
-            "dvf",
-            runTime.timeName(),
-            runTime,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        ),
-        vm
-    );
-
-    Info<< (dvf ^ (dvf ^ dvf)) << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/DimensionedField/Make/files b/applications/test/DimensionedField/Make/files
deleted file mode 100644
index 02c479015..000000000
--- a/applications/test/DimensionedField/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-DimensionedFieldTest.C
-
-EXE = $(FOAM_USER_APPBIN)/DimensionedFieldTest
diff --git a/applications/test/DimensionedField/Make/options b/applications/test/DimensionedField/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/DimensionedField/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/DynamicList/DynamicListTest.C b/applications/test/DynamicList/DynamicListTest.C
deleted file mode 100644
index 5cb217e54..000000000
--- a/applications/test/DynamicList/DynamicListTest.C
+++ /dev/null
@@ -1,107 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 1991-2008 OpenCFD Ltd.
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software; you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by the
-    Free Software Foundation; either version 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "DynamicList.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    List<DynamicList<label, 1, 0> > ldl(2);
-
-    ldl[0](0) = 0;
-    ldl[0](2) = 2;
-    ldl[0](3) = 3;
-    ldl[0](1) = 1;
-
-    ldl[0].setSize(5);     // increase allocated size
-    ldl[1].setSize(10);    // increase allocated size
-    ldl[1](2) = 2;
-
-    ldl[1] = 3;
-
-    Info<< "<ldl>" << ldl << "</ldl>" << nl << "sizes: ";
-    forAll(ldl, i)
-    {
-        Info<< " " << ldl[i].size() << "/" << ldl[i].allocSize();
-    }
-    Info<< endl;
-
-    List<List<label> > ll(2);
-    ll[0].transfer(ldl[0]);
-    ll[1].transfer(ldl[1].shrink());
-
-    Info<< "<ldl>" << ldl << "</ldl>" << nl << "sizes: ";
-    forAll(ldl, i)
-    {
-        Info<< " " << ldl[i].size() << "/" << ldl[i].allocSize();
-    }
-    Info<< endl;
-
-    Info<< "<ll>" << ll << "</ll>" << nl << endl;
-
-
-    // test the transfer between DynamicLists
-    DynamicList<label, 1, 0> dlA;
-    DynamicList<label, 1, 0> dlB;
-
-    for (label i = 0; i < 5; i++)
-    {
-        dlA.append(i);
-    }
-    dlA.setSize(10);
-
-    Info<< "<dlA>" << dlA << "</dlA>" << nl << "sizes: "
-        << " " << dlA.size() << "/" << dlA.allocSize() << endl;
-
-    dlB.transfer(dlA);
-
-    // provokes memory error if previous transfer did not maintain
-    // the correct allocated space
-
-    // currently fails in OpenFOAM-1.5.x
-    /*
-     * dlB[6] = 6;
-     */
-
-    Info<< "Transferred to dlB" << endl;
-    Info<< "<dlA>" << dlA << "</dlA>" << nl << "sizes: "
-        << " " << dlA.size() << "/" << dlA.allocSize() << endl;
-    Info<< "<dlB>" << dlB << "</dlB>" << nl << "sizes: "
-        << " " << dlB.size() << "/" << dlB.allocSize() << endl;
-
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/DynamicList/Make/files b/applications/test/DynamicList/Make/files
deleted file mode 100644
index 561605b6a..000000000
--- a/applications/test/DynamicList/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-
-DynamicListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/DynamicListTest
diff --git a/applications/test/DynamicList/Make/options b/applications/test/DynamicList/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/DynamicList/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/Field/FieldTest.C b/applications/test/Field/FieldTest.C
deleted file mode 100644
index 42c01a053..000000000
--- a/applications/test/Field/FieldTest.C
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "testField.H"
-
-int main()
-{
-    Vector<double> v1(1, 2);
-    Vector<double> v2(2, 3);
-
-    std::cout << v1 + v2;
-
-    return 0;
-}
diff --git a/applications/test/Field/Make/files b/applications/test/Field/Make/files
deleted file mode 100644
index 56e8f0ffa..000000000
--- a/applications/test/Field/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-FieldTest.C
-
-SEXE = $(FOAM_USER_APPBIN)/FieldTest
diff --git a/applications/test/Field/Make/options b/applications/test/Field/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/Field/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/Field/testField.H b/applications/test/Field/testField.H
deleted file mode 100644
index d43452fea..000000000
--- a/applications/test/Field/testField.H
+++ /dev/null
@@ -1,59 +0,0 @@
-#include <iostream>
-
-template<class C>
-class Vector;
-
-template<class C>
-Vector<C> operator+(const Vector<C>& v1, const Vector<C>& v2);
-
-template<class C>
-std::ostream& operator<<(std::ostream& os, const Vector<C>& v);
-
-
-/*---------------------------------------------------------------------------*\
-                           Class Vector Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class C>
-class Vector
-{
-
-    double X, Y;
-
-public:
-
-    inline Vector(const double x, const double y);
-
-    C x() const
-    {
-        return X;
-    }
-
-    C y() const
-    {
-        return Y;
-    }
-
-    friend Vector<C> operator+ <C>(const Vector<C>& v1, const Vector<C>& v2);
-
-    friend std::ostream& operator<<(std::ostream& os, const Vector<C>& v)
-    {
-        os << v.X << '\t' << v.Y << '\n';
-        return os;
-    }
-};
-
-template<class C>
-inline Vector<C>::Vector(const double x, const double y)
-{
-    X = x;
-    Y = y;
-}
-
-
-template<class C>
-inline Vector<C> operator+(const Vector<C>& v1, const Vector<C>& v2)
-{
-    return Vector<C>(v1.X+v2.X, v1.Y+v2.Y);
-}
-
diff --git a/applications/test/FixedList/FixedListTest.C b/applications/test/FixedList/FixedListTest.C
deleted file mode 100644
index 69c684b26..000000000
--- a/applications/test/FixedList/FixedListTest.C
+++ /dev/null
@@ -1,100 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    FixedListTest
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "IOstreams.H"
-#include "FixedList.H"
-#include "IFstream.H"
-#include "OFstream.H"
-#include "IPstream.H"
-#include "OPstream.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    argList::validArgs.clear();
-    argList args(argc, argv);
-
-    FixedList<label, 4> list;
-    list[0] = 1;
-    list[1] = 2;
-    list[2] = 3;
-    list[3] = 4;
-    Info<< list << endl;
-
-    label a[4] = {0, 1, 2, 3};
-    FixedList<label, 4> list2(a);
-    Info<< list2 << endl;
-
-    Info<< FixedList<label, 4>::Hash<>()(list2) << endl;
-
-    //FixedList<label, 3> hmm(Sin);
-    //Info<< hmm << endl;
-
-    if (Pstream::parRun())
-    {
-        if (Pstream::myProcNo() != Pstream::masterNo())
-        {
-            Serr<< "slave sending to master "
-                << Pstream::masterNo() << endl;
-            OPstream toMaster(Pstream::blocking, Pstream::masterNo(), IOstream::ASCII);
-            FixedList<label, 2> list3;
-            list3[0] = 0;
-            list3[1] = 1;
-            toMaster << list3;
-        }
-        else
-        {
-            for
-            (
-                int slave=Pstream::firstSlave();
-                slave<=Pstream::lastSlave();
-                slave++
-            )
-            {
-                Serr << "master receiving from slave " << slave << endl;
-                IPstream fromSlave(Pstream::blocking, slave, IOstream::ASCII);
-                FixedList<label, 2> list3(fromSlave);
-
-                Serr<< list3 << endl;
-            }
-        }
-    }
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/FixedList/Make/files b/applications/test/FixedList/Make/files
deleted file mode 100644
index 0728e72bc..000000000
--- a/applications/test/FixedList/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-FixedListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/FixedListTest
diff --git a/applications/test/FixedList/Make/options b/applications/test/FixedList/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/FixedList/fixedListFile b/applications/test/FixedList/fixedListFile
deleted file mode 100644
index 4faae2f6a..000000000
Binary files a/applications/test/FixedList/fixedListFile and /dev/null differ
diff --git a/applications/test/HashPtrTable/Make/files b/applications/test/HashPtrTable/Make/files
deleted file mode 100644
index b4b57ffc7..000000000
--- a/applications/test/HashPtrTable/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-hashPtrTableTest.C
-
-EXE = $(FOAM_USER_APPBIN)/hashPtrTableTest
diff --git a/applications/test/HashPtrTable/Make/options b/applications/test/HashPtrTable/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/HashSet/Make/files b/applications/test/HashSet/Make/files
deleted file mode 100644
index 4c846a2c3..000000000
--- a/applications/test/HashSet/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-hashSetTest.C
-
-EXE = $(FOAM_USER_APPBIN)/hashSetTest
diff --git a/applications/test/HashSet/Make/options b/applications/test/HashSet/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/HashSet/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/HashTable/Make/files b/applications/test/HashTable/Make/files
deleted file mode 100644
index 13884d64f..000000000
--- a/applications/test/HashTable/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-hashTableTest.C
-
-EXE = $(FOAM_USER_APPBIN)/hashTableTest
diff --git a/applications/test/HashTable/Make/options b/applications/test/HashTable/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/HashTable/hashTableTest.C b/applications/test/HashTable/hashTableTest.C
deleted file mode 100644
index cfecd9349..000000000
--- a/applications/test/HashTable/hashTableTest.C
+++ /dev/null
@@ -1,116 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include <iostream>
-#include "HashTable.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main()
-{
-    //for (;;)
-    {
-    HashTable<double> myTable(100);
-
-    myTable.insert("aaa", 1.0);
-    myTable.insert("aba", 2.0);
-    myTable.insert("aca", 3.0);
-    myTable.insert("ada", 4.0);
-    myTable.insert("aeq", 5.0);
-    myTable.insert("aaw", 6.0);
-    myTable.insert("abs", 7.0);
-    myTable.insert("acr", 8.0);
-    myTable.insert("adx", 9.0);
-    myTable.insert("aec", 10.0);
-
-    myTable.erase("aaw");
-    myTable.erase("abs");
-
-    std::cerr << myTable.find("aaa")() << '\n';
-    std::cerr << myTable.find("aba")() << '\n';
-    std::cerr << myTable.find("aca")() << '\n';
-    std::cerr << myTable.find("ada")() << '\n';
-    std::cerr << myTable.find("aeq")() << '\n';
-    //std::cerr << myTable.find("aaw")() << '\n';
-    //std::cerr << myTable.find("abs")() << '\n';
-    std::cerr << myTable.find("acr")() << '\n';
-    std::cerr << myTable.find("adx")() << '\n';
-    std::cerr << myTable.find("aec")() << '\n';
-
-    std::cerr << "\nprint table\n" << std::endl;
-
-    for
-    (
-        HashTable<double>::iterator iter = myTable.begin();
-        iter != myTable.end();
-        ++iter
-    )
-    {
-        std::cerr << *iter << '\n';
-    }
-
-    std::cerr << "\nprint table\n" << std::endl;
-
-    forAllIter(HashTable<double>, myTable, iter)
-    {
-        std::cerr << *iter << '\n';
-    }
-
-    std::cerr << "\ncopy of table\n" << std::endl;
-
-    HashTable<double> myTable2;
-    myTable2 = myTable;
-
-    forAllConstIter(HashTable<double>, myTable2, iter2)
-    {
-        std::cerr << *iter2 << '\n';
-    }
-
-    std::cerr << "\ndelete entries\n" << std::endl;
-
-    forAllIter(HashTable<double>, myTable, iter)
-    {
-        std::cerr << "deleting " << *iter << '\n';
-        myTable.erase(iter);
-        std::cerr << "deleted\n";
-    }
-
-    forAllConstIter(HashTable<double>, myTable, iter)
-    {
-        std::cerr << *iter << '\n';
-    }
-    }
-
-    std::cerr << "\nBye.\n";
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/HashTable2/Make/files b/applications/test/HashTable2/Make/files
deleted file mode 100644
index 2bf9c9217..000000000
--- a/applications/test/HashTable2/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-hashTableTest2.C
-
-EXE = $(FOAM_USER_APPBIN)/hashTableTest2
diff --git a/applications/test/HashTable2/Make/options b/applications/test/HashTable2/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/HashTable2/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/HashTable2/hashTableTest2.C b/applications/test/HashTable2/hashTableTest2.C
deleted file mode 100644
index e4174c9ce..000000000
--- a/applications/test/HashTable2/hashTableTest2.C
+++ /dev/null
@@ -1,76 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "HashTable.H"
-#include "HashPtrTable.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    HashTable<label, Foam::string> testTable(0);
-
-    testTable.insert("kjhk", 10);
-    testTable.insert("kjhk2", 12);
-
-    Info<< testTable << endl;
-    Info<< testTable.toc() << endl;
-
-    HashTable<label, label, Hash<label> > testTable2(10);
-
-    testTable2.insert(3, 10);
-    testTable2.insert(5, 12);
-    testTable2.insert(7, 16);
-
-    Info<< testTable2 << endl;
-    Info<< testTable2.toc() << endl;
-
-    HashTable<label, label, Hash<label> > testTable3(1);
-    testTable3.transfer(testTable2);
-
-    Info<< testTable2 << endl;
-    Info<< testTable2.toc() << endl;
-
-    Info<< testTable3 << endl;
-    Info<< testTable3.toc() << endl;
-
-    Foam::HashPtrTable<label, Foam::string> testPtrTable(0);
-    testPtrTable.insert("kjhkjh", new label(10));
-
-    Info<< testPtrTable.toc() << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/ISLList/ISLListTest.C b/applications/test/ISLList/ISLListTest.C
deleted file mode 100644
index 2f6b5f55d..000000000
--- a/applications/test/ISLList/ISLListTest.C
+++ /dev/null
@@ -1,107 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "OSspecific.H"
-
-#include "IOstreams.H"
-#include "ISLList.H"
-
-using namespace Foam;
-
-class Scalar
-:
-    public ISLList<Scalar>::link
-{
-public:
-
-    scalar data_;
-
-    Scalar()
-    :
-        data_(0)
-    {}
-
-    Scalar(scalar s)
-    :
-        data_(s)
-    {}
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    ISLList<Scalar> myList;
-
-    for (int i = 0; i<10; i++)
-    {
-        myList.append(new Scalar(1.3*i));
-    }
-
-    myList.append(new Scalar(100.3));
-
-    myList.append(new Scalar(500.3));
-
-
-    Info<< nl << "And again using STL iterator: " << nl << endl;
-
-    for
-    (
-        SLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
-    {
-        Info<< "element:" << *iter << endl;
-    }
-
-    Info<< nl << "And again using STL const_iterator: " << nl << endl;
-
-    const ISLList<Scalar>& const_myList = myList;
-
-    for
-    (
-        SLList<scalar>::const_iterator iter2 = const_myList.begin();
-        iter2 != const_myList.end();
-        ++iter2
-    )
-    {
-        Info<< "element:" << *iter2 << endl;
-    }
-
-
-    Info<< nl << "Bye." << endl;
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/ISLList/Make/files b/applications/test/ISLList/Make/files
deleted file mode 100644
index 9b5b00ccc..000000000
--- a/applications/test/ISLList/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-ISLListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/ISLListTest
diff --git a/applications/test/ISLList/Make/options b/applications/test/ISLList/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/IStringStream/Make/files b/applications/test/IStringStream/Make/files
deleted file mode 100644
index e88d4acec..000000000
--- a/applications/test/IStringStream/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-IStringStreamTest.C
-
-EXE = $(FOAM_USER_APPBIN)/IStringStreamTest
diff --git a/applications/test/IStringStream/Make/options b/applications/test/IStringStream/Make/options
deleted file mode 100644
index 4e772fdf9..000000000
--- a/applications/test/IStringStream/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/IndirectList/Make/files b/applications/test/IndirectList/Make/files
deleted file mode 100644
index ac59789e8..000000000
--- a/applications/test/IndirectList/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-
-IndirectListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/IndirectListTest
diff --git a/applications/test/IndirectList/Make/options b/applications/test/IndirectList/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/IndirectList/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/LduMatrix/LduMatrixTest.C b/applications/test/LduMatrix/LduMatrixTest.C
deleted file mode 100644
index c3090841e..000000000
--- a/applications/test/LduMatrix/LduMatrixTest.C
+++ /dev/null
@@ -1,164 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "Time.H"
-#include "fvMesh.H"
-#include "volFields.H"
-#include "LduMatrix.H"
-#include "diagTensorField.H"
-#include "TPCG.H"
-#include "TPBiCG.H"
-#include "NoPreconditioner.H"
-
-using namespace Foam;
-
-typedef Foam::LduMatrix<vector, diagTensor, scalar>
-    lduVectorMatrix;
-defineNamedTemplateTypeNameAndDebug(lduVectorMatrix, 0);
-
-typedef Foam::DiagonalSolver<vector, diagTensor, scalar>
-    lduVectorDiagonalSolver;
-defineNamedTemplateTypeNameAndDebug(lduVectorDiagonalSolver, 0);
-
-template<>
-const vector lduVectorMatrix::great_(1e15, 1e15, 1e15);
-
-template<>
-const vector lduVectorMatrix::small_(1e-15, 1e-15, 1e-15);
-
-namespace Foam
-{
-    typedef LduMatrix<vector, diagTensor, scalar>::preconditioner
-        lduVectorPreconditioner;
-    defineTemplateRunTimeSelectionTable(lduVectorPreconditioner, symMatrix);
-    defineTemplateRunTimeSelectionTable(lduVectorPreconditioner, asymMatrix);
-
-    typedef LduMatrix<vector, diagTensor, scalar>::smoother
-        lduVectorSmoother;
-    defineTemplateRunTimeSelectionTable(lduVectorSmoother, symMatrix);
-    defineTemplateRunTimeSelectionTable(lduVectorSmoother, asymMatrix);
-
-    typedef LduMatrix<vector, diagTensor, scalar>::solver
-        lduVectorSolver;
-    defineTemplateRunTimeSelectionTable(lduVectorSolver, symMatrix);
-    defineTemplateRunTimeSelectionTable(lduVectorSolver, asymMatrix);
-
-    typedef TPCG<vector, diagTensor, scalar> TPCGVector;
-    defineNamedTemplateTypeNameAndDebug(TPCGVector, 0);
-
-    LduMatrix<vector, diagTensor, scalar>::solver::
-        addsymMatrixConstructorToTable<TPCGVector>
-        addTPCGSymMatrixConstructorToTable_;
-
-    typedef TPBiCG<vector, diagTensor, scalar> TPBiCGVector;
-    defineNamedTemplateTypeNameAndDebug(TPBiCGVector, 0);
-
-    LduMatrix<vector, diagTensor, scalar>::solver::
-        addasymMatrixConstructorToTable<TPBiCGVector>
-        addTPBiCGSymMatrixConstructorToTable_;
-
-    typedef NoPreconditioner<vector, diagTensor, scalar> NoPreconditionerVector;
-    defineNamedTemplateTypeNameAndDebug(NoPreconditionerVector, 0);
-
-    LduMatrix<vector, diagTensor, scalar>::preconditioner::
-        addsymMatrixConstructorToTable<NoPreconditionerVector>
-        addNoPreconditionerSymMatrixConstructorToTable_;
-
-    LduMatrix<vector, diagTensor, scalar>::preconditioner::
-        addasymMatrixConstructorToTable<NoPreconditionerVector>
-        addNoPreconditionerAsymMatrixConstructorToTable_;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    volVectorField psi
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    lduVectorMatrix testMatrix(mesh);
-    testMatrix.diag() = 2*pTraits<diagTensor>::one;
-    testMatrix.source() = pTraits<vector>::one;
-    testMatrix.upper() = 0.1;
-    testMatrix.lower() = -0.1;
-
-    Info<< testMatrix << endl;
-
-    FieldField<Field, scalar> boundaryCoeffs(0);
-    FieldField<Field, scalar> internalCoeffs(0);
-
-    autoPtr<lduVectorMatrix::solver> testMatrixSolver =
-    lduVectorMatrix::solver::New
-    (
-        psi.name(),
-        testMatrix,
-        boundaryCoeffs,
-        internalCoeffs,
-        psi.boundaryField().interfaces(),
-        IStringStream
-        (
-            "PBiCG"
-            "{"
-            "    preconditioner   none;"
-            "    tolerance        (1e-05 1e-05 1e-05);"
-            "    relTol           (0 0 0);"
-            "}"
-        )()
-    );
-
-    lduVectorMatrix::solverPerformance solverPerf =
-        testMatrixSolver->solve(psi);
-
-    solverPerf.print();
-
-    Info<< psi << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/LduMatrix/LduMatrixTest2.C b/applications/test/LduMatrix/LduMatrixTest2.C
deleted file mode 100644
index 4f0fed2c8..000000000
--- a/applications/test/LduMatrix/LduMatrixTest2.C
+++ /dev/null
@@ -1,164 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "Time.H"
-#include "fvMesh.H"
-#include "volFields.H"
-#include "LduMatrix.H"
-#include "tensorField.H"
-#include "TPCG.H"
-#include "TPBiCG.H"
-#include "NoPreconditioner.H"
-
-using namespace Foam;
-
-typedef Foam::LduMatrix<vector, tensor, scalar>
-    lduVectorMatrix;
-defineNamedTemplateTypeNameAndDebug(lduVectorMatrix, 0);
-
-typedef Foam::DiagonalSolver<vector, tensor, scalar>
-    lduVectorDiagonalSolver;
-defineNamedTemplateTypeNameAndDebug(lduVectorDiagonalSolver, 0);
-
-template<>
-const vector lduVectorMatrix::great_(1e15, 1e15, 1e15);
-
-template<>
-const vector lduVectorMatrix::small_(1e-15, 1e-15, 1e-15);
-
-namespace Foam
-{
-    typedef LduMatrix<vector, tensor, scalar>::preconditioner
-        lduVectorPreconditioner;
-    defineTemplateRunTimeSelectionTable(lduVectorPreconditioner, symMatrix);
-    defineTemplateRunTimeSelectionTable(lduVectorPreconditioner, asymMatrix);
-
-    typedef LduMatrix<vector, tensor, scalar>::smoother
-        lduVectorSmoother;
-    defineTemplateRunTimeSelectionTable(lduVectorSmoother, symMatrix);
-    defineTemplateRunTimeSelectionTable(lduVectorSmoother, asymMatrix);
-
-    typedef LduMatrix<vector, tensor, scalar>::solver
-        lduVectorSolver;
-    defineTemplateRunTimeSelectionTable(lduVectorSolver, symMatrix);
-    defineTemplateRunTimeSelectionTable(lduVectorSolver, asymMatrix);
-
-    typedef TPCG<vector, tensor, scalar> TPCGVector;
-    defineNamedTemplateTypeNameAndDebug(TPCGVector, 0);
-
-    LduMatrix<vector, tensor, scalar>::solver::
-        addsymMatrixConstructorToTable<TPCGVector>
-        addTPCGSymMatrixConstructorToTable_;
-
-    typedef TPBiCG<vector, tensor, scalar> TPBiCGVector;
-    defineNamedTemplateTypeNameAndDebug(TPBiCGVector, 0);
-
-    LduMatrix<vector, tensor, scalar>::solver::
-        addasymMatrixConstructorToTable<TPBiCGVector>
-        addTPBiCGSymMatrixConstructorToTable_;
-
-    typedef NoPreconditioner<vector, tensor, scalar> NoPreconditionerVector;
-    defineNamedTemplateTypeNameAndDebug(NoPreconditionerVector, 0);
-
-    LduMatrix<vector, tensor, scalar>::preconditioner::
-        addsymMatrixConstructorToTable<NoPreconditionerVector>
-        addNoPreconditionerSymMatrixConstructorToTable_;
-
-    LduMatrix<vector, tensor, scalar>::preconditioner::
-        addasymMatrixConstructorToTable<NoPreconditionerVector>
-        addNoPreconditionerAsymMatrixConstructorToTable_;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    volVectorField psi
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    lduVectorMatrix testMatrix(mesh);
-    testMatrix.diag() = 2*I;
-    testMatrix.source() = pTraits<vector>::one;
-    testMatrix.upper() = 0.1;
-    testMatrix.lower() = -0.1;
-
-    Info<< testMatrix << endl;
-
-    FieldField<Field, scalar> boundaryCoeffs(0);
-    FieldField<Field, scalar> internalCoeffs(0);
-
-    autoPtr<lduVectorMatrix::solver> testMatrixSolver =
-    lduVectorMatrix::solver::New
-    (
-        psi.name(),
-        testMatrix,
-        //boundaryCoeffs,
-        //internalCoeffs,
-        //psi.boundaryField().interfaces(),
-        IStringStream
-        (
-            "PBiCG"
-            "{"
-            "    preconditioner   none;"
-            "    tolerance        (1e-05 1e-05 1e-05);"
-            "    relTol           (0 0 0);"
-            "}"
-        )()
-    );
-
-    lduVectorMatrix::solverPerformance solverPerf =
-        testMatrixSolver->solve(psi);
-
-    solverPerf.print();
-
-    Info<< psi << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/LduMatrix/LduMatrixTest3.C b/applications/test/LduMatrix/LduMatrixTest3.C
deleted file mode 100644
index 355ebe5d1..000000000
--- a/applications/test/LduMatrix/LduMatrixTest3.C
+++ /dev/null
@@ -1,149 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    icoFoam
-
-Description
-    Transient solver for incompressible, laminar flow of Newtonian fluids.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "LduMatrix.H"
-#include "diagTensorField.H"
-
-typedef LduMatrix<vector, scalar, scalar> lduVectorMatrix;
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-
-#   include "createTime.H"
-#   include "createMesh.H"
-#   include "createFields.H"
-#   include "initContinuityErrs.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    for (runTime++; !runTime.end(); runTime++)
-    {
-        Info<< "Time = " << runTime.timeName() << nl << endl;
-
-#       include "readPISOControls.H"
-#       include "CourantNo.H"
-
-        fvVectorMatrix UEqn
-        (
-            fvm::ddt(U)
-          + fvm::div(phi, U)
-          - fvm::laplacian(nu, U)
-        );
-
-        fvVectorMatrix UEqnp(UEqn == -fvc::grad(p));
-
-        lduVectorMatrix U3Eqnp(mesh);
-        U3Eqnp.diag() = UEqnp.diag();
-        U3Eqnp.upper() = UEqnp.upper();
-        U3Eqnp.lower() = UEqnp.lower();
-        U3Eqnp.source() = UEqnp.source();
-
-        UEqnp.addBoundaryDiag(U3Eqnp.diag(), 0);
-        UEqnp.addBoundarySource(U3Eqnp.source(), false);
-
-        autoPtr<lduVectorMatrix::solver> U3EqnpSolver =
-            lduVectorMatrix::solver::New
-            (
-                U.name(),
-                U3Eqnp,
-                dictionary
-                (
-                    IStringStream
-                    (
-                        "{"
-                        "    solver           PBiCG;"
-                        "    preconditioner   DILU;"
-                        "    tolerance        (1e-13 1e-13 1e-13);"
-                        "    relTol           (0 0 0);"
-                        "}"
-                    )()
-                )
-            );
-
-        U3EqnpSolver->solve(U).print(Info);
-
-        // --- PISO loop
-
-        for (int corr=0; corr<nCorr; corr++)
-        {
-            volScalarField rUA = 1.0/UEqn.A();
-
-            U = rUA*UEqn.H();
-            phi = (fvc::interpolate(U) & mesh.Sf()) 
-                + fvc::ddtPhiCorr(rUA, U, phi);
-
-            adjustPhi(phi, U, p);
-
-            for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
-            {
-                fvScalarMatrix pEqn
-                (
-                    fvm::laplacian(rUA, p) == fvc::div(phi)
-                );
-
-                pEqn.setReference(pRefCell, pRefValue);
-                pEqn.solve();
-
-                if (nonOrth == nNonOrthCorr)
-                {
-                    phi -= pEqn.flux();
-                }
-            }
-
-#           include "continuityErrs.H"
-
-            U -= rUA*fvc::grad(p);
-            U.correctBoundaryConditions();
-        }
-
-        runTime.write();
-
-        Info<< "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
-            << "  ClockTime = " << runTime.elapsedClockTime() << " s"
-            << nl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/LduMatrix/Make/files b/applications/test/LduMatrix/Make/files
deleted file mode 100644
index 99fa29929..000000000
--- a/applications/test/LduMatrix/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-LduMatrixTest3.C
-
-EXE = $(FOAM_USER_APPBIN)/LduMatrixTest
diff --git a/applications/test/LduMatrix/Make/options b/applications/test/LduMatrix/Make/options
deleted file mode 100644
index 725122ea1..000000000
--- a/applications/test/LduMatrix/Make/options
+++ /dev/null
@@ -1,4 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = -lfiniteVolume
diff --git a/applications/test/LduMatrix/createFields.H b/applications/test/LduMatrix/createFields.H
deleted file mode 100644
index ea64f1302..000000000
--- a/applications/test/LduMatrix/createFields.H
+++ /dev/null
@@ -1,56 +0,0 @@
-    Info<< "Reading transportProperties\n" << endl;
-
-    IOdictionary transportProperties
-    (
-        IOobject
-        (
-            "transportProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        )
-    );
-
-    dimensionedScalar nu
-    (
-        transportProperties.lookup("nu")
-    );
-
-
-    Info<< "Reading field p\n" << endl;
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-
-#   include "createPhi.H"
-
-
-    label pRefCell = 0;
-    scalar pRefValue = 0.0;
-    setRefCell(p, mesh.solutionDict().subDict("PISO"), pRefCell, pRefValue);
diff --git a/applications/test/List/ListLoop.C b/applications/test/List/ListLoop.C
deleted file mode 100644
index 8695836db..000000000
--- a/applications/test/List/ListLoop.C
+++ /dev/null
@@ -1,18 +0,0 @@
-#include "List.H"
-#include "scalar.H"
-
-using namespace Foam;
-
-void func
-(
-    List<scalar>& l1,
-    const List<scalar>& l2,
-    const List<label>& a1,
-    const List<label>& a2
-)
-{
-    forAll(l1, i)
-    {
-        l1[a1[i]] -= l2[a2[i]];
-    }
-}
diff --git a/applications/test/List/ListLoop.s b/applications/test/List/ListLoop.s
deleted file mode 100644
index 4acfadf82..000000000
--- a/applications/test/List/ListLoop.s
+++ /dev/null
@@ -1,224 +0,0 @@
-	.file	"ListLoop.C"
-	.section	.ctors,"aw",@progbits
-	.align 4
-	.long	_GLOBAL__I__Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_
-	.text
-	.align 2
-	.p2align 4,,15
-	.type	_Z41__static_initialization_and_destruction_0ii, @function
-_Z41__static_initialization_and_destruction_0ii:
-.LFB2550:
-	pushl	%ebp
-.LCFI0:
-	movl	%esp, %ebp
-.LCFI1:
-	pushl	%ebx
-.LCFI2:
-	call	__i686.get_pc_thunk.bx
-	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
-	subl	$20, %esp
-.LCFI3:
-	decl	%eax
-	je	.L7
-.L5:
-	addl	$20, %esp
-	popl	%ebx
-	leave
-	ret
-	.p2align 4,,7
-.L7:
-	cmpl	$65535, %edx
-	jne	.L5
-	leal	_ZSt8__ioinit@GOTOFF(%ebx), %eax
-	movl	%eax, (%esp)
-	call	_ZNSt8ios_base4InitC1Ev@PLT
-	movl	__dso_handle@GOT(%ebx), %eax
-	movl	$0, 4(%esp)
-	movl	%eax, 8(%esp)
-	leal	__tcf_0@GOTOFF(%ebx), %eax
-	movl	%eax, (%esp)
-	call	__cxa_atexit@PLT
-	addl	$20, %esp
-	popl	%ebx
-	leave
-	ret
-.LFE2550:
-	.size	_Z41__static_initialization_and_destruction_0ii, .-_Z41__static_initialization_and_destruction_0ii
-.globl __gxx_personality_v0
-	.align 2
-	.p2align 4,,15
-	.type	_GLOBAL__I__Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_, @function
-_GLOBAL__I__Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_:
-.LFB2552:
-	pushl	%ebp
-.LCFI4:
-	movl	$65535, %edx
-	movl	$1, %eax
-	movl	%esp, %ebp
-.LCFI5:
-	leave
-	jmp	_Z41__static_initialization_and_destruction_0ii
-.LFE2552:
-	.size	_GLOBAL__I__Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_, .-_GLOBAL__I__Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_
-	.align 2
-	.p2align 4,,15
-	.type	__tcf_0, @function
-__tcf_0:
-.LFB2551:
-	pushl	%ebp
-.LCFI6:
-	movl	%esp, %ebp
-.LCFI7:
-	pushl	%ebx
-.LCFI8:
-	call	__i686.get_pc_thunk.bx
-	addl	$_GLOBAL_OFFSET_TABLE_, %ebx
-	subl	$4, %esp
-.LCFI9:
-	leal	_ZSt8__ioinit@GOTOFF(%ebx), %eax
-	movl	%eax, (%esp)
-	call	_ZNSt8ios_base4InitD1Ev@PLT
-	addl	$4, %esp
-	popl	%ebx
-	leave
-	ret
-.LFE2551:
-	.size	__tcf_0, .-__tcf_0
-	.align 2
-	.p2align 4,,15
-.globl _Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_
-	.type	_Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_, @function
-_Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_:
-.LFB2352:
-	pushl	%ebp
-.LCFI10:
-	movl	%esp, %ebp
-.LCFI11:
-	pushl	%edi
-.LCFI12:
-	pushl	%esi
-.LCFI13:
-	subl	$12, %esp
-.LCFI14:
-	movl	8(%ebp), %edx
-	movl	(%edx), %eax
-	testl	%eax, %eax
-	movl	%eax, -20(%ebp)
-	jle	.L16
-	movl	16(%ebp), %eax
-	movl	4(%edx), %edx
-	xorl	%ecx, %ecx
-	movl	4(%eax), %eax
-	movl	%edx, -12(%ebp)
-	movl	%eax, -16(%ebp)
-	movl	20(%ebp), %eax
-	movl	4(%eax), %edi
-	movl	12(%ebp), %eax
-	movl	4(%eax), %esi
-	.p2align 4,,7
-.L15:
-	movl	-16(%ebp), %edx
-	movl	(%edx,%ecx,4), %eax
-	movl	-12(%ebp), %edx
-	leal	(%edx,%eax,8), %eax
-	movl	(%edi,%ecx,4), %edx
-	incl	%ecx
-	cmpl	%ecx, -20(%ebp)
-	fldl	(%eax)
-	fsubl	(%esi,%edx,8)
-	fstpl	(%eax)
-	jne	.L15
-.L16:
-	addl	$12, %esp
-	popl	%esi
-	popl	%edi
-	leave
-	ret
-.LFE2352:
-	.size	_Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_, .-_Z4funcRN4Foam4ListIdEERKS1_RKNS0_IiEES7_
-	.local	_ZSt8__ioinit
-	.comm	_ZSt8__ioinit,1,1
-	.section	.eh_frame,"a",@progbits
-.Lframe1:
-	.long	.LECIE1-.LSCIE1
-.LSCIE1:
-	.long	0x0
-	.byte	0x1
-	.string	"zPR"
-	.uleb128 0x1
-	.sleb128 -4
-	.byte	0x8
-	.uleb128 0x6
-	.byte	0x9b
-	.long	DW.ref.__gxx_personality_v0-.
-	.byte	0x1b
-	.byte	0xc
-	.uleb128 0x4
-	.uleb128 0x4
-	.byte	0x88
-	.uleb128 0x1
-	.align 4
-.LECIE1:
-.LSFDE1:
-	.long	.LEFDE1-.LASFDE1
-.LASFDE1:
-	.long	.LASFDE1-.Lframe1
-	.long	.LFB2550-.
-	.long	.LFE2550-.LFB2550
-	.uleb128 0x0
-	.byte	0x4
-	.long	.LCFI0-.LFB2550
-	.byte	0xe
-	.uleb128 0x8
-	.byte	0x85
-	.uleb128 0x2
-	.byte	0x4
-	.long	.LCFI1-.LCFI0
-	.byte	0xd
-	.uleb128 0x5
-	.byte	0x4
-	.long	.LCFI2-.LCFI1
-	.byte	0x83
-	.uleb128 0x3
-	.align 4
-.LEFDE1:
-.LSFDE5:
-	.long	.LEFDE5-.LASFDE5
-.LASFDE5:
-	.long	.LASFDE5-.Lframe1
-	.long	.LFB2551-.
-	.long	.LFE2551-.LFB2551
-	.uleb128 0x0
-	.byte	0x4
-	.long	.LCFI6-.LFB2551
-	.byte	0xe
-	.uleb128 0x8
-	.byte	0x85
-	.uleb128 0x2
-	.byte	0x4
-	.long	.LCFI7-.LCFI6
-	.byte	0xd
-	.uleb128 0x5
-	.byte	0x4
-	.long	.LCFI8-.LCFI7
-	.byte	0x83
-	.uleb128 0x3
-	.align 4
-.LEFDE5:
-	.hidden DW.ref.__gxx_personality_v0
-	.weak	DW.ref.__gxx_personality_v0
-	.section	.data.DW.ref.__gxx_personality_v0,"awG",@progbits,DW.ref.__gxx_personality_v0,comdat
-	.align 4
-	.type	DW.ref.__gxx_personality_v0, @object
-	.size	DW.ref.__gxx_personality_v0, 4
-DW.ref.__gxx_personality_v0:
-	.long	__gxx_personality_v0
-	.ident	"GCC: (GNU) 4.1.1"
-	.section	.text.__i686.get_pc_thunk.bx,"axG",@progbits,__i686.get_pc_thunk.bx,comdat
-.globl __i686.get_pc_thunk.bx
-	.hidden	__i686.get_pc_thunk.bx
-	.type	__i686.get_pc_thunk.bx, @function
-__i686.get_pc_thunk.bx:
-	movl	(%esp), %ebx
-	ret
-	.section	.note.GNU-stack,"",@progbits
diff --git a/applications/test/List/Make/files b/applications/test/List/Make/files
deleted file mode 100644
index f6ed74ee6..000000000
--- a/applications/test/List/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-ListTest.C
-ListLoop.C
-
-EXE = $(FOAM_USER_APPBIN)/ListTest
diff --git a/applications/test/List/Make/options b/applications/test/List/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/Map/Make/files b/applications/test/Map/Make/files
deleted file mode 100644
index 7d6fd2141..000000000
--- a/applications/test/Map/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-
-MapTest.C
-
-EXE = $(FOAM_USER_APPBIN)/MapTest
diff --git a/applications/test/Map/Make/options b/applications/test/Map/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/Map/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/Map/MapTest.C b/applications/test/Map/MapTest.C
deleted file mode 100644
index c87019a57..000000000
--- a/applications/test/Map/MapTest.C
+++ /dev/null
@@ -1,86 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    testMapIterators
-
-Description
-    For each time calculate the magnitude of velocity.
-
-\*---------------------------------------------------------------------------*/
-
-#include "Map.H"
-#include <map>
-#include "IOstreams.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    Map<bool> banana;
-
-    banana.insert(5, true);
-
-    // Taking a const iterator from find does not work!
-    // Also, fails later on op==
-    Map<bool>::const_iterator bananaIter = banana.find(5);
-
-    // This works but now I can change the value.
-    //Map<bool>::iterator bananaIter = banana.find(5);
-
-    if (bananaIter == banana.end())
-    {
-        Info << "not found" << endl;
-    }
-    else
-    {
-        Info << "5 is " << bananaIter() << endl;
-    }
-
-    // Same with STL
-    Info << "Same with STL" << endl;
-
-    std::map<label, bool> STLbanana;
-    STLbanana[5] = true;
-    std::map<label, bool>::const_iterator STLbananaIter = STLbanana.find(5);
-
-    if (STLbananaIter == STLbanana.end())
-    {
-        Info << "not found" << endl;
-    }
-    else
-    {
-        Info << "5 is " << STLbananaIter->second << endl;
-    }
-
-
-    Info<< "End\n" << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/Matrix/Make/files b/applications/test/Matrix/Make/files
deleted file mode 100644
index b5e2f3c68..000000000
--- a/applications/test/Matrix/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-MatrixTest.C
-
-EXE = $(FOAM_USER_APPBIN)/MatrixTest
diff --git a/applications/test/Matrix/Make/options b/applications/test/Matrix/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/Matrix/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/NamedEnum/Make/files b/applications/test/NamedEnum/Make/files
deleted file mode 100644
index a06d4ba5a..000000000
--- a/applications/test/NamedEnum/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-
-namedEnumTest.C
-
-EXE = $(FOAM_APPBIN)/NamedEnum
diff --git a/applications/test/NamedEnum/Make/options b/applications/test/NamedEnum/Make/options
deleted file mode 100644
index 4e772fdf9..000000000
--- a/applications/test/NamedEnum/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/ODETest/Make/files b/applications/test/ODETest/Make/files
deleted file mode 100644
index 0550b6661..000000000
--- a/applications/test/ODETest/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-ODETest.C
-
-EXE = $(FOAM_USER_APPBIN)/ODETest
diff --git a/applications/test/ODETest/Make/options b/applications/test/ODETest/Make/options
deleted file mode 100644
index e678a1c0e..000000000
--- a/applications/test/ODETest/Make/options
+++ /dev/null
@@ -1,3 +0,0 @@
-EXE_INC = -I$(LIB_SRC)/ODE/lnInclude
-EXE_LIBS = -lODE
-
diff --git a/applications/test/ODETest/ODETest.C b/applications/test/ODETest/ODETest.C
deleted file mode 100644
index 5138453db..000000000
--- a/applications/test/ODETest/ODETest.C
+++ /dev/null
@@ -1,176 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "IOmanip.H"
-#include "ODE.H"
-#include "ODESolver.H"
-#include "RK.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-class testODE
-:
-    public ODE
-{
-
-public:
-
-    testODE()
-    {}
-
-    label nEqns() const
-    {
-        return 4;
-    }
-
-    void derivatives
-    (
-        const scalar x,
-        const scalarField& y,
-        scalarField& dydx
-    ) const
-    {
-        dydx[0] = -y[1];
-        dydx[1] = y[0] - (1.0/x)*y[1];
-        dydx[2] = y[1] - (2.0/x)*y[2];
-        dydx[3] = y[2] - (3.0/x)*y[3];
-    }
-
-    void jacobian
-    (
-        const scalar x,
-        const scalarField& y,
-        scalarField& dfdx,
-        Matrix<scalar>& dfdy
-    ) const
-    {
-        dfdx[0] = 0.0;
-        dfdx[1] = (1.0/sqr(x))*y[1];
-        dfdx[2] = (2.0/sqr(x))*y[2];
-        dfdx[3] = (3.0/sqr(x))*y[3];
-
-        dfdy[0][0] = 0.0;
-        dfdy[0][1] = -1.0;
-        dfdy[0][2] = 0.0;
-        dfdy[0][3] = 0.0;
-
-        dfdy[1][0] = 1.0;
-        dfdy[1][1] = -1.0/x;
-        dfdy[1][2] = 0.0;
-        dfdy[1][3] = 0.0;
-
-        dfdy[2][0] = 0.0;
-        dfdy[2][1] = 1.0;
-        dfdy[2][2] = -2.0/x;
-        dfdy[2][3] = 0.0;
-
-        dfdy[3][0] = 0.0;
-        dfdy[3][1] = 0.0;
-        dfdy[3][2] = 1.0;
-        dfdy[3][3] = -3.0/x;
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    argList::validArgs.clear();
-    argList::validArgs.append("ODESolver");
-    argList args(argc, argv);
-
-    word ODESolverName(args.additionalArgs()[0]);
-
-    testODE ode;
-    autoPtr<ODESolver> odeSolver = ODESolver::New(ODESolverName, ode);
-
-    scalar xStart = 1.0;
-    scalarField yStart(ode.nEqns());
-    yStart[0] = ::Foam::j0(xStart);
-    yStart[1] = ::Foam::j1(xStart);
-    yStart[2] = ::Foam::jn(2, xStart);
-    yStart[3] = ::Foam::jn(3, xStart);
-
-    scalarField dyStart(ode.nEqns());
-    ode.derivatives(xStart, yStart, dyStart);
-
-    Info<< setw(10) << "eps" << setw(12) << "hEst";
-    Info<< setw(13) << "hDid" << setw(14) << "hNext" << endl;
-    Info<< setprecision(6);
-
-    for (label i=0; i<15; i++)
-    {
-        scalar eps = ::Foam::exp(-scalar(i + 1));
-
-        scalar x = xStart;
-        scalarField y = yStart;
-        scalarField dydx = dyStart;
-
-        scalarField yScale(ode.nEqns(), 1.0);
-        scalar hEst = 0.6;
-        scalar hDid, hNext;
-
-        odeSolver->solve(ode, x, y, dydx, eps, yScale, hEst, hDid, hNext);
-
-        Info<< scientific << setw(13) << eps;
-        Info<< fixed << setw(11) << hEst;
-        Info<< setw(13) << hDid << setw(13) << hNext
-            << setw(13) << y[0] << setw(13) << y[1]
-            << setw(13) << y[2] << setw(13) << y[3]
-            << endl;
-    }
-
-    scalar x = xStart;
-    scalar xEnd = x + 1.0;
-    scalarField y = yStart;
-
-    scalarField yEnd(ode.nEqns());
-    yEnd[0] = ::Foam::j0(xEnd);
-    yEnd[1] = ::Foam::j1(xEnd);
-    yEnd[2] = ::Foam::jn(2, xEnd);
-    yEnd[3] = ::Foam::jn(3, xEnd);
-
-    scalar hEst = 0.5;
-
-    odeSolver->solve(ode, x, xEnd, y, 1e-4, hEst);
-
-    Info<< nl << "Analytical: y(2.0) = " << yEnd << endl;
-    Info      << "Numerical:  y(2.0) = " << y << ", hEst = " << hEst << endl;
-
-    Info << "\nEnd\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/OStringStream/Make/files b/applications/test/OStringStream/Make/files
deleted file mode 100644
index 8c96d099c..000000000
--- a/applications/test/OStringStream/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-OStringStreamTest.C
-
-EXE = $(FOAM_USER_APPBIN)/OStringStreamTest
diff --git a/applications/test/OStringStream/Make/options b/applications/test/OStringStream/Make/options
deleted file mode 100644
index 4e772fdf9..000000000
--- a/applications/test/OStringStream/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/SLList/Make/files b/applications/test/SLList/Make/files
deleted file mode 100644
index b046754ac..000000000
--- a/applications/test/SLList/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-SLListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/SLListTest
diff --git a/applications/test/SLList/Make/options b/applications/test/SLList/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/SLList/SLListTest.C b/applications/test/SLList/SLListTest.C
deleted file mode 100644
index 58674cb04..000000000
--- a/applications/test/SLList/SLListTest.C
+++ /dev/null
@@ -1,107 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "OSspecific.H"
-
-#include "IOstreams.H"
-#include "SLList.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    SLList<scalar> myList;
-
-    for (int i = 0; i<10; i++)
-    {
-        myList.append(1.3*i);
-    }
-
-    myList.append(100.3);
-
-    myList.append(500.3);
-
-
-    Info<< nl << "And again using STL iterator: " << nl << endl;
-
-    for
-    (
-        SLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
-    {
-        Info<< "element:" << *iter << endl;
-    }
-
-    Info<< nl << "And again using STL const_iterator: " << nl << endl;
-
-    const SLList<scalar>& const_myList = myList;
-
-    for
-    (
-        SLList<scalar>::const_iterator iter2 = const_myList.begin();
-        iter2 != const_myList.end();
-        ++iter2
-    )
-    {
-        Info<< "element:" << *iter2 << endl;
-    }
-
-    for
-    (
-        SLList<scalar>::iterator iter = myList.begin();
-        iter != myList.end();
-        ++iter
-    )
-    {
-        Info<< "Removing element:" << *iter << endl;
-        myList.remove(iter);
-    }
-
-    for
-    (
-        SLList<scalar>::const_iterator iter2 = const_myList.begin();
-        iter2 != const_myList.end();
-        ++iter2
-    )
-    {
-        Info<< "element:" << *iter2 << endl;
-    }
-
-    Info<< nl << "Bye." << endl;
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/StaticHashTable/staticHashTableTest.C b/applications/test/StaticHashTable/staticHashTableTest.C
deleted file mode 100644
index 759393a78..000000000
--- a/applications/test/StaticHashTable/staticHashTableTest.C
+++ /dev/null
@@ -1,140 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-
-\*---------------------------------------------------------------------------*/
-
-#include <iostream>
-#include "StaticHashTable.H"
-#include "IOstreams.H"
-#include "IStringStream.H"
-#include "OStringStream.H"
-
-using namespace Foam;
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main()
-{
-    //for (;;)
-    {
-    StaticHashTable<double> myTable(10);
-
-    myTable.insert("aaa", 1.0);
-    myTable.insert("aba", 2.0);
-    myTable.insert("aca", 3.0);
-    myTable.insert("ada", 4.0);
-    myTable.insert("aeq", 5.0);
-    myTable.insert("aaw", 6.0);
-    myTable.insert("abs", 7.0);
-    myTable.insert("acr", 8.0);
-    myTable.insert("adx", 9.0);
-    myTable.insert("aec", 10.0);
-
-    Pout<< "Foam output operator:" << nl << endl;
-    Pout<< myTable << endl;
-
-    //myTable.erase("aaw");
-    //myTable.erase("abs");
-    //std::cerr << "Size now:" << myTable.size() << '\n';
-
-    Pout<< "toc:" << nl << endl;
-    Pout<< myTable.toc() << endl;
-
-
-    std::cerr << myTable.find("aaa")() << '\n';
-    std::cerr << myTable.find("aba")() << '\n';
-    std::cerr << myTable.find("aca")() << '\n';
-    std::cerr << myTable.find("ada")() << '\n';
-    std::cerr << myTable.find("aeq")() << '\n';
-    std::cerr << myTable.find("aaw")() << '\n';
-    std::cerr << myTable.find("abs")() << '\n';
-    std::cerr << myTable.find("acr")() << '\n';
-    std::cerr << myTable.find("adx")() << '\n';
-    std::cerr << myTable.find("aec")() << '\n';
-
-    std::cerr << myTable["aaa"] << '\n';
-
-    {
-        OStringStream os;
-
-        os << myTable;
-
-        IStringStream is(os.str());
-
-        Pout<< "Foam Istream constructor:" << nl << endl;
-        StaticHashTable<double> readTable(is, 100);
-
-        Pout<< readTable << endl;
-    }
-
-    std::cerr << "\ncopy construct of table\n" << std::endl;
-
-    StaticHashTable<double> myTable1(myTable);
-    Pout<< "myTable1:" << myTable1 << endl;
-
-    std::cerr << "\nassignment of table\n" << std::endl;
-
-    StaticHashTable<double> myTable2(100);
-    myTable2.transfer(myTable);
-
-    //Pout<< "myTable:" << myTable << endl;
-
-    forAllConstIter(StaticHashTable<double>, myTable2, iter2)
-    {
-        std::cerr << *iter2 << '\n';
-    }
-
-    std::cerr << "\ntable resize 1\n" << std::endl;
-
-    myTable2.resize(1);
-    
-    forAllConstIter(StaticHashTable<double>, myTable2, iter2)
-    {
-        std::cerr << *iter2 << '\n';
-    }
-
-    std::cerr << "\ntable size 10000\n" << std::endl;
-
-    myTable2.resize(10000);
-    
-    forAllConstIter(StaticHashTable<double>, myTable2, iter2)
-    {
-        std::cerr << *iter2 << '\n';
-    }
-
-    }
-
-
-    std::cerr << "\nBye.\n";
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/Tuple2/Make/files b/applications/test/Tuple2/Make/files
deleted file mode 100644
index bac600a9c..000000000
--- a/applications/test/Tuple2/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-Tuple2Test.C
-
-EXE = $(FOAM_USER_APPBIN)/Tuple2Test
diff --git a/applications/test/Tuple2/Make/options b/applications/test/Tuple2/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/UDictionary/Make/files b/applications/test/UDictionary/Make/files
deleted file mode 100644
index c3feead38..000000000
--- a/applications/test/UDictionary/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-UDictionaryTest.C
-
-EXE = $(FOAM_USER_APPBIN)/UDictionaryTest
diff --git a/applications/test/UDictionary/Make/options b/applications/test/UDictionary/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/UDictionary/UDictionaryTest.C b/applications/test/UDictionary/UDictionaryTest.C
deleted file mode 100644
index 312dd545c..000000000
--- a/applications/test/UDictionary/UDictionaryTest.C
+++ /dev/null
@@ -1,121 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "OSspecific.H"
-
-#include "IOstreams.H"
-#include "UDictionary.H"
-
-using namespace Foam;
-
-class ent
-:
-    public UDictionary<ent>::link
-{
-    word keyword_;
-    int i_;
-
-public:
-
-    ent(const word& keyword, int i)
-    :
-        keyword_(keyword),
-        i_(i)
-    {}
-
-    const word& keyword() const
-    {
-        return keyword_;
-    }
-
-    friend Ostream& operator<<(Ostream& os, const ent& e)
-    {
-        os << e.keyword_ << ' ' << e.i_ << endl;
-        return os;
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    UDictionary<ent>* dictPtr = new UDictionary<ent>;
-    UDictionary<ent>& dict = *dictPtr;
-
-    for (int i = 0; i<10; i++)
-    {
-        ent* ePtr = new ent(word("ent") + name(i), i);
-        dict.append(ePtr->keyword(), ePtr);
-        dict.swapUp(ePtr);
-    }
-
-    Info<< dict << endl;
-
-    dict.swapDown(dict.first());
-
-    for
-    (
-        UDictionary<ent>::const_iterator iter = dict.begin();
-        iter != dict.end();
-        ++iter
-    )
-    {
-        Info<< "element : " << *iter;
-    }
-
-    Info<< dict.toc() << endl;
-
-    delete dictPtr;
-
-    dictPtr = new UDictionary<ent>;
-    UDictionary<ent>& dict2 = *dictPtr;
-
-    for (int i = 0; i<10; i++)
-    {
-        ent* ePtr = new ent(word("ent") + name(i), i);
-        dict2.append(ePtr->keyword(), ePtr);
-        dict2.swapUp(ePtr);
-    }
-
-    Info<< dict2 << endl;
-
-    dict2.remove("ent9");
-    dict2.UILList<DLListBase, ent>::remove(dict2.first());
-
-    Info<< dict2 << endl;
-
-    Info<< nl << "Bye." << endl;
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/Unix/Make/files b/applications/test/Unix/Make/files
deleted file mode 100644
index 6554bfcbb..000000000
--- a/applications/test/Unix/Make/files
+++ /dev/null
@@ -1,2 +0,0 @@
-UnixTest.C
-EXE = $(FOAM_USER_APPBIN)/UnixTest
diff --git a/applications/test/Unix/Make/options b/applications/test/Unix/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/Unix/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/alloc/Make/files b/applications/test/alloc/Make/files
deleted file mode 100644
index e036a1053..000000000
--- a/applications/test/alloc/Make/files
+++ /dev/null
@@ -1,8 +0,0 @@
-allocTest.C
-/*
-newTest.C
-mallocTest.C
-test.C
-*/
-
-SEXE = $(FOAM_USER_APPBIN)/allocTest
diff --git a/applications/test/alloc/Make/options b/applications/test/alloc/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/alloc/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/alloc/allocTest.C b/applications/test/alloc/allocTest.C
deleted file mode 100644
index db4318475..000000000
--- a/applications/test/alloc/allocTest.C
+++ /dev/null
@@ -1,27 +0,0 @@
-#include <iostream>
-#include <unistd.h>
-
-using namespace std;
-
-int main()
-{
-    int *ptrs[500000];
-
-//    for (;;);
-
-    cerr << "allocating ints\n";
-
-    for (int i=0; i<500000; i++)
-    {
-        ptrs[i] = new int[1];
-        delete[] ptrs[i];
-    }
-
-    for (;;);
-
-    cerr << "allocating double\n";
-
-    double* array = new double[500000];
-
-    for (;;);
-}
diff --git a/applications/test/alloc/mallocTest.C b/applications/test/alloc/mallocTest.C
deleted file mode 100644
index 1614987e3..000000000
--- a/applications/test/alloc/mallocTest.C
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "stream.h"
-#include <unistd.h>
-#include <stdlib.h>
-
-main()
-{
-    int *ptrs[500000];
-
-    cerr << "allocating ints\n";
-
-    for (int i=0; i<500000; i++)
-    {
-        ptrs[i] = (int*)malloc(sizeof(int));
-    }
-
-//    for (;;);
-
-    cerr << "deallocating ints\n";
-
-    for (i=0; i<500000; i++)
-    {
-        free(ptrs[i]);
-    }
-
-    cerr << "allocating double\n";
-
-    double* array = (double*)malloc(500000*sizeof(double));
-
-    for (;;);
-}
diff --git a/applications/test/alloc/newTest.C b/applications/test/alloc/newTest.C
deleted file mode 100644
index 7609172b0..000000000
--- a/applications/test/alloc/newTest.C
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <stream.h>
-
-main()
-{
-    int* intPtrs[500000];
-
-    cerr << "allocating ints\n";
-
-    for (int i=0; i<500000; i++)
-    {
-        intPtrs[i] = new int[1];
-    }
-
-    cerr << "allocated ints\n";
-
-    cerr << "deallocating ints\n";
-
-    for (i=0; i<500000; i++)
-    {
-        delete[] intPtrs[i];
-    }
-
-    cerr << "deallocated ints\n";
-
-    cerr << "alloacting doubles\n";
-
-    double* doubles = new double[500000];
-
-    for (;;);
-}
diff --git a/applications/test/alloc/test.C b/applications/test/alloc/test.C
deleted file mode 100644
index 67f77ab05..000000000
--- a/applications/test/alloc/test.C
+++ /dev/null
@@ -1,64 +0,0 @@
-#include <stdlib.h>
-
-class Int
-{
-    int I;
-
-public:
-
-    Int(){}
-
-    operator int()
-    {
-        return I;
-    }
-};
-
-
-template<class T>
-class List : public T
-{
-    T* v;
-    int sz;
-
-public:
-
-    List()
-    {
-        v = new T[sz=10];
-    }
-
-    List(int s)
-    {
-        v = new T[sz=s];
-    }
-
-    ~List()
-    {
-        delete[] v;
-    }
-
-    inline int size() const;
-
-};
-
-
-template<class T>
-inline int List<T>::size() const
-{
-    return sz;
-}
-
-
-#include <stream.h>
-
-main()
-{
-    typedef List<Int> intList;
-
-    intList list(10);
-
-    cout << list.size() << "\n";
-
-    return 0;
-}
diff --git a/applications/test/callback/Make/files b/applications/test/callback/Make/files
deleted file mode 100644
index 788abb046..000000000
--- a/applications/test/callback/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-callbackTest.C
-
-EXE = $(FOAM_APPBIN)/callbackTest
diff --git a/applications/test/callback/Make/options b/applications/test/callback/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/callback/callbackTest.C b/applications/test/callback/callbackTest.C
deleted file mode 100644
index 5029de963..000000000
--- a/applications/test/callback/callbackTest.C
+++ /dev/null
@@ -1,127 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    callBackTest
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "Callback.H"
-
-using namespace Foam;
-
-class callback
-:
-    public Callback<callback>
-{
-public:
-
-    callback(CallbackRegistry<callback>& cbr)
-    :
-        Callback<callback>(cbr)
-    {}
-
-    ~callback()
-    {}
-
-    virtual const word& name() const = 0;
-
-    void testCallbackFunction() const
-    {
-        Info<< "calling testCallbackFunction for object " << name() << endl;
-    }
-};
-
-
-class callbackRegistry
-:
-    public CallbackRegistry<callback>
-{
-public:
-
-    callbackRegistry()
-    {}
-
-    ~callbackRegistry()
-    {}
-
-    void testCallbackFunction() const
-    {
-        forAllConstIter(callbackRegistry, *this, iter)
-        {
-            iter().testCallbackFunction();
-        }
-    }
-};
-
-
-class objectWithCallback
-:
-    public callback
-{
-    word name_;
-
-public:
-
-    objectWithCallback(const word& n, callbackRegistry& cbr)
-    :
-        callback(cbr),
-        name_(n)
-    {}
-
-    virtual const word& name() const
-    {
-        return name_;
-    }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    callbackRegistry cbr;
-
-    objectWithCallback ob1("ob1", cbr);
-    objectWithCallback ob2("ob2", cbr);
-
-    cbr.testCallbackFunction();
-
-    {
-        objectWithCallback ob1("ob1", cbr);
-        cbr.testCallbackFunction();
-    }
-
-    cbr.testCallbackFunction();
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/cyclic/Make/files b/applications/test/cyclic/Make/files
deleted file mode 100644
index f373d8da3..000000000
--- a/applications/test/cyclic/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-cyclicTest.C
-
-EXE = $(FOAM_USER_APPBIN)/cyclicTest
diff --git a/applications/test/cyclic/Make/options b/applications/test/cyclic/Make/options
deleted file mode 100644
index fa15f1245..000000000
--- a/applications/test/cyclic/Make/options
+++ /dev/null
@@ -1,5 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume
diff --git a/applications/test/cyclic/createFields.H b/applications/test/cyclic/createFields.H
deleted file mode 100644
index 0ec3c54a2..000000000
--- a/applications/test/cyclic/createFields.H
+++ /dev/null
@@ -1,27 +0,0 @@
-    Info<< nl << "Reading field p" << endl;
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    Info<< nl << "Reading field U" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
diff --git a/applications/test/dataEntry/Make/files b/applications/test/dataEntry/Make/files
deleted file mode 100644
index abbd55d34..000000000
--- a/applications/test/dataEntry/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-testDataEntry.C
-
-EXE = $(FOAM_APPBIN)/testDataEntry
diff --git a/applications/test/dataEntry/Make/options b/applications/test/dataEntry/Make/options
deleted file mode 100644
index cde1970d7..000000000
--- a/applications/test/dataEntry/Make/options
+++ /dev/null
@@ -1,11 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume \
-    -llagrangianIntermediate \
-    -lradiation \
-    -lthermophysicalFunctions
\ No newline at end of file
diff --git a/applications/test/dataEntry/files b/applications/test/dataEntry/files
deleted file mode 100644
index c7e4dc904..000000000
--- a/applications/test/dataEntry/files
+++ /dev/null
@@ -1,4 +0,0 @@
-testTable.C
-
-EXE=$(FOAM_USER_APPBIN)/testTable
-
diff --git a/applications/test/dataEntry/testDataEntry.C b/applications/test/dataEntry/testDataEntry.C
deleted file mode 100644
index e16c39619..000000000
--- a/applications/test/dataEntry/testDataEntry.C
+++ /dev/null
@@ -1,89 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    testDataEntry
-
-Description
-    Tests lagrangian/intermediate/submodels/IO/DataEntry
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "DataEntry.H"
-#include "IOdictionary.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    IOdictionary dataEntryProperties
-    (
-        IOobject
-        (
-            "dataEntryProperties",
-            runTime.constant(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::NO_WRITE
-        )
-    );
-
-    autoPtr<DataEntry<scalar> > dataEntry
-    (
-        DataEntry<scalar>::New
-        (
-            "dataEntry",
-            dataEntryProperties
-        )
-    );
-
-    scalar x0 = readScalar(dataEntryProperties.lookup("x0"));
-    scalar x1 = readScalar(dataEntryProperties.lookup("x1"));
-
-    Info<< "Data entry type: " << dataEntry().type() << nl << endl;
-
-    Info<< "Inputs" << nl
-        << "    x0 = " << x0 << nl
-        << "    x1 = " << x1 << nl
-        << endl;
-
-    Info<< "Interpolation" << nl
-        << "    f(x0) = " << dataEntry().value(x0) << nl
-        << "    f(x1) = " << dataEntry().value(x1) << nl
-        << endl;
-
-    Info<< "Integration" << nl
-        << "    int(f(x)) lim(x0->x1) = " << dataEntry().integrate(x0, x1) << nl
-        << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/delete/Make/files b/applications/test/delete/Make/files
deleted file mode 100644
index 89e563518..000000000
--- a/applications/test/delete/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-deleteTest.C
-
-EXE = $(FOAM_USER_APPBIN)/deleteTest
diff --git a/applications/test/delete/Make/options b/applications/test/delete/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/dictionary/Make/files b/applications/test/dictionary/Make/files
deleted file mode 100644
index 759804fcf..000000000
--- a/applications/test/dictionary/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-calcEntry/calcEntry.C
-dictionaryTest.C
-
-EXE = $(FOAM_USER_APPBIN)/dictionaryTest
diff --git a/applications/test/dictionary/Make/options b/applications/test/dictionary/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/dictionary/testDict b/applications/test/dictionary/testDict
deleted file mode 100644
index 9bd58c58a..000000000
--- a/applications/test/dictionary/testDict
+++ /dev/null
@@ -1,98 +0,0 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-|    =========                                                              |
-|    \\      /     OpenFOAM                                                 |
-|     \\    /                                                               |
-|      \\  /       The Open Source CFD Toolbox                              |
-|       \\/                                        http://www.OpenFOAM.org  |
-\*-------------------------------------------------------------------------*/
-FoamFile
-{
-    version         2.0;
-    format          ascii;
-    class           dictionary;
-    object          testDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-#inputMode  merge
-
-dimensions      [ 0 2 -2 0 0 0 0 ];
-internalField   uniform 1;
-
-active
-{
-    type            turbulentIntensityKineticEnergyInlet;
-    intensity       0.1;
-    value           $internalField;
-}
-
-
-inactive
-{
-    type            zeroGradient;
-}
-
-boundaryField
-{
-    Default_Boundary_Region
-    {
-        type            zeroGradient;
-    }
-
-    inlet_1  { $active }
-    inlet_2  { $inactive }
-    inlet_3  { $inactive }
-    inlet_4  { $inactive }
-    inlet_5  "a primitiveEntry is squashed by a directory entry";
-    inlet_5  { $inactive }
-    inlet_6  { $inactive }
-    inlet_7  { $inactive }
-    inlet_8  { $inactive }
-
-    #include "testDictInc"
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           #include "value";
-        // error           #remove self;
-        x               5;
-        y               6;
-        another         #calc{x $x; y $y;};
-    }
-
-    // this should have no effect
-    #remove inactive
-
-    inlet_7  { $active }
-    #inputMode overwrite
-    inlet_8  { $active }
-}
-
-// NB: the inputMode has a global scope
-#inputMode merge
-#include "testDict2"
-
-foo
-{
-    $active
-}
-
-bar
-{
-    $active
-}
-
-baz
-{
-    $active
-}
-
-
-// this should work
-#remove active
-
-// this should work too
-#remove ( bar baz )
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/dictionary/testDict2 b/applications/test/dictionary/testDict2
deleted file mode 100644
index 6c55ab384..000000000
--- a/applications/test/dictionary/testDict2
+++ /dev/null
@@ -1,30 +0,0 @@
-/*-------------------------------*- C++ -*---------------------------------*\
-|    =========                                                              |
-|    \\      /     OpenFOAM                                                 |
-|     \\    /                                                               |
-|      \\  /       The Open Source CFD Toolbox                              |
-|       \\/                                        http://www.OpenFOAM.org  |
-\*-------------------------------------------------------------------------*/
-FoamFile
-{
-    version         2.0;
-    format          ascii;
-    class           dictionary;
-    object          testDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-boundaryField
-{
-    Default_Boundary_Region
-    {
-        value $internalField;
-        note "actually a noslip wall";
-    }
-
-    inlet_3  "a primitiveEntry squashes directory entry";
-}
-
-#inputMode  overwrite
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/dictionary/testDictInc b/applications/test/dictionary/testDictInc
deleted file mode 100644
index a0814c183..000000000
--- a/applications/test/dictionary/testDictInc
+++ /dev/null
@@ -1,6 +0,0 @@
-    inlet_4
-    {
-        type            inletOutlet;
-        inletValue      $internalField;
-        value           $internalField;
-    }
diff --git a/applications/test/dictionary/value b/applications/test/dictionary/value
deleted file mode 100644
index 6a860dc35..000000000
--- a/applications/test/dictionary/value
+++ /dev/null
@@ -1,2 +0,0 @@
-// the trailing ';' shouldn't actually be there, but shouldn't cause problems
-uniform 2;
diff --git a/applications/test/dimensionedType/Make/files b/applications/test/dimensionedType/Make/files
deleted file mode 100644
index fcffbec3d..000000000
--- a/applications/test/dimensionedType/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-
-dimensionedTypeTest.C
-
-EXE = $(FOAM_USER_APPBIN)/dimensionedType
diff --git a/applications/test/dimensionedType/Make/options b/applications/test/dimensionedType/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/dimensionedType/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/error/Make/files b/applications/test/error/Make/files
deleted file mode 100644
index 51380f63b..000000000
--- a/applications/test/error/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-errorTest.C
-
-EXE = $(FOAM_USER_APPBIN)/errorTest
diff --git a/applications/test/error/Make/options b/applications/test/error/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/error/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/error/errorTest.C b/applications/test/error/errorTest.C
deleted file mode 100644
index ecd3be51c..000000000
--- a/applications/test/error/errorTest.C
+++ /dev/null
@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "error.H"
-#include "IOstreams.H"
-#include "dictionary.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    FatalError.throwExceptions();
-
-    try
-    {
-        WarningIn("main") << "warning 1" << endl;
-        IOWarningIn("main", Serr) << "warning 2" << endl;
-
-        dictionary dict;
-
-        IOWarningIn("main", dict) << "warning 3" << endl;
-
-        FatalErrorIn("main") << "error 1" << endl;
-        FatalErrorIn("main") << "error 2" << exit(FatalError);
-    }
-    catch (Foam::error& fErr)
-    {
-        Serr<< "Caught Foam error " << fErr << nl << endl;
-    }
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/fileName/Make/files b/applications/test/fileName/Make/files
deleted file mode 100644
index 4b7575a03..000000000
--- a/applications/test/fileName/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-fileNameTest.C
-
-EXE = $(FOAM_USER_APPBIN)/fileNameTest
diff --git a/applications/test/fileName/Make/options b/applications/test/fileName/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/fileName/fileNameTest.C b/applications/test/fileName/fileNameTest.C
deleted file mode 100644
index 223b80940..000000000
--- a/applications/test/fileName/fileNameTest.C
+++ /dev/null
@@ -1,66 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    fileName
-
-Description
-
-
-\*---------------------------------------------------------------------------*/
-
-#include "fileName.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main()
-{
-    wordList wrdList(5);
-    wrdList[0] = "hello";
-    wrdList[1] = "hello1";
-    wrdList[2] = "hello2";
-    wrdList[3] = "hello3";
-    wrdList[4] = "hello4.hmm";
-
-    fileName pathName(wrdList);
-
-    Info<< "pathName = " << pathName << endl;
-    Info<< "pathName.name() = " << pathName.name() << endl;
-    Info<< "pathName.path() = " << pathName.path() << endl;
-    Info<< "pathName.ext() = " << pathName.ext() << endl;
-
-    Info<< "pathName.components() = " << pathName.components() << endl;
-    Info<< "pathName.component(2) = " << pathName.component(2) << endl;
-
-    Info<< "end" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/findCell-octree/Make/files b/applications/test/findCell-octree/Make/files
deleted file mode 100644
index 809cf2db1..000000000
--- a/applications/test/findCell-octree/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-findCell-octree.C
-
-EXE = $(FOAM_USER_APPBIN)/findCell-octree
diff --git a/applications/test/findCell-octree/findCell-octree.C b/applications/test/findCell-octree/findCell-octree.C
deleted file mode 100644
index 394e0078a..000000000
--- a/applications/test/findCell-octree/findCell-octree.C
+++ /dev/null
@@ -1,99 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "Time.H"
-#include "fvMesh.H"
-#include "IStringStream.H"
-#include "octree.H"
-#include "octreeDataCell.H"
-#include "OFstream.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    argList::validArgs.append("point (x y z)");
-
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    point sample(IStringStream(args.additionalArgs()[0])());
-
-    treeBoundBox meshBb(mesh.points());
-
-    // Calculate typical cell releated size to shift bb by.
-    scalar typDim = meshBb.avgDim()/(2.0*Foam::cbrt(scalar(mesh.nCells())));
-
-    treeBoundBox shiftedBb
-    (
-        meshBb.min(),
-        meshBb.max() + vector(typDim, typDim, typDim)
-    );
-
-
-    Info<< "Mesh" << endl;
-    Info<< "   bounding box           : " << meshBb << endl;
-    Info<< "   bounding box (shifted) : " << shiftedBb << endl;
-    Info<< "   typical dimension      : " << shiftedBb.typDim() << endl;
-
-
-    /*
-     * Now we have allBb and shiftedBb
-     */
-
-    // Wrap indices and mesh information into helper object
-    octreeDataCell shapes(mesh);
-
-    octree<octreeDataCell> oc
-    (
-        shiftedBb,  // overall bounding box
-        shapes,     // all information needed to do checks on cells
-        1,          // min. levels
-        10.0,       // max. size of leaves
-        10.0        // maximum ratio of cubes v.s. cells
-    );
-
-    Info<< "Point:" << sample << " is in shape "
-        << oc.find(sample) << endl;
-    Info<< "Point:" << sample << " is in cell  "
-        << mesh.findCell(sample) << endl;
-
-
-    oc.printStats(Info);
-
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/findCell-octree/findSubSet.C b/applications/test/findCell-octree/findSubSet.C
deleted file mode 100644
index a4f7fba97..000000000
--- a/applications/test/findCell-octree/findSubSet.C
+++ /dev/null
@@ -1,229 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "IStringStream.H"
-
-#include "myBoundBox.H"
-#include "myBoundBoxList.H"
-#include "octree.H"
-#include "octreeData.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-
-
-int main(int argc, char *argv[])
-{
-    argList::validOptions.insert("x1", "X1");
-    argList::validOptions.insert("y1", "Y1");
-    argList::validOptions.insert("z1", "Z1");
-
-    argList::validOptions.insert("x2", "X2");
-    argList::validOptions.insert("y2", "Y2");
-    argList::validOptions.insert("z2", "Z2");
-
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    // Calculate BB of all cells
-
-
-    myBoundBoxList allBb(mesh.nCells());
-
-    const pointField& allPoints = mesh.points();
-
-     vectorField bbMin(mesh.nCells());
-     bbMin = vector(GREAT, GREAT, GREAT);
-     vectorField bbMax(mesh.nCells());
-     bbMax = vector(-GREAT, -GREAT, -GREAT);
-
-     const labelListList& pCells = mesh.pointCells();
-
-     forAll(pCells, pointi)
-     {
-         const point& vertCoord = allPoints[pointi];
-
-         const labelList& cells = pCells[pointi];
-
-         forAll(cells, celli)
-         {
-             label cellNum = cells[celli];
-
-             bbMin[cellNum].x() = min(bbMin[cellNum].x(), vertCoord.x());
-             bbMin[cellNum].y() = min(bbMin[cellNum].y(), vertCoord.y());
-             bbMin[cellNum].z() = min(bbMin[cellNum].z(), vertCoord.z());
-
-             bbMax[cellNum].x() = max(bbMax[cellNum].x(), vertCoord.x());
-             bbMax[cellNum].y() = max(bbMax[cellNum].y(), vertCoord.y());
-             bbMax[cellNum].z() = max(bbMax[cellNum].z(), vertCoord.z());
-         }
-     }
-
-
-    forAll(allBb, celli)
-    {
-        allBb[celli] = myBoundBox(bbMin[celli], bbMax[celli]);
-    }
-
-
-    myBoundBox meshBb(allPoints);
-
-    scalar typDim = meshBb.minDim()/111;
-
-    myBoundBox shiftedBb
-    (
-        meshBb.min(),
-        point
-        (
-            meshBb.max().x() + typDim,
-            meshBb.max().y() + typDim,
-            meshBb.max().z() + typDim
-        )
-    );
-
-
-    Info<< "Mesh" << endl;
-    Info<< "   bounding box     :" << shiftedBb << endl;
-    Info<< "   typical dimension:" << shiftedBb.typDim() << endl;
-
-
-    /*
-     * Now we have allBb and shiftedBb
-     */
-
-
-
-    // Construct table of subset of cells
-
-    labelList cellIndices(10);
-
-    cellIndices[0] = 1433;
-    cellIndices[1] = 1434;
-    cellIndices[2] = 1435;
-    cellIndices[3] = 1436;
-    cellIndices[4] = 1437;
-    cellIndices[5] = 1438;
-    cellIndices[6] = 1439;
-    cellIndices[7] = 1440;
-    cellIndices[8] = 1441;
-    cellIndices[9] = 1442;
-
-    // Get the corresponding bounding boxes
-
-    forAll(cellIndices, i)
-    {
-        allBb[i] = allBb[cellIndices[i]];
-    }
-    allBb.setSize(cellIndices.size());
-    
-
-
-    // Wrap indices and mesh information into helper object
-    octreeData shapes(mesh, cellIndices);
-
-    octree oc
-    (
-        shiftedBb,  // overall bounding box
-        shapes,     // all information needed to do checks on cells
-        allBb,      // bounding boxes of cells
-        10.0        // maximum ratio of cubes v.s. cells
-    );
-
-//    scalar x1(readScalar(IStringStream(args.options()["x1"])()));
-//    scalar y1(readScalar(IStringStream(args.options()["y1"])()));
-//    scalar z1(readScalar(IStringStream(args.options()["z1"])()));
-
-//    scalar x2(readScalar(IStringStream(args.options()["x2"])()));
-//    scalar y2(readScalar(IStringStream(args.options()["y2"])()));
-//    scalar z2(readScalar(IStringStream(args.options()["z2"])()));
-
-
-
-    label nFound = 0;
-
-    scalar x = -5.0;
-    for(int i = 0; i < 100; i++)
-    {
-        scalar y = -7.0;
-        for(int j = 0; j < 10; j++)
-        {
-            scalar z = -12.0;
-            for (int k = 0; k < 10; k++)
-            {
-                point sample(x, y, z);
-
-                label index = oc.find(sample);
-
-                // Convert index into shapes back into cellindex.
-                label cell;
-                if (index != -1)
-                {
-                    cell = cellIndices[index];
-                }
-                else
-                {
-                    cell = -1;
-                }
-                Info<< "Point:" << sample
-                    << " is in cell " << cell << "(octree)  "
-                    << mesh.findCell(sample) << "(linear)"
-                    << endl;
-
-                z += 1.2;
-            }
-            y += 0.9;
-        }
-        x += 0.1;
-    }
-
-
-    Info<< "nFound=" << nFound << endl;
-
-    Info<< "End\n" << endl;
-
-
-    Info<< "Statistics:" << endl
-        << "  nCells   :" << allBb.size() << endl
-        << "  nNodes   :" << oc.nNodes() << endl
-        << "  nLeaves  :" << oc.nLeaves() << endl
-        << "  nEntries :" << oc.nEntries() << endl
-        << "  Cells per leaf :"
-        << oc.nEntries()/oc.nLeaves()
-        << endl
-        << "  Every cell in  :"
-        << oc.nEntries()/allBb.size() << " cubes"
-        << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/findTimes/Make/files b/applications/test/findTimes/Make/files
deleted file mode 100644
index fcfbd3e92..000000000
--- a/applications/test/findTimes/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-findTimes.C
-
-EXE = $(FOAM_USER_APPBIN)/findTimes
diff --git a/applications/test/findTimes/Make/options b/applications/test/findTimes/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/findTimes/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/fvc/Make/files b/applications/test/fvc/Make/files
deleted file mode 100644
index 08c41f8db..000000000
--- a/applications/test/fvc/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-fvcTest.C
-
-EXE = $(FOAM_USER_APPBIN)/fvcTest
diff --git a/applications/test/fvc/Make/options b/applications/test/fvc/Make/options
deleted file mode 100644
index fa15f1245..000000000
--- a/applications/test/fvc/Make/options
+++ /dev/null
@@ -1,5 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume
diff --git a/applications/test/fvc/fvcTest.C b/applications/test/fvc/fvcTest.C
deleted file mode 100644
index bf4891b30..000000000
--- a/applications/test/fvc/fvcTest.C
+++ /dev/null
@@ -1,69 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    test
-
-Description
-    Finite volume method test code.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    volScalarField fx = pow(mesh.C().component(vector::X), 2);
-    fx.write();
-    volScalarField gradx4 = fvc::grad(fx)().component(vector::X);
-    gradx4.write();
-
-    //volVectorField curlC = fvc::curl(1.0*mesh.C());
-
-    //curlC.write();
-
-    /*
-    surfaceScalarField xf = mesh.Cf().component(vector::X);
-    surfaceScalarField xf4 = pow(xf, 4);
-
-    for (int i=1; i<xf4.size()-1; i++)
-    {
-        scalar gradx4a = (xf4[i] - xf4[i-1])/(xf[i] - xf[i-1]);
-        Info<< (gradx4a - gradx4[i])/gradx4a << endl;
-    }
-    */
-
-    Info<< "end" << endl;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/getRoots/Make/files b/applications/test/getRoots/Make/files
deleted file mode 100644
index 01385a773..000000000
--- a/applications/test/getRoots/Make/files
+++ /dev/null
@@ -1,2 +0,0 @@
-getRoots.C
-EXE = $(FOAM_USER_APPBIN)/getRoots
diff --git a/applications/test/getRoots/Make/options b/applications/test/getRoots/Make/options
deleted file mode 100644
index 4e772fdf9..000000000
--- a/applications/test/getRoots/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/getRoots/getRoots.C b/applications/test/getRoots/getRoots.C
deleted file mode 100644
index 2cc985b16..000000000
--- a/applications/test/getRoots/getRoots.C
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "dictionary.H"
-#include "fileNameList.H"
-#include "IFstream.H"
-#include "OSspecific.H"
-
-using namespace Foam;
-
-int main()
-{
-    Info << "\nReading Roots" << endl;
-
-    IFstream rootsFile(home()/".foam/apps/openDX/roots");
-    fileNameList rootsList(dictionary(rootsFile).lookup("roots"));
-
-    char** rootsStrings = new char*[rootsList.size() + 1];
-    rootsStrings[rootsList.size()] = 0;
-
-    if (rootsList.size())
-    {
-        for (int i=0; i<rootsList.size(); i++)
-        {
-            rootsStrings[i] = new char[rootsList[i].size() + 1];
-            strcpy(rootsStrings[i], rootsList[i].c_str());
-
-            Info<< rootsStrings[i] << endl;
-        }
-    }
-
-    return 0;
-}
diff --git a/applications/test/ggiInterpolation/Make/files b/applications/test/ggiInterpolation/Make/files
deleted file mode 100644
index 40777e803..000000000
--- a/applications/test/ggiInterpolation/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-ggiInterpolationTest.C
-
-EXE = $(FOAM_USER_APPBIN)/ggiInterpolationTest
diff --git a/applications/test/ggiInterpolation/Make/options b/applications/test/ggiInterpolation/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/ggiInterpolation/ggiInterpolationTest.C b/applications/test/ggiInterpolation/ggiInterpolationTest.C
deleted file mode 100644
index fe0348f81..000000000
--- a/applications/test/ggiInterpolation/ggiInterpolationTest.C
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "point2D.H"
-#include "HormannAgathos.H"
-
-using namespace Foam;
-
-// Self check ... for debugging
-//
-//
-//                          w = 0
-//
-//
-//   (-10, 10 X--------------X--------------X (10, 10)
-//            |              .              |
-//            |              .              |
-//            |     w = 1    .  w = 1       |
-//            |              .              |
-//            |              .              |
-//    w = 0   X..............X.(0,0)........X     w = 0
-//            |              .              |
-//            |              .              |
-//            |     w = 1    .  w = 1       |
-//            |              .              |
-//            |              .              |
-// (-10, -10) X--------------X--------------X (10, -10)
-//
-//
-//                        w = 0
-//
-//
-//
-
-
-int main()
-{
-    Info << "Starting HormannAgathos::selfCheck" << endl;
-
-    List<point2D> P(4);
-    point2D p0(-10.0, -10);
-    point2D p1( 10.0, -10);
-    point2D p2( 10.0,  10);
-    point2D p3(-10.0,  10);
-
-    point2D deltaX = (p1 - p0);
-    point2D deltaY = (p2 - p1);
-
-    P[0] = p0;
-    P[1] = p1;
-    P[2] = p2;
-    P[3] = p3;
-
-    scalar distTol = 0.0000001;
-    HormannAgathos ha(P, distTol);
-
-    // Check every vertex
-    ha.evaluate(p0);
-    ha.evaluate(p1);
-    ha.evaluate(p2);
-    ha.evaluate(p3);
-
-    // Ha.Evaluate on edges
-    ha.evaluate(p0 + 0.5*deltaX);
-    ha.evaluate(p1 + 0.5*deltaY);
-    // In this case, we exit with ON_EDGE while w = 1; this is ok, we
-    // chose to exit sooner
-    ha.evaluate(p2 - 0.5*deltaX);
-    ha.evaluate(p3 - 0.5*deltaY);
-     
-    // Ha.Evaluate right in the middle of each quadrant
-    ha.evaluate(-0.25*deltaX - 0.25*deltaY);
-    ha.evaluate( 0.25*deltaX - 0.25*deltaY);
-    ha.evaluate( 0.25*deltaX + 0.25*deltaY);
-    ha.evaluate(-0.25*deltaX + 0.25*deltaY);
-
-    // Ha.Evaluate outside of polygon
-    point2D hugeX(10000.0, 0.0);
-    point2D hugeY( 0.0, 10000.0);
-    ha.evaluate(p0 - hugeX - hugeY);
-    ha.evaluate(p1 + hugeX - hugeY);
-    ha.evaluate(p2 + hugeX + hugeY);
-    ha.evaluate(p3 - hugeX + hugeY);
-   
-    ha.evaluate(p0 + 0.5*deltaX - hugeY);
-    ha.evaluate(p1 + 0.5*deltaY + hugeX);
-    ha.evaluate(p2 - 0.5*deltaX + hugeY);
-    ha.evaluate(p3 - 0.5*deltaY - hugeX);
-
-    // In problem:
-    ha.evaluate(p3 - 0.5*deltaY);
-    ha.evaluate(p3 - 0.5*deltaY - hugeX);
-    ha.evaluate(p3 - 0.5*deltaY);
-    ha.evaluate(p3 - 0.5*deltaY - hugeX);
-
-    Info << "Exiting HormannAgathos selfCheck" << endl;
-    return 0;
-}
diff --git a/applications/test/graph/Make/files b/applications/test/graph/Make/files
deleted file mode 100644
index 1c69ce1c7..000000000
--- a/applications/test/graph/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-graphTest.C
-
-EXE = $(FOAM_USER_APPBIN)/graphTest
diff --git a/applications/test/graph/Make/options b/applications/test/graph/Make/options
deleted file mode 100644
index 73db7f956..000000000
--- a/applications/test/graph/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lsampling \
-    -lmeshTools
diff --git a/applications/test/graph/graphTest.C b/applications/test/graph/graphTest.C
deleted file mode 100644
index c1a0f810d..000000000
--- a/applications/test/graph/graphTest.C
+++ /dev/null
@@ -1,72 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    graphTest
-
-Description
-    Test program for making graphs
-
-\*---------------------------------------------------------------------------*/
-
-#include "graph.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main()
-{
-    scalarField alpha(200);
-    scalarField phie(alpha.size());
-    scalarField phic(alpha.size());
-
-    forAll(alpha, i)
-    {
-        alpha[i] = scalar(i)/50.0;
-    }
-
-    scalar R = 5.0;
-
-    phie = (R - 1)/(sqrt(R/(alpha + 1.0e-6)) + 1.0) + 1.0;
-    phic = (R - 1)/(sqrt(R*alpha) + 1.0) + 1.0;
-
-
-    graph phi("@f! (R = 5)", "@a!", "@f!", alpha);
-    phi.insert
-    (
-        "@f!&e!", new curve("@f!&e!", curve::curveStyle::CONTINUOUS, phie)
-    );
-    phi.insert
-    (
-        "@f!&c!", new curve("@f!&c!", curve::curveStyle::CONTINUOUS, phic)
-    );
-    phi.write("phi", "xmgr");
-
-    Info<< "end" << endl;
-}
-
-
-// ************************************************************************* //
-
diff --git a/applications/test/graphXi/Make/files b/applications/test/graphXi/Make/files
deleted file mode 100644
index 408fe21b8..000000000
--- a/applications/test/graphXi/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-graphXi.C
-
-EXE = $(FOAM_USER_APPBIN)/graphXi
diff --git a/applications/test/graphXi/Make/options b/applications/test/graphXi/Make/options
deleted file mode 100644
index 73db7f956..000000000
--- a/applications/test/graphXi/Make/options
+++ /dev/null
@@ -1,7 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/sampling/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lsampling \
-    -lmeshTools
diff --git a/applications/test/graphXi/graphXi.C b/applications/test/graphXi/graphXi.C
deleted file mode 100644
index 4dc5b8ab7..000000000
--- a/applications/test/graphXi/graphXi.C
+++ /dev/null
@@ -1,67 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    graphTest
-
-Description
-    Test program for making graphs
-
-\*---------------------------------------------------------------------------*/
-
-#include "graph.H"
-#include "OFstream.H"
-#include "mathematicalConstants.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main()
-{
-    scalarField x(100);
-    scalarField r(x.size());
-
-    forAll(x, i)
-    {
-        x[i] = -3 + 0.06*i;
-    }
-
-    scalarField b = 0.5*(1.0 + erf(x));
-    scalarField c = 1.0 - b;
-    scalarField gradb = (1/::sqrt(mathematicalConstant::pi))*exp(-sqr(x));
-    scalarField lapb = -2*x*gradb;
-
-    r = lapb*b*c/(gradb*gradb);
-
-
-    graph("r", "x", "r", x, r).write("r", "xmgr");
-
-    Info<< "end" << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/graphXi/r.agr b/applications/test/graphXi/r.agr
deleted file mode 100644
index d012ca651..000000000
--- a/applications/test/graphXi/r.agr
+++ /dev/null
@@ -1,107 +0,0 @@
-@title "r"
-@xaxis label "x"
-@yaxis label "r"
-@s0 legend "r"
-@target G0.S0
-@type xy
--3 0.951803
--2.94 0.950065
--2.88 0.948234
--2.82 0.946302
--2.76 0.944261
--2.7 0.942103
--2.64 0.939817
--2.58 0.937392
--2.52 0.934816
--2.46 0.932074
--2.4 0.929149
--2.34 0.926023
--2.28 0.922673
--2.22 0.919075
--2.16 0.915199
--2.1 0.911012
--2.04 0.906476
--1.98 0.901547
--1.92 0.896176
--1.86 0.890307
--1.8 0.883875
--1.74 0.87681
--1.68 0.869032
--1.62 0.860453
--1.56 0.850978
--1.5 0.840503
--1.44 0.828916
--1.38 0.8161
--1.32 0.801931
--1.26 0.786282
--1.2 0.769024
--1.14 0.750029
--1.08 0.729172
--1.02 0.706337
--0.96 0.681414
--0.9 0.654311
--0.84 0.624951
--0.78 0.59328
--0.72 0.559268
--0.66 0.522911
--0.6 0.48424
--0.54 0.443314
--0.48 0.40023
--0.42 0.355116
--0.36 0.308137
--0.3 0.259489
--0.24 0.2094
--0.18 0.158121
--0.12 0.10593
--0.06 0.0531214
--1.11022e-16 9.8391e-17
-0.06 -0.0531214
-0.12 -0.10593
-0.18 -0.158121
-0.24 -0.2094
-0.3 -0.259489
-0.36 -0.308137
-0.42 -0.355116
-0.48 -0.40023
-0.54 -0.443314
-0.6 -0.48424
-0.66 -0.522911
-0.72 -0.559268
-0.78 -0.59328
-0.84 -0.624951
-0.9 -0.654311
-0.96 -0.681414
-1.02 -0.706337
-1.08 -0.729172
-1.14 -0.750029
-1.2 -0.769024
-1.26 -0.786282
-1.32 -0.801931
-1.38 -0.8161
-1.44 -0.828916
-1.5 -0.840503
-1.56 -0.850978
-1.62 -0.860453
-1.68 -0.869032
-1.74 -0.87681
-1.8 -0.883875
-1.86 -0.890307
-1.92 -0.896176
-1.98 -0.901547
-2.04 -0.906476
-2.1 -0.911012
-2.16 -0.915199
-2.22 -0.919075
-2.28 -0.922673
-2.34 -0.926023
-2.4 -0.929149
-2.46 -0.932074
-2.52 -0.934816
-2.58 -0.937392
-2.64 -0.939817
-2.7 -0.942103
-2.76 -0.944261
-2.82 -0.946302
-2.88 -0.948234
-2.94 -0.950065
-
diff --git a/applications/test/graphXi/r.dat b/applications/test/graphXi/r.dat
deleted file mode 100644
index 28642e468..000000000
--- a/applications/test/graphXi/r.dat
+++ /dev/null
@@ -1,103 +0,0 @@
-# JPlot file
-# column 1: x
-# column 2: r
--3 0.951803
--2.94 0.950065
--2.88 0.948234
--2.82 0.946302
--2.76 0.944261
--2.7 0.942103
--2.64 0.939817
--2.58 0.937392
--2.52 0.934816
--2.46 0.932074
--2.4 0.929149
--2.34 0.926023
--2.28 0.922673
--2.22 0.919075
--2.16 0.915199
--2.1 0.911012
--2.04 0.906476
--1.98 0.901547
--1.92 0.896176
--1.86 0.890307
--1.8 0.883875
--1.74 0.87681
--1.68 0.869032
--1.62 0.860453
--1.56 0.850978
--1.5 0.840503
--1.44 0.828916
--1.38 0.8161
--1.32 0.801931
--1.26 0.786282
--1.2 0.769024
--1.14 0.750029
--1.08 0.729172
--1.02 0.706337
--0.96 0.681414
--0.9 0.654311
--0.84 0.624951
--0.78 0.59328
--0.72 0.559268
--0.66 0.522911
--0.6 0.48424
--0.54 0.443314
--0.48 0.40023
--0.42 0.355116
--0.36 0.308137
--0.3 0.259489
--0.24 0.2094
--0.18 0.158121
--0.12 0.10593
--0.06 0.0531214
--1.11022e-16 9.8391e-17
-0.06 -0.0531214
-0.12 -0.10593
-0.18 -0.158121
-0.24 -0.2094
-0.3 -0.259489
-0.36 -0.308137
-0.42 -0.355116
-0.48 -0.40023
-0.54 -0.443314
-0.6 -0.48424
-0.66 -0.522911
-0.72 -0.559268
-0.78 -0.59328
-0.84 -0.624951
-0.9 -0.654311
-0.96 -0.681414
-1.02 -0.706337
-1.08 -0.729172
-1.14 -0.750029
-1.2 -0.769024
-1.26 -0.786282
-1.32 -0.801931
-1.38 -0.8161
-1.44 -0.828916
-1.5 -0.840503
-1.56 -0.850978
-1.62 -0.860453
-1.68 -0.869032
-1.74 -0.87681
-1.8 -0.883875
-1.86 -0.890307
-1.92 -0.896176
-1.98 -0.901547
-2.04 -0.906476
-2.1 -0.911012
-2.16 -0.915199
-2.22 -0.919075
-2.28 -0.922673
-2.34 -0.926023
-2.4 -0.929149
-2.46 -0.932074
-2.52 -0.934816
-2.58 -0.937392
-2.64 -0.939817
-2.7 -0.942103
-2.76 -0.944261
-2.82 -0.946302
-2.88 -0.948234
-2.94 -0.950065
diff --git a/applications/test/graphXi/r.gplt b/applications/test/graphXi/r.gplt
deleted file mode 100644
index 29092adf7..000000000
--- a/applications/test/graphXi/r.gplt
+++ /dev/null
@@ -1,110 +0,0 @@
-#set term postscript color
-set output "r.ps"
-set title "r" 0,0
-show title
-set xlabel "x" 0,0
-show xlabel
-set ylabel "r" 0,0
-show ylabel
-plot'-' title "r" with lines; pause -1
-
--3 0.951803
--2.94 0.950065
--2.88 0.948234
--2.82 0.946302
--2.76 0.944261
--2.7 0.942103
--2.64 0.939817
--2.58 0.937392
--2.52 0.934816
--2.46 0.932074
--2.4 0.929149
--2.34 0.926023
--2.28 0.922673
--2.22 0.919075
--2.16 0.915199
--2.1 0.911012
--2.04 0.906476
--1.98 0.901547
--1.92 0.896176
--1.86 0.890307
--1.8 0.883875
--1.74 0.87681
--1.68 0.869032
--1.62 0.860453
--1.56 0.850978
--1.5 0.840503
--1.44 0.828916
--1.38 0.8161
--1.32 0.801931
--1.26 0.786282
--1.2 0.769024
--1.14 0.750029
--1.08 0.729172
--1.02 0.706337
--0.96 0.681414
--0.9 0.654311
--0.84 0.624951
--0.78 0.59328
--0.72 0.559268
--0.66 0.522911
--0.6 0.48424
--0.54 0.443314
--0.48 0.40023
--0.42 0.355116
--0.36 0.308137
--0.3 0.259489
--0.24 0.2094
--0.18 0.158121
--0.12 0.10593
--0.06 0.0531214
--1.11022e-16 9.8391e-17
-0.06 -0.0531214
-0.12 -0.10593
-0.18 -0.158121
-0.24 -0.2094
-0.3 -0.259489
-0.36 -0.308137
-0.42 -0.355116
-0.48 -0.40023
-0.54 -0.443314
-0.6 -0.48424
-0.66 -0.522911
-0.72 -0.559268
-0.78 -0.59328
-0.84 -0.624951
-0.9 -0.654311
-0.96 -0.681414
-1.02 -0.706337
-1.08 -0.729172
-1.14 -0.750029
-1.2 -0.769024
-1.26 -0.786282
-1.32 -0.801931
-1.38 -0.8161
-1.44 -0.828916
-1.5 -0.840503
-1.56 -0.850978
-1.62 -0.860453
-1.68 -0.869032
-1.74 -0.87681
-1.8 -0.883875
-1.86 -0.890307
-1.92 -0.896176
-1.98 -0.901547
-2.04 -0.906476
-2.1 -0.911012
-2.16 -0.915199
-2.22 -0.919075
-2.28 -0.922673
-2.34 -0.926023
-2.4 -0.929149
-2.46 -0.932074
-2.52 -0.934816
-2.58 -0.937392
-2.64 -0.939817
-2.7 -0.942103
-2.76 -0.944261
-2.82 -0.946302
-2.88 -0.948234
-2.94 -0.950065
diff --git a/applications/test/graphXi/r.ps b/applications/test/graphXi/r.ps
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/graphXi/r.xy b/applications/test/graphXi/r.xy
deleted file mode 100644
index d6d8f2b40..000000000
--- a/applications/test/graphXi/r.xy
+++ /dev/null
@@ -1,100 +0,0 @@
--3 0.951803
--2.94 0.950065
--2.88 0.948234
--2.82 0.946302
--2.76 0.944261
--2.7 0.942103
--2.64 0.939817
--2.58 0.937392
--2.52 0.934816
--2.46 0.932074
--2.4 0.929149
--2.34 0.926023
--2.28 0.922673
--2.22 0.919075
--2.16 0.915199
--2.1 0.911012
--2.04 0.906476
--1.98 0.901547
--1.92 0.896176
--1.86 0.890307
--1.8 0.883875
--1.74 0.87681
--1.68 0.869032
--1.62 0.860453
--1.56 0.850978
--1.5 0.840503
--1.44 0.828916
--1.38 0.8161
--1.32 0.801931
--1.26 0.786282
--1.2 0.769024
--1.14 0.750029
--1.08 0.729172
--1.02 0.706337
--0.96 0.681414
--0.9 0.654311
--0.84 0.624951
--0.78 0.59328
--0.72 0.559268
--0.66 0.522911
--0.6 0.48424
--0.54 0.443314
--0.48 0.40023
--0.42 0.355116
--0.36 0.308137
--0.3 0.259489
--0.24 0.2094
--0.18 0.158121
--0.12 0.10593
--0.06 0.0531214
--1.11022e-16 9.8391e-17
-0.06 -0.0531214
-0.12 -0.10593
-0.18 -0.158121
-0.24 -0.2094
-0.3 -0.259489
-0.36 -0.308137
-0.42 -0.355116
-0.48 -0.40023
-0.54 -0.443314
-0.6 -0.48424
-0.66 -0.522911
-0.72 -0.559268
-0.78 -0.59328
-0.84 -0.624951
-0.9 -0.654311
-0.96 -0.681414
-1.02 -0.706337
-1.08 -0.729172
-1.14 -0.750029
-1.2 -0.769024
-1.26 -0.786282
-1.32 -0.801931
-1.38 -0.8161
-1.44 -0.828916
-1.5 -0.840503
-1.56 -0.850978
-1.62 -0.860453
-1.68 -0.869032
-1.74 -0.87681
-1.8 -0.883875
-1.86 -0.890307
-1.92 -0.896176
-1.98 -0.901547
-2.04 -0.906476
-2.1 -0.911012
-2.16 -0.915199
-2.22 -0.919075
-2.28 -0.922673
-2.34 -0.926023
-2.4 -0.929149
-2.46 -0.932074
-2.52 -0.934816
-2.58 -0.937392
-2.64 -0.939817
-2.7 -0.942103
-2.76 -0.944261
-2.82 -0.946302
-2.88 -0.948234
-2.94 -0.950065
diff --git a/applications/test/io/Make/files b/applications/test/io/Make/files
deleted file mode 100644
index 1f7ba5ca5..000000000
--- a/applications/test/io/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-ioTest.C
-
-EXE = $(FOAM_USER_APPBIN)/ioTest
diff --git a/applications/test/io/Make/options b/applications/test/io/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/io/ioTest.C b/applications/test/io/ioTest.C
deleted file mode 100644
index aba6dddf6..000000000
--- a/applications/test/io/ioTest.C
+++ /dev/null
@@ -1,58 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    test
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "IOstreams.H"
-#include "IOmanip.H"
-#include "scalar.H"
-#include "List.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(void)
-{
-    string st("sfdsf  sdfs23df sdf32f .  sdfsdff23/2sf32");
-    Info<< word(string::validate<word>(st)) << "END" << endl;
-
-    string st1("1234567");
-
-    Info<< label(st1.size()) << tab << string(word(st1)) << endl;
-
-    Info<< setw(20) << setprecision(3) << 1.234234 << endl;
-
-    Info<< hex << 255 << endl;
-
-    Info.operator Foam::OSstream&() << "stop" << endl;
-}
-
-// ************************************************************************* //
-
diff --git a/applications/test/liquid/Make/files b/applications/test/liquid/Make/files
deleted file mode 100644
index de4f827ff..000000000
--- a/applications/test/liquid/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-liquidTest.C
-
-EXE = $(FOAM_USER_APPBIN)/liquidTest
diff --git a/applications/test/liquid/Make/options b/applications/test/liquid/Make/options
deleted file mode 100644
index 4abee70c4..000000000
--- a/applications/test/liquid/Make/options
+++ /dev/null
@@ -1,5 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude
-
-EXE_LIBS = -lliquids -lthermophysicalFunctions
diff --git a/applications/test/maxMem/Make/files b/applications/test/maxMem/Make/files
deleted file mode 100644
index 3190556e2..000000000
--- a/applications/test/maxMem/Make/files
+++ /dev/null
@@ -1,2 +0,0 @@
-maxMem.C
-SEXE = $(FOAM_USER_APPBIN)/maxMem
diff --git a/applications/test/maxMem/Make/options b/applications/test/maxMem/Make/options
deleted file mode 100644
index 6a57715f8..000000000
--- a/applications/test/maxMem/Make/options
+++ /dev/null
@@ -1 +0,0 @@
-EXE_LIBS = $(LIB_WM_OPTIONS_DIR)/libfbsdmalloc.o
diff --git a/applications/test/maxMem/maxMem.C b/applications/test/maxMem/maxMem.C
deleted file mode 100644
index 0a43faa15..000000000
--- a/applications/test/maxMem/maxMem.C
+++ /dev/null
@@ -1,32 +0,0 @@
-#include <iostream>
-#include <stdlib.h>
-using namespace std;
-
-int main(int argc, char *argv[])
-{
-    if (argc != 2)
-    {
-        cerr << "Usage: " << argv[0] << " <number of Mb per chunk>\n";
-        exit(1);
-    }
-
-    int nBytes = (1024U*1024U)*atoi(argv[1]);
-
-    char *cPtr;
-
-    for (unsigned i=1;; i++)
-    {
-        cPtr = new char[nBytes];
-
-        /*
-        for (int j=0; j<nBytes; j++)
-        {
-            cPtr[j] = 0;
-        }
-        */
-
-        cout << "allocated " << i*nBytes/(1024U*1024U) << " Mbytes" << endl;
-    }
-
-    return(0);
-}
diff --git a/applications/test/mesh/Make/files b/applications/test/mesh/Make/files
deleted file mode 100644
index 2ba7eeb62..000000000
--- a/applications/test/mesh/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-meshTest.C
-
-EXE = $(FOAM_USER_APPBIN)/meshTest
diff --git a/applications/test/mesh/Make/options b/applications/test/mesh/Make/options
deleted file mode 100644
index fa15f1245..000000000
--- a/applications/test/mesh/Make/options
+++ /dev/null
@@ -1,5 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume
diff --git a/applications/test/mkdir/Make/files b/applications/test/mkdir/Make/files
deleted file mode 100644
index 6d2483b76..000000000
--- a/applications/test/mkdir/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-
-mkdirTest.C
-
-EXE = $(FOAM_USER_APPBIN)/mkdirTest
diff --git a/applications/test/mkdir/Make/options b/applications/test/mkdir/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/mkdir/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/nearWallDist-wave/Make/files b/applications/test/nearWallDist-wave/Make/files
deleted file mode 100644
index d8829db8c..000000000
--- a/applications/test/nearWallDist-wave/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-testWallDist.C
-
-EXE = $(FOAM_USER_APPBIN)/testWallDist
diff --git a/applications/test/nearWallDist-wave/README b/applications/test/nearWallDist-wave/README
deleted file mode 100644
index 5beac181d..000000000
--- a/applications/test/nearWallDist-wave/README
+++ /dev/null
@@ -1,5 +0,0 @@
-testWallDist.C: calculate distance to wall and reflection vectors.
-
-testWallDist2.C: for debugging: same but do explicit iterations and dump every
-timestep.
-
diff --git a/applications/test/nearWallDist-wave/testWallDist.C b/applications/test/nearWallDist-wave/testWallDist.C
deleted file mode 100644
index 0b6f217b9..000000000
--- a/applications/test/nearWallDist-wave/testWallDist.C
+++ /dev/null
@@ -1,104 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-    Calculate distance to wall.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "wallDist.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    Info<< "Mesh read in = "
-        << runTime.cpuTimeIncrement()
-        << " s\n" << endl << endl;
-
-
-    Info<< "Time now = " << runTime.timeName() << endl;
-
-    // Wall distance
-
-    wallDist y(mesh, true);
-
-    if (y.nUnset() != 0)
-    {
-        WarningIn(args.executable())
-            << "There are " << y.nUnset()
-            << " remaining unset cells and/or boundary values" << endl;
-    }
-
-
-
-    y.write();
-
-
-    runTime++;
-
-    Info<< "Time now = " << runTime.timeName() << endl;
-
-
-    // Move points
-
-    boundBox meshBb(mesh.points());
-
-    pointField newPoints(mesh.points());
-
-    const point half(0.5*(meshBb.min() + meshBb.max()));
-
-    forAll(newPoints, pointI)
-    {
-        point& pt = newPoints[pointI];
-
-        // expand around half
-        pt.y() +=  pt.y() - half.y();
-    }
-
-    mesh.movePoints(newPoints);
-
-    mesh.write();
-
-    y.correct();
-
-    y.write();
-    
-
-    Info<< "End\n" << endl;
-
-    return 0;
-
-
-
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/nearWallDist-wave/testWallDist2.C b/applications/test/nearWallDist-wave/testWallDist2.C
deleted file mode 100644
index 1471c67d1..000000000
--- a/applications/test/nearWallDist-wave/testWallDist2.C
+++ /dev/null
@@ -1,216 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-    Wave propagation of nearwall distance through grid. Every iteration
-    information goes through one layer of cells.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "wallFvPatch.H"
-#include "MeshWave.H"
-#include "wallPoint.H"
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    Info<< "Mesh read in = "
-        << runTime.cpuTimeIncrement()
-        << " s\n" << endl << endl;
-
-    Info<< "Creating field wDistNC\n" << endl;
-    volScalarField wallDistUncorrected
-    (
-        IOobject
-        (
-            "wDistNC",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh,
-        dimensionedScalar
-        (
-            "wallDist",
-            dimensionSet(0, 1, 0, 0, 0),
-            0.0
-        )
-    );
-
-    //
-    // Set initial changed faces: set wallPoint for wall faces to wall centre
-    //
-
-    // Count walls
-    label nWalls = 0;
-    forAll (mesh.boundary(), patchI)
-    {
-        const fvPatch& patch = mesh.boundary()[patchI];
-
-        if (typeid(patch) == typeid(wallFvPatch))
-        {
-            nWalls += patch.size();
-        }
-    }
-
-    List<wallPoint> faceDist(nWalls);
-    labelList changedFaces(nWalls);
-
-    label nChangedFaces = 0;
-    forAll (mesh.boundary(), patchI)
-    {
-        const fvPatch& patch = mesh.boundary()[patchI];
-
-        if (typeid(patch) == typeid(wallFvPatch))
-        {
-            forAll (patch.Cf(), patchFaceI)
-            {
-                const polyPatch& polyPatch = mesh.boundaryMesh()[patchI];
-
-                label meshFaceI = polyPatch.start() + patchFaceI;
-
-                changedFaces[nChangedFaces] = meshFaceI;
-
-                faceDist[nChangedFaces] =
-                    wallPoint(patch.Cf()[patchFaceI], 0.0);
-
-                nChangedFaces++;
-            }
-        }
-    }
-
-
-    MeshWave<wallPoint> wallDistCalc
-    (
-        mesh,
-        changedFaces,
-        faceDist,
-        0           // max iterations
-    );
-
-    Info<< "\nStarting time loop\n" << endl;
-
-    for (runTime++; !runTime.end(); runTime++)
-    {
-        Info<< "Time = " << runTime.timeName() << endl;
-
-
-        label nCells = wallDistCalc.faceToCell();
-
-        Info<< "    Total changed cells   : " << nCells << endl;
-
-        if (nCells == 0)
-        {
-            break;
-        }
-
-
-        label nFaces = wallDistCalc.cellToFace();
-
-        Info<< "    Total changed faces   : " << nFaces << endl;
-
-        if (nFaces == 0)
-        {
-            break;
-        }
-
-
-        //
-        // Copy face and cell values into field
-        //
-
-        const List<wallPoint>& cellInfo = wallDistCalc.allCellInfo();
-        const List<wallPoint>& faceInfo = wallDistCalc.allFaceInfo();
-
-        label nIllegal = 0;
-
-        // Copy cell values
-        forAll(cellInfo, cellI)
-        {
-            scalar dist = cellInfo[cellI].distSqr();
-            if (cellInfo[cellI].valid())
-            {
-                wallDistUncorrected[cellI] = Foam::sqrt(dist);
-            }
-            else
-            {
-                wallDistUncorrected[cellI] = -1;
-                nIllegal++;
-            }
-        }
-
-        // Copy boundary values
-        forAll (wallDistUncorrected.boundaryField(), patchI)
-        {
-            fvPatchScalarField& patchField =
-                wallDistUncorrected.boundaryField()[patchI];
-
-            forAll(patchField, patchFaceI)
-            {
-                label meshFaceI =
-                    patchField.patch().patch().start() + patchFaceI;
-
-                scalar dist = faceInfo[meshFaceI].distSqr();
-                if (faceInfo[meshFaceI].valid())
-                {
-                    patchField[patchFaceI] = Foam::sqrt(dist);
-                }
-                else
-                {
-                    patchField[patchFaceI] = dist;
-                    nIllegal++;
-                }
-            }
-        }
-
-        Info<< "nIllegal:" << nIllegal << endl;
-
-
-        //
-        // Write it
-        //
-
-        wallDistUncorrected.write();
-
-        Info<< "ExecutionTime = "
-            << runTime.elapsedCpuTime()
-            << " s\n" << endl << endl;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/nearWallDist-wave/testWallDistData.C b/applications/test/nearWallDist-wave/testWallDistData.C
deleted file mode 100644
index 5ba8f2258..000000000
--- a/applications/test/nearWallDist-wave/testWallDistData.C
+++ /dev/null
@@ -1,136 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-    Calculate distance to wall.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "wallDistData.H"
-#include "wallPointData.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    Info<< "Mesh read in = "
-        << runTime.cpuTimeIncrement()
-        << " s\n" << endl << endl;
-
-
-    Info<< "Time now = " << runTime.timeName() << endl;
-
-    // wall distance and reflection vectors
-
-    volVectorField n
-    (
-        IOobject
-        (
-            "n",
-            mesh.time().timeName(),
-            mesh
-        ),
-        mesh,
-        dimensionedVector("n", dimLength, wallPoint::greatPoint)
-    );
-
-    // Fill wall patches with unit normal
-    forAll(mesh.boundary(), patchI)
-    {
-        const fvPatch& patch = mesh.boundary()[patchI];
-
-        if (typeid(patch) == typeid(wallFvPatch))
-        {
-            fvPatchVectorField& wallData = n.boundaryField()[patchI];
-
-            forAll(patch.Cf(), patchFaceI)
-            {
-                wallData[patchFaceI] = patch.Cf()[patchFaceI];
-                wallData[patchFaceI] /= Foam::mag(wallData[patchFaceI]);
-            }
-        }
-    }
-
-
-    // Do distance calculation, transporting values of n.
-    wallDistData<wallPointData<vector> > y(mesh, n, true);
-
-    if (y.nUnset() != 0)
-    {
-        WarningIn(args.executable())
-            << "There are " << y.nUnset()
-            << " remaining unset cells and/or boundary values" << endl;
-    }
-
-
-    y.write();
-    y.data().write();
-
-    runTime++;
-
-    Info<< "Time now = " << runTime.timeName() << endl;
-
-
-    // Move points
-
-    boundBox meshBb(mesh.points());
-
-    pointField newPoints(mesh.points());
-
-    const point half(0.5*(meshBb.min() + meshBb.max()));
-
-    forAll(newPoints, pointI)
-    {
-        point& pt = newPoints[pointI];
-
-        // expand around half
-        pt.y() +=  pt.y() - half.y();
-    }
-
-    mesh.movePoints(newPoints);
-
-    mesh.write();
-
-    y.correct();
-
-    y.write();
-    y.data().write();
-    
-
-    Info<< "End\n" << endl;
-
-    return 0;
-
-
-
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/nearWallDist-wave/testYPlus.C b/applications/test/nearWallDist-wave/testYPlus.C
deleted file mode 100644
index 966f3a1a6..000000000
--- a/applications/test/nearWallDist-wave/testYPlus.C
+++ /dev/null
@@ -1,120 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-    Calculate distance to wall.
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "wallDistData.H"
-#include "wallPointYPlus.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    Info<< "Mesh read in = "
-        << runTime.cpuTimeIncrement()
-        << " s\n" << endl << endl;
-
-
-    Info<< "Time now = " << runTime.timeName() << endl;
-
-    // wall distance and yStar
-
-    volScalarField yStar
-    (
-        IOobject
-        (
-            "yStar",
-            mesh.time().timeName(),
-            mesh
-        ),
-        mesh,
-        dimensionedScalar("yStar", dimless, 1.0)
-    );
-
-    // Fill wall patches of yStar with some value.
-    forAll(mesh.boundary(), patchI)
-    {
-        const fvPatch& patch = mesh.boundary()[patchI];
-
-        if (typeid(patch) == typeid(wallFvPatch))
-        {
-            fvPatchScalarField& wallData = yStar.boundaryField()[patchI];
-
-            forAll(patch, patchFaceI)
-            {
-// Hack. Just some value.
-                wallData[patchFaceI] = 1/2500.0;
-            }
-        }
-    }
-
-
-    // Do distance calculation, transporting values of yStar
-    wallPointYPlus::yPlusCutOff = 200;
-    wallDistData<wallPointYPlus> y(mesh, yStar, true);
-
-    if (y.nUnset() != 0)
-    {
-        WarningIn(args.executable())
-            << "There are " << y.nUnset()
-            << " remaining unset cells and/or boundary values" << endl;
-    }
-
-
-    y.write();
-
-    y.data().write();
-
-    volScalarField yPlus
-    (
-        IOobject
-        (
-            "yPlus",
-            mesh.time().timeName(),
-            mesh
-        ),
-        y/y.data()
-    );
-
-    yPlus.write();
-
-    Info<< "End\n" << endl;
-
-    return 0;
-
-
-
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/pTraits/Make/files b/applications/test/pTraits/Make/files
deleted file mode 100644
index 430cd299d..000000000
--- a/applications/test/pTraits/Make/files
+++ /dev/null
@@ -1,2 +0,0 @@
-pTraitsTest.C
-EXE = $(FOAM_USER_APPBIN)/pTraits
diff --git a/applications/test/pTraits/Make/options b/applications/test/pTraits/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/pTraits/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/parallel/Make/files b/applications/test/parallel/Make/files
deleted file mode 100644
index 8abb292dd..000000000
--- a/applications/test/parallel/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-parallelTest.C  
-
-EXE = $(FOAM_USER_APPBIN)/parallelTest
diff --git a/applications/test/parallel/Make/options b/applications/test/parallel/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/parallel/parallelTest.C b/applications/test/parallel/parallelTest.C
deleted file mode 100644
index 704098367..000000000
--- a/applications/test/parallel/parallelTest.C
+++ /dev/null
@@ -1,110 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    icoFoam
-
-Description
-    Incompressible laminar CFD code.
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "Time.H"
-#include "IPstream.H"
-#include "OPstream.H"
-#include "vector.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-#   include "createTime.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Perr<< "\nStarting transfers\n" << endl;
-
-    vector data(0, 1, 2);
-
-    if (Pstream::parRun())
-    {
-        if (Pstream::myProcNo() != Pstream::masterNo())
-        {
-            {
-                Perr<< "slave sending to master "
-                    << Pstream::masterNo() << endl;
-                OPstream toMaster(Pstream::masterNo());
-                toMaster << data;
-            }
-
-            Perr<< "slave receiving from master " 
-                << Pstream::masterNo() << endl;
-            IPstream fromMaster(Pstream::masterNo());
-            fromMaster >> data;
-
-            Perr<< data << endl;
-        }
-        else
-        {
-            for
-            (
-                int slave=Pstream::firstSlave();
-                slave<=Pstream::lastSlave();
-                slave++
-            )
-            {
-                Perr << "master receiving from slave " << slave << endl;
-                IPstream fromSlave(slave);
-                fromSlave >> data;
-
-                Perr<< data << endl;
-            }
-
-            for
-            (
-                int slave=Pstream::firstSlave();
-                slave<=Pstream::lastSlave();
-                slave++
-            )
-            {
-                Perr << "master sending to slave " << slave << endl;
-                OPstream toSlave(slave);
-                toSlave << data;
-            }
-        }
-    }
-
-    Info<< "End\n" << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/pointField/Make/files b/applications/test/pointField/Make/files
deleted file mode 100644
index 29c2ead60..000000000
--- a/applications/test/pointField/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-
-testPointField.C
-
-EXE = $(FOAM_USER_APPBIN)/pointField
diff --git a/applications/test/pointField/Make/options b/applications/test/pointField/Make/options
deleted file mode 100644
index fa15f1245..000000000
--- a/applications/test/pointField/Make/options
+++ /dev/null
@@ -1,5 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume
diff --git a/applications/test/prefixOSstream/Make/files b/applications/test/prefixOSstream/Make/files
deleted file mode 100644
index 576d23c82..000000000
--- a/applications/test/prefixOSstream/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-prefixOSstreamTest.C
-
-EXE = $(FOAM_USER_APPBIN)/prefixOSstreamTest
diff --git a/applications/test/prefixOSstream/Make/options b/applications/test/prefixOSstream/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/prefixOSstream/prefixOSstreamTest.C b/applications/test/prefixOSstream/prefixOSstreamTest.C
deleted file mode 100644
index 7b2dbd2aa..000000000
--- a/applications/test/prefixOSstream/prefixOSstreamTest.C
+++ /dev/null
@@ -1,87 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    prefixOSstreamTest
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "OSspecific.H"
-
-#include "IOstreams.H"
-#include "IStringStream.H"
-#include "scalar.H"
-#include "vector.H"
-#include "ListOps.H"
-#include "Pstream.H"
-#include "argList.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
-{
-    argList::validArgs.clear();
-    argList args(argc, argv);
-
-    //Pout.prefix() = '[' + name(Pstream::myProcNo()) + "] ";
-
-    List<vector> list(IStringStream("1 ((0 1 2))")());
-    Info<< list << endl;
-
-    List<vector> list2
-    (
-        IStringStream
-        (
-            "(\
-                 (0 1 2)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-                 (3 4 5)\
-             )"
-        )()
-    );
-    Pout<< list2 << endl;
-
-    Info<< findIndex(list2, vector(3, 4, 5)) << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/primitivePatch/Make/files b/applications/test/primitivePatch/Make/files
deleted file mode 100644
index 9b7ce02ab..000000000
--- a/applications/test/primitivePatch/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-testPrimitivePatch.C
-
-EXE = $(FOAM_USER_APPBIN)/testPrimitivePatch
diff --git a/applications/test/primitivePatch/Make/options b/applications/test/primitivePatch/Make/options
deleted file mode 100644
index 4e772fdf9..000000000
--- a/applications/test/primitivePatch/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/finiteVolume/lnInclude */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/primitivePatch/testPrimitivePatch.C b/applications/test/primitivePatch/testPrimitivePatch.C
deleted file mode 100644
index 4393e87a5..000000000
--- a/applications/test/primitivePatch/testPrimitivePatch.C
+++ /dev/null
@@ -1,258 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-    Test new primitive patches.
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "Time.H"
-#include "polyMesh.H"
-#include "primitivePatch.H"
-#include "faceIOList.H"
-#include "IFstream.H"
-#include "OFstream.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-typedef PrimitivePatch<face, List, const pointField&> myPrimitivePatch;
-
-
-void writeObj(Ostream& os,const pointField& points)
-{
-    forAll(points, pointI)
-    {
-        const point& pt = points[pointI];
-
-        os << "v " << pt.x() << ' ' << pt.y()
-            << ' ' << pt.z() << endl;
-    }
-}
-
-
-void checkFaceEdges
-(
-    const faceList& localFaces,
-    const edgeList& edges,
-    const labelListList& faceEdges
-)
-{
-    forAll(faceEdges, faceI)
-    {
-        const face& f = localFaces[faceI];
-
-        const labelList& myEdges = faceEdges[faceI];
-
-        forAll(f, fp)
-        {
-            label fp1 = (fp + 1) % f.size();
-
-            if (edges[myEdges[fp]] != edge(f[fp], f[fp1]))
-            {
-                FatalErrorIn("checkFaceEdges")
-                    << "Edges of face not in face point order:"
-                    << "face:" << faceI << " localF:" << f
-                    << " faceEdges:" << myEdges
-                    << abort(FatalError);
-            }
-        }
-    }
-}
-
-
-void writeEdges
-(
-    const pointField& localPoints,
-    const edgeList& edges,
-    const label nInternalEdges
-)
-{
-    Info<< "Writing internal edges to internalEdges.obj" << nl << endl;
-
-    OFstream intStream("internalEdges.obj");
-
-    writeObj(intStream, localPoints);
-
-    for (label edgeI = 0; edgeI < nInternalEdges; edgeI++)
-    {
-        const edge& e = edges[edgeI];
-
-        intStream << "l " << e.start()+1 << ' ' << e.end()+1 << endl;
-    }
-
-    Info<< "Writing boundary edges to boundaryEdges.obj" << nl << endl;
-
-    OFstream bndStream("boundaryEdges.obj");
-
-    writeObj(bndStream, localPoints);
-
-    for (label edgeI = nInternalEdges; edgeI < edges.size(); edgeI++)
-    {
-        const edge& e = edges[edgeI];
-
-        bndStream << "l " << e.start()+1 << ' ' << e.end()+1 << endl;
-    }
-}
-
-
-void writeFaceEdges
-(
-    const pointField& localPoints,
-    const edgeList& edges,
-    const labelListList& faceEdges
-)
-{
-    Info<< "Writing faceEdges per face to faceEdges.obj" << nl << endl;
-
-    OFstream feStream("faceEdges.obj");
-
-    writeObj(feStream, localPoints);
-
-    forAll(faceEdges, faceI)
-    {
-        const labelList& myEdges = faceEdges[faceI];
-
-        forAll(myEdges, i)
-        {   
-            const edge& e = edges[myEdges[i]];
-
-            feStream<< "l " << e.start()+1 << ' ' << e.end()+1 << endl;
-        }
-    }
-}
-
-
-void writeEdgeFaces
-(
-    const pointField& localPoints,
-    const faceList& localFaces,
-    const edgeList& edges,
-    const labelListList& edgeFaces
-)
-{
-    Info<< "Writing edgeFaces per face to edgeFaces.obj" << nl << endl;
-
-    OFstream efStream("edgeFaces.obj");
-
-    pointField ctrs(localFaces.size(), vector::zero);
-
-    forAll(localFaces, faceI)
-    {
-        ctrs[faceI] = localFaces[faceI].centre(localPoints);
-    }
-    writeObj(efStream, ctrs);
-
-
-    forAll(edgeFaces, edgeI)
-    {
-        const labelList& myFaces = edgeFaces[edgeI];
-
-        forAll(myFaces, i)
-        {   
-            efStream<< "l " << myFaces[0]+1 << ' ' << myFaces[i]+1 << endl;
-        }
-    }
-}
-
-
-void writeFaceFaces
-(
-    const pointField& localPoints,
-    const faceList& localFaces,
-    const labelListList& faceFaces
-)
-{
-    Info<< "Writing faceFaces per face to faceFaces.obj" << nl << endl;
-
-    OFstream ffStream("faceFaces.obj");
-
-    pointField ctrs(localFaces.size(), vector::zero);
-
-    forAll(localFaces, faceI)
-    {
-        ctrs[faceI] = localFaces[faceI].centre(localPoints);
-    }
-    writeObj(ffStream, ctrs);
-
-    forAll(faceFaces, faceI)
-    {
-        const labelList& nbrs = faceFaces[faceI];
-
-        forAll(nbrs, nbI)
-        {
-            ffStream << "l " << faceI+1 << ' ' << nbrs[nbI]+1 << endl;
-        }
-    }
-}
-
-
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    argList::noParallel();
-    argList::validArgs.append("patch");
-
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createPolyMesh.H"
-
-    word patchName(args.additionalArgs()[0]);
-
-    label patchI = mesh.boundaryMesh().findPatchID(patchName);
-
-    const polyPatch& patch = mesh.boundaryMesh()[patchI];
-
-    Info<< "Patch:" << patch.name() << endl;
-
-    PrimitivePatch<face, List, const pointField&> pp(patch, patch.points());
-
-    const pointField& localPoints = pp.localPoints();
-    const faceList& localFaces = pp.localFaces();
-    const labelListList& faceFaces = pp.faceFaces();
-    const edgeList& edges = pp.edges();
-    const labelListList& edgeFaces = pp.edgeFaces();
-    const labelListList& faceEdges = pp.faceEdges();
-
-
-    checkFaceEdges(localFaces, edges, faceEdges);
-
-    writeEdges(localPoints, edges, pp.nInternalEdges());
-
-    writeFaceEdges(localPoints, edges, faceEdges);
-
-    writeEdgeFaces(localPoints, localFaces, edges, edgeFaces);
-
-    writeFaceFaces(localPoints, localFaces, faceFaces);
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/ptrList/Make/files b/applications/test/ptrList/Make/files
deleted file mode 100644
index 2a4e0ad01..000000000
--- a/applications/test/ptrList/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-ptrListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/ptrListTest
diff --git a/applications/test/ptrList/Make/options b/applications/test/ptrList/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/quaternion/Make/files b/applications/test/quaternion/Make/files
deleted file mode 100644
index a6d9519c2..000000000
--- a/applications/test/quaternion/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-quaternionTest.C
-
-EXE = $(FOAM_USER_APPBIN)/quaternionTest
diff --git a/applications/test/quaternion/Make/options b/applications/test/quaternion/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/quaternion/quaternionTest.C b/applications/test/quaternion/quaternionTest.C
deleted file mode 100644
index f06ac53a1..000000000
--- a/applications/test/quaternion/quaternionTest.C
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "quaternion.H"
-#include "septernion.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-int main()
-{
-    quaternion q(vector(1, 0, 0), 0.7853981);
-    Info<< "q " << q << endl;
-
-    vector v(0, 1, 0);
-    Info<< "v " << v << endl;
-
-    Info<< "inv(q)*q " << inv(q)*q << endl;
-
-    Info<< "q*quaternion(0, v)*conjugate(q) "
-        << q*quaternion(0, v)*conjugate(q) << endl;
-
-    Info<< "q.transform(v) " << q.transform(v) << endl;
-    Info<< "q.R() & v " << (q.R() & v) << endl;
-
-    Info<< "q.invTransform(v) " << q.invTransform(v) << endl;
-
-    septernion tr(vector(0, 0.1, 0), q);
-    Info<< "tr " << tr << endl;
-
-    Info<< "inv(tr)*tr " << inv(tr)*tr << endl;
-
-    Info<< "tr.transform(v) " << tr.transform(v) << endl;
-
-    Info<< "(septernion(vector(0, -1, 0))*q*septernion(vector(0, 1, 0))).transform(v) "
-        << (septernion(vector(0, -1, 0))*q*septernion(vector(0, 1, 0))).transform(v)
-        << endl;
-
-    return 0;
-}
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_DME b/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_DME
deleted file mode 100644
index bfb87d3c4..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_DME
+++ /dev/null
@@ -1,434 +0,0 @@
-ELEMENTS
- H   O    C   N  AR
-END
-SPECIES
-H2 O2 OH H H2O O H2O2 HO2
-CH4 CO CO2 HCO CH3O CH2OH CH2O CH3 CH2 CH2(S) CH HCCO CH3O2 CH4O2
-C2H6 C2H5 C2H4 C2H3 C2H2 C2H CH3CO CH2CO C3H2 C3H3 C3H4 C3H5 C3H6 HCCOH
-C2H5OH CH3HCO CH3CHOH CH3OH C4H2 C4H3 CH3OCH3 CH3OCH2 CH3OCH2OOH CH3OCH2OO
-CH3OCH2O HCOOCH3 HCOOH CH3OCO
-O3 N2 AR C
-THERMO            ! 1995 NASA COMPILATION + EDGAR DATA
-CH3O2             L 1/84C   1H   3O   2N   0G   300.000  5000.00               1
- 0.66812963E 01 0.80057271E-02-0.27188507E-05 0.40631365E-09-0.21927725E-13    2
- 0.52621851E 03-0.99423847E 01 0.20986490E 01 0.15786357E-01 0.75683261E-07    3
--0.11274587E-07 0.56665133E-11 0.20695879E 04 0.15007068E 02                   4
-CH4O2             T12/93C   1H   4O   2N   0G   200.000  6000.000              1
- 0.61600316E+01 0.10239957E-01-0.36101507E-05 0.57550301E-09-0.34178147E-13    2
--0.17654526E+05-0.61911544E+01 0.49652507E+01 0.92343510E-03 0.34455956E-04    3
--0.44469600E-07 0.17456120E-10-0.16726970E+05 0.29880275E+01                   4
-C2H5OH            L 8/88C   2H   6O   1N   0G   200.000  6000.000              1
- 0.65624365E+01 0.15204222E-01-0.53896795E-05 0.86225011E-09-0.51289787E-13    2
--0.31525621E+05-0.94730202E+01 0.48586957E+01-0.37401726E-02 0.69555378E-04    3
--0.88654796E-07 0.35168835E-10-0.29996132E+05 0.48018545E+01-0.28257829E+05    4
-C3H3              BUR 92C   3H   3O   0N   0G   200.000  6000.000              1
- 6.64175821E+00 8.08587428E-03-2.84787887E-06 4.53525977E-10-2.68879815E-14    2
- 3.89793699E+04-1.04004255E+01 1.82840766E+00 2.37839036E-02-2.19228176E-05    3
- 1.00067444E-08-1.38984644E-12 4.01863058E+04 1.38447957E+01 4.16139977E+04    4
-C3H4              L12/92C   3H   4O   0N   0G   200.000  6000.000              1
- 6.31694869E+00 1.11336262E-02-3.96289018E-06 6.35633775E-10-3.78749885E-14    2
- 2.01174617E+04-1.09718862E+01 2.61307487E+00 1.21223371E-02 1.85405400E-05    3
--3.45258475E-08 1.53353389E-11 2.15415642E+04 1.02503319E+01 2.29622672E+04    4
-C3H5              BUR 92C   3H   5O   0N   0G   200.000  6000.000              1
- 6.54761132E+00 1.33152246E-02-4.78333100E-06 7.71949814E-10-4.61930808E-14    2
- 1.72714707E+04-9.27486841E+00 3.78794693E+00 9.48414335E-03 2.42343368E-05    3
--3.65604010E-08 1.48592356E-11 1.86261218E+04 7.82822499E+00 2.03259122E+04    4
-C4H2              L 2/93C   4H   2O   0N   0G   200.000  6000.000              1
- 8.66704895E+00 6.71505191E-03-2.35355060E-06 3.73635366E-10-2.21054043E-14    2
- 5.10016978E+04-2.18002050E+01-4.07132393E-01 5.20775143E-02-9.21138340E-05    3
- 8.08657403E-08-2.70422080E-11 5.25957367E+04 2.03240223E+01 5.41222513E+04    4
-C4H3              L 9/89C   4H   3O   0N   0G   298.150  6000.000              1
- 0.84762079E+01 0.88782327E-02-0.30328412E-05 0.47358302E-09-0.27716627E-13    2
- 0.54756540E+05-0.17170551E+02 0.24173247E+01 0.24104782E-01-0.12813470E-04    3
--0.28606237E-08 0.39194527E-11 0.56506476E+05 0.14471107E+02 0.58181574E+05    4
-C4H4              L 9/89C   4H   4O   0N   0G   200.000  6000.000              1
- 0.82948104E+01 0.11994381E-01-0.42624075E-05 0.68306978E-09-0.40680631E-13    2
- 0.33550866E+05-0.18426826E+02 0.14049083E+01 0.29531073E-01-0.15596302E-04    3
--0.32142002E-08 0.45436937E-11 0.35507830E+05 0.17450183E+02 0.37097268E+05    4
-CH3OCH3           L12/92C   2H   6O   1N   0G   200.000  6000.000              1
- 5.64844183E+00 1.63381899E-02-5.86802367E-06 9.46836869E-10-5.66504738E-14    2
--2.51074690E+04-5.96264939E+00 5.30562279E+00-2.14254272E-03 5.30873244E-05    3
--6.23147136E-08 2.30731036E-11-2.39866295E+04 7.13264209E-01-2.21432171E+04    4
-CH3OCH2           T11/82C   2H   5O   1N   0G   300.000  5000.0                1
- 0.65567484E+01 0.12180723E-01-0.40628420E-05 0.59495830E-09-0.31276214E-13    2
--0.40282515E+04-0.81302772E+01 0.35953999E+01 0.13379216E-01 0.53914910E-05    3
--0.10947097E-07 0.38193320E-11-0.27021975E+04 0.92850365E+01                   4
-CH3OCH2OOH        Jan96 C   2H   6O   3N   0G    300.00  3000.00   1000.     0 1
- 7.66981055E+00 2.35536769E-02-1.15031834E-05 2.84464629E-09-2.79520304E-13    2
--3.96295537E+04-1.39224857E+01 3.05518950E-02 4.90560834E-02-4.43030986E-05    3
- 2.21548123E-08-4.66587486E-12-3.80282020E+04 2.43189660E+01                   4
-CH3OCH2OO         Jan96 C   2H   5O   3N   0G    300.00  3000.00   1000.     0 1
- 8.06217488E+00 2.05153644E-02-1.00803231E-05 2.50244952E-09-2.46544863E-13    2
--2.19951127E+04-1.59505736E+01 4.74967287E-01 4.68199208E-02-4.55041928E-05    3
- 2.44627078E-08-5.51108848E-12-2.04517448E+04 2.17234867E+01                   4
-CH3OCH2O          Jan96 C   2H   5O   2N   0G    300.00  3000.00   1000.     0 1
- 5.98450336E+00 1.93302785E-02-9.44575204E-06 2.33651645E-09-2.29626013E-13    2
--2.12266609E+04-7.95685946E+00-1.22386711E-01 3.94270827E-02-3.47990406E-05    3
- 1.69073231E-08-3.44801024E-12-1.99352987E+04 2.26909497E+01                   4
-CH3OCHO           Jan96 C   2H   4O   2N   0G    300.00  3000.00   1000.       1
- 5.46071782E+00 1.70659166E-02-8.38236448E-06 2.08015776E-09-2.04870146E-13    2
--4.58756417E+04-3.33482124E+00-4.40150386E-01 3.69251939E-02-3.41468832E-05    3
- 1.73800460E-08-3.70831952E-12-4.46516329E+04 2.61277510E+01                   4
-HCOOCH3                 C   2H   4O   2N   0G   300.000  5000.000              1
- 0.83982000E 01 0.11267000E-01-0.41325000E-05 0.72745000E-09-0.48932000E-13    2
--0.48328000E 05-0.18820000E 02-0.15323000E 01 0.43051000E-01-0.45098000E-04    3
- 0.26064000E-07-0.63345000E-11-0.45711000E 05 0.31603000E 02                   4
-HCOOH             L 8/88H  2.C  1.O  2.   0.G   200.000  6000.000              1
- 5.69579404E+00 7.72237361E-03-3.18037808E-06 5.57949466E-10-3.52618226E-14    2
--4.81599723E+04-6.01680080E+00 3.23262453E+00 2.81129582E-03 2.44034975E-05    3
--3.17501066E-08 1.20631660E-11-4.67785606E+04 9.86205647E+00-4.55312460E+04    4
-CH3OCO                  C   2H   3O   2    0G   300.000  5000.000              1
- 0.76505900E 01 0.99082000E-02-0.37559700E-05 0.67845900E-09-0.46572100E-13    2
--0.24947700E 05-0.12937300E 02-0.89045900E 00 0.38842600E-01-0.42829300E-04    3
- 0.25682800E-07-0.63729700E-11-0.22835200E 05 0.29911300E 02                   4
-END
-REACTIONS
-CH4   + O2           = CH3   + HO2        7.900E+13  0.00  56000.
-CH4   + H            = CH3   + H2         6.600E+08  1.62  10840. ! 2.200E+04  3.00   8750.
-CH4   + OH           = CH3   + H2O        1.600E+06  2.10   2460.
-CH4   + O            = CH3   + OH         1.020E+09  1.50   8604.
-CH4   + HO2          = CH3   + H2O2       1.800E+11  0.00  18700.
-CH3   + HO2          = CH3O  + OH         2.000E+13  0.00      0.
-CH3   + O2           = CH3O  + O          2.720E+13  0.00  30900.
-CH3   + O2           = CH2O  + OH         3.800E+10  0.00   9000.  ! 3.8
-CH3   + CH2O         = CH4   + HCO        5.500E+03  2.82   6000.
-CH3   + HCO          = CH4   + CO         1.200E+14  0.00      0.
-CH3   + O            = CH2O  + H          8.000E+13  0.00      0.
-CH3   + OH           = CH2   + H2O        7.500E+06  2.00   5000.
-CH3   + OH           = CH2O  + H2         4.000E+12  0.00      0.
-CH3   + H            = CH4                1.900E+36 -7.00   9050.
-CH3   + CH3          = C2H6               1.700D+53 -12.0  19400.
-!
-CH3   + CH3O         = CH4   + CH2O       1.000E+13  0.00      0.
-CH3   + CH2OH        = CH4   + CH2O       1.000E+12  0.00      0.
-CH3   + C2H5         = CH4   + C2H4       2.000E+13 -0.50      0.
-CH3   + C2H4         = CH4   + C2H3       6.620E+00  3.70   9482.
-CH3   + C2H3         = CH4   + C2H2       1.000E+12  0.00      0.
-CH3   + C2H2         = CH4   + C2H        1.800E+11  0.00  17270.
-CH3   + CH3          = C2H4  + H2         1.000E+14  0.00  31000.
-CH3   + M            = CH2   + H     + M  1.000E+16  0.00  90600.
-CH3   + HCO          = CH2   + CH2O       2.000E+14  0.00      0.
-!
-CH2   + H2           = CH3   + H          5.000E+05  2.00   7230.
-CH2   + CH3          = C2H4  + H          4.000E+13  0.00      0.
-CH2   + OH           = CH    + H2O        1.130E+07  2.00   3000.
-CH2   + OH           = CH2O  + H          2.500E+13  0.00      0.
-CH2   + CH2          = C2H2  + H2         4.000E+13  0.00      0.
-CH2   + HCCO         = C2H3  + CO         3.000E+13  0.00      0.
-CH2   + O            = CO    + H     + H  5.000E+13  0.00      0.
-CH2   + O            = HCO   + H          8.000E+13  0.00      0.
-CH2   + O2           = CO2   + H     + H  1.600E+12  0.00   1000.
-CH2   + O2           = CH2O  + O          5.000E+13  0.00   9000.
-CH2   + O2           = CO2   + H2         6.900E+11  0.00    500.
-CH2   + O2           = HCO   + OH         4.300E+10  0.00   -500.
-!
-CH2(S)+ CH3          = C2H4  + H          3.000E+13  0.00   -570.
-CH2(S)+ H2           = CH3   + H          8.000E+13  0.00      0.
-CH2(S)+ CH4          = CH3   + CH3        4.000E+12  0.00   -570.
-CH2(S)+ C2H6         = CH3   + C2H5       4.000E+12  0.00   -550.
-CH2(S)+ C2H2         = C3H3  + H          3.000E+13  0.00      0.
-CH2(S)+ N2           = CH2   + N2         1.500E+13  0.00    600.
-CH2(S)+ AR           = CH2   + AR         9.000E+12  0.00    600.
-CH2(S)+ CO2          = CH2   + CO2        7.000E+12  0.00      0.
-CH2(S)+ CO2          = CH2O  + CO         1.400E+11  0.00   1000.
-CH2(S)+ H2O          = CH2   + H2O        3.000E+13  0.00      0.
-CH2(S)+ O2           = CO    + OH    + H  2.800E+12  0.00   -500.
-CH2(S)+ O2           = CO    + H2O        1.200E+12  0.00   -500.
-CH2(S)+ H            = CH    + H2         3.000E+13  0.00      0.
-CH2(S)+ O            = CO    + H2         3.000E+13  0.00      0.
-!
-CH2OH + H            = CH3   + OH         1.000E+14  0.00      0.
-CH3O  + H            = CH3   + OH         1.000E+14  0.00      0.
-CH3O  + M            = CH2O  + H     + M  1.000E+14  0.00  25000.
-CH2OH + M            = CH2O  + H     + M  1.000E+14  0.00  25000.
-CH3O  + H            = CH2O  + H2         2.000E+13  0.00      0.
-CH2OH + H            = CH2O  + H2         2.000E+13  0.00      0.
-CH3O  + OH           = CH2O  + H2O        1.000E+13  0.00      0.
-CH2OH + OH           = CH2O  + H2O        1.000E+13  0.00      0.
-CH3O  + O            = CH2O  + OH         1.000E+13  0.00      0.
-CH2OH + O            = CH2O  + OH         1.000E+13  0.00      0.
-CH3O  + O2           = CH2O  + HO2        6.300E+10  0.00   2600.    ! 6.3
-CH2OH + O2           = CH2O  + HO2        1.480E+13  0.00   1500.
-!CH2   + H            = CH    + H2         1.000E+18 -1.56      0.
-CH    + H2           = H     + CH2        1.107E+08  1.79   1670.
-CH    + O2           = HCO   + O          6.300E+13  0.00      0.
-CH    + O            = CO    + H          5.700E+13  0.00      0.
-CH    + OH           = HCO   + H          3.000E+13  0.00      0.
-CH    + CO2          = HCO   + CO         3.400E+12  0.00    690.
-CH    + H2O          = CH2O  + H          1.170E+15 -0.75      0.
-CH    + CH2O         = CH2CO + H          9.460E+13  0.00   -515.
-CH    + C2H2         = C3H2  + H          1.000E+14  0.00      0.
-CH    + CH2          = C2H2  + H          4.000E+13  0.00      0.
-CH    + CH3          = C2H3  + H          3.000E+13  0.00   -400.
-CH    + CH4          = C2H4  + H          3.000E+13  0.00      0.
-!
-CH2O  + OH           = HCO   + H2O        3.430E+09  1.18   -447.
-CH2O  + H            = HCO   + H2         2.190E+08  1.77   3000.
-CH2O  + M            = HCO   + H     + M  3.310E+16  0.00  81000.
-CH2O  + O            = HCO   + OH         1.800E+13  0.00   3080.
-CH2O  + O2           = HCO   + HO2        6.200E+13  0.00  39000.
-CH2O  + HO2          = HCO   + H2O2       1.000E+12  0.00   9000.
-CH2O  + HO2          = HCOOH + OH         1.000E+13  0.00  14900.
-!
-HCOOH + H            = H     + CO2  + H2  3.060E+10  1.00   3200.
-HCOOH + O            = H     + CO2  + OH  5.360E+11  0.60   2900.
-HCOOH + OH           = H     + CO2  + H2O 2.500E+11  0.00      0.
-HCOOH + HO2          = H2O2  + CO2  + H   2.500E+11  0.00      0.
-HCOOH + CH3          = CH4   + CO2  + H   1.100E-03  4.90   3480.
-HCOOH + CH3OCH2      = CH3OCH3 + CO2 + H  1.100E-03  4.90   3480.
-!
-HCO   + OH           = H2O   + CO         1.000E+14  0.00      0.
-!HCO   + M            = H     + CO    + M  2.500E+14  0.00  16802.
-HCO   + H2O          = H     + CO   + H2O 2.244E+18 -1.00  17000.
-HCO   + M            = H     + CO    + M  1.870E+17 -1.00  17000.
-H2/2.00/ H2O/ .00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/
-HCO   + H            = CO    + H2         1.190E+13  0.25      0.
-HCO   + O            = CO    + OH         3.000E+13  0.00      0.
-HCO   + O            = CO2   + H          3.000E+13  0.00      0.
-HCO   + O2           = HO2   + CO         3.300E+13 -0.40      0.
-HCO   + HCO          = CH2O  + CO         3.000E+13  0.00      0.
-HCO   + HCO          = H2    + CO   + CO  3.000E+12  0.00      0.
-CO    + O    + M     = CO2   + M          6.170E+14  0.00   3000.
-H2/2.00/ O2/6.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/3.50/ C2H6/3.00/ AR/0.50/
-CO    + OH           = CO2   + H          1.510E+07  1.30   -758.
-CO    + O2           = CO2   + O          1.600E+13  0.00  41000.
-HO2   + CO           = CO2   + OH         5.800E+13  0.00  22934.
-C2H6  + CH3          = C2H5  + CH4        5.500E-01  4.00   8300.
-C2H6  + H            = C2H5  + H2         5.400E+02  3.50   5210.
-C2H6  + O            = C2H5  + OH         3.000E+07  2.00   5115.
-C2H6  + OH           = C2H5  + H2O        8.700E+09  1.05   1810.
-C2H4  + H            = C2H3  + H2         1.100E+14  0.00   8500.
-C2H4  + O            = CH3   + HCO        1.600E+09  1.20    746.
-C2H4  + OH           = C2H3  + H2O        2.020E+13  0.00   5955.
-H     + C2H4         = C2H5               2.600E+43 -9.25  52580.
-C2H5  + H            = CH3   + CH3        1.000E+14  0.00      0.
-C2H5  + O2           = C2H4  + HO2        8.430E+11  0.00   3875.
-C2H2  + O            = CH2   + CO         1.020E+07  2.00   1900.
-C2H2  + O            = HCCO  + H          1.020E+07  2.00   1900.
-H2    + C2H          = C2H2  + H          4.090E+05  2.39    864.
-C2H3                 = C2H2  + H          4.600E+40 -8.80  46200.
-C2H3  + H            = C2H2  + H2         4.000E+13  0.00      0.
-C2H3  + O            = CH2CO + H          3.000E+13  0.00      0.
-C2H3  + O2           = CH2O  + HCO        4.000E+12  0.00   -250.
-C2H3  + O2           = C2H2  + HO2        1.580E+13  0.00  10060.
-C2H3  + OH           = C2H2  + H2O        5.000E+12  0.00      0.
-C2H3  + CH2          = C2H2  + CH3        3.000E+13  0.00      0.
-C2H3  + C2H          = C2H2  + C2H2       3.000E+13  0.00      0.
-C2H3  + CH           = CH2   + C2H2       5.000E+13  0.00      0.
-OH    + C2H2         = C2H   + H2O        3.370E+07  2.00  14000.
-OH    + C2H2         = HCCOH + H          5.040E+05  2.30  13500.
-OH    + C2H2         = CH2CO + H          2.180E-04  4.50  -1000.
-OH    + C2H2         = CH3   + CO         4.830E-04  4.00  -2000.
-C2H2  + O            = C2H   + OH         3.160E+15 -0.60  15000.
-HCCOH + H            = CH2CO + H          1.000E+13  0.00      0.
-!
-CH2CO + O            = CO2   + CH2        1.750E+12  0.00   1350.
-CH2CO + O            = HCO   + HCO        2.300E+13  0.00   2300.
-CH2CO + H            = CH3   + CO         1.130E+13  0.00   3428.
-CH2CO + H            = HCCO  + H2         5.000E+13  0.00   8000.
-CH2CO + O            = HCCO  + OH         1.000E+13  0.00   8000.
-CH2CO + OH           = HCCO  + H2O        7.500E+12  0.00   2000.
-CH2CO + M            = CH2   + CO   + M   3.000E+14  0.00  70980.
-C2H   + O2           = CO    + CO   + H   5.000E+13  0.00   1500.
-HCCO  + H            = CH2(S)+ CO         1.000E+14  0.00      0.
-HCCO  + O            = H     + CO   + CO  1.000E+14  0.00      0.
-HCCO  + O2           = OH    + CO   + CO  1.600E+12  0.00    854.
-HCCO  + CH           = C2H2  + CO         5.000E+13  0.00      0.
-HCCO  + HCCO         = C2H2  + CO   + CO  1.600E+12  0.00    854.
-C2H   + O            = CH    + CO         5.000E+13  0.00      0.
-C2H   + OH           = HCCO  + H          2.000E+13  0.00      0.
-C3H2  + O2           = HCCO  + HCO        1.000E+13  0.00      0.
-C3H3  + O2           = CH2CO + HCO        3.000E+10  0.00   2868.
-C3H3  + O            = CH2O  + C2H        2.000E+13  0.00      0.
-C3H3  + OH           = C3H2  + H2O        2.000E+13  0.00      0.
-C2H2  + O2           = HCCO  + OH         2.000E+08  1.50  30100.
-C2H2  + M            = C2H   + H     + M  4.200E+16  0.00 107000.
-C2H4  + M            = C2H2  + H2    + M  1.500E+15  0.00  55800.
-H2    + O2           = OH    + OH         1.700E+13  0.00  47780.
-H2    + OH           = H2O   + H          1.170E+09  1.30   3626.
-O     + OH           = O2    + H          8.000E+14 -0.60      0.
-!H     + O2           =  O    + OH         8.300E+13  0.00  14413.
-O     + H2           = OH    + H          5.060E+04  2.67   6290.
-H     + O2   + M     = HO2   + M          3.610E+17 -0.72      0.
-  H2O/21./  CO2/5.0/  H2/3.3/  CO/2.0/ AR/0.0/
-H     + O2   +    AR = HO2   + AR         7.000E+17 -0.80     0.
-OH    + HO2          = H2O   + O2         2.890E+13  0.00    497.
-H     + HO2          = OH    + OH         1.700E+14  0.00    874.
-O     + HO2          = O2    + OH         1.400E+13  0.00   1073.
-OH    + OH           = O     + H2O        6.000E+08  1.30      0.
-H     + H    + M     = H2    + M          1.000E+18 -1.00      0.
-  H2O/0./   H/2./  H2/0./ CO2/0./ AR/0.5/
-H     + H    + H2    = H2    + H2         9.200E+16 -0.60      0.
-H     + H    + H2O   = H2    + H2O        6.000E+19 -1.25      0.
-H     + H    + CO2   = H2    + CO2        5.490E+20 -2.00      0.
-H     + OH   + M     = H2O   + M          1.600E+22 -2.00      0.
-  H2/0.73/ H2O/3.65/ CH4/2.00/ C2H6/3.00/ AR/0.38/
-H     + O    + M     = OH    + M          5.000E+17 -1.00      0.
-  H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ AR/0.50/
-O     + O    + M     = O2    + M          1.200E+17 -1.00      0.
-  H2/ 2.40/ H2O/15.40/ CH4/ 2.00/ CO/ 1.75/ CO2/ 3.60/ C2H6/ 3.00/ AR/ 0.50/
-H     + HO2          = H2    + O2         4.280E+13  0.00   1411.
-HO2   + HO2          = H2O2  + O2         3.020E+12  0.00   1390.  ! 1.300E+11     .000   -1630.00
-H2O2  + M            = OH    + OH    + M  1.200E+17  0.00  45500.
-     AR/0.5/
-H2O2  + H            = HO2   + H2         4.790E+13  0.00   7950.
-H2O2  + OH           = H2O   + HO2        1.000E+13  0.00   1800.
-H     + HO2          = O     + H2O        3.100E+10  0.00   1720.
-O     + OH   + M     = HO2   + M          6.400E+15  0.00      0.
-     AR/0.5/
-H2O2  + H            = H2O   + OH         1.000E+13  0.00   3590.
-H2O2  + O            = H2O   + O2         8.400E+11  0.00   4260.
-H2O2  + O            = OH    + HO2        2.000E+13  0.00   5900.
-H2    + HO2          = H2O   + OH         6.500E+11  0.00  18800.
-C2H6  + CH           = H     + C3H6       1.100E+14  0.00   -263.
-C3H6  + O            = CH3CO + CH3        5.000E+12  0.00    454.
-C3H6  + O            = C2H5  + HCO        1.500E+12  0.00      0.
-CH3CO + H            = CH2CO + H2         2.000E+13  0.00      0.
-CH3CO + O            = CH3   + CO2        2.000E+13  0.00      0.
-CH3CO + CH3          = C2H6  + CO         5.000E+13  0.00      0.
-CH3CO                = CH3   + CO         2.300E+26 -5.00  17970.
-!C2H3  + CH3  + M     = C3H6  + M          5.000E+10  0.00      0.
-CH3   + C2H3         = C3H6               2.000E+13  0.00      0.
-CH3   + C2H2         = C3H5               6.000E+11  0.00  16000.
-C2H5  + C3H5         = C2H4  + C3H6       4.000E+11  0.00      0.
-C2H3  + C3H6         = C2H4  + C3H5       3.160E+12  0.00  31000.
-C3H5  + H            = C3H6               2.000E+13  0.00      0.
-C2H6  + O2           = C2H5  + HO2        1.000E+13  0.00  48960.
-C2H4  + O2           = C2H3  + HO2        4.200E+13  0.00  57590.
-C2H5  + HO2          = C2H4  + H2O2       3.000E+11  0.00      0.
-!
-O3    + M            = O2    + O     + M  3.000E+14  0.00  22180.
-O3    + O            = O2    + O2         1.000E+13  0.00   4570.
-O3    + H            = O2    + OH         1.000E+14  0.00    890.
-O3    + OH           = HO2   + O2         1.000E+12  0.00   1848.
-O3    + HO2          = OH    + O2    + O2 1.000E+13  0.00  11000.
-!
-CH3OH                = CH2OH + H          3.700E+15  0.00  96700.
-CH3OH                = CH3O  + H          4.500E+15  0.00  96700.
-CH3OH                = CH3   + OH         3.800E+15  0.00  91700.
-CH3OH + O2           = CH2OH + HO2        2.050E+13  0.0   44906.
-CH3OH + H            = CH2OH + H2         1.700E+07  2.10   4870.
-CH3OH + H            = CH3O  + H2         4.200E+06  2.10   4870.
-CH3OH + O            = OH    + CH2OH      3.880E+05  2.50   3100.
-CH3OH + O            = OH    + CH3O       1.300E+05  2.50   5000.
-CH3OH + OH           = CH2OH + H2O        1.440E+06  2.00   -840.
-CH3OH + OH           = CH3O  + H2O        6.300E+06  2.00   1500.
-CH3OH + HO2          = CH2OH + H2O2       5.200E+13  0.00  19360.
-CH3OH + CH3          = CH2OH + CH4        3.000E+07  1.50   9940.
-CH3OH + CH3          = CH3O  + CH4        1.000E+07  1.50   9940.
-CH3OH + CH3O         = CH3OH + CH2OH      3.00E+11   0.0    4000.
-CH3O  + CH3O         = CH3OH + CH2O       1.200E+12  0.0       0.
-CH2OH + CH2OH        = CH3OH + CH2O       1.200E+12  0.0       0.
-CH2OH + HCO          = CH3OH + CO         1.200E+12  0.0       0.
-!
-C2H5OH               = CH3     + CH2OH    3.020E+15  0.00  80600.
-C2H5OH               = C2H5    + OH       5.000E+16  0.00  91210.
-C2H5OH               = C2H4    + H2O      1.000E+14  0.00  76706.
-C2H5OH + O2          = CH3CHOH + HO2      4.000E+13  0.00  51000.
-C2H5OH + OH          = CH3CHOH + H2O      8.000E+06  1.78  -1540.
-C2H5OH + H           = C2H5    + H2O      2.400E+10  0.00      0.
-C2H5OH + H           = CH3CHOH + H2       4.360E+12  0.00   4570.
-C2H5OH + O           = CH3CHOH + OH       6.000E+05  2.46   1850.
-C2H5OH + HO2         = CH3CHOH + H2O2     6.310E+12  0.00  15000.
-C2H5OH + CH3         = CH3CHOH + CH4      4.000E+12  0.00   9690.
-C2H5OH + CH3O        = CH3CHOH + CH3OH    2.000E+11  0.00   7000.
-C2H5OH + CH2O        = CH3CHOH + CH3O     1.500E+12  0.00  79500.
-C2H5OH + C2H5        = CH3CHOH + C2H6     4.000E+13  0.00  10000.
-C2H5OH + CH2OH       = CH3CHOH + CH3OH    4.000E+11  0.00   9700.
-!
-CH3CHOH + M          = CH3HCO  + H   + M  5.000E+13  0.00  21850.
-CH3CHOH + O          = CH3HCO  + OH       9.040E+13  0.00      0.
-CH3CHOH + OH         = CH3HCO  + H2O      1.500E+13  0.00      0.
-CH3CHOH + H          = CH3HCO  + H2       2.000E+13  0.00      0.
-CH3CHOH + O2         = CH3HCO  + HO2      8.400E+15 -1.20      0.
-CH3CHOH + HO2        = CH3HCO  + OH  + OH 1.000E+13  0.00      0.
-!
-CH3HCO               = CH3     + HCO      7.080E+15  0.00  81760.
-CH3HCO               = CH3CO   + H        5.000E+14  0.00  87860.
-CH3HCO  + O2         = CH3CO   + HO2      2.000E+13  0.50  42200.
-CH3HCO  + H          = CH3CO   + H2       4.000E+13  0.00   4200.
-CH3HCO  + OH         = CH3CO   + H2O      1.000E+13  0.00      0.
-CH3HCO  + O          = CH3CO   + OH       5.000E+12  0.00   1790.
-CH3HCO  + CH3        = CH3CO   + CH4      1.700E+12  0.00   8430.
-CH3HCO  + HO2        = CH3CO   + H2O2     1.700E+12  0.00  10700.
-C2H2    + C2H2       = C4H3    + H        2.000E+12  0.00  45900.
-C4H3    + M          = C4H2    + H  + M   1.000E+16  0.00  59700.
-C4H2    + O          = C3H2    + CO       1.200E+12  0.00      0.
-C2H2    + C2H        = C4H2    + H        4.000E+13  0.00      0.
-C3H4    + O          = CH2O    + C2H2     1.000E+12  0.00      0.
-C3H4    + OH         = CH2O    + C2H3     1.000E+12  0.00      0.
-C3H4    + O          = HCO     + C2H3     1.000E+12  0.00      0.
-C3H4    + OH         = HCO     + C2H4     1.000E+12  0.00      0.
-C3H6    + O          = CH2O    + C2H4     5.900E+13  0.00      0.
-C3H6    + OH         = CH3     + CH3HCO   7.080E+12  0.00      0.
-C3H6    + OH         = C3H5    + H2O      4.000E+12  0.00      0.
-C3H6    + OH         = C2H5    + CH2O     8.000E+12  0.00      0.
-C3H6    + H          = C3H5    + H2       5.000E+12  0.00   1500.
-C3H6    + CH3        = C3H5    + CH4      1.000E+11  0.00   8500.
-C3H6    + C2H5       = C3H5    + C2H6     1.000E+11  0.00   9200.
-C3H5                 = C3H4    + H        4.000E+13  0.00  70000.
-C3H5    + O2         = C3H4    + HO2      6.020E+11  0.00  10000.
-C3H5    + H          = C3H4    + H2       1.000E+13  0.00      0.
-C3H5    + CH3        = C3H4    + CH4      1.000E+12  0.00      0.
-!
-CH3     + O2         = CH3O2              9.020E+58 -15.0  17204.
-CH3O2   + HO2        = CH4O2   + O2       4.630E+10   0.0  -2583.
-CH3O2   + CH4        = CH4O2   + CH3      1.810E+11   0.0  18480.
-CH3O2   + CH3        = CH3O    + CH3O     2.410E+13   0.0      0.
-CH3O2   + O          = CH3O    + O2       3.610E+13   0.0      0.
-CH3O2   + H          = CH3O    + OH       9.640E+13   0.0      0.
-CH3O2   + OH         = CH3OH   + O2       6.030E+13   0.0      0.
-CH3O2   + CH2O       = CH4O2   + HCO      1.000E+12   0.0  11665.
-CH3O2   + CH3OH      = CH4O2   + CH2OH    1.800E+12   0.0  13712.
-CH3O2   + C2H6       = CH4O2   + C2H5     2.950E+11   0.0  14944.
-CH4O2                = CH3O    + OH       4.000E+15   0.0  42924.
-CH4O2   + OH         = CH3O2   + H2O      8.200E+11   0.0   -258.
-!
-CH3OCH3 + H          = CH3OCH2 + H2       8.400E+07  2.00   7700.
-CH3OCH3 + O          = CH3OCH2 + OH       6.540E+06  2.40   5500.
-CH3OCH3 + OH         = CH3OCH2 + H2O      6.560E+09  1.00   1590.
-CH3OCH3 + HO2        = CH3OCH2 + H2O2     4.200E+12  0.00  13875.
-CH3OCH3 + CH3O       = CH3OCH2 + CH3OH    2.600E+12  0.00   7000.
-CH3OCH3 + O2         = CH3OCH2 + HO2      4.100E+13  0.00  44906.
-CH3OCH3 + CH3        = CH3OCH2 + CH4      1.950E+12  0.00  11600.
-CH3OCH3              = CH3+CH3O           2.620E+16  0.0   82202.
-CH3OCH3              = CH3OCH2 + H        2.588E+16  .265 104300.
-CH3OCH2              = CH3+CH2O           3.300E+14  0.0   31000.      !  4.3
-CH3OCH2 + CH3O       = CH3OCH3 + CH2O     6.030E+13  0.0       0.
-CH3OCH2 + O2         = CH3OCH2OO          2.000E+42 -10.3   6080.
-CH3OCH2 + O2         = HCOOCH3 + OH       5.480E+13  0.0    8370.
-CH3OCH2 + HO2        = CH2O   + CH3O + OH 3.000E+12  0.0       0.
-CH3OCH2 + H2O2       = CH2O  + CH3O + H2O 3.000E+12  0.0       0.
-CH3OCH2OO + CH3OCH3  = CH3OCH2OOH+CH3OCH2 1.200E+12  0.0   14000.      !  2.2
-CH3OCH2OOH           = CH3OCH2O  + OH     8.200E+08  3.65  34000.
-CH3OCH2O             = CH3O      + CH2O   4.000E+14  0.0   15600.
-CH3OCH2O + O2        = HCOOCH3 + HO2      2.000E+12  0.0    6000.
-CH3OCH2OOH           = CH2O + CH2O + H2O  8.800E+12  0.0   16000.
-CH3OCH3   + CH3O2    = CH3OCH2   + CH4O2  1.500E+13  0.0   13700.      !  2.0
-CH3O2     + CH3O2    = CH3O + CH3O + O2   6.300E+10  0.0    -600.
-CH3O2     + CH3O2    = CH3OCH2O + HO2     6.300E+10  0.0    -600.
-! new termination reactions
-CH3OCH2O  + CH3      = CH4     + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + H        = H2      + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + HO2      = H2O2    + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + O        = OH      + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + OH       = H2O     + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + C2H5     = C2H6    + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + CH3OCH2  = CH3OCH3 + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + CH3O     = CH3OH   + HCOOCH3  6.000E+13  0.0       0.
-HCOOCH3              = CH4     + CO2      6.000E+09  0.0   48520.
-HCOOCH3              = CH3O    + HCO      6.200E+09 1.61  102580.
-HCOOCH3   + O        = CH3OCO  + OH       5.360E+11  0.6    2900.
-HCOOCH3   + H        = CH3OCO  + H2       1.620E+08  1.6    1980.
-HCOOCH3   + OH       = CH3OCO  + H2O      1.200E+09  1.3    -280.
-HCOOCH3   + HO2      = CH3OCO  + H2O2     4.000E+12  0.0   12060.
-HCOOCH3   + CH3      = CH3OCO  + CH4      9.900E-03  4.5    3420.
-HCOOCH3   + CH3O     = CH3OCO  + CH3OH    1.020E+11  0.0    2980.
-HCOOCH3   + CH3OCH2  = CH3OCO  + CH3OCH3  1.100E-03  4.9    3480.
-CH3OCO               = CO2 +  CH3         1.000E+11  1.1     860.
-!
-H         + CH       = C         + H2     1.100E+14  0.0       0.
-C         + O2       = O         + CO     5.800E+13  0.0     576.
-C         + CH2      = H         + C2H    5.000E+13  0.0       0.
-C         + CH3      = H         + C2H2   5.000E+13  0.0       0.
-END
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c7h16 b/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c7h16
deleted file mode 100644
index 044d75306..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c7h16
+++ /dev/null
@@ -1,533 +0,0 @@
-ELEMENTS
- H   O    C   N   AR
-END
-SPECIE 
-C7H16     O2         N2        CO       CO2   
-H         H2         O         H2O      OH  
-HO2       H2O2       CH4       CH3      CH3O 
-CH2       CH2O       CH3O2     CH4O2    HCO    HCCO   CH2CO
-C7H15-1   C7H15-2    C7H15O2   C7H14O2H  C7H14O2HO2  
-C7KET21   C6H12      C5H11CHO  C5H11CO   C5H11 
-C4H9  C4H   C4H2  C4H3  
-C3H7  C3H6  C3H5  C3H4  C3H3  C3H2
-C2H   C2H2  C2H3  C2H4  C2H5  C2H6  
-N2O       NO         N     
-C3H8    CH2CHO  CH3CHO  CH3CO   CH2OH
-!A1   A1-   C(S)
-AR
-THERMO            ! 1995 NASA COMPILATION + CURRAN DATA
-CH3O2             L 1/84C   1H   3O   2N   0G   300.000  5000.00               1
- 0.66812963E 01 0.80057271E-02-0.27188507E-05 0.40631365E-09-0.21927725E-13    2
- 0.52621851E 03-0.99423847E 01 0.20986490E 01 0.15786357E-01 0.75683261E-07    3
--0.11274587E-07 0.56665133E-11 0.20695879E 04 0.15007068E 02                   4
-CH4O2             T11/96C   1H   4O   2    0G   200.000  6000.000              1
- 6.86907934E+00 1.00840883E-02-3.66515947E-06 5.96302681E-10-3.58894156E-14    2
--1.98402231E+04-1.24951986E+01 3.72654981E+00 7.51851847E-03 2.35970425E-05    3
--3.52694507E-08 1.42757614E-11-1.83982011E+04 6.52443362E+00-1.68074366E+04    4
-C2H5OH            L 8/88C   2H   6O   1N   0G   200.000  6000.000              1
- 0.65624365E+01 0.15204222E-01-0.53896795E-05 0.86225011E-09-0.51289787E-13    2
--0.31525621E+05-0.94730202E+01 0.48586957E+01-0.37401726E-02 0.69555378E-04    3
--0.88654796E-07 0.35168835E-10-0.29996132E+05 0.48018545E+01-0.28257829E+05    4
-C2H3              T06/93C   2H   3    0    0G   200.000  6000.000              1
- 0.47025310E+01 0.72642283E-02-0.25801992E-05 0.41319944E-09-0.24591492E-13    2
- 0.34029675E+05-0.14293714E+01 0.30019602E+01 0.30304354E-02 0.24444315E-04    3
--0.35810242E-07 0.15108700E-10 0.34868173E+05 0.93304495E+01 0.36050230E+05    4
-C3H3              BUR 92C   3H   3O   0N   0G   200.000  6000.000              1
- 6.64175821E+00 8.08587428E-03-2.84787887E-06 4.53525977E-10-2.68879815E-14    2
- 3.89793699E+04-1.04004255E+01 1.82840766E+00 2.37839036E-02-2.19228176E-05    3
- 1.00067444E-08-1.38984644E-12 4.01863058E+04 1.38447957E+01 4.16139977E+04    4
-C3H4              L12/92C   3H   4O   0N   0G   200.000  6000.000              1
- 6.31694869E+00 1.11336262E-02-3.96289018E-06 6.35633775E-10-3.78749885E-14    2
- 2.01174617E+04-1.09718862E+01 2.61307487E+00 1.21223371E-02 1.85405400E-05    3
--3.45258475E-08 1.53353389E-11 2.15415642E+04 1.02503319E+01 2.29622672E+04    4
-C3H5              BUR 92C   3H   5O   0N   0G   200.000  6000.000              1
- 6.54761132E+00 1.33152246E-02-4.78333100E-06 7.71949814E-10-4.61930808E-14    2
- 1.72714707E+04-9.27486841E+00 3.78794693E+00 9.48414335E-03 2.42343368E-05    3
--3.65604010E-08 1.48592356E-11 1.86261218E+04 7.82822499E+00 2.03259122E+04    4
-C3H6              120186C   3H   6          G  0300.00   5000.00  1000.00      1
- 0.06732257E+02 0.01490834E+00-0.04949899E-04 0.07212022E-08-0.03766204E-12    2
--0.09235703E+04-0.01331335E+03 0.01493307E+02 0.02092518E+00 0.04486794E-04    3
--0.01668912E-06 0.07158146E-10 0.01074826E+05 0.01614534E+03                   4
-C4H2              L 2/93C   4H   2O   0N   0G   200.000  6000.000              1
- 8.66704895E+00 6.71505191E-03-2.35355060E-06 3.73635366E-10-2.21054043E-14    2
- 5.10016978E+04-2.18002050E+01-4.07132393E-01 5.20775143E-02-9.21138340E-05    3
- 8.08657403E-08-2.70422080E-11 5.25957367E+04 2.03240223E+01 5.41222513E+04    4
-C4H3              L 9/89C   4H   3O   0N   0G   298.150  6000.000              1
- 0.84762079E+01 0.88782327E-02-0.30328412E-05 0.47358302E-09-0.27716627E-13    2
- 0.54756540E+05-0.17170551E+02 0.24173247E+01 0.24104782E-01-0.12813470E-04    3
--0.28606237E-08 0.39194527E-11 0.56506476E+05 0.14471107E+02 0.58181574E+05    4
-C4H4              L 9/89C   4H   4O   0N   0G   200.000  6000.000              1
- 0.82948104E+01 0.11994381E-01-0.42624075E-05 0.68306978E-09-0.40680631E-13    2
- 0.33550866E+05-0.18426826E+02 0.14049083E+01 0.29531073E-01-0.15596302E-04    3
--0.32142002E-08 0.45436937E-11 0.35507830E+05 0.17450183E+02 0.37097268E+05    4
-CH3OCH3           L12/92C   2H   6O   1N   0G   200.000  6000.000              1
- 5.64844183E+00 1.63381899E-02-5.86802367E-06 9.46836869E-10-5.66504738E-14    2
--2.51074690E+04-5.96264939E+00 5.30562279E+00-2.14254272E-03 5.30873244E-05    3
--6.23147136E-08 2.30731036E-11-2.39866295E+04 7.13264209E-01-2.21432171E+04    4
-CH3OCH2           T11/82C   2H   5O   1N   0G   300.000  5000.0                1
- 0.65567484E+01 0.12180723E-01-0.40628420E-05 0.59495830E-09-0.31276214E-13    2
--0.40282515E+04-0.81302772E+01 0.35953999E+01 0.13379216E-01 0.53914910E-05    3
--0.10947097E-07 0.38193320E-11-0.27021975E+04 0.92850365E+01                   4
-CH3OCH2OOH        Jan96 C   2H   6O   3N   0G    300.00  3000.00   1000.       1
- 7.66981055E+00 2.35536769E-02-1.15031834E-05 2.84464629E-09-2.79520304E-13    2
--3.96295537E+04-1.39224857E+01 3.05518950E-02 4.90560834E-02-4.43030986E-05    3
- 2.21548123E-08-4.66587486E-12-3.80282020E+04 2.43189660E+01                   4
-CH3OCH2OO         Jan96 C   2H   5O   3N   0G    300.00  3000.00   1000.       1
- 8.06217488E+00 2.05153644E-02-1.00803231E-05 2.50244952E-09-2.46544863E-13    2
--2.19951127E+04-1.59505736E+01 4.74967287E-01 4.68199208E-02-4.55041928E-05    3
- 2.44627078E-08-5.51108848E-12-2.04517448E+04 2.17234867E+01                   4
-CH3OCH2O          Jan96 C   2H   5O   2N   0G    300.00  3000.00   1000.       1
- 5.98450336E+00 1.93302785E-02-9.44575204E-06 2.33651645E-09-2.29626013E-13    2
--2.12266609E+04-7.95685946E+00-1.22386711E-01 3.94270827E-02-3.47990406E-05    3
- 1.69073231E-08-3.44801024E-12-1.99352987E+04 2.26909497E+01                   4
-CH3OCHO           Jan96 C   2H   4O   2N   0G    300.00  3000.00   1000.       1
- 5.46071782E+00 1.70659166E-02-8.38236448E-06 2.08015776E-09-2.04870146E-13    2
--4.58756417E+04-3.33482124E+00-4.40150386E-01 3.69251939E-02-3.41468832E-05    3
- 1.73800460E-08-3.70831952E-12-4.46516329E+04 2.61277510E+01                   4
-HCOOCH3                 C   2H   4O   2N   0G   300.000  5000.000              1
- 0.83982000E 01 0.11267000E-01-0.41325000E-05 0.72745000E-09-0.48932000E-13    2
--0.48328000E 05-0.18820000E 02-0.15323000E 01 0.43051000E-01-0.45098000E-04    3
- 0.26064000E-07-0.63345000E-11-0.45711000E 05 0.31603000E 02                   4
-HCOOH             L 8/88C   1H   2O   2N   0G   200.000  6000.000              1
- 5.69579404E+00 7.72237361E-03-3.18037808E-06 5.57949466E-10-3.52618226E-14    2
--4.81599723E+04-6.01680080E+00 3.23262453E+00 2.81129582E-03 2.44034975E-05    3
--3.17501066E-08 1.20631660E-11-4.67785606E+04 9.86205647E+00-4.55312460E+04    4
-COOCH3                  C   2H   3O   2    0G   300.000  5000.000              1
- 0.76505900E 01 0.99082000E-02-0.37559700E-05 0.67845900E-09-0.46572100E-13    2
--0.24947700E 05-0.12937300E 02-0.89045900E 00 0.38842600E-01-0.42829300E-04    3
- 0.25682800E-07-0.63729700E-11-0.22835200E 05 0.29911300E 02                   4
-C7H16             P10/95C   7H  16    0    0G   300.000  5000.000  1391.000    1
- 2.22148969e+01 3.47675750e-02-1.18407129e-05 1.83298478e-09-1.06130266e-13    2
--3.42760081e+04-9.23040196e+01-1.26836187e+00 8.54355820e-02-5.25346786e-05    3
- 1.62945721e-08-2.02394925e-12-2.56586565e+04 3.53732912e+01                   4
-C7H15-1    2/10/95      C   7H  15    0    0G   300.000  5000.000  1391.000    1
- 2.17940709e+01 3.26280243e-02-1.11138244e-05 1.72067148e-09-9.96366999e-14    2
--9.20938221e+03-8.64954311e+01-4.99570406e-01 8.08826467e-02-5.00532754e-05    3
- 1.56549308e-08-1.96616227e-12-1.04590223e+03 3.46564011e+01                   4
-C7H15-2    2/10/95      C   7H  15    0    0G   300.000  5000.000  1391.000    1
- 2.16368842e+01 3.23324804e-02-1.09273807e-05 1.68357060e-09-9.71774091e-14    2
--1.05873616e+04-8.52209653e+01-3.79155767e-02 7.56726570e-02-4.07473634e-05    3
- 9.32678943e-09-4.92360745e-13-2.35605303e+03 3.37321506e+01                   4
-C7H15O2    7/23/98      C  7.H 15.O  2.   0.G   300.000  5000.000              1
- 2.49023689e+01 3.50716920e-02-1.20440306e-05 1.87464822e-09-1.08947791e-13    2
--2.82976050e+04-9.73923542e+01 2.37499334e+00 8.34651906e-02-5.13897320e-05    3
- 1.64217662e-08-2.19505216e-12-1.99237961e+04 2.53067342e+01                   4
-C7H14O2H   7/23/98      C  7.H 15.O  2.   0.G   300.000  5000.000              1
- 2.70028807e+01 3.22272216e-02-1.09366516e-05 1.68977918e-09-9.77321946e-14    2
--2.27229231e+04-1.06332170e+02 2.49875186e+00 8.32443344e-02-4.85933986e-05    3
- 1.28927950e-08-1.09878385e-12-1.36530733e+04 2.73754005e+01                   4
-C7H14O2HO2   7/23/98    C  7.H 15.O  4.   0.G   300.000  5000.000              1
- 3.23937788e+01 3.33911097e-02-1.15672104e-05 1.81146023e-09-1.05739941e-13    2
--4.36321048e+04-1.32597311e+02 3.84933185e+00 9.45955097e-02-5.94934121e-05    3
- 1.78836457e-08-2.00618696e-12-3.32051631e+04 2.25912030e+01                   4
-C7KET12    7/23/98      C  7.H 14.O  3.   0.G   300.000  5000.000              1
- 2.97472906e+01 3.06622294e-02-1.05563590e-05 1.64627343e-09-9.58171675e-14    2
--5.66856828e+04-1.22432490e+02 5.82433697e-01 1.01207869e-01-7.65855996e-05    3
- 3.00738606e-08-4.82902792e-12-4.68054419e+04 3.33331449e+01                   4
-C7KET21    2/10/95      C  7.H 14.O  3.   0.G   300.000  5000.000 1382.000     1
- 2.80512936e+01 3.27356029e-02-1.14107044e-05 1.79404506e-09-1.05002142e-13    2
--5.89640173e+04-1.11392338e+02 4.19023030e+00 8.43118237e-02-5.44315814e-05    3
- 1.85837721e-08-2.72768938e-12-5.00570382e+04 1.85783455e+01                   4
-C6H12      2/14/95      C  6.H 12.O  0.   0.G   300.000  5000.000              1
- 1.78337529e+01 2.67377658e-02-9.10036773e-06 1.40819768e-09-8.15124244e-14    2
--1.42062860e+04-6.83818851e+01-1.35275205e+00 6.98655426e-02-4.59408022e-05    3
- 1.56967343e-08-2.21296175e-12-7.34368617e+03 3.53120691e+01                   4
-C5H11CHO   2/29/96      C   6H  12O   1    0G   300.000  5000.000              1
- 1.98891043e+01 2.71869340e-02-9.27391515e-06 1.43744158e-09-8.33090761e-14    2
--3.97523444e+04-7.60741671e+01 1.37517192e+00 6.65669689e-02-4.04423050e-05    3
- 1.23836270e-08-1.52905857e-12-3.28740986e+04 2.48343934e+01                   4
-C5H11CO    2/29/96      C  6.H 11.O  1.   0.G   300.000  5000.000              1
- 1.94783812e+01 2.50466029e-02-8.54861346e-06 1.32557944e-09-7.68503296e-14    2
--2.07923937e+04-7.21995578e+01 2.14479069e+00 6.17863563e-02-3.74134690e-05    3
- 1.13283795e-08-1.36917698e-12-1.43451172e+04 2.23128045e+01                   4
-C5H11             T03/97C  5.H 11.   0.   0.G   298.150  5000.000              1
- 1.13324106E+01 3.03659897E-02-1.13934480E-05 1.99539733E-09-1.32825012E-13    2
--5.95299959E+03-3.13564905E+01 3.57867617E+00 3.04236365E-02 3.27768270E-05    3
--5.86453147E-08 2.39315107E-11-2.60420265E+03 1.42591121E+01 6.68760000E+03    4
-C4H9              P10/84C  4.H  9.   0.   0.G   200.000  6000.000              1
- 9.43040607E+00 2.34271349E-02-8.53599182E-06 1.39748355E-09-8.44057456E-14    2
- 2.14214862E+03-2.42207994E+01 3.54885235E+00 1.78747638E-02 5.00782825E-05    3
--7.94475071E-08 3.35802354E-11 4.74011588E+03 1.11849382E+01 6.89397210E+03    4
-C3H7            N-L 9/84C   3H   7    0    0G   300.000  5000.000              1
- 0.77026987E 01 0.16044203E-01-0.52833220E-05 0.76298590E-09-0.39392284E-13    2
- 0.82984336E 04-0.15480180E 02 0.10515518E 01 0.25991980E-01 0.23800540E-05    3
--0.19609569E-07 0.93732470E-11 0.10631863E 05 0.21122559E 02 0.12087447E 05    4
-C2H2              L 1/91C  2.H  2.   0.   0.G   200.000  6000.000              1
- 4.65878504E+00 4.88396547E-03-1.60828775E-06 2.46974226E-10-1.38605680E-14    2
- 2.57594044E+04-3.99834772E+00 8.08681094E-01 2.33615629E-02-3.55171815E-05    3
- 2.80152437E-08-8.50072974E-12 2.64289807E+04 1.39397051E+01 2.74459950E+04    4
-C2H4O             L 8/88C   2H   4O   1    0G   200.000  6000.000              1
- 0.54887641E+01 0.12046190E-01-0.43336931E-05 0.70028311E-09-0.41949088E-13    2
--0.91804251E+04-0.70799605E+01 0.37590532E+01-0.94412180E-02 0.80309721E-04    3
--0.10080788E-06 0.40039921E-10-0.75608143E+04 0.78497475E+01-0.63304657E+04    4
-A1                MF /94C   6H   6    0    0G   300.000  4000.000              1
- 0.17246994E+02 0.38420164E-02 0.82776232E-05-0.48961120E-08 0.76064545E-12    2
- 0.26646055E+04-0.71945175E+02-0.48998680E+01 0.59806932E-01-0.36710087E-04    3
- 0.32740399E-08 0.37600886E-11 0.91824570E+04 0.44095642E+02                   4
-A1-               MF /94C   6H   5    0    0G   300.000  4000.000              1
- 0.14493439E+02 0.75712688E-02 0.37894542E-05-0.30769500E-08 0.51347820E-12    2
- 0.33189977E+05-0.54288940E+02-0.49076147E+01 0.59790771E-01-0.45639827E-04    3
- 0.14964993E-07-0.91767826E-12 0.38733410E+05 0.46567780E+02                   4
-CH3CHO            L 8/88C   2H   4O   1     G   200.000  6000.000  1000.000    1
- 0.54041108E+01 0.11723059E-01-0.42263137E-05 0.68372451E-09-0.40984863E-13    2
--0.22593122E+05-0.34807917E+01 0.47294595E+01-0.31932858E-02 0.47534921E-04    3
--0.57458611E-07 0.21931112E-10-0.21572878E+05 0.41030159E+01                   4
-CH2CHO            SAND86O   1H   3C   2     G   300.000  5000.000  1000.000    1
- 0.05975670E+02 0.08130591E-01-0.02743624E-04 0.04070304E-08-0.02176017E-12    2
- 0.04903218E+04-0.05045251E+02 0.03409062E+02 0.10738574E-01 0.01891492E-04    3
--0.07158583E-07 0.02867385E-10 0.15214766E+04 0.09558290E+02                   4
-END
-REACTIONS
- C7H16 + O2            = C7H15-1 + HO2        2.500E+13  0.0   48810.0! 1
- C7H16 + O2            = C7H15-2 + HO2        2.800E+14  0.0   47180.0! 2
- C7H16 + H             = C7H15-1 + H2         5.600E+07  2.0    7667.0! 3
- C7H16 + H             = C7H15-2 + H2         4.380E+07  2.0    4750.0! 4
- C7H16 + OH            = C7H15-1 + H2O        8.600E+09  1.10   1815.0! 5
- C7H16 + OH            = C7H15-2 + H2O        4.800E+09  1.30    690.5! 6
- C7H16 + HO2           = C7H15-1 + H2O2       8.000E+12  0.0   19300.0! 7
- C7H16 + HO2           = C7H15-2 + H2O2       1.000E+13  0.0   16950.0! 8
- C7H16 + CH3           = C7H15-1 + CH4        1.300E+12  0.0  1.160E+4! 9 
- C7H16 + CH3           = C7H15-2 + CH4        8.000E+11  0.0  9.500E+3! 10
- C7H16                 = C7H15-1 + H          3.972E+19 -0.95 1.032E+5! 11
- C7H16                 = C7H15-2 + H          1.248E+21 -1.34 1.007E+5! 12
- C7H16                 = C4H9 + C3H7          2.000E+16  0.0   80710.0! 13
-!
- C7H15-1 + O2          = C7H15O2              2.000E+12  0.0       0.0! 14
- C7H15-2 + O2          = C7H15O2              2.000E+12  0.0       0.0! 15
- C7H15O2               = C7H14O2H             6.000E+11  0.0   20380.0! 16
- C7H14O2H + O2         = C7H14O2HO2           2.340E+11  0.0       0.0! 17    
- C7H14O2HO2            = C7KET21 + OH         2.965E+13  0.0  2.670E+4! 18
- C7KET21               = C5H11CO + CH2O + OH  1.000E+16  0.0  4.240E+4! 19 
- C5H11CHO + O2         = C5H11CO + HO2        2.000E+13  0.5  4.220E+4! 20
- C5H11CHO + OH         = C5H11CO + H2O        1.000E+13  0.0  0.000E+0! 21
- C5H11CHO + H          = C5H11CO + H2         4.000E+13  0.0  4.200E+3! 22
- C5H11CHO + O          = C5H11CO + OH         5.000E+12  0.0  1.790E+3! 23
- C5H11CHO + HO2        = C5H11CO + H2O2       2.800E+12  0.0  1.360E+4! 24
- C5H11CHO + CH3        = C5H11CO + CH4        1.700E+12  0.0  8.440E+3! 25
- C5H11CHO + CH3O2      = C5H11CO + CH4O2      1.000E+12  0.0  9.500E+3! 26
- C5H11CO               = C5H11 + CO           1.000E+11  0.0  9.600E+3! 27
- C5H11                 = C2H5  + C3H6         3.200E+13  0.0   28300.0! 28
- C7H15-1               = C2H4  + C5H11        2.500E+13  0.0   28810.0! 29
- C7H15-2               = CH3   + C6H12        3.000E+13  0.0   29800.0! 30
- C6H12                 = C3H7  + C3H5         1.000E+16  0.0   68000.0! 31
- C7H15-2               = C4H9  + C3H6         1.200E+13  0.0   29600.0! 32
- C7H15-1               = C7H15-2              2.000E+11  0.0   18100.0! 33
- C4H9                  = C3H6 + CH3           2.232E+17 -1.40  30830.0! 34 
- C4H9                  = C2H5 + C2H4          2.500E+13  0.0   28810.0! 35
- C3H7                  = C2H4 + CH3           9.600E+13  0.0   30950.0! 36
- C3H7                  = C3H6 + H             1.250E+14  0.0   36900.0! 37
- C3H7 + O2             = C3H6 + HO2           1.000E+12  0.0    4980.0! 38
- C3H6                  = C2H3 + CH3           6.150E+15  0.0   85500.0! 39  ! 3.15
- C3H6 + H              = C3H5 + H2            5.000E+12  0.0    1500.0! 40
- C3H6 + CH3            = C3H5 + CH4           9.000E+12  0.0    8480.0! 41
- C3H6 + O2             = C3H5 + HO2           4.000E+12  0.0   39900.0! 42
- C3H6 + OH             = CH3CHO + CH3         3.500E+11  0.0       0.0! 43
- C3H5                  = C3H4 + H             4.000E+13  0.0   69760.0! 44
- C3H5 + H              = C3H4 + H2            1.000E+13  0.0       0.0! 45
- C3H5 + O2             = C3H4 + HO2           6.000E+11  0.0   10000.0! 46
- C3H4 + OH             = C2H3 + CH2O          1.000E+12  0.0       0.0! 47
- C3H4 + OH             = C2H4 + HCO           1.000E+12  0.0       0.0! 48
- C3H4 + O2             = C3H3 + HO2           4.000E+13  0.0   39160.0! 49
-!
- C2H5  + O             = CH3CHO + H           5.300E+13  0.0       0.0! 50
- C2H4  + HO2           = CH3CHO + OH          2.200E+13  0.0   17200.0! 51
- C2H4  + CH3O          = CH3CHO + CH3         3.000E+13  0.0   14500.0! 52
- C2H4  + CH3O2         = CH3CHO + CH3O        7.000E+13  0.0   14500.0! 53
-!C2H3  + OH            = CH3CHO               3.000E+13  0.0       0.0!   
- CH3CHO                = CH3     + HCO        7.080E+15  0.00  81760. ! 54 
-!CH3CHO                = CH3CO   + H          5.000E+14  0.00  87860. !   
- CH3CO + M             = CH3     + CO  + M    1.800E+16  0.00  1.44E+4! 55
- CH3CHO  + O2          = CH3CO   + HO2        2.000E+13  0.50  42200. ! 56
- CH3CHO  + H           = CH3CO   + H2         4.100E+13  0.00   4200. ! 57
- CH3CHO  + OH          = CH3CO   + H2O        1.000E+13  0.00      0. ! 58
- CH3CHO  + O           = CH3CO   + OH         5.800E+12  0.00   1790. ! 59
- CH3CHO  + CH3         = CH3CO   + CH4        1.700E+12  0.0    8440.0! 60
- CH3CHO  + CH2         = CH3CO   + CH3        1.660E+12  0.0    3510. ! 61
- CH3CHO  + HO2         = CH3CO   + H2O2       1.700E+12  0.00  10700. ! 62
- CH3CHO  + CH3O2       = CH3CO   + CH4O2      1.150E+11  0.0   10000.0! 63
- CH3CO + O             = CH3   + CO2          1.000E+13  0.00      0. ! 64
- CH3CO + H             = CH3   + HCO          1.000E+14  0.0       0. ! 65
- CH3CO + OH            = CH3   + CO  + OH     3.000E+13  0.0       0. ! 66
- CH3CO + HO2           = CH3   + CO2 + OH     3.000E+13  0.0       0. ! 67
- CH3CO + CH3           = C2H6  + CO           5.000E+13  0.00      0. ! 68
-! 
- CH3O  + CO            = CH3   + CO2          1.570E+14  0.00  11800. ! 69
- CH3O  + H             = CH2O  + H2           2.000E+13  0.00      0. ! 70
- CH3O  + OH            = CH2O  + H2O          1.000E+13  0.00      0. ! 71
- CH3O  + O             = CH2O  + OH           1.000E+13  0.00      0. ! 72
- CH3O  + O2            = CH2O  + HO2          1.200E+11  0.00   2600. ! 73  
- CH3O (+M)             = CH2O  + H (+M)       2.000E+13  0.00  27420.0! 74
-     LOW /2.344E+25 -2.7  3.060E+04/
- CH3   + HO2           = CH3O  + OH           4.300E+13  0.00      0. ! 75
- CH3   + O2            = CH3O  + O            3.670E+13  0.00  30000. ! 76
- CH3   + O2            = CH2O  + OH           4.800E+10  0.00   9000. ! 77 4.8  9000
- CH3   + O2            = CH3O2                3.020E+59 -15.0  17204. ! 78 3.02
-!
- CH3O2 + HO2           = CH4O2 + O2           4.630E+11   0.0  -2583. ! 79
- CH3O2 + CH4           = CH4O2 + CH3          1.810E+11   0.0  18480. ! 80
- CH3O2 + CH3           = CH3O  + CH3O         2.410E+13   0.0      0. ! 81  2.410E+13
- CH3O2 + O             = CH3O  + O2           3.610E+13   0.0      0. ! 82
- CH3O2 + H             = CH3O  + OH           9.640E+13   0.0      0. ! 83
- CH3O2 + CH2O          = CH4O2 + HCO          1.000E+12   0.0  11665. ! 84
- CH3O2 + C2H6          = CH4O2 + C2H5         2.950E+11   0.0  14944. ! 85
- CH3O2 + CH3O2         = CH3O  + CH3O + O2    2.800E+11   0.0   -780. ! 86  11
- CH3O2 + H2O2          = CH4O2 + HO2          2.400E+12   0.0  10000. ! 87
- CH4O2                 = CH3O  + OH           3.000E+16   0.0  42920. ! 88  6.000E+16
- CH3O2 + C2H4          = C2H3  + CH4O2        7.100E+11   0.0  17110. ! 89
- CH4O2 + OH            = CH3O2 + H2O          1.000E+13   0.0   -258. ! 90  ! 8.2
- CH4O2 + O             = CH3O2 + OH           2.000E+13   0.0   4750. ! 91
- CH3   + O             = CH2O  + H            8.000E+13  0.00      0. ! 92
- CH3   + OH            = CH2   + H2O          7.500E+06  2.00   5000. ! 93
- CH3   + OH            = CH2O  + H2           4.000E+12  0.00      0. ! 94
- CH3O  + H             = CH3   + OH           1.000E+14  0.00      0. ! 95
- CO    + O     + M     = CO2   + M            6.170E+14  0.00   3000. ! 96
- CO    + OH            = CO2   + H            3.510E+07  1.30   -758. ! 97
- CO    + O2            = CO2   + O            1.600E+13  0.00  41000. ! 98
- HO2   + CO            = CO2   + OH           5.800E+13  0.00  22930. ! 99
-!
- H2    + O2            = OH    + OH           1.700E+13  0.00  47780. !100
- H2    + OH            = H2O   + H            1.170E+09  1.30   3626. !101
- O     + OH            = O2    + H            4.000E+14 -0.50      0. !102
- O     + H2            = OH    + H            5.060E+04  2.67   6290. !103
- H     + HO2           = O     + H2O          3.100E+10  0.00   3590. !104
- O     + OH    + M     = HO2   + M            1.000E+16  0.00      0. !105
-       H2O/6.0/  CO2/5.0/  H2/3.3/  CO/2.0/  N2/0.70/
- H     + O2    + M     = HO2   + M            2.800E+18  -.86      0.0!106    
- O2/ .00/ H2O/ .00/ CO/ .75/ CO2/1.50/ C2H6/1.50/ N2/0.0/ 
- H     + O2    + O2    = HO2   + O2           2.080E+19 -1.24      0.0!107
- H     + O2    + H2O   = HO2   + H2O          11.26E+18  -.76      0.0!108
- H     + O2    + N2    = HO2   + N2           2.600E+19 -1.24      0.0!109
- OH    + HO2           = H2O   + O2           7.500E+12  0.00      0. !110
- H     + HO2           = OH    + OH           1.700E+14  0.0     875. !111
- O     + HO2           = O2    + OH           1.400E+13  0.00   1073. !112
- OH    + OH            = O     + H2O          6.000E+08  1.30      0. !113
- H     + H     + M     = H2    + M            1.000E+18 -1.00      0. !114
-       H2/0./ H2O/0./ CO2/0./ 
- H     + H     + H2    = H2    + H2           9.200E+16 -0.60      0. !115
- H     + H     + H2O   = H2    + H2O          6.000E+19 -1.25      0. !116
- H     + H     + CO2   = H2    + CO2          5.490E+20 -2.00      0. !117
- H     + OH    + M     = H2O   + M            1.600E+22 -2.00      0. !118
- H     + O     + M     = OH    + M            6.200E+16 -0.60      0. !119
- O     + O     + M     = O2    + M            1.890E+13  0.00  -1788. !120
- H     + HO2           = H2    + O2           1.250E+13  0.00      0. !121
- HO2   + HO2           = H2O2  + O2           2.000E+12  0.00      0. !122
- OH    + OH   (+M)     = H2O2 (+M)            7.600E+13  -.37      0. !123
-     LOW  /  4.300E+18    -.900  -1700.00/
-     TROE/   .7346   94.00  1756.00  5182.00 /
-       H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ N2/0.70/ 
- H2O2  + H             = HO2   + H2           1.600E+12  0.00   3800. !124
- H2O2  + OH            = H2O   + HO2          1.000E+13  0.00   1800. !125
- H2O2  + H             = H2O   + OH           1.000E+13  0.00   3590. !126
- H2O2  + O             = H2O   + O2           8.400E+11  0.00   4260. !127
- H2O2  + O             = OH    + HO2          2.000E+13  0.00   5900. !128
- H2    + HO2           = H2O   + OH           6.500E+11  0.00  18800. !129
-!
- CO2   + N             = NO    + CO           1.900E+11  0.00   3400. !130 
- N2O   + O             = N2    + O2           1.400E+12  0.00  10810. !131
- N2O   + O             = NO    + NO           2.900E+13  0.00  23150. !132
- N2O   + H             = N2    + OH           4.400E+14  0.00  18880. !133 
- N2O   + OH            = N2    + HO2          2.000E+12  0.00  21060. !134
- N2O   + M             = N2    + O     + M    1.300E+11  0.00  59620. !135
- N     + NO            = N2    + O            3.270E+12  0.30      0. !136
- N     + O2            = NO    + O            6.400E+09  1.00   6280. !137
- N     + OH            = NO    + H            7.333E+13  0.00   1120. !138
-!
- CH2O  + O2            = HCO   + HO2          6.200E+13  0.00  39000. !139
- CH2O  + O             = HCO   + OH           4.100E+11  0.57   2760. !140   4.1
- CH2O  + H             = HCO   + H2           2.190E+08  1.80   3000. !141
- CH2O  + OH            = HCO   + H2O          2.430E+10  1.18   -447. !142       
- CH2O  + HO2           = HCO   + H2O2         3.000E+12  0.00   8000. !143
- CH2O  + M             = CO    + H2    + M    6.250E+15  0.00  69540. !144
- CH2O  + M             = HCO   + H     + M    3.300E+16  0.00  81000. !145
-!H2    + CO            = CH2O                 4.300E+07  1.50  79600. !   
- HCO   + HCO           = CH2O  + CO           3.010E+13  0.00      0. !146
- HCO   + OH            = H2O   + CO           1.000E+14  0.00      0. !147
- HCO   + H             = H2    + CO           1.190E+13  0.30      0. !148
- HCO   + O             = OH    + CO           3.000E+13  0.00      0. !149
- HCO   + O             = H     + CO2          3.000E+13  0.00      0. !150
- HCO   + O2            = HO2   + CO           3.300E+13 -0.40      0. !151
- HCO   + M             = H     + CO    + M    1.870E+17 -1.00  17000. !152
-!HCO   + H     + M     = CH2O  + M            1.000E+12  0.48   -260. !   
- HCO   + HO2           = CO2   + OH    + H    3.000E+13  0.00      0. !153
- CH4   + O2            = CH3   + HO2          7.900E+13  0.00  56000. !154
-!CH3   + HO2           = CH4   + O2           1.000E+12  0.00      0. !   
- CH4   + H             = CH3   + H2           6.600E+08  1.60  10840. !155
- CH4   + OH            = CH3   + H2O          1.600E+06  2.10   2460. !156
- CH4   + O             = CH3   + OH           1.020E+09  1.50   8604. !157 
- CH4   + HO2           = CH3   + H2O2         1.000E+13  0.00  18700. !158
- CH4   + CH2           = CH3   + CH3          4.000E+12  0.00   -570. !159
- CH3   + CH2O          = CH4   + HCO          5.500E+03  2.80   6000. !160
- CH3   + HCO           = CH4   + CO           1.200E+14  0.00      0. !161
- CH3   + H             = CH4                  1.900E+36 -7.00   9050. !162
- CH3   + H             = CH2   + H2           9.000E+13  0.00  15100. !163
- CH3   + CH3O          = CH4   + CH2O         3.300E+14  0.00      0. !164  3.3
-!CH3   + CH3           = C2H6                 2.700D+53 -12.0  19400. !   
- CH3   + CH3   (+M)    = C2H6  (+M)           2.120E+16 -0.97    620. !165
-     LOW  /  1.770E+50   -9.670   6220.00/
-     TROE/  0.5325  151.00  1038.00  4970.00 /
-     H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/  N2/0.7/
- CH3   + CH3           = C2H5  + H            4.990E+12  .100  10600. !166
-!CH2   + H2            = CH3   + H            5.000E+05  2.00   7230. !    
- CH2   + OH            = CH2O  + H            2.500E+13  0.00      0. !167
- CH2   + O2            = HCO   + OH           4.300E+10  0.00   -500. !168
- CH2   + O2            = CO2   + H2           6.900E+11  0.00    500. !169
- CH2   + O2            = CO    + H2O          2.000E+10  0.00  -1000. !170
- CH2   + O2            = CH2O  + O            5.000E+13  0.00   9000. !171
- CH2   + O2            = CO2   + H     + H    1.600E+12  0.00   1000. !172
- CH2   + O2            = CO    + OH    + H    8.600E+10  0.00   -500. !173
- CH2   + CH2           = C2H2  + H2           1.200E+13  0.0     800. !174
- CH2   + CH2           = C2H2  + H     + H    1.200E+14  0.0     800. !175
- CH2   + CO2           = CH2O  + CO           1.000E+11  0.00   1000. !176
- CH3   + HCO           = CH2O  + CH2          3.000E+13  0.00      0. !177
- CH3   + C2H4          = CH4   + C2H3         6.620E+00  3.70   9482. !178
- CH3   + CH3           = C2H4  + H2           1.000E+15  0.00  31000. !179
- CH3   + CH2           = C2H4  + H            3.000E+13  0.00   -570. !180
- C2H4  + H             = C2H3  + H2           1.100E+14  0.00   8500. !181
- C2H4  + O             = CH3   + HCO          1.600E+09  1.20    746. !182
- C2H4  + O             = CH2O  + CH2          3.000E+04  1.88    180. !183
- C2H4  + O             = C2H3  + OH           1.510E+07  1.91   3790. !184
- C2H4  + OH            = CH2O  + CH3          6.000E+13  0.0     960. !185  ! 13
- C2H4 +  HO2           = C2H3  + H2O2         7.100E+11  0.0   17110. !186
- C2H4  + OH            = C2H3  + H2O          6.020E+13  0.00   5955. !187  ! 6.02  5955
- C2H4  + M             = C2H2  + H2    + M    1.500E+15  0.00  55800. !188
- C2H4  + M             = C2H3  + H     + M    2.600E+17  0.0   96570. !189
- C2H4  + H             = C2H5                 2.600E+43 -9.25  52580. !190
- C2H6  + O2            = C2H5  + HO2          1.000E+13  0.00  48960. !191
- C2H5  + O2            = C2H4  + HO2          2.000E+10  0.0   -2200. !192
- C2H4  + O2            = C2H3  + HO2          4.200E+14  0.00  57590. !193  ! 14
- C2H4  + C2H4          = C2H5  + C2H3         5.000E+14  0.0   64700. !194  ! 14
- C2H5  + HO2           = C2H4  + H2O2         3.000E+11  0.00      0. !195
- C2H2  + O2            = HCO   + HCO          4.000E+12  0.00  28000. !196    2.0
- C2H2  + O             = CH2   + CO           1.020E+07  2.00   1900. !197
- C2H2  + H     + M     = C2H3  + M            5.540E+12  0.00   2410. !198
- C2H3  + H             = C2H2  + H2           4.000E+13  0.00      0. !199
- C2H3  + O2            = CH2O  + HCO          4.000E+12  0.00   -250. !200
- C2H3  + OH            = C2H2  + H2O          3.000E+13  0.00      0. !201
- C2H3  + CH2           = C2H2  + CH3          3.000E+13  0.00      0. !202
- C2H3  + HCO           = C2H4  + CO           6.034E+13  0.0       0. !203
- C2H3  + C2H3          = C2H2  + C2H4         1.450E+13  0.0       0. !204
- C2H3  + O             = C2H2  + OH           1.000E+13  0.0       0. !205
- C2H2  + OH            = CH3   + CO           4.830E-04  4.00  -2000. !206
- C2H2  + CH2           = C3H3  + H            1.200E+13  0.0    6620. !207
- C3H3  + OH            = C3H2  + H2O          1.000E+13  0.0       0. !208
- C3H3  + O             = CH2O  + C2H          1.000E+13  0.0       0. !209 
- C2H3                  = C2H2  + H            4.600E+40 -8.80  46200. !210
-!
- C2H2                  = C2H   + H            2.373E+32 -5.28 130688. !211
- C2H  + O2             = HCO   + CO           5.000E+13  0.00   1500. !212
- C2H  + H2             = H     + C2H2         4.900E+05  2.50   560.0 !213
- C2H2 + O              = C2H   + OH           4.600E+19 -1.41 28950.0 !214
- C2H2 + OH             = C2H   + H2O          3.370E+07  2.00 14000.0 !215
- C2H2 + C2H            = C4H2  + H            9.600E+13  0.00     0.0 !216
- C3H4 + O              = C2H3  + HCO          3.200E+12  0.00  2.01E+3!217
- C3H4 + O              = C2H4  + CO           3.200E+12  0.00  2.01E+3!218
- C3H4 + O              = HCCO  + CH3          6.300E+12  0.00  2.01E+3!219
-!
-! Reactions of C4H and C4H2
-!
- C4H + H2 = H + C4H2                     4.900E+05    2.5     560.0  !220
- C4H2 + OH = C4H + H2O                   3.370E+07    2.0    14000.0 !221
- C4H2 + O = C3H2 + CO                    2.700E+13    0.0     1720.0 !222 Wellman
- C3H2 + O = C2H2 + CO                    6.800E+13    0.0        0.0 !223
- C3H2 + OH = HCO + C2H2                  6.800E+13    0.0        0.0 !224
- C2H2 + C2H = C4H3                       4.500E+37   -7.68    7100.0 !225
- C3H2 + CH2 = C4H3 + H                   5.000E+13    0.0        0.0 !226
- C4H2   + H = C4H3                       1.100E+42   -8.72   15300.0 !227
- C4H3   + H = C2H2 + C2H2                6.300E+25   -3.34   10014.0 !228
- C4H3   + H = C4H2 + H2                  1.500E+13    0.00       0.0 !229
- C4H3   + OH = C4H2 + H2O                2.500E+12    0.00       0.0 !230
-!
- C2H2 + HCCO = C3H3 + CO                 1.000E+11    0.000   3000.0 !231 Miller-Bowman
- C3H2 + O2 = HCCO + CO + H               5.000E+13    0.000      0.0 !232 Miller-Melius
- HCCO+O = H+CO+CO                        1.000E+14    0.000      0.0 !233
- HCCO+O2 = OH+2CO                        3.200E+12    0.000    854.0 !234
- HCCO+CH2 = C2H3+CO                      3.000E+13    0.000      0.0 !235
- HCCO+HCCO = C2H2+CO+CO                  1.000E+13    0.000      0.0 !236
- C2H+OH = H+HCCO                         2.000E+13    0.000      0.0 !237
- CH2+CO(+M) = CH2CO(+M)                  8.100E+11    0.500   4510.0 !238
-      LOW  /  2.690E+33   -5.110   7095.00/
-      TROE/  0.5907  275.00  1226.00  5185.00 /
- H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ N2/0.7/
- C2H2+OH = CH2CO+H                       2.180E-04    4.500  -1000.0 !239
- CH2CO+H = HCCO+H2                       5.000E+13    0.000   8000.0 !240
- CH2CO+H = CH3+CO                        1.130E+13    0.000   3428.0 !241
- CH2CO+O = HCCO+OH                       5.000E+13    0.000   8000.0 !242
- CH2CO+O = CH2+CO2                       1.750E+12    0.000   1350.0 !243
- CH2CO+OH = HCCO+H2O                     7.500E+12    0.000   2000.0 !244
- C2H3+O = CH2CO+H                        3.000E+13    0.000      0.0 !245
- C3H3 + O2 = CH2CO + HCO                 3.000E+10    0.0     2878.0 !246 Gutman
- C4H3 + O2 = HCCO + CH2CO                7.860E+16   -1.80       0.0 !247 Gutman
-!C4H3 + C2H2 = A1-                       1.900E+63  -15.25   30600.0 !   
-!A1 + H = A1- + H2                       2.500E+14    0.0    16000.  ! Kiefer
-!A1 + OH = A1- + H2O                     1.600E+08    1.42    1450.  ! CEC
-!A1- + H (+M) = A1 (+M)                  1.000E+14    0.00       0.  ! RRKM
-!    LOW/ 6.6E+75  -16.30   7000. /
-!    TROE / 1.0 0.1 584.9 6113. /
-!  H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-! soot formation
-!C3H3 + C3H3 = A1                        2.000E+10    0.0        0.0 !
-!A1   =  6C(S)+3H2                       2.000E+10    0.0        0.0 !
-!C4H2 =  4C(S)+H2                        2.000E+10    0.0        0.0 !
-!C(S)+C2H2=>3C(S)+H2                     2.000E+10    0.0        0.0 !
-!C2H2 =  2C(S)+H2                        2.000E+10    0.0        0.0 !
-!
- O+CH2OH<=>OH+CH2O                        1.000E+13     .000        .00!248
- H+CH2O(+M)<=>CH2OH(+M)                   5.400E+11     .454    3600.00!249
-     LOW  /  1.270E+32   -4.820   6530.00/
-     TROE/   .7187  103.00  1291.00  4160.00 /
-     H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ N2/0.7/
- H+CH2OH<=>H2+CH2O                        2.000E+13     .000        .00!250
- H+CH2OH<=>OH+CH3                         1.650E+11     .650    -284.00!251
- H+CH3O<=>H+CH2OH                         4.150E+07    1.630    1924.00!252
- C2H3+O2<=>O+CH2CHO                       3.030E+11     .290      11.00!253
- C2H3+O2<=>HO2+C2H2                       1.337E+06    1.610    -384.00!254
- O+CH3CHO<=>OH+CH2CHO                     2.920E+12     .000    1808.00!255
- O+CH3CHO=>OH+CH3+CO                      2.920E+12     .000    1808.00!256
- O2+CH3CHO=>HO2+CH3+CO                    3.010E+13     .000   39150.00!257
- H+CH3CHO<=>CH2CHO+H2                     2.050E+09    1.160    2405.00!258
- H+CH3CHO=>CH3+H2+CO                      2.050E+09    1.160    2405.00!259
- OH+CH3CHO=>CH3+H2O+CO                    2.343E+10    0.730   -1113.00!260
- HO2+CH3CHO=>CH3+H2O2+CO                  3.010E+12     .000   11923.00!261
- CH3+CH3CHO=>CH3+CH4+CO                   2.720E+06    1.770    5920.00!262
- H+CH2CO(+M)<=>CH2CHO(+M)                 4.865E+11    0.422   -1755.00!263
-     LOW/ 1.012E+42  -7.63  3854.0/
-     TROE/ 0.465  201.0  1773.0  5333.0 /
- H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ N2/ .70/
- O+CH2CHO=>H+CH2+CO2                      1.500E+14     .000       .00!264
- O2+CH2CHO=>OH+CO+CH2O                    1.810E+10     .000       .00!265
- O2+CH2CHO=>OH+2HCO                       2.350E+10     .000       .00!266
- H+CH2CHO<=>CH3+HCO                       2.200E+13     .000       .00!267
- H+CH2CHO<=>CH2CO+H2                      1.100E+13     .000       .00!268
- OH+CH2CHO<=>H2O+CH2CO                    1.200E+13     .000       .00!269
- OH+CH2CHO<=>HCO+CH2OH                    3.010E+13     .000       .00!270
-!
- C3H8(+M)=C2H5+CH3(+M)                    9.90E+22    -1.6    84429.0 !271 Tsang 1988
-      LOW / 2.237E+27 -2.88 67448.0 /                  ! Al-Alami 1983
-      TROE /1.0 1.0E-15 1500.0 1.0E+15/
-      H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/  N2/ .70/ C3H8/4.0/
- O+C3H8<=>OH+C3H7                         1.930E+05    2.680   3716.00!272
- H+C3H8<=>C3H7+H2                         1.020E+06    2.340   6756.00!273
- OH+C3H8<=>C3H7+H2O                       3.160E+07    1.800    934.00!274
- C3H7+H2O2<=>HO2+C3H8                     3.780E+02    2.720   1500.00!275
- CH3+C3H8<=>C3H7+CH4                      0.903E+00    3.650   7154.00!276
- C3H8+C2H5=C3H7+C2H6                      9.000E-01    3.650   9140.00!277
- C3H8+C2H3=C3H7+C2H4                      6.000E+02    3.300  10502.00!278
- CH3+C2H4(+M)<=>C3H7(+M)                  2.550E+06    1.600   5700.00!279
-       LOW/ 3.00E+63  -14.6  18170./
-       TROE/ .1894  277.0  8748.0  7891.0 /
- H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ N2/0.70/  C3H8/4.0/
- O+C3H7<=>C2H5+CH2O                       9.640E+13     .000       .00!280
- H+C3H7(+M)<=>C3H8(+M)                    3.613E+13     .000       .00!281
-       LOW/ 4.420E+61  -13.545  11357.0/
-       TROE/ .315  369.0  3285.0  6667.0 /
- H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ N2/0.70/
- H+C3H7<=>CH3+C2H5                        4.060E+06    2.190    890.00!282
- CH2+C3H8=CH3+C3H7                        1.500E+0     3.460   7470.00!283
- OH+C3H7<=>C2H5+CH2OH                     2.410E+13     .000       .00!284
- HO2+C3H7<=>O2+C3H8                       2.550E+10    0.255   -943.00!285
- HO2+C3H7=>OH+C2H5+CH2O                   2.410E+13     .000       .00!286
- CH3+C3H7<=>2C2H5                         1.927E+13   -0.320       .00!287
- C3H7+CH3 <=> CH4+C3H6                    1.100E+13    0.000      0.0 !288 TS3
- C3H6+C2H5=C3H5+C2H6                      2.230E+00    3.500   6640.0 !289
- C3H6+O = CH3+CH3CO                       6.800E+04    2.560  -1.13E+3!290
-END
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c7h16_soot b/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c7h16_soot
deleted file mode 100644
index 172770945..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c7h16_soot
+++ /dev/null
@@ -1,1525 +0,0 @@
-ELEMENTS
- H   O    C   N   AR
-END
-SPECIE 
-C7H16     O2         N2        CO       CO2   
-H         H2         O         H2O      OH  
-HO2       H2O2       CH4       CH3      CH3O 
-CH2       CH2O       CH3O2     CH4O2    HCO
-C7H15-1   C7H15-2    C7H15O2   C7H14O2H  C7H14O2HO2  
-C7KET12   C6H12      C5H11CHO  C5H11CO   C5H11    
-C4H9      C3H7       C3H6      C3H5      AC3H4    C3H3
-C2H2      C2H3       C2H4      C2H5     C2H6  
-AR
-! soot model
-CH2OH   CH3OH
-C       C2O     
-CH      CH2*    C2H     CH2CO   HCCO    HCCOH
-C2H3O
-C3H2    PC3H4
-C4H     C4H2    C4H4    n-C4H3  i-C4H3  H2C4O
-n-C4H5  i-C4H5  C4H6    C4H612
-C5H2    C5H3
-C6H     C6H2    C6H3    l-C6H4  c-C6H4  n-C6H5  i-C6H5  l-C6H6
-n-C6H7  i-C6H7  c-C6H7  C6H8
-A1      A1-
-C6H5O   C6H5OH  C5H6    C5H5    C5H5O   C5H4OH  C5H4O
-n-A1C2H2        i-A1C2H2        A1C2H3          A1C2H3*
-A1C2H           A1C2H*          A1C2H-          A1C2H)2
-A2      A2-1    A2-2    naphthyne
-A2C2HA  A2C2HB  A2C2HA* A2C2HB* A2C2H2  A2C2H)2
-A3      A3-1    A3-4
-A3C2H   A3C2H2  A4      A4-
-P2      P2-     P2-H
-C(S)
-!
-THERMO            ! 1995 NASA COMPILATION + CURRAN DATA
-CH3O2             L 1/84C   1H   3O   2N   0G   300.000  5000.00               1
- 0.66812963E 01 0.80057271E-02-0.27188507E-05 0.40631365E-09-0.21927725E-13    2
- 0.52621851E 03-0.99423847E 01 0.20986490E 01 0.15786357E-01 0.75683261E-07    3
--0.11274587E-07 0.56665133E-11 0.20695879E 04 0.15007068E 02                   4
-CH4O2             T11/96C   1H   4O   2    0G   200.000  6000.000              1
- 6.86907934E+00 1.00840883E-02-3.66515947E-06 5.96302681E-10-3.58894156E-14    2
--1.98402231E+04-1.24951986E+01 3.72654981E+00 7.51851847E-03 2.35970425E-05    3
--3.52694507E-08 1.42757614E-11-1.83982011E+04 6.52443362E+00-1.68074366E+04    4
-C2H5OH            L 8/88C   2H   6O   1N   0G   200.000  6000.000              1
- 0.65624365E+01 0.15204222E-01-0.53896795E-05 0.86225011E-09-0.51289787E-13    2
--0.31525621E+05-0.94730202E+01 0.48586957E+01-0.37401726E-02 0.69555378E-04    3
--0.88654796E-07 0.35168835E-10-0.29996132E+05 0.48018545E+01-0.28257829E+05    4
-C2H3              T06/93C   2H   3    0    0G   200.000  6000.000              1
- 0.47025310E+01 0.72642283E-02-0.25801992E-05 0.41319944E-09-0.24591492E-13    2
- 0.34029675E+05-0.14293714E+01 0.30019602E+01 0.30304354E-02 0.24444315E-04    3
--0.35810242E-07 0.15108700E-10 0.34868173E+05 0.93304495E+01 0.36050230E+05    4
-C3H3              BUR 92C   3H   3O   0N   0G   200.000  6000.000              1
- 6.64175821E+00 8.08587428E-03-2.84787887E-06 4.53525977E-10-2.68879815E-14    2
- 3.89793699E+04-1.04004255E+01 1.82840766E+00 2.37839036E-02-2.19228176E-05    3
- 1.00067444E-08-1.38984644E-12 4.01863058E+04 1.38447957E+01 4.16139977E+04    4
-AC3H4             L12/92C   3H   4O   0N   0G   200.000  6000.000              1
- 6.31694869E+00 1.11336262E-02-3.96289018E-06 6.35633775E-10-3.78749885E-14    2
- 2.01174617E+04-1.09718862E+01 2.61307487E+00 1.21223371E-02 1.85405400E-05    3
--3.45258475E-08 1.53353389E-11 2.15415642E+04 1.02503319E+01 2.29622672E+04    4
-C3H5              BUR 92C   3H   5O   0N   0G   200.000  6000.000              1
- 6.54761132E+00 1.33152246E-02-4.78333100E-06 7.71949814E-10-4.61930808E-14    2
- 1.72714707E+04-9.27486841E+00 3.78794693E+00 9.48414335E-03 2.42343368E-05    3
--3.65604010E-08 1.48592356E-11 1.86261218E+04 7.82822499E+00 2.03259122E+04    4
-C3H6              120186C   3H   6          G  0300.00   5000.00  1000.00      1
- 0.06732257E+02 0.01490834E+00-0.04949899E-04 0.07212022E-08-0.03766204E-12    2
--0.09235703E+04-0.01331335E+03 0.01493307E+02 0.02092518E+00 0.04486794E-04    3
--0.01668912E-06 0.07158146E-10 0.01074826E+05 0.01614534E+03                   4
-C4H2              L 2/93C   4H   2O   0N   0G   200.000  6000.000              1
- 8.66704895E+00 6.71505191E-03-2.35355060E-06 3.73635366E-10-2.21054043E-14    2
- 5.10016978E+04-2.18002050E+01-4.07132393E-01 5.20775143E-02-9.21138340E-05    3
- 8.08657403E-08-2.70422080E-11 5.25957367E+04 2.03240223E+01 5.41222513E+04    4
-C4H3              L 9/89C   4H   3O   0N   0G   298.150  6000.000              1
- 0.84762079E+01 0.88782327E-02-0.30328412E-05 0.47358302E-09-0.27716627E-13    2
- 0.54756540E+05-0.17170551E+02 0.24173247E+01 0.24104782E-01-0.12813470E-04    3
--0.28606237E-08 0.39194527E-11 0.56506476E+05 0.14471107E+02 0.58181574E+05    4
-C4H4              L 9/89C   4H   4O   0N   0G   200.000  6000.000              1
- 0.82948104E+01 0.11994381E-01-0.42624075E-05 0.68306978E-09-0.40680631E-13    2
- 0.33550866E+05-0.18426826E+02 0.14049083E+01 0.29531073E-01-0.15596302E-04    3
--0.32142002E-08 0.45436937E-11 0.35507830E+05 0.17450183E+02 0.37097268E+05    4
-CH3OCH3           L12/92C   2H   6O   1N   0G   200.000  6000.000              1
- 5.64844183E+00 1.63381899E-02-5.86802367E-06 9.46836869E-10-5.66504738E-14    2
--2.51074690E+04-5.96264939E+00 5.30562279E+00-2.14254272E-03 5.30873244E-05    3
--6.23147136E-08 2.30731036E-11-2.39866295E+04 7.13264209E-01-2.21432171E+04    4
-CH3OCH2           T11/82C   2H   5O   1N   0G   300.000  5000.0                1
- 0.65567484E+01 0.12180723E-01-0.40628420E-05 0.59495830E-09-0.31276214E-13    2
--0.40282515E+04-0.81302772E+01 0.35953999E+01 0.13379216E-01 0.53914910E-05    3
--0.10947097E-07 0.38193320E-11-0.27021975E+04 0.92850365E+01                   4
-CH3OCH2OOH        Jan96 C   2H   6O   3N   0G    300.00  3000.00   1000.       1
- 7.66981055E+00 2.35536769E-02-1.15031834E-05 2.84464629E-09-2.79520304E-13    2
--3.96295537E+04-1.39224857E+01 3.05518950E-02 4.90560834E-02-4.43030986E-05    3
- 2.21548123E-08-4.66587486E-12-3.80282020E+04 2.43189660E+01                   4
-CH3OCH2OO         Jan96 C   2H   5O   3N   0G    300.00  3000.00   1000.       1
- 8.06217488E+00 2.05153644E-02-1.00803231E-05 2.50244952E-09-2.46544863E-13    2
--2.19951127E+04-1.59505736E+01 4.74967287E-01 4.68199208E-02-4.55041928E-05    3
- 2.44627078E-08-5.51108848E-12-2.04517448E+04 2.17234867E+01                   4
-CH3OCH2O          Jan96 C   2H   5O   2N   0G    300.00  3000.00   1000.       1
- 5.98450336E+00 1.93302785E-02-9.44575204E-06 2.33651645E-09-2.29626013E-13    2
--2.12266609E+04-7.95685946E+00-1.22386711E-01 3.94270827E-02-3.47990406E-05    3
- 1.69073231E-08-3.44801024E-12-1.99352987E+04 2.26909497E+01                   4
-CH3OCHO           Jan96 C   2H   4O   2N   0G    300.00  3000.00   1000.       1
- 5.46071782E+00 1.70659166E-02-8.38236448E-06 2.08015776E-09-2.04870146E-13    2
--4.58756417E+04-3.33482124E+00-4.40150386E-01 3.69251939E-02-3.41468832E-05    3
- 1.73800460E-08-3.70831952E-12-4.46516329E+04 2.61277510E+01                   4
-HCOOCH3                 C   2H   4O   2N   0G   300.000  5000.000              1
- 0.83982000E 01 0.11267000E-01-0.41325000E-05 0.72745000E-09-0.48932000E-13    2
--0.48328000E 05-0.18820000E 02-0.15323000E 01 0.43051000E-01-0.45098000E-04    3
- 0.26064000E-07-0.63345000E-11-0.45711000E 05 0.31603000E 02                   4
-HCOOH             L 8/88H  2.C  1.O  2.   0.G   200.000  6000.000              1
- 5.69579404E+00 7.72237361E-03-3.18037808E-06 5.57949466E-10-3.52618226E-14    2
--4.81599723E+04-6.01680080E+00 3.23262453E+00 2.81129582E-03 2.44034975E-05    3
--3.17501066E-08 1.20631660E-11-4.67785606E+04 9.86205647E+00-4.55312460E+04    4
-COOCH3                  C   2H   3O   2    0G   300.000  5000.000              1
- 0.76505900E 01 0.99082000E-02-0.37559700E-05 0.67845900E-09-0.46572100E-13    2
--0.24947700E 05-0.12937300E 02-0.89045900E 00 0.38842600E-01-0.42829300E-04    3
- 0.25682800E-07-0.63729700E-11-0.22835200E 05 0.29911300E 02                   4
-C7H16             P10/95C   7H  16    0    0G   300.000  5000.000              1
- 2.22148969e+01 3.47675750e-02-1.18407129e-05 1.83298478e-09-1.06130266e-13    2
--3.42760081e+04-9.23040196e+01-1.26836187e+00 8.54355820e-02-5.25346786e-05    3
- 1.62945721e-08-2.02394925e-12-2.56586565e+04 3.53732912e+01                   4
-C7H15-1    2/10/95      C   7H  15    0    0G   300.000  5000.000              1
- 2.17940709e+01 3.26280243e-02-1.11138244e-05 1.72067148e-09-9.96366999e-14    2
--9.20938221e+03-8.64954311e+01-4.99570406e-01 8.08826467e-02-5.00532754e-05    3
- 1.56549308e-08-1.96616227e-12-1.04590223e+03 3.46564011e+01                   4
-C7H15-2    2/10/95      C   7H  15    0    0G   300.000  5000.000              1
- 2.16368842e+01 3.23324804e-02-1.09273807e-05 1.68357060e-09-9.71774091e-14    2
--1.05873616e+04-8.52209653e+01-3.79155767e-02 7.56726570e-02-4.07473634e-05    3
- 9.32678943e-09-4.92360745e-13-2.35605303e+03 3.37321506e+01                   4
-C7H15-3    2/10/95      C   7H  15    0    0G   300.000  5000.000              1
- 2.16368842e+01 3.23324804e-02-1.09273807e-05 1.68357060e-09-9.71774091e-14    2
--1.05873616e+04-8.52209653e+01-3.79155767e-02 7.56726570e-02-4.07473634e-05    3
- 9.32678943e-09-4.92360745e-13-2.35605303e+03 3.37321506e+01                   4
-C7H15O2    7/23/98      C  7.H 15.O  2.   0.G   300.000  5000.000              1
- 2.49023689e+01 3.50716920e-02-1.20440306e-05 1.87464822e-09-1.08947791e-13    2
--2.82976050e+04-9.73923542e+01 2.37499334e+00 8.34651906e-02-5.13897320e-05    3
- 1.64217662e-08-2.19505216e-12-1.99237961e+04 2.53067342e+01                   4
-C7H14O2H   7/23/98      C  7.H 15.O  2.   0.G   300.000  5000.000              1
- 2.70028807e+01 3.22272216e-02-1.09366516e-05 1.68977918e-09-9.77321946e-14    2
--2.27229231e+04-1.06332170e+02 2.49875186e+00 8.32443344e-02-4.85933986e-05    3
- 1.28927950e-08-1.09878385e-12-1.36530733e+04 2.73754005e+01                   4
-C7H14O2HO2   7/23/98    C  7.H 15.O  4.   0.G   300.000  5000.000              1
- 3.23937788e+01 3.33911097e-02-1.15672104e-05 1.81146023e-09-1.05739941e-13    2
--4.36321048e+04-1.32597311e+02 3.84933185e+00 9.45955097e-02-5.94934121e-05    3
- 1.78836457e-08-2.00618696e-12-3.32051631e+04 2.25912030e+01                   4
-C7KET12    7/23/98      C  7.H 14.O  3.   0.G   300.000  5000.000              1
- 2.97472906e+01 3.06622294e-02-1.05563590e-05 1.64627343e-09-9.58171675e-14    2
--5.66856828e+04-1.22432490e+02 5.82433697e-01 1.01207869e-01-7.65855996e-05    3
- 3.00738606e-08-4.82902792e-12-4.68054419e+04 3.33331449e+01                   4
-C6H12      2/14/95      C  6.H 12.O  0.   0.G   300.000  5000.000              1
- 1.78337529e+01 2.67377658e-02-9.10036773e-06 1.40819768e-09-8.15124244e-14    2
--1.42062860e+04-6.83818851e+01-1.35275205e+00 6.98655426e-02-4.59408022e-05    3
- 1.56967343e-08-2.21296175e-12-7.34368617e+03 3.53120691e+01                   4
-C5H11CHO   2/29/96      C   6H  12O   1    0G   300.000  5000.000              1
- 1.98891043e+01 2.71869340e-02-9.27391515e-06 1.43744158e-09-8.33090761e-14    2
--3.97523444e+04-7.60741671e+01 1.37517192e+00 6.65669689e-02-4.04423050e-05    3
- 1.23836270e-08-1.52905857e-12-3.28740986e+04 2.48343934e+01                   4
-C5H11CO    2/29/96      C  6.H 11.O  1.   0.G   300.000  5000.000              1
- 1.94783812e+01 2.50466029e-02-8.54861346e-06 1.32557944e-09-7.68503296e-14    2
--2.07923937e+04-7.21995578e+01 2.14479069e+00 6.17863563e-02-3.74134690e-05    3
- 1.13283795e-08-1.36917698e-12-1.43451172e+04 2.23128045e+01                   4
-C5H11             T03/97C  5.H 11.   0.   0.G   298.150  5000.000              1
- 1.13324106E+01 3.03659897E-02-1.13934480E-05 1.99539733E-09-1.32825012E-13    2
--5.95299959E+03-3.13564905E+01 3.57867617E+00 3.04236365E-02 3.27768270E-05    3
--5.86453147E-08 2.39315107E-11-2.60420265E+03 1.42591121E+01 6.68760000E+03    4
-C4H9              P10/84C  4.H  9.   0.   0.G   200.000  6000.000              1
- 9.43040607E+00 2.34271349E-02-8.53599182E-06 1.39748355E-09-8.44057456E-14    2
- 2.14214862E+03-2.42207994E+01 3.54885235E+00 1.78747638E-02 5.00782825E-05    3
--7.94475071E-08 3.35802354E-11 4.74011588E+03 1.11849382E+01 6.89397210E+03    4
-C3H7            N-L 9/84C   3H   7    0    0G   300.000  5000.000              1
- 0.77026987E 01 0.16044203E-01-0.52833220E-05 0.76298590E-09-0.39392284E-13    2
- 0.82984336E 04-0.15480180E 02 0.10515518E 01 0.25991980E-01 0.23800540E-05    3
--0.19609569E-07 0.93732470E-11 0.10631863E 05 0.21122559E 02 0.12087447E 05    4
-C2H2              L 1/91C  2.H  2.   0.   0.G   200.000  6000.000              1
- 4.65878504E+00 4.88396547E-03-1.60828775E-06 2.46974226E-10-1.38605680E-14    2
- 2.57594044E+04-3.99834772E+00 8.08681094E-01 2.33615629E-02-3.55171815E-05    3
- 2.80152437E-08-8.50072974E-12 2.64289807E+04 1.39397051E+01 2.74459950E+04    4
-C2H4O             L 8/88C   2H   4O   1    0G   200.000  6000.000              1
- 0.54887641E+01 0.12046190E-01-0.43336931E-05 0.70028311E-09-0.41949088E-13    2
--0.91804251E+04-0.70799605E+01 0.37590532E+01-0.94412180E-02 0.80309721E-04    3
--0.10080788E-06 0.40039921E-10-0.75608143E+04 0.78497475E+01-0.63304657E+04    4
-END
-REACTIONS
- C7H16 + O2            = C7H15-1 + HO2        2.500E+13  0.0   48810.0!CGS 1
- C7H16 + O2            = C7H15-2 + HO2        3.200E+14  0.0   47380.0!CGS 2
- C7H16 + H             = C7H15-1 + H2         5.600E+07  2.0    7667.0!CGS 3
- C7H16 + H             = C7H15-2 + H2         4.380E+07  2.0    4750.0!CGS 4
- C7H16 + OH            = C7H15-1 + H2O        8.600E+09  1.10   1815.0!CGS 5
- C7H16 + OH            = C7H15-2 + H2O        6.800E+09  1.30    690.5!CGS 6
- C7H16 + HO2           = C7H15-1 + H2O2       8.000E+12  0.0   19300.0!CGS 7
- C7H16 + HO2           = C7H15-2 + H2O2       1.200E+13  0.0   16950.0!CGS 8
- C7H16                 = C4H9 + C3H7          3.000E+16  0.0   80710.0!CGS 9
-!
- C7H15-1 + O2          = C7H15O2              2.000E+12  0.0       0.0! 10
- C7H15-2 + O2          = C7H15O2              2.000E+12  0.0       0.0! 11
- C7H15O2               = C7H14O2H             6.000E+11  0.0   20380.0! 12
- C7H14O2H + O2         = C7H14O2HO2           4.000E+11  0.0       0.0! 13
- C7H14O2HO2            = C7KET12 + OH         1.000E+09  0.0    7480.0! 14
- C7KET12               = C5H11CHO + CH2O + O  1.050E+16  0.0  4.110E+4! 15
- C5H11CHO + O2         = C5H11CO + HO2        2.000E+13  0.5  4.220E+4! 16
- C5H11CHO + OH         = C5H11CO + H2O        1.000E+13  0.0  0.000E+0! 17
- C5H11CHO + H          = C5H11CO + H2         4.000E+13  0.0  4.200E+3! 18
- C5H11CHO + O          = C5H11CO + OH         5.000E+12  0.0  1.790E+3! 19
- C5H11CHO + HO2        = C5H11CO + H2O2       2.800E+12  0.0  1.360E+4! 20
- C5H11CHO + CH3        = C5H11CO + CH4        1.700E+12  0.0  8.440E+3! 21
- C5H11CHO + CH3O2      = C5H11CO + CH4O2      1.000E+12  0.0  9.500E+3! 22
- C5H11CO               = C5H11 + CO           1.000E+11  0.0  9.600E+3! 23
- C5H11                 = C2H4  + C3H7         3.200E+13  0.0   28300.0! 24
- C7H15-1               = C2H4  + C5H11        2.500E+13  0.0   28810.0! 25
- C7H15-2               = CH3   + C6H12        3.000E+13  0.0   29800.0! 26
- C6H12                 = C3H7  + C3H5         1.000E+16  0.0   68000.0! 27
- C7H15-2               = C4H9  + C3H6         1.000E+13  0.0   28600.0! 28
- C7H15-1               = C7H15-2              2.000E+11  0.0   18050.0! 29
- C4H9                  = C3H6 + CH3           2.232E+17 -1.40  30830.0! 30
- C4H9                  = C2H5 + C2H4          2.500E+13  0.0   28810.0! 31
- C3H7                  = C2H4 + CH3           9.600E+13  0.0   30950.0! 32
- C3H7                  = C3H6 + H             1.250E+14  0.0   36900.0! 33
- C3H7 + O2             = C3H6 + HO2           1.000E+12  0.0    4980.0! 34
- C3H6                  = C2H3 + CH3           3.150E+15  0.0   85500.0! 35
- C3H6 + H              = C3H5 + H2            5.000E+12  0.0    1500.0! 36
- C3H6 + CH3            = C3H5 + CH4           9.000E+12  0.0    8480.0! 37
- C3H6 + O2             = C3H5 + HO2           4.000E+12  0.0   39900.0! 38
- C3H5                  = AC3H4 + H            4.000E+13  0.0   69760.0! 39
- C3H5 + H              = AC3H4 + H2           1.000E+13  0.0       0.0! 40
- C3H5 + O2             = AC3H4 + HO2          6.000E+11  0.0   10000.0! 47
- AC3H4 + OH            = C2H3 + CH2O          1.000E+12  0.0       0.0! 41
- AC3H4 + OH            = C2H4 + HCO           1.000E+12  0.0       0.0! 42
- AC3H4 + O2            = C3H3 + HO2           4.000E+13  0.0   39160.0! 43
-!
- CH3O  + CO            = CH3   + CO2          1.570E+14  0.00  11800. !CGS 44
- CH3O  + H             = CH2O  + H2           2.000E+13  0.00      0. !CGS 45
- CH3O  + H             = CH3   + OH           1.000E+14  0.00      0. !CGS 46
- CH3O  + OH            = CH2O  + H2O          1.000E+13  0.00      0. !CGS 46
- CH3O  + O             = CH2O  + OH           1.000E+13  0.00      0. !CGS 47
- CH3O  + O2            = CH2O  + HO2          1.200E+11  0.00   2600. !CGS 48  
- CH3O                  = CH2O  + H            7.050E+00  3.00  20260. !CGS 49
- CH3   + HO2           = CH3O  + OH           3.300E+13  0.00      0. !CGS 50
- CH3   + O2            = CH3O  + O            3.670E+13  0.00  30000. !CGS 51
- CH3   + O2            = CH2O  + OH           6.800E+10  0.00   9000. !CGS 52 4.8  9000
- CH3   + O2            = CH3O2                3.020E+59 -15.0  17204. !CGS 53 3.02
- CH3O2 + HO2           = CH4O2 + O2           4.630E+11   0.0  -2583. !CGS 54
- CH3O2 + CH4           = CH4O2 + CH3          1.810E+11   0.0  18480. !CGS 55
- CH3O2 + CH3           = CH3O  + CH3O         2.410E+13   0.0      0. !CGS 56  2.410E+13
- CH3O2 + O             = CH3O  + O2           3.610E+13   0.0      0. !CGS 57
- CH3O2 + H             = CH3O  + OH           9.640E+13   0.0      0. !CGS 58
- CH3O2 + CH2O          = CH4O2 + HCO          1.000E+12   0.0  11665. !CGS 59
- CH3O2 + C2H6          = CH4O2 + C2H5         2.950E+11   0.0  14944. !CGS 60
- CH3O2 + CH3O2         = CH3O  + CH3O + O2    2.800E+11   0.0   -780. !CGS 61  11
- CH3O2 + H2O2          = CH4O2 + HO2          2.400E+12   0.0  10000. !CGS 62
- CH4O2                 = CH3O  + OH           3.000E+16   0.0  42920. !CGS 63  6.000E+16
- CH3O2 + C2H4          = C2H3  + CH4O2        7.100E+11   0.0  17110. !CGS 64
- CH4O2 + OH            = CH3O2 + H2O          1.000E+13   0.0   -258. !CGS 65  ! 8.2
- CH4O2 + O             = CH3O2 + OH           2.000E+13   0.0   4750. !    66
- CH3   + O             = CH2O  + H            8.000E+13  0.00      0. !CGS 67
- CH3   + OH            = CH2   + H2O          7.500E+06  2.00   5000. !CGS 68
- CH3   + OH            = CH2O  + H2           4.000E+12  0.00      0. !CGS 69
- CO    + O     + M     = CO2   + M            6.170E+14  0.00   3000. !CGS 70
- CO    + OH            = CO2   + H            3.510E+07  1.30   -758. !CGS 71
- CO    + O2            = CO2   + O            1.600E+13  0.00  41000. !CGS 72
- CO    + HO2           = CO2   + OH           5.800E+13  0.00  22930. !CGS 73
-!
- H2    + O2            = OH    + OH           1.700E+13  0.00  47780. !CGS 76
- H2    + OH            = H2O   + H            1.170E+09  1.30   3626. !CGS 77
- O     + OH            = O2    + H            4.000E+14 -0.50      0. !CGS 78
- O     + H2            = OH    + H            5.060E+04  2.67   6290. !CGS 79
- H     + HO2           = O     + H2O          3.100E+10  0.00   3590. !CGS 80
- O     + OH    + M     = HO2   + M            1.000E+16  0.00      0. !CGS 81
-       H2O/6.0/  CO2/5.0/  H2/3.3/  CO/2.0/
- H     + O2    + M     = HO2   + M            2.800E+18  -.86      0.0!    82
- O2/ .00/ H2O/ .00/ CO/ .75/ CO2/1.50/ C2H6/1.50/ N2/ .00/
- H     + O2    + O2    = HO2   + O2           2.080E+19 -1.24      0.0!    83
- H     + O2    + H2O   = HO2   + H2O          11.26E+18  -.76      0.0!    84
- H     + O2    + N2    = HO2   + N2           2.600E+19 -1.24      0.0!    85
- OH    + HO2           = H2O   + O2           7.500E+12  0.00      0. !CGS 86
- H     + HO2           = OH    + OH           1.700E+14  0.0     875. !CGS 87
- O     + HO2           = O2    + OH           1.400E+13  0.00   1073. !CGS 88
- OH    + OH            = O     + H2O          6.000E+08  1.30      0. !CGS 89
- H     + H     + M     = H2    + M            1.000E+18 -1.00      0. !CGS 90
-       H2/0./ H2O/0./ CO2/0./
- H     + H     + H2    = H2    + H2           9.200E+16 -0.60      0. !CGS 91
- H     + H     + H2O   = H2    + H2O          6.000E+19 -1.25      0. !CGS 92
- H     + H     + CO2   = H2    + CO2          5.490E+20 -2.00      0. !CGS 93
- H     + OH    + M     = H2O   + M            1.600E+22 -2.00      0. !CGS 94
- H     + O     + M     = OH    + M            6.200E+16 -0.60      0. !CGS 95
- O     + O     + M     = O2    + M            1.890E+13  0.00  -1788. !CGS 96
- H     + HO2           = H2    + O2           1.250E+13  0.00      0. !CGS 97
- HO2   + HO2           = H2O2  + O2           2.000E+12  0.00      0. !CGS 98
- OH    + OH   (+M)     = H2O2 (+M)            7.400E+13  -.370     0. !CGS 99
-     LOW  /  5.300E+18    -.900  -1700.00/
-     TROE/   .7346   94.00  1756.00  5182.00 /
-       H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ AR/ .70/
- H2O2  + H             = HO2   + H2           1.600E+12  0.00   3800. !CGS 95
- H2O2  + OH            = H2O   + HO2          1.000E+13  0.00   1800. !CGS 96
- H2O2  + H             = H2O   + OH           1.000E+13  0.00   3590. !CGS 97
- H2O2  + O             = H2O   + O2           8.400E+11  0.00   4260. !CGS 98
- H2O2  + O             = OH    + HO2          2.000E+13  0.00   5900. !CGS 99
- H2    + HO2           = H2O   + OH           6.500E+11  0.00  18800. !CGS 100
-!
-!CO2   + N             = NO    + CO           1.900E+11  0.00   3400. !CGS 
-!N2O   + O             = N2    + O2           1.400E+12  0.00  10810. !CGS
-!N2O   + O             = NO    + NO           2.900E+13  0.00  23150. !CGS
-!N2O   + H             = N2    + OH           4.400E+14  0.00  18880. !CGS
-!N2O   + OH            = N2    + HO2          2.000E+12  0.00  21060. !CGS
-!N2O   + M             = N2    + O     + M    1.300E+11  0.00  59620. !CGS
-!N     + NO            = N2    + O            3.270E+12  0.30      0. !CGS
-!N     + O2            = NO    + O            6.400E+09  1.00   6280. !CGS
-!N     + OH            = NO    + H            7.333E+13  0.00   1120. !CGS
-!
- CH2O  + O2            = HCO   + HO2          6.200E+13  0.00  39000. !CGS
- CH2O  + O             = HCO   + OH           1.800E+13  0.00   3080. !CGS
- CH2O  + H             = HCO   + H2           2.190E+08  1.80   3000. !CGS
- CH2O  + OH            = HCO   + H2O          2.430E+10  1.20   -447. !CGS        09
- CH2O  + HO2           = HCO   + H2O2         3.000E+12  0.00   8000. !CGS        12
- CH2O  + M             = CO    + H2    + M    6.250E+15  0.00  69540. !CGS
- CH2O  + M             = HCO   + H     + M    4.000E+23 -1.66  91120. !CGS
-!H2    + CO            = CH2O                 4.300E+07  1.50  79600. !CGS
- HCO   + HCO           = CH2O  + CO           3.010E+13  0.00      0. !CGS
- HCO   + OH            = H2O   + CO           1.000E+14  0.00      0. !CGS
- HCO   + H             = H2    + CO           1.190E+13  0.30      0. !CGS
- HCO   + O             = OH    + CO           3.000E+13  0.00      0. !CGS
- HCO   + O             = H     + CO2          3.000E+13  0.00      0. !CGS
- HCO   + O2            = HO2   + CO           3.300E+13 -0.40      0. !CGS
- HCO   + M             = H     + CO    + M    1.870E+17 -1.00  17000. !CGS
-!HCO   + H     + M     = CH2O  + M            1.000E+12  0.48   -260. !CGS
- HCO   + HO2           = CO2   + OH    + H    3.000E+13  0.00      0. !CGS
- CH4   + O2            = CH3   + HO2          7.900E+13  0.00  56000. !CGS
-!CH3   + HO2           = CH4   + O2           1.000E+12  0.00      0. !CGS
- CH4   + H             = CH3   + H2           6.600E+08  1.60  10840. !CGS
- CH4   + OH            = CH3   + H2O          1.600E+06  2.10   2460. !CGS
- CH4   + O             = CH3   + OH           1.020E+09  1.50   8604. !CGS   99
- CH4   + HO2           = CH3   + H2O2         1.000E+13  0.00  18700. !CGS  100
- CH4   + CH2           = CH3   + CH3          4.000E+12  0.00   -570. !CGS  101
- CH3   + CH2O          = CH4   + HCO          5.500E+03  2.80   6000. !CGS  102
- CH3   + HCO           = CH4   + CO           1.200E+14  0.00      0. !CGS  103
-!CH3   + H             = CH4                  1.900E+36 -7.00   9050. !CGS  104
- CH3   + H             = CH2   + H2           9.000E+13  0.00  15100. !CGS  105
- CH3   + CH3O          = CH4   + CH2O         5.300E+14  0.00      0. !CGS  106  3.3
-!CH3   + CH3           = C2H6                 2.120E+16 -0.97    620. !
- CH3+H(+M) = CH4(+M)                      1.270E+16   -0.630    383.0
-      LOW  /  2.477E+33   -4.760   2440.00/
-      TROE/  0.7830   74.00  2941.00  6964.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
- CH3+CH3(+M) = C2H6(+M)                   2.120E+16   -0.970    620.0
-      LOW  /  1.770E+50   -9.670   6220.00/
-      TROE/  0.5325  151.00  1038.00  4970.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
- CH3   + CH3           = C2H5  + H            4.990E+12  .100  10600. !CGS
-!CH2   + H2            = CH3   + H            5.000E+05  2.00   7230. !CGS     
- CH2   + OH            = CH2O  + H            2.500E+13  0.00      0. !CGS  107
- CH2   + O2            = HCO   + OH           4.300E+10  0.00   -500. !CGS  108
- CH2   + O2            = CO2   + H2           6.900E+11  0.00    500. !CGS  109
- CH2   + O2            = CO    + H2O          2.000E+10  0.00  -1000. !CGS  110
- CH2   + O2            = CH2O  + O            5.000E+13  0.00   9000. !CGS  111
- CH2   + O2            = CO2   + H     + H    1.600E+12  0.00   1000. !CGS
- CH2   + O2            = CO    + OH    + H    8.600E+10  0.00   -500. !
- CH2   + CH2           = C2H2  + H2           1.200E+13  0.0     800. !
- CH2   + CH2           = C2H2  + H     + H    1.200E+14  0.0     800. !
- CH2   + CO2           = CH2O  + CO           1.000E+11  0.00   1000. !CGS  112
- CH3   + HCO           = CH2O  + CH2          3.000E+13  0.00      0. !CGS  113
- CH3   + C2H4          = CH4   + C2H3         6.620E+00  3.70   9482. !CGS  114
- CH3   + CH3           = C2H4  + H2           1.000E+15  0.00  31000. !CGS  115
- CH3   + CH2           = C2H4  + H            3.000E+13  0.00   -570. !CGS  116
- C2H4  + H             = C2H3  + H2           1.100E+14  0.00   8500. !CGS  117
- C2H4  + O             = CH3   + HCO          1.600E+09  1.20    746. !CGS  118
- C2H4  + O             = CH2O  + CH2          3.000E+04  1.88    180. !CGS  119
- C2H4  + O             = C2H3  + OH           1.510E+07  1.91   3790. !CGS  120
- C2H4  + OH            = CH2O  + CH3          6.000E+13  0.0     960. !CGS  121  ! 13
- C2H4 +  HO2           = C2H3  + H2O2         7.100E+11  0.0   17110. !CGS  122
- C2H4  + OH            = C2H3  + H2O          8.020E+13  0.00   5955. !CGS  123  ! 6.02  5955
- C2H4  + M             = C2H2  + H2    + M    1.500E+15  0.00  55800. !CGS  124
- C2H4  + M             = C2H3  + H     + M    2.600E+17  0.0   96570. !CGS  125
- C2H4  + H             = C2H5                 2.600E+43 -9.25  52580. !CGS  126
- C2H6  + O2            = C2H5  + HO2          1.000E+13  0.00  48960. !CGS  127
- C2H5  + O2            = C2H4  + HO2          2.000E+10  0.0   -2200. !CGS  128
- C2H4  + O2            = C2H3  + HO2          4.200E+14  0.00  57590. !CGS  128  ! 14
- C2H4  + C2H4          = C2H5  + C2H3         5.000E+14  0.0   64700. !CGS  129  ! 14
- C2H5  + HO2           = C2H4  + H2O2         3.000E+11  0.00      0. !CGS  130
- C2H2  + O2            = HCO   + HCO          4.000E+12  0.00  28000. !CGS         2.0
- C2H2  + O             = CH2   + CO           1.020E+07  2.00   1900. !CGS  131
- C2H2  + H     + M     = C2H3  + M            5.540E+12  0.00   2410. !CGS  132
- C2H3  + H             = C2H2  + H2           4.000E+13  0.00      0. !CGS  133
- C2H3  + O2            = CH2O  + HCO          4.000E+12  0.00   -250. !CGS  134
- C2H3  + OH            = C2H2  + H2O          3.000E+13  0.00      0. !CGS  135
- C2H3  + CH2           = C2H2  + CH3          3.000E+13  0.00      0. !CGS  136
- C2H3  + HCO           = C2H4  + CO           6.034E+13  0.0       0. !CGS  137
- C2H3  + C2H3          = C2H2  + C2H4         1.450E+13  0.0       0. !
- C2H3  + O             = C2H2  + OH           1.000E+13  0.0       0. !
- C2H2  + OH            = CH3   + CO           4.830E-04  4.00  -2000. !CGS  138
-!C2H2  + CH2           = C3H3  + H            1.200E+13  0.0    6620. !Bohland 86
- C3H3  + OH            = C2H3  + HCO          4.000E+13  0.0       0. !Estimated
- C2H3                  = C2H2  + H            4.600E+40 -8.80  46200. !
-! 
-! soot model
-!
-! Reactions of CH3
-!
- CH3+OH(+M) = CH3OH(+M)                   6.300E+13    0.000      0.0
-      LOW  /  2.700E+38   -6.300   3100.00/
-      TROE/  0.2105   83.50  5398.00  8370.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!CH3+O = CH2O+H                           8.430E+13    0.000      0.0
-!CH3+OH = CH2+H2O                         5.600E+07    1.600   5420.0
- CH3+OH = CH2*+H2O                        2.501E+13    0.000      0.0
-!CH3+O2 = O+CH3O                          2.675E+13    0.000  28800.0
-!CH3+O2 = OH+CH2O                         3.600E+10    0.000   8940.0
-!CH3+HO2 = CH4+O2                         1.000E+12    0.000      0.0
-!CH3+HO2 = CH3O+OH                        2.000E+13    0.000      0.0
-!CH3+H2O2 = CH4+HO2                       2.450E+04    2.470   5180.0
- CH3+C = C2H2+H                           5.000E+13    0.000      0.0
- CH3+CH = C2H3+H                          3.000E+13    0.000      0.0
-!CH3+HCO = CH4+CO                         2.648E+13    0.000      0.0
-!CH3+CH2O = CH4+HCO                       3.320E+03    2.810   5860.0
-!CH3+CH2 = C2H4+H                         4.000E+13    0.000      0.0
- CH3+CH2* = C2H4+H                        1.200E+13    0.000   -570.0
-!CH3+CH3 = H+C2H5                         4.990E+12    0.100  10600.0
-!
-! Reactions of CH2O
-!
- CH2O+H(+M) = CH2OH(+M)                   5.400E+11    0.454   3600.0
-      LOW  /  1.270E+32   -4.820   6530.00/
-      TROE/  0.7187  103.00  1291.00  4160.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!CH2O+H(+M) = CH3O(+M)                    5.400E+11    0.454   2600.0
-!     LOW  /  1.200E+30   -4.800   6560.00/
-!     TROE/  0.7580   94.00  1555.00  4200.00 /
-!   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!CH2O+H = HCO+H2                          2.300E+10    1.050   3275.0
-!CH2O+O = HCO+OH                          3.900E+13    0.000   3540.0
-!CH2O+OH = HCO+H2O                        3.430E+09    1.180   -447.0
-!CH2O+O2 = HCO+HO2                        1.000E+14    0.000  40000.0
-!CH2O+HO2 = HCO+H2O2                      1.000E+12    0.000   8000.0
- CH2O+CH = CH2CO+H                        9.460E+13    0.000   -515.0
-!
-! Reactions of C2H4
-!
- C2H4(+M) = H2+C2H2(+M)                   8.000E+12    0.440  88770.0
-      LOW  /  7.000E+50   -9.310  99860.00/
-      TROE/  0.7345  180.00  1035.00  5417.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
- C2H4+H(+M) = C2H5(+M)                    1.080E+12    0.454   1820.0
-      LOW  /  1.200E+42   -7.620   6970.00/
-      TROE/  0.9753  210.00   984.00  4374.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
-!C2H4+H = C2H3+H2                         1.325E+06    2.530  12240.0
-!C2H4+O = CH3+HCO                         1.920E+07    1.830    220.0
-!C2H4+OH = C2H3+H2O                       3.600E+06    2.000   2500.0
-!C2H4+CH3 = C2H3+CH4                      2.270E+05    2.000   9200.0
-!
-! Reactions of C2H2
-!
- C2H2+H(+M) = C2H3(+M)                    5.600E+12    0.000   2400.0
-      LOW  /  3.800E+40   -7.270   7220.00/
-      TROE/  0.7507   98.50  1302.00  4167.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
- C2H2+O = HCCO+H                          1.020E+07    2.000   1900.0
- C2H2+O = C2H+OH                          4.600E+19   -1.410  28950.0
-!C2H2+O = CH2+CO                          1.020E+07    2.000   1900.0
- C2H2+OH = CH2CO+H                        2.180E-04    4.500  -1000.0
- C2H2+OH = HCCOH+H                        5.040E+05    2.300  13500.0
- C2H2+OH = C2H+H2O                        3.370E+07    2.000  14000.0
-!C2H2+OH = CH3+CO                         4.830E-04    4.000  -2000.0
-!
-! Reactions of CH2(singlet)
-!
- CH2*+N2 = CH2+N2                       1.500E+13    0.000      600.0
- CH2*+AR = CH2+AR                       9.000E+12    0.000      600.0
- CH2*+H = CH+H2                         3.000E+13    0.000        0.0
- CH2*+O = CO+H2                         1.500E+13    0.000        0.0
- CH2*+O = HCO+H                         1.500E+13    0.000        0.0
- CH2*+OH = CH2O+H                       3.000E+13    0.000        0.0
- CH2*+H2 = CH3+H                        7.000E+13    0.000        0.0
- CH2*+O2 = H+OH+CO                      2.800E+13    0.000        0.0
- CH2*+O2 = CO+H2O                       1.200E+13    0.000        0.0
- CH2*+H2O(+M) = CH3OH(+M)               2.000E+13    0.000        0.0
-      LOW  /  2.700E+38   -6.300   3100.00/
-      TROE/  0.1507  134.00  2383.00  7265.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
- CH2*+H2O = CH2+H2O                     3.000E+13    0.000        0.0
- CH2*+CO = CH2+CO                       9.000E+12    0.000        0.0
- CH2*+CO2 = CH2+CO2                     7.000E+12    0.000        0.0
- CH2*+CO2 = CH2O+CO                     1.400E+13    0.000        0.0
-!
-! Reactions of C
-!
- C+OH = CO+H                              5.000E+13    0.000      0.0
- C+O2 = CO+O                              5.800E+13    0.000    576.0
-!
-! Reactions of CH
-!
- CH+H = C+H2                              1.100E+14    0.000      0.0
- CH+O = CO+H                              5.700E+13    0.000      0.0
- CH+OH = HCO+H                            3.000E+13    0.000      0.0
- CH+H2 = CH2+H                            1.107E+08    1.790   1670.0
- CH+H2O = CH2O+H                          5.710E+12    0.000   -755.0
- CH+O2 = HCO+O                            3.300E+13    0.000      0.0
- CH+CO(+M) = HCCO(+M)                     5.000E+13    0.000      0.0
-      LOW  /  2.690E+28   -3.740   1936.00/
-      TROE/  0.5757  237.00  1652.00  5069.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
- CH+CO2 = HCO+CO                          3.400E+12    0.000    690.0
-!
-! Reactions of CH3OH
-!
- CH3OH+H = CH2OH+H2                       1.700E+07    2.100   4870.0
- CH3OH+H = CH3O+H2                        4.200E+06    2.100   4870.0
- CH3OH+O = CH2OH+OH                       3.880E+05    2.500   3100.0
- CH3OH+O = CH3O+OH                        1.300E+05    2.500   5000.0
- CH3OH+OH = CH2OH+H2O                     1.440E+06    2.000   -840.0
- CH3OH+OH = CH3O+H2O                      6.300E+06    2.000   1500.0
- CH3OH+CH3 = CH2OH+CH4                    3.000E+07    1.500   9940.0
- CH3OH+CH3 = CH3O+CH4                     1.000E+07    1.500   9940.0
-!
-! Reactions of C2H
-!
- C2H+H(+M) = C2H2(+M)                     1.000E+17   -1.000      0.0
-      LOW  /  3.750E+33   -4.800   1900.00/
-      TROE/  0.6464  132.00  1315.00  5566.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
- C2H+O = CH+CO                            5.000E+13    0.000      0.0
- C2H+OH = H+HCCO                          2.000E+13    0.000      0.0
- C2H+O2 = HCO+CO                          5.000E+13    0.000   1500.0
- C2H+H2 = H+C2H2                          4.900E+05    2.500    560.0
-!
-! Reactions of HCCO
-!
- HCCO+H = CH2*+CO                         1.000E+14    0.000      0.0
- HCCO+O = H+CO+CO                         1.000E+14    0.000      0.0
- HCCO+O2 = OH+2CO                         1.600E+12    0.000    854.0
- HCCO+CH = C2H2+CO                        5.000E+13    0.000      0.0
- HCCO+CH2 = C2H3+CO                       3.000E+13    0.000      0.0
- HCCO+HCCO = C2H2+CO+CO                   1.000E+13    0.000      0.0
-!
-! Reactions of CH2CO/HCCOH
-!
- CH2CO+H = HCCO+H2                        5.000E+13    0.000   8000.0
- CH2CO+H = CH3+CO                         1.130E+13    0.000   3428.0
- CH2CO+O = HCCO+OH                        1.000E+13    0.000   8000.0
- CH2CO+O = CH2+CO2                        1.750E+12    0.000   1350.0
- CH2CO+OH = HCCO+H2O                      7.500E+12    0.000   2000.0
-!
- HCCOH+H = CH2CO+H                        1.000E+13    0.000      0.0
-!
-! Reactions of C2H3
-!
- C2H3+H(+M) = C2H4(+M)                    6.080E+12    0.270    280.0
-      LOW  /  1.400E+30   -3.860   3320.00/
-      TROE/  0.7820  207.50  2663.00  6095.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
-!C2H3+H = C2H2+H2                         3.000E+13    0.000      0.0
- C2H3+O = CH2CO+H                         3.000E+13    0.000      0.0
-!C2H3+OH = C2H2+H2O                       5.000E+12    0.000      0.0
-!
- C2H3+O2 = C2H2+HO2                       1.66E+14   -0.830   2540.0
-!C2H3+O2 = C2H3O+O                        2.50E+12    0.057    950.0 !  20 Torr
-!C2H3+O2 = C2H3O+O                        2.50E+12    0.057    950.0 !  90 Torr
- C2H3+O2 = C2H3O+O                        1.24E+13   -0.120   1696.0 ! 760 Torr
-!C2H3+O2 = HCO+CH2O                       1.64E+21   -2.780   2523.0 !  20 Torr
-!C2H3+O2 = HCO+CH2O                       1.64E+21   -2.780   2523.0 !  90 Torr
-!C2H3+O2 = HCO+CH2O                       8.60E+21   -2.970   3320.0 ! 760 Torr
-!
-! Reactions of CH3O/CH2OH
-!
- CH3O+H(+M) = CH3OH(+M)                   5.000E+13    0.000      0.0
-      LOW  /  8.600E+28   -4.000   3025.00/
-      TROE/  0.8902  144.00  2838.00 45569.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
- CH3O+H = CH2OH+H                         3.400E+06    1.600      0.0
-!CH3O   = CH2OH                           1.000E+13    0.000  26000.0  ! new reaction
-!CH3O+H = CH2O+H2                         2.000E+13    0.000      0.0
-!CH3O+H = CH3+OH                          3.200E+13    0.000      0.0
- CH3O+H = CH2*+H2O                        1.600E+13    0.000      0.0
-!CH3O+O = CH2O+OH                         1.000E+13    0.000      0.0
-!CH3O+OH = CH2O+H2O                       5.000E+12    0.000      0.0
-!CH3O+O2 = CH2O+HO2                       4.280E-13    7.600  -3530.0
-!
- CH2OH+H(+M) = CH3OH(+M)                  1.800E+13    0.000      0.0
-      LOW  /  3.000E+31   -4.800   3300.00/
-      TROE/  0.7679  338.00  1812.00  5081.00 /
-    H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
- CH2OH+H = CH2O+H2                        2.000E+13    0.000      0.0
- CH2OH+H = CH3+OH                         1.200E+13    0.000      0.0
- CH2OH+H = CH2*+H2O                       6.000E+12    0.000      0.0
- CH2OH+O = CH2O+OH                        1.000E+13    0.000      0.0
- CH2OH+OH = CH2O+H2O                      5.000E+12    0.000      0.0
- CH2OH+O2 = CH2O+HO2                      1.800E+13    0.000    900.0
-!
-! C2O chemistry taken from Miller-Melius
-!
- HCCO + OH = C2O + H2O                   3.00E+13      0.0        0.0
- C2O + H = CH + CO                       5.00E+13      0.0        0.0
- C2O + O = CO + CO                       5.00E+13      0.0        0.0
- C2O + OH = CO + CO + H                  2.00E+13      0.0        0.0
- C2O + O2 = CO + CO + O                  2.00E+13      0.0        0.0
-!
-! C2H3O chemistry
-!
- CH2CO + H = C2H3O                       5.40E+11      0.454   1820.0 ! half of kinf(C2H4+H)
- C2H3O + H = CH2CO + H2                  1.00E+13      0.0        0.0 ! Estimated
- C2H3O + O = CH2O + HCO                  9.60E+06      1.83     220.0 ! half of k(C2H4+O)
- C2H3O + O = CH2CO + OH                  1.00E+13      0.0        0.0 ! Estimated
- C2H3O + OH = CH2CO + H2O                5.00E+12      0.0        0.0 ! Estimated
-!
- CH3 + HCCO = C2H4 + CO                  5.00E+13      0.0        0.0 ! Estimated
- CH3 + C2H = C3H3 + H                    2.41E+13      0.0        0.0 ! Tsang-Hampson
- CH4 + C2H = C2H2 + CH3                  1.81E+12      0.0      500.0 ! Tsang-Hampson
-!
- C2H2 + CH = C3H2 + H                    3.00E+13      0.0        0.0 ! Warnatz 83
- C2H2 + CH2 = C3H3 + H                   1.20E+13      0.0     6620.0 ! Bohland 86
- C2H2 + CH2* = C3H3 + H                  2.00E+13      0.0        0.0 ! Estimated
-!
-!C2H2 + CH3 = AC3H4 + H                  2.87E+21     -2.74   24800.0 !  20 Torr Westmoreland
-!C2H2 + CH3 = AC3H4 + H                  2.87E+21     -2.74   24800.0 !  90 Torr Westmoreland
- C2H2 + CH3 = AC3H4 + H                  5.72E+20     -2.36   31500.0 ! 760 Torr Westmoreland
-!
-!C2H2 + CH3 = PC3H4 + H                  1.00E+13     -0.53   13400.0 !  20 Torr Westmoreland
-!C2H2 + CH3 = PC3H4 + H                  1.00E+13     -0.53   13400.0 !  90 Torr Westmoreland
- C2H2 + CH3 = PC3H4 + H                  2.72E+18     -1.97   20200.0 ! 760 Torr Westmoreland
-!
- C2H2 + C2H = C4H2 + H                   9.60E+13      0.0        0.0 ! New data
-!
-!C2H2 + C2H = n-C4H3                     1.10E+30     -6.30    2790.0 !   20 Torr RRKM
-!C2H2 + C2H = n-C4H3                     1.30E+30     -6.12    2510.0 !   90 Torr RRKM
- C2H2 + C2H = n-C4H3                     4.50E+37     -7.68    7100.0 !  760 Torr RRKM
-!
-!C2H2 + C2H = i-C4H3                     4.10E+33     -7.31    4600.0 !   20 Torr RRKM
-!C2H2 + C2H = i-C4H3                     1.60E+34     -7.28    4830.0 !   90 Torr RRKM
- C2H2 + C2H = i-C4H3                     2.60E+44     -9.47   14650.0 !  760 Torr RRKM
-!
-!C2H3 + C2H2 = C4H4 + H                  7.20E+13     -0.48    6100.  !   10 Torr RRKM
-!C2H2 + C2H3 = C4H4 + H                  5.00E+14     -0.71    6700.  !   20 Torr RRKM
-!C2H2 + C2H3 = C4H4 + H                  4.60E+16     -1.25    8400.  !   90 Torr RRKM
- C2H2 + C2H3 = C4H4 + H                  2.00E+18     -1.68   10600.  !  760 Torr RRKM
-!C2H3 + C2H2 = C4H4 + H                  4.90E+16     -1.13   11800.  ! 7600 Torr RRKM
-!
-!C2H3 + C2H2 = n-C4H5                    1.10E+31     -7.14    5600.  !   10 Torr RRKM
-!C2H2 + C2H3 = n-C4H5                    1.10E+32     -7.33    6200.  !   20 Torr RRKM
-!C2H2 + C2H3 = n-C4H5                    2.40E+31     -6.95    5600.  !   90 Torr RRKM
- C2H2 + C2H3 = n-C4H5                    9.30E+38     -8.76   12000.  !  760 Torr RRKM
-!C2H3 + C2H2 = n-C4H5                    8.10E+37     -8.09   13400.  ! 7600 Torr RRKM
-!
-!C2H3 + C2H2 = i-C4H5                    5.00E+34     -8.42    7900.  !   10 Torr RRKM
-!C2H2 + C2H3 = i-C4H5                    2.10E+36     -8.78    9100.  !   20 Torr RRKM
-!C2H2 + C2H3 = i-C4H5                    1.00E+37     -8.77    9800.  !   90 Torr RRKM
- C2H2 + C2H3 = i-C4H5                    1.60E+46    -10.98   18600.  !  760 Torr RRKM
-!C2H3 + C2H2 = i-C4H5                    5.10E+53    -12.64   28800.  ! 7600 Torr RRKM
-!
- C2H4 + C2H = C4H4 + H                   1.20E+13      0.0        0.0 ! Tsang
-!
-!C2H4 + C2H3 = C4H6 + H                  7.40E+14     -0.66    8420.0 !   20 Torr RRKM
-!C2H4 + C2H3 = C4H6 + H                  1.90E+17     -1.32   10600.0 !   90 Torr RRKM
- C2H4 + C2H3 = C4H6 + H                  2.80E+21     -2.44   14720.0 !  760 Torr RRKM
-!
- C2H2 + HCCO = C3H3 + CO                 1.00E+11      0.0     3000.0 ! Miller-Bowman
-!
-!C2H4 + O2 = C2H3 + HO2                  4.22E+13      0.0    60800.0 ! Tsang-Hampson Ea+3.2kcal/mol
-!
-!C2H3 + H2O2 = C2H4 + HO2                1.21E+10      0.0     -596.0 ! Tsang-Hampson
-!C2H3 + HCO = C2H4 + CO                  2.50E+13      0.0        0.0 ! Estimated
- C2H3 + CH3 = C2H2 + CH4                 3.92E+11      0.0        0.0 ! Tsang-Hampson
-!
-!C2H3 + C2H3 = C4H6                      7.00E+57    -13.82   17629.  ! RRKM 20 Torr
-!C2H3 + C2H3 = C4H6                      1.50E+52    -11.97   16056.  ! RRKM 90 Torr
- C2H3 + C2H3 = C4H6                      1.50E+42     -8.84   12483.  ! RRKM 760 Torr
-!
-!C2H3 + C2H3 = i-C4H5 + H                1.50E+30     -4.95   12958.  ! RRKM 20 Torr
-!C2H3 + C2H3 = i-C4H5 + H                7.20E+28     -4.49   14273.  ! RRKM 90 Torr
- C2H3 + C2H3 = i-C4H5 + H                1.20E+22     -2.44   13654.  ! RRKM 760 Torr
-!
-!C2H3 + C2H3 = n-C4H5 + H                1.10E+24     -3.28   12395.  ! RRKM 20 Torr
-!C2H3 + C2H3 = n-C4H5 + H                4.60E+24     -3.38   14650.  ! RRKM 90 Torr
- C2H3 + C2H3 = n-C4H5 + H                2.40E+20     -2.04   15361.  ! RRKM 760 Torr
-!
-! Reactions of C3Hx species
-!
- C3H2 + O = C2H2 + CO                    6.80E+13      0.0        0.0 ! Warnatz 82
- C3H2 + OH = HCO + C2H2                  6.80E+13      0.0        0.0 ! Warnatz 82
- C3H2 + O2 = HCCO + CO + H               5.00E+13      0.0        0.0 ! Miller-Melius
- C3H2 + CH = C4H2 + H                    5.00E+13      0.0        0.0 ! Estimated
- C3H2 + CH2 = n-C4H3 + H                 5.00E+13      0.0        0.0 ! Estimated
- C3H2 + CH3 = C4H4 + H                   5.00E+12      0.0        0.0 ! Estimated
- C3H2 + HCCO = n-C4H3 + CO               1.00E+13      0.0        0.0 ! Estimated
-!
- C3H3 + H (+M) = AC3H4 (+M)              3.00E+13      0.0        0.0 ! Estimated
-     LOW/ 1.4E+31 -5.00 -6000.0/
-     TROE / 0.5 2000. 10.0 10000.0/
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
- C3H3 + H (+M) = PC3H4 (+M)              3.00E+13      0.0        0.0 ! Estimated
-     LOW/ 1.4E+31 -5.00 -6000.0/
-     TROE / 0.5 2000. 10.0 10000.0/
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
- C3H3 + O = CH2O + C2H                   2.00E+13      0.0        0.0 ! Miller-Bowman
- C3H3 + OH = C3H2 + H2O                  2.00E+13      0.0        0.0 ! Miller-Bowman
-!C3H3 + OH = C2H3 + HCO                  4.00E+13      0.0        0.0 ! Estimated
- C3H3 + O2 = CH2CO + HCO                 3.00E+10      0.0     2878.0 ! Gutman
-!C3H3 + HO2 = AC3H4 + O2                 1.00E+12      0.0        0.0 ! Estimated
- C3H3 + HO2 = PC3H4 + O2                 1.00E+12      0.0        0.0 ! Estimated
- C3H3 + HCO = AC3H4 + CO                 2.50E+13      0.0        0.0 ! Estimated
- C3H3 + HCO = PC3H4 + CO                 2.50E+13      0.0        0.0 ! Estimated
- C3H3 + CH = i-C4H3 + H                  5.00E+13      0.0        0.0 ! Estimated
- C3H3 + CH2 = C4H4 + H                   2.00E+13      0.0        0.0 ! Estimated
- i-C4H5 + H = C3H3 + CH3                 2.00E+13      0.0     2000.0 ! Estimated
- C3H3 + CH3 (+M) = C4H612 (+M)           1.50E+13      0.0        0.0 ! kinf assumed, falloff:C2H3+CH3 600 cm-1
-   LOW /2.60E+58 -11.94 9770.0/
-   TROE /0.175 1340.6 60000.0 9769.8/
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
-!C3H3 + C3H3 =>A1                        1.00E+11      0.0        0.0 !   20 Torr, Estimated
-!C3H3 + C3H3 =>A1                        1.00E+12      0.0        0.0 !   90 Torr, Estimated
- C3H3 + C3H3 =>A1                        2.00E+12      0.0        0.0 !  760 Torr, Estimated
-!
- AC3H4 + H = C3H3 + H2                   1.15E+08      1.9     7530.0 !
- AC3H4 + O = CH2CO + CH2                 2.00E+07      1.8     1000.0 ! Estimated
- AC3H4 + OH = C3H3 + H2O                 5.30E+06      2.0     2000.0 ! Refit to Liu et al.
- AC3H4 + C2H = C2H2 + C3H3               1.00E+13      0.0        0.0 ! Estimated
-!
- PC3H4 + H = C3H3 + H2                   1.15E+08      1.9     7530.0 ! = C2H6 + H
- PC3H4 + OH = C3H3 + H2O                 3.54E+06      2.12     870.0 ! = C2H6 + OH
- PC3H4 + C2H = C2H2 + C3H3               1.00E+13      0.0        0.0 ! Estimated
-!
-! Reactions of C4H and C4H2
-!
- C4H + H (+M) = C4H2 (+M)                1.000E+17    -1.000      0.00
-      LOW  /  3.750E+33   -4.800   1900.00/
-      TROE/  0.6464  132.00  1315.00  5566.00 /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
- C4H + C2H2 = C6H2 + H                   9.60E+13      0.0        0.0 ! = C2H2 + C2H
- C4H + O = C2H + C2O                     5.00E+13      0.0        0.0 ! = C2H + O
- C4H + O2 = HCCO + C2O                   5.00E+13      0.0     1500.0 ! = C2H + O2
- C4H + H2 = H + C4H2                     4.90E+05      2.5      560.0 ! = C2H + H2
-!
-!C4H2 + H = n-C4H3                       1.70E+49    -11.67   12804.0 !   20 Torr RRKM
-!C4H2 + H = n-C4H3                       3.30E+50    -11.80   15010.0 !   90 Torr RRKM
- C4H2 + H = n-C4H3                       1.10E+42     -8.72   15300.0 !  760 Torr RRKM
-!
-!C4H2 + H = i-C4H3                       4.30E+45    -10.15   13250.0 !   20 Torr RRKM
-!C4H2 + H = i-C4H3                       2.60E+46    -10.15   15500.0 !   90 Torr RRKM
- C4H2 + H = i-C4H3                       1.10E+30     -4.92   10800.0 !  760 Torr RRKM
-!
- C4H2 + O = C3H2 + CO                    2.70E+13      0.0     1720.0 ! Wellman
- C4H2 + OH = H2C4O + H                   6.60E+12      0.0     -410.0 ! Perry
- C4H2 + OH = C4H + H2O                   3.37E+07      2.0    14000.0 ! = C2H2 + OH
- C4H2 + CH = C5H2 + H                    5.00E+13      0.0        0.0 ! Estimated
- C4H2 + CH2 = C5H3 + H                   1.30E+13      0.0     6620.0 ! = C2H2 + CH2
- C4H2 + CH2* = C5H3 + H                  2.00E+13      0.0        0.0 ! Miller-Melius
-!
- C4H2 + C2H = C6H2 + H                   9.60E+13      0.0        0.0 ! = C2H2 + C2H
-!C4H2 + C2H = C6H2 + H                   3.00E+13      0.0        0.0 ! = C2H2 + C2H
-!
-!C4H2 + C2H = C6H3                       1.10E+30     -6.30    2790.0 !   20 Torr RRKM
-!C4H2 + C2H = C6H3                       1.30E+30     -6.12    2510.0 !   90 Torr RRKM
- C4H2 + C2H = C6H3                       4.50E+37     -7.68    7100.0 !  760 Torr RRKM
-!
- H2C4O + H = C2H2 + HCCO                 5.00E+13      0.0     3000.0 ! Miller-Melius
- H2C4O + OH = CH2CO + HCCO               1.00E+07      2.0     2000.0 ! Miller-Melius
- H2C4O + O = CH2CO + C2O                 2.00E+07      1.9      200.0 ! Estimated
-!
-! Reactions of C4H3 and C4H4
-!
-!n-C4H3 = i-C4H3                         3.70E+61    -15.81   54890.0 !   20 Torr RRKM
-!n-C4H3 = i-C4H3                         1.00E+51    -12.45   51000.0 !   90 Torr RRKM
- n-C4H3 = i-C4H3                         4.10E+43     -9.49   53000.0 !  760 Torr RRKM
-!
-!n-C4H3 + H = i-C4H3 + H                 2.40E+11      0.79    2410.0 !   20 Torr RRKM
-!n-C4H3 + H = i-C4H3 + H                 9.20E+11      0.63    2990.0 !   90 Torr RRKM
- n-C4H3 + H = i-C4H3 + H                 2.50E+20     -1.67   10800.0 !  760 Torr RRKM
-!
-!n-C4H3 + H = C2H2 + C2H2                1.60E+19     -1.60    2220.0 !   20 Torr RRKM
-!n-C4H3 + H = C2H2 + C2H2                1.30E+20     -1.85    2960.0 !   90 Torr RRKM
- n-C4H3 + H = C2H2 + C2H2                6.30E+25     -3.34   10014.0 !  760 Torr RRKM
-!  
-!i-C4H3 + H = C2H2 + C2H2                2.40E+19     -1.60    2800.0 !   20 Torr RRKM
-!i-C4H3 + H = C2H2 + C2H2                3.70E+22     -2.50    5140.0 !   90 Torr RRKM
- i-C4H3 + H = C2H2 + C2H2                2.80E+23     -2.55   10780.0 !  760 Torr RRKM
-!  
-!n-C4H3 + H = C4H4                       1.10E+42     -9.65    7000.0 !   20 Torr RRKM
-!n-C4H3 + H = C4H4                       1.10E+42     -9.65    7000.0 !   90 Torr RRKM
- n-C4H3 + H = C4H4                       2.00E+47    -10.26   13070.0 !  760 Torr RRKM
-!  
-!i-C4H3 + H = C4H4                       4.20E+44    -10.27    7890.0 !   20 Torr RRKM
-!i-C4H3 + H = C4H4                       5.30E+46    -10.68    9270.0 !   90 Torr RRKM
- i-C4H3 + H = C4H4                       3.40E+43     -9.01   12120.0 !  760 Torr RRKM
-!  
- n-C4H3 + H = C4H2 + H2                  1.50E+13      0.00       0.0 ! 0.5*C2H3+H
- i-C4H3 + H = C4H2 + H2                  3.00E+13      0.00       0.0 ! C2H3+H
- n-C4H3 + OH = C4H2 + H2O                2.50E+12      0.00       0.0
- i-C4H3 + OH = C4H2 + H2O                5.00E+12      0.00       0.0
- i-C4H3 + O2 = HCCO + CH2CO              7.86E+16     -1.80       0.0 ! Gutman
-!
-!n-C4H3 + C2H2 = l-C6H4 + H              1.40E+15     -0.81    10000. !   10 Torr RRKM
-!n-C4H3 + C2H2 = l-C6H4 + H              3.70E+16     -1.21    11100. !   20 Torr RRKM
-!n-C4H3 + C2H2 = l-C6H4 + H              1.80E+19     -1.95    13200. !   90 Torr RRKM
- n-C4H3 + C2H2 = l-C6H4 + H              2.50E+14     -0.56    10600. !  760 Torr RRKM
-!n-C4H3 + C2H2 = l-C6H4 + H              1.20E+17     -1.28    13700. ! 7600 Torr RRKM
-!
-!n-C4H3 + C2H2 = n-C6H5                  1.50E+33     -7.29    13300. !   10 Torr RRKM
-!n-C4H3 + C2H2 = n-C6H5                  6.00E+33     -7.37    13700. !   20 Torr RRKM
-!n-C4H3 + C2H2 = n-C6H5                  4.10E+33     -7.12    13700. !   90 Torr RRKM
- n-C4H3 + C2H2 = n-C6H5                  2.70E+36     -7.62    16200. !  760 Torr RRKM
-!n-C4H3 + C2H2 = n-C6H5                  3.80E+21     -3.17     6400. ! 7600 Torr RRKM
-!
-!n-C4H3 + C2H2 = A1-                     1.40E+67    -17.42    23000. !   10 Torr RRKM
-!n-C4H3 + C2H2 = A1-                     2.30E+68    -17.65    24400. !   20 Torr RRKM
-!n-C4H3 + C2H2 = A1-                     9.80E+68    -17.58    26500. !   90 Torr RRKM
- n-C4H3 + C2H2 = A1-                     9.60E+70    -17.77    31300. !  760 Torr RRKM
-!n-C4H3 + C2H2 = A1-                     1.90E+63    -15.25    30600. ! 7600 Torr RRKM
-!
-!n-C4H3 + C2H2 = c-C6H4 + H              9.20E+33     -6.57    15900. !   10 Torr RRKM
-!n-C4H3 + C2H2 = c-C6H4 + H              1.90E+36     -7.21    17900. !   20 Torr RRKM
-!n-C4H3 + C2H2 = c-C6H4 + H              3.50E+41     -8.63    23000. !   90 Torr RRKM
- n-C4H3 + C2H2 = c-C6H4 + H              6.90E+46    -10.01    30100. !  760 Torr RRKM
-!n-C4H3 + C2H2 = c-C6H4 + H              3.10E+49    -10.59    37700. ! 7600 Torr RRKM
-!
-!C4H4 + H = n-C4H5                       1.20E+51    -12.57    12300. !   10 Torr RRKM
-!C4H4 + H = n-C4H5                       4.20E+50    -12.34    12500. !   20 Torr RRKM
-!C4H4 + H = n-C4H5                       1.10E+50    -11.94    13400. !   90 Torr RRKM
- C4H4 + H = n-C4H5                       1.30E+51    -11.92    16500. !  760 Torr RRKM
-!C4H4 + H = n-C4H5                       6.20E+45    -10.08    15800. ! 7600 Torr RRKM
-!
-!C4H4 + H = i-C4H5                       6.10E+53    -13.19    14200. !   10 Torr RRKM
-!C4H4 + H = i-C4H5                       9.60E+52    -12.85    14300. !   20 Torr RRKM
-!C4H4 + H = i-C4H5                       2.10E+52    -12.44    15500. !   90 Torr RRKM
- C4H4 + H = i-C4H5                       4.90E+51    -11.92    17700. !  760 Torr RRKM
-!C4H4 + H = i-C4H5                       1.50E+48    -10.58    18800. ! 7600 Torr RRKM
-!
- C4H4 + H = n-C4H3 + H2                  6.65E+05      2.53   12240.0 ! =(C2H4+H)/2
- C4H4 + H = i-C4H3 + H2                  3.33E+05      2.53    9240.0 ! -3kcal/mol, /4
-!
- C4H4 + OH = n-C4H3 + H2O                3.10E+06      2.0     3430.0 ! = C4H6 + OH
- C4H4 + OH = i-C4H3 + H2O                1.55E+06      2.0      430.0 ! -3kcal/mol, /2
-!
- C4H4 + O = PC3H4 + CO                   3.00E+13      0.0     1808.0 ! Homann&Wellman
-!
-!C4H4 + C2H3 = l-C6H6 + H                7.40E+14     -0.66    8420.0 !  20 Torr
-!C4H4 + C2H3 = l-C6H6 + H                1.90E+17     -1.32   10600.0 !  90 Torr
- C4H4 + C2H3 = l-C6H6 + H                2.80E+21     -2.44   14720.0 ! 760 Torr
-!
-! Reactions of C4H5 and 1,3-C4H6
-!
-!n-C4H5 = i-C4H5                         2.40E+60    -16.08   47500.  !   10 Torr RRKM
-!n-C4H5 = i-C4H5                         1.30E+62    -16.38   49600.  !   20 Torr RRKM
-!n-C4H5 = i-C4H5                         4.90E+66    -17.26   55400.  !   90 Torr RRKM
- n-C4H5 = i-C4H5                         1.50E+67    -16.89   59100.  !  760 Torr RRKM
-!n-C4H5 = i-C4H5                         2.00E+60    -14.46   58600.  ! 7600 Torr RRKM
-!
-!n-C4H5 + H = i-C4H5 + H                 1.00E+36     -6.26   17486.  ! RRKM 20 Torr
-!n-C4H5 + H = i-C4H5 + H                 1.00E+34     -5.61   18476.  ! RRKM 90 Torr
- n-C4H5 + H = i-C4H5 + H                 3.10E+26     -3.35   17423.  ! RRKM 760 Torr
-!
-!C4H6 = i-C4H5 + H                       8.20E+51    -10.92  118409.  ! RRKM 20 Torr
-!C4H6 = i-C4H5 + H                       3.30E+45     -8.95  115934.  ! RRKM 90 Torr
- C4H6 = i-C4H5 + H                       5.70E+36     -6.27  112353.  ! RRKM 760 Torr
-!
-!C4H6 = n-C4H5 + H                       3.50E+61    -13.87  129677.  ! RRKM 20 Torr
-!C4H6 = n-C4H5 + H                       8.50E+54    -11.78  127472.  ! RRKM 90 Torr
- C4H6 = n-C4H5 + H                       5.30E+44     -8.62  123608.  ! RRKM 760 Torr
-!
- n-C4H5 + H = C4H4 + H2                  1.50E+13      0.00       0.
- i-C4H5 + H = C4H4 + H2                  3.00E+13      0.00       0.
- n-C4H5 + OH = C4H4 + H2O                2.50E+12      0.00       0.
- i-C4H5 + OH = C4H4 + H2O                5.00E+12      0.00       0.
- n-C4H5 + O2 => C2H4 + CO + HCO          4.16E+10      0.00    2500.  ! Gutman
- i-C4H5 + O2 = CH2CO + C2H3O             7.86E+16     -1.80       0.  ! =i-C4H3+O2
-!
-!n-C4H5 + C2H2 + M = n-C6H7 + M          4.50E+26     -3.28   10200.  !   10 Torr RRKM
-!n-C4H5 + C2H2 + M = n-C6H7 + M          4.50E+26     -3.28   10200.  !   20 Torr RRKM
-!n-C4H5 + C2H2 + M = n-C6H7 + M          4.50E+26     -3.28   10200.  !   90 Torr RRKM
- n-C4H5 + C2H2 = n-C6H7                  1.10E+14     -1.27    2900.  !  760 Torr RRKM
-!n-C4H5 + C2H2 = n-C6H7                  5.20E+15     -1.46    4000.  ! 7600 Torr RRKM
-!
-!n-C4H5 + C2H2 + M = c-C6H7 + M          5.20E+25     -4.21    4000.  !   10 Torr RRKM
-!n-C4H5 + C2H2 + M = c-C6H7 + M          5.20E+25     -4.21    4000.  !   20 Torr RRKM
-!n-C4H5 + C2H2 + M = c-C6H7 + M          5.20E+25     -4.21    4000.  !   90 Torr RRKM
- n-C4H5 + C2H2 = c-C6H7                  5.00E+24     -5.46    4600.  !  760 Torr RRKM
-!n-C4H5 + C2H2 = c-C6H7                  7.70E+25     -5.50    5400.  ! 7600 Torr RRKM
-!
-!n-C4H5 + C2H2 = l-C6H6 + H              5.80E+08      1.02   10900.  !   10 Torr RRKM
-!n-C4H5 + C2H2 = l-C6H6 + H              5.80E+08      1.02   10900.  !   20 Torr RRKM
-!n-C4H5 + C2H2 = l-C6H6 + H              5.80E+08      1.02   10900.  !   90 Torr RRKM
- n-C4H5 + C2H2 = l-C6H6 + H              5.80E+08      1.02   10900.  !  760 Torr RRKM
-!n-C4H5 + C2H2 = l-C6H6 + H              2.90E+04      2.24    8600.  ! 7600 Torr RRKM
-!
-!n-C4H5 + C2H2 = A1 + H                  2.10E+15     -1.07    4800.  !   10 Torr RRKM
-!n-C4H5 + C2H2 = A1 + H                  2.10E+15     -1.07    4800.  !   20 Torr RRKM
-!n-C4H5 + C2H2 = A1 + H                  2.10E+15     -1.07    4800.  !   90 Torr RRKM
- n-C4H5 + C2H2 = A1 + H                  1.60E+16     -1.33    5400.  !  760 Torr RRKM
-!n-C4H5 + C2H2 = A1 + H                  1.60E+18     -1.88    7400.  ! 7600 Torr RRKM
-!
- C4H6 + H = n-C4H5 + H2                  1.33E+06      2.53   12240.0 ! = C2H4 + H
- C4H6 + H = i-C4H5 + H2                  6.65E+05      2.53    9240.0 ! -3kcal/mol,/2
- C4H6 + OH = n-C4H5 + H2O                6.20E+06      2.0     3430.0 ! refit to Liu et al.
- C4H6 + OH = i-C4H5 + H2O                3.10E+06      2.0      430.0 ! -3kcal/mol
-!
-!C4H6 + C2H3 = C6H8 + H                  7.40E+14     -0.66    8420.0 ! 20 Torr
-!C4H6 + C2H3 = C6H8 + H                  1.90E+17     -1.32   10600.0 ! 90 Torr
- C4H6 + C2H3 = C6H8 + H                  2.80E+21     -2.44   14720.0 ! 760 Torr
-!
-! Reactions of 1,2-C4H6
-!
- C4H612 + H = C4H6 + H                   2.00E+13      0.0     4000.0 ! Estimated
- C4H612 + H = i-C4H5 + H2                1.70E+05      2.5     2490.0 ! = C3H6+H TS5
- C4H612 + H = AC3H4 + CH3                2.00E+13      0.0     2000.0 ! Estimated
- C4H612 + O = CH2CO + C2H4               1.20E+08      1.65     327.0 ! C3H6+O TS5
- C4H612 + O = i-C4H5 + OH                1.80E+11      0.70    5880.0 ! C3H6+O TS5
- C4H612 + OH = i-C4H5 + H2O              3.10E+06      2.00    -298.0 ! C3H6+OH
-!
-! Reactions of C5H2 and C5H3
-!
- C5H2 + OH => C4H2 + H + CO              2.00E+13      0.0        0.0 ! Estimated
- C5H2 + CH = C6H2 + H                    5.00E+13      0.0        0.0 ! Estimated
- C5H2 + O2 = H2C4O + CO                  1.00E+12      0.0        0.0 ! Estimated
- C5H3 + OH = C5H2 + H2O                  1.00E+13      0.0        0.0 ! Estimated
- C5H3 + CH = C6H2 + H + H                5.00E+13      0.0        0.0 ! Estimated
- C5H3 + CH2 = l-C6H4 + H                 5.00E+13      0.0        0.0 ! = C3H3+CH2
- C5H3 + O2 = H2C4O + HCO                 1.00E+12      0.0        0.0 ! Estimated
-!
-! Reactions of C6H and C6H2
-!
- C6H + H (+M) = C6H2 (+M)                1.000E+17    -1.000      0.0
-      LOW  /  3.750E+33   -4.800   1900.00/
-      TROE/  0.6464  132.00  1315.00  5566.00 /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/ AR/0.7/
-!C6H2 + H = C6H3                         4.30E+45    -10.15   13250.0 !   20 Torr
-!C6H2 + H = C6H3                         2.60E+46    -10.15   15500.0 !   90 Torr
- C6H2 + H = C6H3                         1.10E+30     -4.92   10800.0 !  760 Torr
- C6H + O = C4H + C2O                     5.00E+13      0.0        0.0 ! = C2H + O
- C6H + H2 = H + C6H2                     4.90E+05      2.5      560.0 ! = C2H + H2
- C6H2 + O = C5H2 + CO                    2.70E+13      0.0     1720.0 ! = C4H2 + O
- C6H2 + OH =>C2H+C2H2+C2O                6.60E+12      0.0     -410.0 ! = C4H2 + OH
- C6H2 + OH = C6H + H2O                   3.37E+07      2.0    14000.0 ! = C2H2 + OH
-!
-! Reactions of C6H3 and C6H4
-!
-!C6H3 + H = C4H2 + C2H2                  2.40E+19     -1.60    2800.0 !   20 Torr RRKM
-!C6H3 + H = C4H2 + C2H2                  3.70E+22     -2.50    5140.0 !   90 Torr RRKM
- C6H3 + H = C4H2 + C2H2                  2.80E+23     -2.55   10780.0 !  760 Torr RRKM
-!
-!C6H3 + H = l-C6H4                       4.20E+44    -10.27    7890.0 !   20 Torr RRKM
-!C6H3 + H = l-C6H4                       5.30E+46    -10.68    9270.0 !   90 Torr RRKM
- C6H3 + H = l-C6H4                       3.40E+43     -9.01   12120.0 !  760 Torr RRKM
-!
- C6H3 + H = C6H2 + H2                    3.00E+13      0.00       0.0 ! C2H3+H
- C6H3 + OH = C6H2 + H2O                  5.00E+12      0.00       0.0
- C6H3+O2 => CO+C3H2+HCCO                 5.00E+11      0.00       0.0 ! Estimated
-!
-!l-C6H4 + H = n-C6H5                     1.60E+44    -10.05   18400.  !   10 Torr RRKM
-!l-C6H4 + H = n-C6H5                     3.30E+44    -10.04   18800.  !   20 Torr RRKM
-!l-C6H4 + H = n-C6H5                     2.60E+43     -9.53   18100.  !   90 Torr RRKM
- l-C6H4 + H = n-C6H5                     5.90E+39     -8.25   15600.  !  760 Torr RRKM
-!l-C6H4 + H = n-C6H5                     9.50E+23     -3.54    5300.  ! 7600 Torr RRKM
-!
-!l-C6H4 + H = A1-                        4.40E+74    -19.09   25800.  !   10 Torr RRKM
-!l-C6H4 + H = A1-                        3.60E+77    -20.09   28100.  !   20 Torr RRKM
-!l-C6H4 + H = A1-                        4.70E+78    -20.10   29500.  !   90 Torr RRKM
- l-C6H4 + H = A1-                        1.70E+78    -19.72   31400.  !  760 Torr RRKM
-!l-C6H4 + H = A1-                        3.90E+69    -16.63   34100.  ! 7600 Torr RRKM
-!
-!l-C6H4 + H = c-C6H4+ H                  8.70E+45     -9.61   22300.  !   10 Torr RRKM
-!l-C6H4 + H = c-C6H4+ H                  2.20E+47     -9.98   24000.  !   20 Torr RRKM
-!l-C6H4 + H = c-C6H4+ H                  9.70E+48    -10.37   27000.  !   90 Torr RRKM
- l-C6H4 + H = c-C6H4+ H                  1.40E+54    -11.70   34500.  !  760 Torr RRKM
-!l-C6H4 + H = c-C6H4+ H                  5.70E+55    -11.98   41900.  ! 7600 Torr RRKM
-!
- l-C6H4 + H = C6H3 + H2                  6.65E+06      2.53    9240.0 ! = C4H4+H
- l-C6H4 + OH = C6H3 + H2O                3.10E+06      2.0      430.0
-! 
-!c-C6H4 + H = A1-                        2.30E+79    -19.51   36800.  !   10 Torr RRKM
-!c-C6H4 + H = A1-                        1.20E+77    -18.77   36300.  !   20 Torr RRKM
-!c-C6H4 + H = A1-                        1.00E+71    -16.88   34200.  !   90 Torr RRKM
- c-C6H4 + H = A1-                        2.40E+60    -13.66   29500.  !  760 Torr RRKM
-!c-C6H4 + H = A1-                        1.50E+47     -9.74   22900.  ! 7600 Torr RRKM
-!
-! Reactions of C6H5 and C6H6
-! 
-!n-C6H5 = A1-                            3.70E+63    -16.49   36100.  !   10 Torr RRKM
-!n-C6H5 = A1-                            1.30E+62    -15.94   35800.  !   20 Torr RRKM
-!n-C6H5 = A1-                            1.30E+59    -14.78   35600.  !   90 Torr RRKM
- n-C6H5 = A1-                            5.10E+54    -13.11   35700.  !  760 Torr RRKM
-!n-C6H5 = A1-                            3.50E+46    -10.44   33600.  ! 7600 Torr RRKM
-! 
-!n-C6H5 = c-C6H4 + H                     1.60E+65    -16.00   58400.  !   10 Torr RRKM
-!n-C6H5 = c-C6H4 + H                     2.70E+65    -15.93   59700.  !   20 Torr RRKM
-!n-C6H5 = c-C6H4 + H                     1.50E+64    -15.32   61500.  !   90 Torr RRKM
- n-C6H5 = c-C6H4 + H                     1.30E+59    -13.56   62000.  !  760 Torr RRKM
-!n-C6H5 = c-C6H4 + H                     1.10E+50    -10.69   60900.  ! 7600 Torr RRKM
-!
-!n-C6H5 + H = i-C6H5 + H                 2.40E+11      0.79    2410.0 !   20 Torr RRKM
-!n-C6H5 + H = i-C6H5 + H                 9.20E+11      0.63    2990.0 !   90 Torr RRKM
- n-C6H5 + H = i-C6H5 + H                 2.50E+20     -1.67   10800.0 !  760 Torr RRKM
-!
-!n-C6H5 + H = C4H4 + C2H2                1.60E+19     -1.60    2220.0 !   20 Torr RRKM
-!n-C6H5 + H = C4H4 + C2H2                1.30E+20     -1.85    2960.0 !   90 Torr RRKM
- n-C6H5 + H = C4H4 + C2H2                6.30E+25     -3.34   10014.0 !  760 Torr RRKM
-!
-!i-C6H5 + H = C4H4 + C2H2                2.40E+19     -1.60    2800.0 !   20 Torr RRKM
-!i-C6H5 + H = C4H4 + C2H2                3.70E+22     -2.50    5140.0 !   90 Torr RRKM
- i-C6H5 + H = C4H4 + C2H2                2.80E+23     -2.55   10780.0 !  760 Torr RRKM
-!
-!n-C6H5 + H = l-C6H6                     1.10E+42     -9.65    7000.0 !   20 Torr RRKM
-!n-C6H5 + H = l-C6H6                     1.10E+42     -9.65    7000.0 !   90 Torr RRKM
- n-C6H5 + H = l-C6H6                     2.00E+47    -10.26   13070.0 !  760 Torr RRKM
-!
-!i-C6H5 + H = l-C6H6                     4.20E+44    -10.27    7890.0 !   20 Torr RRKM
-!i-C6H5 + H = l-C6H6                     5.30E+46    -10.68    9270.0 !   90 Torr RRKM
- i-C6H5 + H = l-C6H6                     3.40E+43     -9.01   12120.0 !  760 Torr RRKM
-!
- n-C6H5 + H = l-C6H4 + H2                1.50E+13      0.00       0.0 ! 0.5*C2H3+H
- i-C6H5 + H = l-C6H4 + H2                3.00E+13      0.00       0.0 ! C2H3+H
- n-C6H5 + OH = l-C6H4 + H2O              2.50E+12      0.00       0.0
- i-C6H5 + OH = l-C6H4 + H2O              5.00E+12      0.00       0.0
- n-C6H5 + O2 => C4H4 + CO + HCO          4.16E+10      0.00    2500.  ! =(n-C4H5+O2)
- i-C6H5 + O2 => CH2CO+CH2CO+C2H          7.86E+16     -1.80       0.0 ! =(i-C4H3+O2)
-!
-!l-C6H6 + H + M = n-C6H7 + M             2.90E+17     -0.52    1000.  !   10 Torr RRKM
-!l-C6H6 + H + M = n-C6H7 + M             2.90E+17     -0.52    1000.  !   20 Torr RRKM
-!l-C6H6 + H + M = n-C6H7 + M             2.90E+17     -0.52    1000.  !   90 Torr RRKM
- l-C6H6 + H = n-C6H7                     1.50E+16     -1.69    1600.  !  760 Torr RRKM
-!l-C6H6 + H = n-C6H7                     2.20E+18     -2.01    3200.  ! 7600 Torr RRKM
-!
-!l-C6H6 + H + M = c-C6H7 + M             1.70E+28     -4.72    2800.  !   10 Torr RRKM
-!l-C6H6 + H + M = c-C6H7 + M             1.70E+28     -4.72    2800.  !   20 Torr RRKM
-!l-C6H6 + H + M = c-C6H7 + M             1.70E+28     -4.72    2800.  !   90 Torr RRKM
- l-C6H6 + H = c-C6H7                     4.70E+27     -6.11    3800.  !  760 Torr RRKM
-!l-C6H6 + H = c-C6H7                     5.10E+28     -6.10    4800.  ! 7600 Torr RRKM
-!
-!l-C6H6 + H = A1 + H                     8.70E+16     -1.34    3500.  !   10 Torr RRKM
-!l-C6H6 + H = A1 + H                     8.70E+16     -1.34    3500.  !   20 Torr RRKM
-!l-C6H6 + H = A1 + H                     8.70E+16     -1.34    3500.  !   90 Torr RRKM
- l-C6H6 + H = A1 + H                     2.00E+18     -1.73    4500.  !  760 Torr RRKM
-!l-C6H6 + H = A1 + H                     3.70E+20     -2.35    6800.  ! 7600 Torr RRKM
-!
- l-C6H6 + H = n-C6H5 + H2                6.65E+05      2.53  12240.0  ! = C2H4 + H/2
- l-C6H6 + H = i-C6H5 + H2                3.33E+05      2.53   9240.0  ! -3kcal/mol,/4
- l-C6H6 + OH = n-C6H5 + H2O              6.20E+06      2.0    3430.0  ! see notes
- l-C6H6 + OH = i-C6H5 + H2O              3.10E+06      2.0     430.0  ! see notes
-!
-! Reactions of C6H7 and C6H8
-!
-!n-C6H7 = c-C6H7                         2.40E+23     -6.94    3200.  !   10 Torr RRKM
-!n-C6H7 = c-C6H7                         4.10E+24     -7.11    3900.  !   20 Torr RRKM
-!n-C6H7 = c-C6H7                         3.60E+27     -7.54    5800.  !   90 Torr RRKM
- n-C6H7 = c-C6H7                         1.20E+31     -7.95    8900.  !  760 Torr RRKM
-!n-C6H7 = c-C6H7                         9.40E+30     -7.30   10800.  ! 7600 Torr RRKM
-!
-!n-C6H7 = A1 + H                         5.90E+20     -3.98   10500.  !   10 Torr RRKM
-!n-C6H7 = A1 + H                         8.40E+21     -4.22   11300.  !   20 Torr RRKM
-!n-C6H7 = A1 + H                         8.80E+24     -4.86   13400.  !   90 Torr RRKM
- n-C6H7 = A1 + H                         3.20E+26     -4.99   15500.  !  760 Torr RRKM
-!n-C6H7 = A1 + H                         5.30E+25     -4.42   17300.  ! 7600 Torr RRKM
-!
-!n-C6H7 + H = i-C6H7 + H                 4.00E+41     -8.09   19200.  !   20 Torr
-!n-C6H7 + H = i-C6H7 + H                 1.60E+42     -8.18   21800.  !   90 Torr
- n-C6H7 + H = i-C6H7 + H                 2.40E+49    -10.72   15100.  !  760 Torr
-!
-!i-C6H7 + H = C6H8                       1.20E+60    -13.86   21000.  !   20 Torr
-!i-C6H7 + H = C6H8                       1.40E+55    -12.32   19300.  !   90 Torr
- i-C6H7 + H = C6H8                       1.80E+39     -7.62   11000.  !  760 Torr
-!
-!n-C6H7 + H = C6H8                       8.70E+69    -17.01   24000.  !   20 Torr
-!n-C6H7 + H = C6H8                       6.70E+65    -15.64   23200.  !   90 Torr
- n-C6H7 + H = C6H8                       5.60E+48    -10.54   14700.  !  760 Torr
-!
- n-C6H7 + H = l-C6H6 + H2                1.50E+13      0.00       0.
- i-C6H7 + H = l-C6H6 + H2                3.00E+13      0.00       0.
- n-C6H7 + OH = l-C6H6 + H2O              2.50E+12      0.00       0.
- i-C6H7 + OH = l-C6H6 + H2O              5.00E+12      0.00       0.
- n-C6H7 + O2 => C4H6 + CO + HCO          4.16E+10      0.00    2500.  ! =(n-C4H5+O2)
- i-C6H7 + O2 => CH2CO+CH2CO+C2H3         7.86E+16     -1.80       0.0 ! =(i-C4H3+O2)
-!
- C6H8 + H = n-C6H7 + H2                  1.33E+06      2.53   12240.0 ! = C2H4 + H
- C6H8 + H = i-C6H7 + H2                  6.65E+05      2.53    9240.0 ! -3kcal/mol, /2
- C6H8 + OH = n-C6H7 + H2O                6.20E+06      2.0     3430.0 ! see notes
- C6H8 + OH = i-C6H7 + H2O                3.10E+06      2.0      430.0 ! see notes
-!
-! Reactions of benzene and phenyl
-!
-!A1 + H = c-C6H7                         3.20E+51    -12.57   13500.  !   20 Torr RRKM
-!A1 + H = c-C6H7                         1.70E+52    -12.54   15000.  !   90 Torr RRKM
- A1 + H = c-C6H7                         1.40E+51    -11.90   16100.  !  760 Torr RRKM
-!
- A1 + H = A1- + H2                       2.50E+14     0.0     16000.  ! Kiefer
- A1 + OH = A1- + H2O                     1.60E+08     1.42     1450.  ! CEC
-!
- A1- + H (+M) = A1 (+M)                  1.00E+14     0.00        0.  ! RRKM
-     LOW/ 6.6E+75  -16.30   7000. /
-     TROE / 1.0 0.1 584.9 6113. /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!
-! Formation and reactions of A1C2H
-!
-!n-C4H3 + C4H2 = A1C2H-                  1.40E+67   -17.42    23000.  !   10 Torr =(C2H2 + n-C4H3)
-!n-C4H3 + C4H2 = A1C2H-                  2.30E+68   -17.65    24400.  !   20 Torr
-!n-C4H3 + C4H2 = A1C2H-                  9.80E+68   -17.58    26500.  !   90 Torr
- n-C4H3 + C4H2 = A1C2H-                  9.60E+70   -17.77    31300.  !  760 Torr
-!n-C4H3 + C4H2 = A1C2H-                  1.90E+63   -15.25    30600.  ! 7600 Torr
-!
- A1 + C2H = A1C2H + H                    5.00E+13     0.0         0.  ! Estimated
-!
-!A1- + C2H2 = n-A1C2H2                   4.00E+39    -8.94    12000.  !   10 Torr RRKM
-!A1- + C2H2 = n-A1C2H2                   7.70E+40    -9.19    13400.  !   20 Torr RRKM
-!A1- + C2H2 = n-A1C2H2                   9.90E+41    -9.26    15700.  !   90 Torr RRKM
- A1- + C2H2 = n-A1C2H2                   7.00E+38    -8.02    16400.  !  760 Torr RRKM
-!A1- + C2H2 = n-A1C2H2                   7.90E+29    -5.15    13700.  ! 7600 Torr RRKM
-!
-!A1- + C2H2 = A1C2H + H                  5.60E+24    -3.38    15200.  !   10 Torr RRKM
-!A1- + C2H2 = A1C2H + H                  7.50E+26    -3.96    17100.  !   20 Torr RRKM
-!A1- + C2H2 = A1C2H + H                  9.90E+30    -5.07    21100.  !   90 Torr RRKM
- A1- + C2H2 = A1C2H + H                  3.30E+33    -5.70    25500.  !  760 Torr RRKM
-!A1- + C2H2 = A1C2H + H                  2.50E+29    -4.43    26400.  ! 7600 Torr RRKM
-!
-!A1C2H + H = n-A1C2H2                    4.70E+54   -13.06    16778.  !   10 Torr RRKM
-!A1C2H + H = n-A1C2H2                    1.00E+54   -12.76    17185.  !   20 Torr RRKM
-!A1C2H + H = n-A1C2H2                    1.20E+51   -11.69    17280.  !   90 Torr RRKM
- A1C2H + H = n-A1C2H2                    3.00E+43    -9.22    15272.  !  760 Torr RRKM
-!A1C2H + H = n-A1C2H2                    1.60E+32    -5.72    11090.  ! 7600 Torr RRKM
-!
-!A1C2H + H = i-A1C2H2                    4.70E+54   -13.06    16778.  !   10 Torr RRKM
-!A1C2H + H = i-A1C2H2                    1.00E+54   -12.76    17185.  !   20 Torr RRKM
-!A1C2H + H = i-A1C2H2                    1.20E+51   -11.69    17280.  !   90 Torr RRKM
- A1C2H + H = i-A1C2H2                    3.00E+43    -9.22    15272.  !  760 Torr RRKM
-!A1C2H + H = i-A1C2H2                    1.60E+32    -5.72    11090.  ! 7600 Torr RRKM
-!
- A1C2H + H = A1C2H* + H2                 2.50E+14     0.0     16000.  ! =A1+H
- A1C2H + H = A1C2H- + H2                 2.50E+14     0.0     16000.  ! =A1+H
- A1C2H + OH = A1C2H* + H2O               1.60E+08     1.42     1450.0 ! =A1+OH
- A1C2H + OH = A1C2H- + H2O               1.60E+08     1.42     1450.0 ! =A1+OH
-!
- A1C2H- + H (+M) = A1C2H (+M)            1.00E+14     0.00        0.  ! = A1-+H
-     LOW/ 6.6E+75  -16.30   7000. /
-     TROE / 1.0 0.1 584.9 6113. /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!
- A1C2H* + H (+M) = A1C2H (+M)            1.00E+14     0.00        0.  ! = A1-+H
-     LOW/ 6.6E+75  -16.30   7000. /
-     TROE / 1.0 0.1 584.9 6113. /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!
-! Formation and reactions of phenylvinyl and styrene
-!
- A1 + C2H3 = A1C2H3 + H                 7.90E+11      0.0      6400.  ! Stein
- A1- + C2H4 = A1C2H3 + H                2.51E+12      0.0      6190.  ! Stein
-!
-!A1- + C2H3 = A1C2H3                    1.90E+48    -10.52    17489.  ! RRKM 20 Torr
-!A1- + C2H3 = A1C2H3                    3.90E+38     -7.63    12868.  ! RRKM 90 Torr
- A1- + C2H3 = A1C2H3                    1.20E+27     -4.22     7235.  ! RRKM 760 Torr
-!
-!A1- + C2H3 = i-A1C2H2 + H              1.80E+31     -4.63    31652.  ! RRKM 20 Torr
-!A1- + C2H3 = i-A1C2H2 + H              5.80E+18     -1.00    26852.  ! RRKM 90 Torr
- A1- + C2H3 = i-A1C2H2 + H              8.50E-02      4.71    18424.  ! RRKM 760 Torr
-!
-!A1- + C2H3 = n-A1C2H2 + H              1.50E+32     -4.91    35504.  ! RRKM 20 Torr
-!A1- + C2H3 = n-A1C2H2 + H              5.10E+20     -1.56    31412.  ! RRKM 90 Torr
- A1- + C2H3 = n-A1C2H2 + H              9.40E+00      4.14    23234.  ! RRKM 760 Torr
-!
-!A1C2H3 = i-A1C2H2 + H                  1.20E+46     -9.07   118323.  ! RRKM 20 Torr
-!A1C2H3 = i-A1C2H2 + H                  3.80E+37     -6.55   114204.  ! RRKM 90 Torr
- A1C2H3 = i-A1C2H2 + H                  5.30E+27     -3.63   109332.  ! RRKM 760 Torr
-!
-!A1C2H3 = n-A1C2H2 + H                  1.90E+54    -11.39   130224.  ! RRKM 20 Torr
-!A1C2H3 = n-A1C2H2 + H                  1.30E+44     -8.36   125385.  ! RRKM 90 Torr
- A1C2H3 = n-A1C2H2 + H                  1.10E+32     -4.77   119483.  ! RRKM 760 Torr
-!
- A1C2H3 + H = A1C2H3*+ H2               2.50E+14      0.0     16000.
- A1C2H3 + OH = A1C2H3* + H2O            1.60E+08      1.42     1450.
- A1C2H3* + H (+M) = A1C2H3 (+M)         1.00E+14      0.00        0.  ! = A1-+H
-     LOW/ 6.6E+75  -16.30   7000. /
-     TROE / 1.0 0.1 584.9 6113. /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!
- A1C2H3 + H = n-A1C2H2 + H2             6.65E+06      2.53    12240.0
- A1C2H3 + H = i-A1C2H2 + H2             3.33E+05      2.53     9240.0
- A1C2H3 + OH = n-A1C2H2 + H2O           3.10E+06      2.0      3430.0
- A1C2H3 + OH = i-A1C2H2 + H2O           1.55E+06      2.0       430.0
-!
- n-A1C2H2 + H = A1C2H + H2              1.50E+13      0.0         0.
- i-A1C2H2 + H = A1C2H + H2              3.00E+13      0.0         0.
-!
-!n-A1C2H2 + H = i-A1C2H2 + H            2.30E+37     -6.00    35164.  ! RRKM 20 Torr
-!n-A1C2H2 + H = i-A1C2H2 + H            1.20E+25     -2.42    30530.  ! RRKM 90 Torr
- n-A1C2H2 + H = i-A1C2H2 + H            9.90E+04      3.37    22040.  ! RRKM 760 Torr
-!
- n-A1C2H2 + OH = A1C2H + H2O            2.50E+12      0.0         0.
- i-A1C2H2 + OH = A1C2H + H2O            5.00E+12      0.0         0.
-!
-! Formation and reactions of A2
-!
-!A1C2H* + C2H2 = A2-1                   7.50E+74    -18.83    34200.  !   10 Torr RRKM
-!A1C2H* + C2H2 = A2-1                   5.20E+72    -18.11    33900.  !   20 Torr RRKM
-!A1C2H* + C2H2 = A2-1                   2.00E+72    -17.74    36600.  !   90 Torr RRKM
- A1C2H* + C2H2 = A2-1                   1.10E+62    -14.56    33100.  !  760 Torr RRKM
-!A1C2H* + C2H2 = A2-1                   5.10E+48    -10.53    28000.  ! 7600 Torr RRKM
-!
-!A1C2H* + C2H2 = A1C2H)2 + H            1.10E+29     -4.44    24300.  !   10 Torr RRKM
-!A1C2H* + C2H2 = A1C2H)2 + H            5.50E+32     -5.46    27600.  !   20 Torr RRKM
-!A1C2H* + C2H2 = A1C2H)2 + H            4.80E+29     -4.59    26000.  !   90 Torr RRKM
- A1C2H* + C2H2 = A1C2H)2 + H            1.80E+19     -1.67    18800.  !  760 Torr RRKM
-!A1C2H* + C2H2 = A1C2H)2 + H            2.10E+10      0.85    13700.  ! 7600 Torr RRKM
-!
-!A1C2H* + C2H2= naphthyne + H           7.90E+57    -12.78    43200.  !   10 Torr RRKM
-!A1C2H* + C2H2= naphthyne + H           2.30E+58    -12.87    44600.  !   20 Torr RRKM
-!A1C2H* + C2H2= naphthyne + H           5.20E+64    -14.54    52200.  !   90 Torr RRKM
- A1C2H* + C2H2= naphthyne + H           5.70E+64    -14.41    57000.  !  760 Torr RRKM
-!A1C2H* + C2H2= naphthyne + H           4.40E+56    -12.00    57100.  ! 7600 Torr RRKM
-!
-!A1C2H)2 + H = A2-1                     9.50E+84    -21.09    37600.  !   10 Torr RRKM
-!A1C2H)2 + H = A2-1                     2.00E+82    -20.23    36900.  !   20 Torr RRKM
-!A1C2H)2 + H = A2-1                     2.00E+75    -18.06    34500.  !   90 Torr RRKM
- A1C2H)2 + H = A2-1                     6.90E+63    -14.57    29900.  !  760 Torr RRKM
-!A1C2H)2 + H = A2-1                     1.50E+51    -10.77    25500.  ! 7600 Torr RRKM
-!
-!A1C2H)2 + H = naphthyne + H            2.00E+69    -15.48    48400.  !   10 Torr RRKM
-!A1C2H)2 + H = naphthyne + H            3.90E+74    -16.91    53700.  !   20 Torr RRKM
-!A1C2H)2 + H = naphthyne + H            2.70E+76    -17.32    58200.  !   90 Torr RRKM
- A1C2H)2 + H = naphthyne + H            1.90E+73    -16.30    60900.  !  760 Torr RRKM
-!A1C2H)2 + H = naphthyne + H            9.60E+62    -13.29    59500.  ! 7600 Torr RRKM
-!
-!naphthyne + H = A2-1                   3.70E+67    -17.51    38000.  !   10 Torr RRKM
-!naphthyne + H = A2-1                   3.30E+65    -16.79    37400.  !   20 Torr RRKM
-!naphthyne + H = A2-1                   5.90E+61    -15.42    36500.  !   90 Torr RRKM
- naphthyne + H = A2-1                   4.90E+52    -12.43    33000.  !  760 Torr RRKM
-!naphthyne + H = A2-1                   2.00E+43     -9.35    30700.  ! 7600 Torr RRKM
-!
- A1C2H + C2H = A1C2H)2 + H              5.00E+13      0.0         0.  ! Estimated
-!
-!A1C2H3*+ C2H2 = A2 + H                 2.10E+15     -1.07     6000.  !   10 Torr (n-C4H5+C2H2, +1.2 kcal/mol)
-!A1C2H3*+ C2H2 = A2 + H                 2.10E+15     -1.07     6000.  !   20 Torr
-!A1C2H3*+ C2H2 = A2 + H                 2.10E+15     -1.07     6000.  !   90 Torr
- A1C2H3*+ C2H2 = A2 + H                 1.60E+16     -1.33     6600.  !  760 Torr
-!A1C2H3*+ C2H2 = A2 + H                 1.60E+18     -1.88     8600.  ! 7600 Torr
-!
-!n-A1C2H2 + C2H2 = A2 + H               2.10E+15     -1.07     4800.  !   10 Torr (n-C4H5 + C2H2)
-!n-A1C2H2 + C2H2 = A2 + H               2.10E+15     -1.07     4800.  !   20 Torr
-!n-A1C2H2 + C2H2 = A2 + H               2.10E+15     -1.07     4800.  !   90 Torr
- n-A1C2H2 + C2H2 = A2 + H               1.60E+16     -1.33     5400.  !  760 Torr
-!n-A1C2H2 + C2H2 = A2 + H               1.60E+18     -1.88     7400.  ! 7600 Torr
-!
- A2 + H = A2-1 + H2                     2.50E+14      0.0     16000.
- A2 + H = A2-2 + H2                     2.50E+14      0.0     16000.
- A2 + OH = A2-1 + H2O                   1.60E+08      1.42     1450.0
- A2 + OH = A2-2 + H2O                   1.60E+08      1.42     1450.0
-!  
- A2-1 + H (+M) = A2 (+M)                1.00E+14      0.0         0.0 ! RRKM
-   LOW  /  3.80E+127 -31.434 18676.0 /
-   TROE / 0.200   122.8   478.4  5411.9 /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
- A2-2 + H (+M) = A2 (+M)                1.00E+14      0.0         0.0 ! RRKM
-   LOW  /  9.50E+129 -32.132  18782.0  /
-   TROE / 0.870   492.7   117.9  5652.0 /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!A2-1 + H = A2-2 + H                    8.80E+58    -11.68    60974.0 !   20 Torr RRKM
-!A2-1 + H = A2-2 + H                    6.50E+45     -7.90    55488.0 !   90 Torr RRKM
- A2-1 + H = A2-2 + H                    2.40E+24     -1.81    45281.0 !  760 Torr RRKM
-!  
-! Formation and reactions of A2C2H
-!
-! A2C2HA 1-ethynylnaphthalene
-! A2C2HB 2-ethynylnaphthalene
-!
- A2 + C2H = A2C2HA + H                  5.00E+13      0.0         0.  ! Estimated
- A2 + C2H = A2C2HB + H                  5.00E+13      0.0         0.  ! Estimated
-!
-!A2-1 + C2H2 = A2C2H2                   3.80E+37     -8.23    12600.  !   10 Torr RRKM
-!A2-1 + C2H2 = A2C2H2                   4.50E+39     -8.71    14300.  !   20 Torr RRKM
-!A2-1 + C2H2 = A2C2H2                   3.40E+43     -9.56    18200.  !   90 Torr RRKM
- A2-1 + C2H2 = A2C2H2                   1.70E+43     -9.12    21100.  !  760 Torr RRKM
-!A2-1 + C2H2 = A2C2H2                   2.00E+28     -4.59    14400.  ! 7600 Torr RRKM
-!
-!A2-1 + C2H2 = A2C2HA + H               1.20E+21     -2.35    16300.  !   10 Torr RRKM
-!A2-1 + C2H2 = A2C2HA + H               1.40E+22     -2.64    17400.  !   20 Torr RRKM
-!A2-1 + C2H2 = A2C2HA + H               9.10E+24     -3.39    20400.  !   90 Torr RRKM
- A2-1 + C2H2 = A2C2HA + H               1.30E+24     -3.06    22600.  !  760 Torr RRKM
-!A2-1 + C2H2 = A2C2HA + H               1.60E+14     -0.19    20000.  ! 7600 Torr RRKM
-!
-!A2C2HA + H = A2C2H2                    1.80E+48    -11.17    14200.  !   10 Torr RRKM
-!A2C2HA + H = A2C2H2                    1.90E+50    -11.63    16200.  !   20 Torr RRKM
-!A2C2HA + H = A2C2H2                    3.30E+51    -11.72    18900.  !   90 Torr RRKM
- A2C2HA + H = A2C2H2                    5.90E+46    -10.03    19100.  !  760 Torr RRKM
-!A2C2HA + H = A2C2H2                    1.70E+30     -5.07    11200.  ! 7600 Torr RRKM
-!
- A2C2H2 + H = A2C2HA + H2               1.50E+13      0.0         0.  ! Estimated
- A2C2H2 + OH = A2C2HA + H2O             2.50E+12      0.0         0.  ! Estimated
-!
- A2C2HA + H = A2C2HA* + H2              2.50E+14      0.0     16000.
- A2C2HB + H = A2C2HB* + H2              2.50E+14      0.0     16000.
- A2C2HA + OH = A2C2HA* + H2O            1.60E+08      1.42     1450.
- A2C2HB + OH = A2C2HB* + H2O            1.60E+08      1.42     1450.
-!
- A2C2HB* + H (+M) = A2C2HB (+M)         1.00E+14      0.0         0.0
-   LOW  /  3.80E+127 -31.434 18676.0 /
-   TROE / 0.200   122.8   478.4  5411.9 /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
- A2C2HA* + H (+M) = A2C2HA (+M)         1.00E+14      0.0         0.0
-   LOW  /  9.50E+129 -32.132  18782.0  /
-   TROE / 0.870   492.7   117.9  5652.0 /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!
-! Formation and reactions of A3
-!
-!A2C2HB* + C2H2 = A3-1                  7.50E+74    -18.83    34200.  !   10 Torr RRKM
-!A2C2HB* + C2H2 = A3-1                  5.20E+72    -18.11    33900.  !   20 Torr RRKM
-!A2C2HB* + C2H2 = A3-1                  2.00E+72    -17.74    36600.  !   90 Torr RRKM
- A2C2HB* + C2H2 = A3-1                  1.10E+62    -14.56    33100.  !  760 Torr RRKM
-!A2C2HB* + C2H2 = A3-1                  5.10E+48    -10.53    28000.  ! 7600 Torr RRKM
-!
-!A2C2HB* + C2H2 = A2C2H)2 + H           1.10E+29     -4.44    24300.  !   10 Torr RRKM
-!A2C2HB* + C2H2 = A2C2H)2 + H           5.50E+32     -5.46    27600.  !   20 Torr RRKM
-!A2C2HB* + C2H2 = A2C2H)2 + H           4.80E+29     -4.59    26000.  !   90 Torr RRKM
- A2C2HB* + C2H2 = A2C2H)2 + H           1.80E+19     -1.67    18800.  !  760 Torr RRKM
-!A2C2HB* + C2H2 = A2C2H)2 + H           2.10E+10      0.85    13700.  ! 7600 Torr RRKM
-!
-!A2C2H)2 + H = A3-1                     9.50E+84    -21.09    37600.  !   10 Torr RRKM
-!A2C2H)2 + H = A3-1                     2.00E+82    -20.23    36900.  !   20 Torr RRKM
-!A2C2H)2 + H = A3-1                     2.00E+75    -18.06    34500.  !   90 Torr RRKM
- A2C2H)2 + H = A3-1                     6.90E+63    -14.57    29900.  !  760 Torr RRKM
-!A2C2H)2 + H = A3-1                     1.50E+51    -10.77    25500.  ! 7600 Torr RRKM
-!
-!A2C2HA* + C2H2 = A3-4                  7.50E+74    -18.83    34200.  !   10 Torr RRKM
-!A2C2HA* + C2H2 = A3-4                  5.20E+72    -18.11    33900.  !   20 Torr RRKM
-!A2C2HA* + C2H2 = A3-4                  2.00E+72    -17.74    36600.  !   90 Torr RRKM
- A2C2HA* + C2H2 = A3-4                  1.10E+62    -14.56    33100.  !  760 Torr RRKM
-!A2C2HA* + C2H2 = A3-4                  5.10E+48    -10.53    28000.  ! 7600 Torr RRKM
-!
-!A2C2HA* + C2H2 = A2C2H)2 + H           1.10E+29     -4.44    24300.  !   10 Torr RRKM
-!A2C2HA* + C2H2 = A2C2H)2 + H           5.50E+32     -5.46    27600.  !   20 Torr RRKM
-!A2C2HA* + C2H2 = A2C2H)2 + H           4.80E+29     -4.59    26000.  !   90 Torr RRKM
- A2C2HA* + C2H2 = A2C2H)2 + H           1.80E+19     -1.67    18800.  !  760 Torr RRKM
-!A2C2HA* + C2H2 = A2C2H)2 + H           2.10E+10      0.85    13700.  ! 7600 Torr RRKM
-!
-!A2C2H)2 + H = A3-4                     9.50E+84    -21.09    37600.  !   10 Torr RRKM
-!A2C2H)2 + H = A3-4                     2.00E+82    -20.23    36900.  !   20 Torr RRKM
-!A2C2H)2 + H = A3-4                     2.00E+75    -18.06    34500.  !   90 Torr RRKM
- A2C2H)2 + H = A3-4                     6.90E+63    -14.57    29900.  !  760 Torr RRKM
-!A2C2H)2 + H = A3-4                     1.50E+51    -10.77    25500.  ! 7600 Torr RRKM
-!
- A2C2HA + C2H = A2C2H)2 + H             5.00E+13      0.0         0.  ! Estimated
- A2C2HB + C2H = A2C2H)2 + H             5.00E+13      0.0         0.  ! Estimated
-!
- A3 + H = A3-1 + H2                     2.50E+14      0.0     16000.
- A3 + H = A3-4 + H2                     2.50E+14      0.0     16000.
- A3 + OH = A3-1 + H2O                   1.60E+08      1.42     1450.
- A3 + OH = A3-4 + H2O                   1.60E+08      1.42     1450.
-!
- A3-1 + H (+M) = A3 (+M)                1.00E+14      0.0         0.
-                         LOW  / 4.0E+148 -37.505 20551.0 /
-                         TROE / 1.000   536.3   144.9  5632.8 /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
- A3-4 + H (+M) = A3 (+M)                1.00E+14      0.0         0.0
-                         LOW  /2.1E+139  -34.803 18378.0 /
-                         TROE / 0.001   171.4   171.4  4992.8 /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!A3-1 + H = A3-4 + H                    1.70E+72    -15.215   77175.0 ! 20 Torr
-!A3-1 + H = A3-4 + H                    9.30E+58    -11.447   71113.0 ! 90 Torr
- A3-1 + H = A3-4 + H                    3.80E+40     -6.309   61782.0 ! 760 Torr
-!
-! Formation and reactions of A4
-!
- A3 + C2H = A3C2H + H                   5.00E+13      0.00        0.  ! Estimated
-!
-!A3-4 + C2H2 = A3C2H2                   8.10E+44    -10.38    20600.  !   10 Torr RRKM
-!A3-4 + C2H2 = A3C2H2                   6.70E+45    -10.55    21200.  !   20 Torr RRKM
-!A3-4 + C2H2 = A3C2H2                   6.50E+53    -12.59    26900.  !   90 Torr RRKM
- A3-4 + C2H2 = A3C2H2                   8.00E+61    -14.50    34800.  !  760 Torr RRKM
-!A3-4 + C2H2 = A3C2H2                   5.60E+50    -10.96    31300.  ! 7600 Torr RRKM
-!
-!A3-4 + C2H2 = A3C2H + H                3.80E+17     -1.12    22300.  !   10 Torr RRKM
-!A3-4 + C2H2 = A3C2H + H                8.00E+17     -1.21    22600.  !   20 Torr RRKM
-!A3-4 + C2H2 = A3C2H + H                3.40E+12      0.34    19700.  !   90 Torr RRKM
- A3-4 + C2H2 = A3C2H + H                1.20E+26     -3.44    30200.  !  760 Torr RRKM
-!A3-4 + C2H2 = A3C2H + H                7.30E+26     -3.52    35100.  ! 7600 Torr RRKM
-!
-!A3-4 + C2H2 = A4 + H                   3.60E+22     -2.91    13600.  !   10 Torr RRKM
-!A3-4 + C2H2 = A4 + H                   4.00E+23     -3.20    14400.  !   20 Torr RRKM
-!A3-4 + C2H2 = A4 + H                   8.90E+24     -3.56    15900.  !   90 Torr RRKM
- A3-4 + C2H2 = A4 + H                   3.30E+24     -3.36    17800.  !  760 Torr RRKM
-!A3-4 + C2H2 = A4 + H                   5.70E+25     -3.60    22700.  ! 7600 Torr RRKM
-!
-!A3C2H + H = A3C2H2                     4.90E+37     -8.29     8400.  !   10 Torr RRKM
-!A3C2H + H = A3C2H2                     5.20E+47    -11.05    14700.  !   20 Torr RRKM
-!A3C2H + H = A3C2H2                     1.40E+56    -13.21    21000.  !   90 Torr RRKM
- A3C2H + H = A3C2H2                     1.90E+64    -15.12    29300.  !  760 Torr RRKM
-!A3C2H + H = A3C2H2                     4.50E+51    -11.16    24900.  ! 7600 Torr RRKM
-!
-!A3C2H + H = A4 + H                     6.50E+25     -3.79     8700.  !   10 Torr RRKM
-!A3C2H + H = A4 + H                     6.80E+26     -4.07     9500.  !   20 Torr RRKM
-!A3C2H + H = A4 + H                     4.20E+27     -4.25    10900.  !   90 Torr RRKM
- A3C2H + H = A4 + H                     9.00E+38     -7.39    20700.  !  760 Torr RRKM
-!A3C2H + H = A4 + H                     5.20E+27     -4.08    17700.  ! 7600 Torr RRKM
-!
-!A3C2H2 = A4 + H                        7.90E+46    -11.42    26400.  !   10 Torr RRKM
-!A3C2H2 = A4 + H                        7.30E+48    -11.86    28100.  !   20 Torr RRKM
-!A3C2H2 = A4 + H                        6.30E+59    -14.70    36900.  !   90 Torr RRKM
- A3C2H2 = A4 + H                        2.00E+63    -15.28    43200.  !  760 Torr RRKM
-!A3C2H2 = A4 + H                        2.50E+33     -6.48    26800.  ! 7600 Torr RRKM
-!
- A4 + H = A4- + H2                      2.50E+14      0.0     16000.
- A4 + OH = A4- + H2O                    1.60E+08      1.42     1450.
- A4- + H = A4                           1.00E+14      0.0         0.
-!
-! Formation and reactions of biphenyl
-!
-!A1 + A1- = P2 + H                      5.60E+12     -0.074    7550.0 !   20 Torr RRKM
-!A1 + A1- = P2 + H                      1.50E+14     -0.45     8915.0 !   90 Torr RRKM
- A1 + A1- = P2 + H                      1.10E+23     -2.92    15890.0 !  760 Torr RRKM
-!
-!A1 + A1- = P2-H                        8.10E+36     -8.62     9125.0 !   20 Torr RRKM
-!A1 + A1- = P2-H                        2.20E+36     -8.21     9920.0 !   90 Torr RRKM
- A1 + A1- = P2-H                        3.70E+32     -6.74     9870.0 !  760 Torr RRKM
-!
-!P2-H = P2 + H                          6.10E+42    -10.09    27460.0 !   20 Torr RRKM
-!P2 + H = P2-H                          2.40E+40     -9.06    11570.0 !   90 Torr RRKM
- P2-H = P2 + H                          3.80E+37     -7.96    27880.0 !  760 Torr RRKM
-!
-!A1- + A1- = P2                         3.80E+31     -5.75     7950.0 !   20 Torr RRKM
-!A1- + A1- = P2                         6.10E+25     -4.00     5590.0 !   90 Torr RRKM
- A1- + A1- = P2                         2.00E+19     -2.05     2900.0 !  760 Torr RRKM
-!
-!A1- + A1- = P2- + H                    7.00E+23     -2.33    38540.0 !   20 Torr RRKM
-!A1- + A1- = P2- + H                    8.60E+13      0.50    34820.0 !   90 Torr RRKM
- A1- + A1- = P2- + H                    2.30E-01      4.62    28950.0 !  760 Torr RRKM
-!
-!P2 = P2- + H                           9.00E+37     -6.63   119580.0 !   20 Torr RRKM
-!P2 = P2- + H                           8.10E+31     -4.79   117120.0 !   90 Torr RRKM
- P2 = P2- + H                           1.10E+25     -2.72   114270.0 !  760 Torr RRKM
-!
- P2 + H = P2- + H2                      2.50E+14      0.0     16000.
- P2 + OH = P2- + H2O                    1.60E+08      1.42     1450.
-!
- P2- + C2H2 = A3 + H                    4.60E+06      1.97     7300.0 ! A3-+C2H2, kinf
-!
-! Benzene oxidation
-!
- A1 + O = C6H5O + H                     2.20E+13      0.0      4530.0 ! CEC
- A1 + OH = C6H5OH + H                   1.30E+13      0.0     10600.0 ! CEC
- A1- + O2 = C6H5O + O                   2.10E+12      0.0      7470.0 ! LIN
-!A1- + O2 = C6H5O + O                   2.70E+12      0.35     5970.0 ! Sum of two channels, Just
-!
- C6H5O = CO + C5H5                      2.50E+11      0.0     43900.0 ! LIN
- C6H5O + H = CO + C5H6                  3.00E+13      0.0         0.0 ! Est.
- C6H5O + O = HCO + 2C2H2 + CO           3.00E+13      0.0         0.0 ! Est.
- C6H5O + H (+M) = C6H5OH (+M)           2.5E+14       0.0         0.0
-   LOW  / 1.00E+94 -21.84 13880.0 /
-   TROE / 0.043 304.2 60000. 5896.4 /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!
- C6H5OH + H = C6H5O + H2                1.15E+14      0.0     12400.0 ! LIN
- C6H5OH + O = C6H5O + OH                2.80E+13      0.0      7352.0 ! Brezinski
- C6H5OH + OH = C6H5O + H2O              6.00E+12      0.0         0.0 ! LIN
-!
- C5H5 + H (+M) = C5H6 (+M)              1.00E+14      0.0         0.0 ! RRKM
-   LOW  / 4.4E+80 -18.28 12994.0 /
-   TROE / 0.068   400.7  4135.8  5501.9 /
-   H2/2.0/ H2O/6.0/ CH4/2.0/ CO/1.5/ CO2/2.0/ C2H6/3.0/
-!
- C5H5 + O = n-C4H5 + CO                 1.00E+14      0.0         0.0 ! Brezinsky
- C5H5 + OH = C5H4OH + H                 5.00E+12      0.0         0.0 ! Est.
- C5H5 + HO2 = C5H5O + OH                3.00E+13      0.0         0.0 ! Brezinsky
-!
- C5H6 + H = C5H5 + H2                   2.20E+08      1.77     3000.0 ! Brezinsky
- C5H6 + O = C5H5 + OH                   1.80E+13      0.0      3080.0 ! Brezinsky
- C5H6 + OH = C5H5 + H2O                 3.43E+09      1.18     -447.0 ! Brezinsky
-!
- C5H5O = n-C4H5 + CO                    2.50E+11      0.0     43900.0 ! Brezinsky
- C5H5O + H = CH2O + 2C2H2               3.00E+13      0.0         0.0 ! Est.
- C5H5O + O = CO2 + n-C4H5               3.00E+13      0.0         0.0 ! Est.
-!
- C5H4OH = C5H4O + H                     2.10E+13      0.0     48000.0 ! Brezinsky
- C5H4OH + H = CH2O + 2C2H2              3.00E+13      0.0         0.0 ! Est.
- C5H4OH + O = CO2 + n-C4H5              3.00E+13      0.0         0.0 ! Est.
-!
- C5H4O = CO + C2H2 + C2H2               1.00E+15      0.0     78000.0 ! Brezinsky
- C5H4O + O = CO2 + 2C2H2                3.00E+13      0.0         0.0 ! Est
-!
-! Higher PAH oxidation by OH
-!
- A1C2H + OH => A1- + CH2CO              2.18E-04      4.5     -1000.0 ! =C2H2+OH
- A1C2H)2 + OH => A1C2H- + CH2CO         2.18E-04      4.5     -1000.0 ! =C2H2+OH
- A2C2HA + OH => A2-1 + CH2CO            2.18E-04      4.5     -1000.0 ! =C2H2+OH
- A2C2HB + OH => A2-2 + CH2CO            2.18E-04      4.5     -1000.0 ! =C2H2+OH
- A3C2H + OH => A3-4 + CH2CO             2.18E-04      4.5     -1000.0 ! =C2H2+OH
-!
- A1C2H + OH => C6H5O + C2H2             1.30E+13      0.0     10600.0 ! CEC
- A1C2H3 + OH => C6H5O + C2H4            1.30E+13      0.0     10600.0 ! CEC
- A1C2H)2 + OH => C4H2 + C6H5O           1.30E+13      0.0     10600.0 ! CEC
- A2 + OH => A1C2H + CH2CO + H           1.30E+13      0.0     10600.0 ! CEC
- A2C2HA + OH => A1C2H + H2C4O + H       1.30E+13      0.0     10600.0 ! CEC
- A2C2HB + OH => A1C2H + H2C4O + H       1.30E+13      0.0     10600.0 ! CEC
- A3 + OH => A2C2HB + CH2CO + H          6.50E+12      0.0     10600.0 ! CEC
- A3 + OH => A2C2HA + CH2CO + H          6.50E+12      0.0     10600.0 ! CEC
- A3C2H + OH => A2C2HA + H2C4O + H       6.50E+12      0.0     10600.0 ! CEC
- A3C2H + OH => A2C2HB + H2C4O + H       6.50E+12      0.0     10600.0 ! CEC
- A4 + OH => A3-4 + CH2CO                1.30E+13      0.0     10600.0 ! CEC
-!
-! Higher PAH oxidation by O
-!
- A1C2H + O => HCCO + A1-                2.04E+07      2.0      1900.0 ! =C2H2+O
- A1C2H)2 + O => HCCO + A1C2H-           2.04E+07      2.0      1900.0 ! =C2H2+O
- A1C2H3 + O => A1- + CH3 + CO           1.92E+07      1.83      220.0 ! =C2H4+O
- A2C2HA + O => HCCO + A2-1              2.04E+07      2.0      1900.0 ! =C2H2+O
- A2C2HB + O => HCCO + A2-2              2.04E+07      2.0      1900.0 ! =C2H2+O
-!
- A1C2H + O => C2H + C6H5O               2.20E+13      0.0      4530.0 ! =A1 + O
- A1C2H3 + O => C2H3 + C6H5O             2.20E+13      0.0      4530.0 ! =A1 + O
- A1C2H)2 + O => C6H5O + C4H             2.20E+13      0.0      4530.0 ! =A1 + O
- A2 + O => CH2CO + A1C2H                2.20E+13      0.0      4530.0 ! =A1 + O
- A2C2HA + O => A1C2H)2 + CH2CO          2.20E+13      0.0      4530.0 ! =A1 + O
- A2C2HB + O => A1C2H)2 + CH2CO          2.20E+13      0.0      4530.0 ! =A1 + O
- A3 + O => A2C2HA + CH2CO               1.10E+13      0.0      4530.0 ! =A1 + O / 2
- A3 + O => A2C2HB + CH2CO               1.10E+13      0.0      4530.0 ! =A1 + O / 2
- A3C2H + O => A2C2HA + H2C4O            1.10E+13      0.0      4530.0 ! =A1 + O / 2
- A3C2H + O => A2C2HB + H2C4O            1.10E+13      0.0      4530.0 ! =A1 + O / 2
- A4 + O => A3-4 + HCCO                  2.20E+13      0.0      4530.0 ! =A1 + O
-!
-! Higher PAH oxidation by O2
-!
- A1C2H* + O2 => l-C6H4 + CO + HCO       2.10E+12      0.0      7470.0 ! = A1- + O2
- A1C2H- + O2 => l-C6H4 + CO + HCO       2.10E+12      0.0      7470.0 ! = A1- + O2
- A1C2H3* + O2 => l-C6H6 + CO + HCO      2.10E+12      0.0      7470.0 ! = A1- + O2
- n-A1C2H2 + O2 => A1- + CO + CH2O       1.00E+11      0.0         0.0 ! Estimated
- A2-1 + O2 => A1C2H + HCO + CO          2.10E+12      0.0      7470.0 ! = A1- + O2
- A2-2 + O2 => A1C2H + HCO + CO          2.10E+12      0.0      7470.0 ! = A1- + O2
- A2C2HA* + O2 => A2-1 + CO + CO         2.10E+12      0.0      7470.0 ! = A1- + O2
- A2C2HB* + O2 => A2-2 + CO + CO         2.10E+12      0.0      7470.0 ! = A1- + O2
- A3-4 + O2 => A2C2HB + HCO + CO         2.10E+12      0.0      7470.0 ! = A1- + O2
- A3-1 + O2 => A2C2HA + HCO + CO         2.10E+12      0.0      7470.0 ! = A1- + O2
- A4- + O2 => A3-4 + CO + CO             2.10E+12      0.0      7470.0 ! = A1- + O2
-! soot formation
- A4=16C(S)+5H2                         2.00E+10      0.0         0.0 ! TDK
-END
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c7h8 b/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c7h8
deleted file mode 100644
index c75da437e..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c7h8
+++ /dev/null
@@ -1,919 +0,0 @@
-ELEMENTS
- H   O    C   N   AR
-END
-SPECIE 
-C6H5CH3  C7H8O  C7H7  C7H7O 
-C7H7OH   C6H5CHO  C6H5CO
-C12H10  C6H6  C6H5OH  C6H5O  C6H5  
-C5H6  C5H5O  C5H4OH  C5H5  C5H4O  C4H6
-CH2CHCHCH  C4H4  H2CCCCH  C4H2  C3H4  H2CCCH
-C3H2  C2H4  C2H3  C2H2  CH2CO  C2H 
-HCCO  CH4  CH3O  CH3  CH2O  CH2  CH2(3)
-CH  CO2  CO  H2O  H2  H2O2  
-HCO  HO2  H  OH  O2  O 
-C6H5(L)  C6H4OH  C6H4  C6H2   C6H  C5H3
-C5H2  CH2CHCCH2  HCCHCCH  C4H  H2C4O  C3H6
-C3H5  C3H4P  C2H6  C2H5  HCCOH  C2O
-CH3OH  CH2OH  C  C2
-C6H3  C8H6  C8H8  C8H10  C10H7  C10H8
-AR N2
-END
-THERMO ALL
-   300.000  1000.000  5000.000
-C6H5CH3           L 6/87C   7H   8    0    0G   200.000  6000.000              1
- 0.12940034E+02 0.26691287E-01-0.96838505E-05 0.15738629E-08-0.94663601E-13    2
--0.69764908E+03-0.46728785E+02 0.16152663E+01 0.21099438E-01 0.85366018E-04    3
--0.13261066E-06 0.55956604E-10 0.40756300E+04 0.20282210E+02                   4
-C7H8O CRESOL      L 6/87C   7H   8O   1    0G   200.000  6000.000              1
- 0.15932987E+02 0.27011160E-01-0.99448722E-05 0.16296689E-08-0.98513298E-13    2
--0.23592065E+05-0.59732841E+02 0.42258267E+00 0.45551636E-01 0.32012513E-04    3
--0.81121959E-07 0.37665658E-10-0.18202621E+05 0.26032903E+02                   4
-C6H5CHO           L 3/86C   7H   6O   1    0G   298.150  5000.000              1
- 0.13650737E+02 0.25680419E-01-0.10466729E-04 0.19413430E-08-0.13483792E-12    2
--0.11019744E+05-0.47965796E+02-0.31627334E+01 0.66369245E-01-0.34816353E-04    3
--0.62999377E-08 0.85807101E-11-0.61169349E+04 0.40231735E+02                   4
-C6H5CO    therm         C   7H   5O   1    0G   300.000  5000.000 1392.000     1
- 1.75116258e+01 1.62650511e-02-5.65051892e-06 8.86922680e-10-5.18657990e-14    2
- 4.67641545e+03-6.70531966e+01-1.56729686e+00 5.99817511e-02-4.29153585e-05    3
- 1.48666854e-08-1.98938453e-12 1.12873830e+04 3.55490009e+01                   4
-C6H4              BurcatC   6H   4    0    0G   300.000  5000.000 1420.000     1
- 1.61320877E+01 9.41620382E-03-3.11126898E-06 4.72171941E-10-2.69719153E-14    2
- 5.66472138E+04-5.91590247E+01-3.97720368E-01 5.75565537E-02-5.66835885E-05    3
- 2.72075244E-08-5.03385170E-12 6.13213019E+04 2.60457753E+01                   4
-CH2               BurcatC   1H   2    0    0G   200.000  6000.000              1
- 0.03552888E+02 0.02066788E-01-0.01914116E-05-0.11046733E-09 0.02021349E-12    2
- 0.04984975E+06 0.01686570E+02 0.03971265E+02-0.01699088E-02 0.10253689E-05    3
- 0.02492550E-07-0.01981266E-10 0.04989367E+06 0.05753207E+00                   4
-CH2(3)            BurcatC   1H   2    0    0G   200.000  6000.000              1
- 0.25387122E+01 0.38225491E-02-0.12861304E-05 0.19800308E-09-0.11465743E-13    2
- 0.46129253E+05 0.81054648E+01 0.41793655E+01-0.22178553E-02 0.79653602E-05    3
--0.69127339E-08 0.22475318E-11 0.45750857E+05-0.76113703E-02                   4
-C3H4P             BurcatH   4C   3    0    0G   300.000  5000.000 1399.000     1
- 7.42833795E+00 9.44170622E-03-3.17278962E-06 4.86601152E-10-2.79868438E-14    2
- 1.88799773E+04-1.68291009E+01 1.75329557E+00 2.24124129E-02-1.45664551E-05    3
- 5.08221854E-09-7.47083130E-13 2.08950138E+04 1.37761621E+01                   4
-C3H4              BurcatC   3H   4    0    0G   300.000  5000.000 1401.000     1
- 7.73985546E+00 9.20561227E-03-3.09859442E-06 4.75848854E-10-2.73966525E-14    2
- 1.93588295E+04-1.93523527E+01 8.39838965E-01 2.58649489E-02-1.86527566E-05    3
- 7.14802816E-09-1.13254013E-12 2.17003608E+04 1.75115041E+01                   4
-C12H9       O-BIPHENYL84C 12.H  9.   0.   0.G   300.000  5000.000   1000.000   1
- 0.23851303E 02 0.31960227E-01-0.11076719E-04 0.16847825E-08-0.92641173E-13    2
- 0.40171297E 05-0.10270549E 03-0.31376228E 01 0.82217276E-01-0.40171444E-05    3
--0.60809782E-07 0.32074482E-10 0.48868754E 05 0.42730362E 02 0.51444448E 05    4
-BIPHENYL          L12/84C  12H  10    0    0G   300.000  5000.000 1398.000     1
- 3.03543436E+01 2.79259296E-02-9.52722170E-06 1.47907724E-09-8.58879412E-14    2
- 6.80038924E+03-1.44507270E+02-9.07687754E+00 1.22663820E-01-9.48186712E-05    3
- 3.55586680E-08-5.17329758E-12 1.99164369E+04 6.58085250E+01                   4
-C12H10            BurcatC  12H  10    0    0G   300.000  5000.000 1398.000     1
- 3.03543436E+01 2.79259296E-02-9.52722170E-06 1.47907724E-09-8.58879412E-14    2
- 6.80038924E+03-1.44507270E+02-9.07687754E+00 1.22663820E-01-9.48186712E-05    3
- 3.55586680E-08-5.17329758E-12 1.99164369E+04 6.58085250E+01                   4
-AR                Kee186AR  1               G  0300.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.07453750E+04 0.04366000E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.07453750E+04 0.04366000E+02                   4
-C                 Kee086C   1               G  0300.00   5000.00  1000.00      1
- 0.02602087E+02-0.01787081E-02 0.09087041E-06-0.11499333E-10 0.03310844E-14    2
- 0.08542154E+06 0.04195177E+02 0.02498584E+02 0.08085776E-03-0.02697697E-05    3
- 0.03040729E-08-0.11066518E-12 0.08545878E+06 0.04753459E+02                   4
-CH4               Kee286C   1H   4          G  0300.00   5000.00  1000.00      1
- 0.01683478E+02 0.10237236E-01-0.03875128E-04 0.06785585E-08-0.04503423E-12    2
--0.10080787E+05 0.09623395E+02 0.07787415E+01 0.01747668E+00-0.02783409E-03    3
- 0.03049708E-06-0.12239307E-10-0.09825229E+05 0.13722195E+02                   4
-C2                Kee286C   2               G  0300.00   5000.00  1000.00      1
- 0.04135978E+02 0.06531618E-03 0.01837099E-05-0.05295085E-09 0.04712137E-13    2
- 0.09967272E+06 0.07472923E+01 0.06996045E+02-0.07400601E-01 0.03234703E-04    3
- 0.04802535E-07-0.03295917E-10 0.09897487E+06-0.13862268E+02                   4
-C2H               Kee387C   2H   1          G  0300.00   5000.00  1000.00      1
- 0.04427688E+02 0.02216268E-01-0.06048952E-05 0.09882517E-09-0.07351179E-13    2
- 0.06590415E+06-0.11994418E+01 0.03050667E+02 0.06051674E-01-0.04956634E-04    3
- 0.02804159E-07-0.08193332E-11 0.06630011E+06 0.05954361E+02                   4
-C2H2              Kee386C   2H   2          G  0300.00   5000.00  1000.00      1
- 0.04436770E+02 0.05376039E-01-0.01912816E-04 0.03286379E-08-0.02156709E-12    2
- 0.02566766E+06-0.02800338E+02 0.02013562E+02 0.15190446E-01-0.16163189E-04    3
- 0.09078992E-07-0.01912746E-10 0.02612444E+06 0.08805378E+02                   4
-C2H4              Kee286C   2H   4          G  0300.00   5000.00  1000.00      1
- 0.03528418E+02 0.11485185E-01-0.04418385E-04 0.07844600E-08-0.05266848E-12    2
- 0.04428288E+05 0.02230389E+02-0.08614880E+01 0.02796162E+00-0.03388677E-03    3
- 0.02785152E-06-0.09737879E-10 0.05573046E+05 0.02421148E+03                   4
-C2H5              Kee387C   2H   5          G  0300.00   5000.00  1000.00      1
- 0.07190480E+02 0.06484077E-01-0.06428064E-05-0.02347879E-08 0.03880877E-12    2
- 0.10674549E+05-0.14780892E+02 0.02690701E+02 0.08719133E-01 0.04419838E-04    3
- 0.09338703E-08-0.03927773E-10 0.12870404E+05 0.12138195E+02                   4
-C2H6              Kee686C   2H   6          G  0300.00   4000.00  1000.00      1
- 0.04825938E+02 0.13840429E-01-0.04557258E-04 0.06724967E-08-0.03598161E-12    2
--0.12717793E+05-0.05239506E+02 0.14625388E+01 0.15494667E-01 0.05780507E-04    3
--0.12578319E-07 0.04586267E-10-0.11239176E+05 0.14432295E+02                   4
-C2O               Kee286C   2O   1          G  0300.00   5000.00  1000.00      1
- 0.04849809E+02 0.02947585E-01-0.10907286E-05 0.01792562E-08-0.11157585E-13    2
- 0.03282055E+06-0.06453225E+01 0.03368850E+02 0.08241803E-01-0.08765145E-04    3
- 0.05569262E-07-0.15400086E-11 0.03317081E+06 0.06713314E+02                   4
-C3H2              Kee686C   3H   2          G  0300.00   5000.00  1000.00      1
- 0.06530853E+02 0.05870316E-01-0.01720776E-04 0.02127498E-08-0.08291910E-13    2
- 0.05115213E+06-0.11227278E+02 0.02691077E+02 0.14803664E-01-0.03250551E-04    3
--0.08644363E-07 0.05284877E-10 0.05219072E+06 0.08757391E+02                   4
-C3H5              Kee/77C   3H   5          G  0300.00   5000.00  1000.00      1
- 0.79091978E+01 0.12115255E-01-0.41175863E-05 0.61566796E-09-0.33235733E-13    2
- 0.12354156E+05-0.19672333E+02-0.54100400E+00 0.27284101E-01-0.96365329E-06    3
--0.19129462E-07 0.98394175E-11 0.15130395E+05 0.26067337E+02                   4
-C3H6              Kee186C   3H   6          G  0300.00   5000.00  1000.00      1
- 0.06732257E+02 0.14908336E-01-0.04949899E-04 0.07212022E-08-0.03766204E-12    2
--0.09235703E+04-0.13313348E+02 0.14933071E+01 0.02092517E+00 0.04486794E-04    3
--0.16689121E-07 0.07158146E-10 0.10748264E+04 0.16145340E+02                   4
-C4                Kee286C   4               G  0300.00   5000.00  1000.00      1
- 0.06500180E+02 0.04228632E-01-0.01790717E-04 0.03404812E-08-0.02403978E-12    2
- 0.11434008E+06-0.11488894E+02 0.02343028E+02 0.16429811E-01-0.15279858E-04    3
- 0.07343826E-07-0.15822743E-11 0.11545384E+06 0.09826204E+02                   4
-C4H               Kee686C   4H   1          G  0300.00   5000.00  1000.00      1
- 0.06242882E+02 0.06193682E-01-0.02085931E-04 0.03082203E-08-0.16364826E-13    2
- 0.07568019E+06-0.07210806E+02 0.05023247E+02 0.07092375E-01-0.06073762E-07    3
--0.02275752E-07 0.08086994E-11 0.07623812E+06-0.06942594E+00                   4
-C4H2              Kee686C   4H   2          G  0300.00   5000.00  1000.00      1
- 0.09031407E+02 0.06047252E-01-0.01948788E-04 0.02754863E-08-0.13856080E-13    2
- 0.05294735E+06-0.02385067E+03 0.04005191E+02 0.01981000E+00-0.09865877E-04    3
--0.06635158E-07 0.06077413E-10 0.05424065E+06 0.01845736E+02                   4
-C4H4              Kee   C   4H   4          G    300.000  5000.000 1404.000    1
- 1.00207062E+01 9.67390881E-03-3.23076021E-06 4.93586227E-10-2.83175163E-14    2
- 3.26359855E+04-2.84768495E+01 1.01074067E+00 3.33151781E-02-2.73656162E-05    3
- 1.17824083E-08-2.04860686E-12 3.54881795E+04 1.89625510E+01                   4
-C4H6              Kee186C   4H   6          G  0300.00   5000.00  1000.00      1
- 0.08046583E+02 0.16485251E-01-0.05522227E-04 0.08123593E-08-0.04295078E-12    2
- 0.13701305E+05-0.01800457E+03 0.03197108E+02 0.02025591E+00 0.06510192E-04    3
--0.16584423E-07 0.06400282E-10 0.15715203E+05 0.09895660E+02                   4
-C5H2              Kee587C   5H   2          G  0300.00   5000.00  1000.00      1
- 0.11329175E+02 0.07424056E-01-0.02628188E-04 0.04082541E-08-0.02301332E-12    2
- 0.07878706E+06-0.03617117E+03 0.03062321E+02 0.02709998E+00-0.10091697E-04    3
--0.12727451E-07 0.09167219E-10 0.08114969E+06 0.07071078E+02                   4
-C5H3              Kee387C   5H   3          G  0300.00   5000.00  1000.00      1
- 0.10787622E+02 0.09539619E-01-0.03206744E-04 0.04733323E-08-0.02512135E-12    2
- 0.06392904E+06-0.03005444E+03 0.04328720E+02 0.02352480E+00-0.05856723E-04    3
--0.12154494E-07 0.07726478E-10 0.06588531E+06 0.04173258E+02                   4
-C5H4O      burcat       C   5H   4O   1    0G   300.000  5000.000 1000.000     1
- 0.12606535e 02 0.16747067e-01-0.61097587e-05 0.99674576e-09-0.60111834e-13    2
- 0.14114657e 04-0.42604911e 02 0.23043601e 00 0.32322572e-01 0.28900908e-04    3
--0.70680613e-07 0.33407174e-10 0.55554724e 04 0.25330946e 02                   4
-C5H4OH     burcat       C   5H   5O   1    0G   300.000  5000.000 1000.000     1
- 0.13367777e 02 0.15205911e-01-0.54592662e-05 0.88135325e-09-0.52774563e-13    2
- 0.47218184e 04-0.45920099e 02-0.12820812e 01 0.49040075e-01-0.13687402e-04    3
--0.29134476e-07 0.19006885e-10 0.88893319e 04 0.30797801e 02                   4
-C5H5               mar96C   5H   5          G  0300.00   4000.00  1403.00      1
- 1.29044479e 01 1.26989021e-02-4.35726839e-06 6.78034680e-10-3.94047039e-14    2
- 2.59665811e 04-4.89414326e 01-4.48313342e 00 6.14978772e-02-5.77725922e-05    3
- 2.73308264e-08-5.08259162e-12 3.11707706e 04 4.15116727e 01                   4
-C6H5O              82489C   6H   5O   1     G  0300.00   4000.00  1000.00      1
- 0.01822639e+03 0.01003985e+00-0.09915668e-05-0.05672804e-08 0.01068372e-11    2
--0.02620846e+05-0.07361391e+03 0.01107497e+02 0.03956946e+00 0.08497295e-05    3
--0.02436311e-06 0.09650660e-10 0.03159672e+05 0.01973496e+03                   4
-C6H5OH             82489C   6H   6O   1     G  0300.00   4000.00  1000.00      1
- 0.01821633e+03 0.01142427e+00-0.01096684e-04-0.06427442e-08 0.01198893e-11    2
--0.02053664e+06-0.07304234e+03 0.01391456e+02 0.03931958e+00 0.01777096e-04    3
--0.02277673e-06 0.08309659e-10-0.01472181e+06 0.01917813e+03                   4
-C5H6              Kee387C   5H   6          G  0300.00   5000.00  1000.00      1
- 0.09689815E+02 0.01838262E+00-0.06264884E-04 0.09393377E-08-0.05087708E-12    2
- 0.11021242E+05-0.03122908E+03-0.03196739E+02 0.04081361E+00 0.06816505E-05    3
--0.03137459E-06 0.15772230E-10 0.15290676E+05 0.03869938E+03                   4
-C6H               Kee686C   6H   1          G  0300.00   5000.00  1000.00      1
- 0.11587352E+02 0.07295362E-01-0.02466008E-04 0.03407045E-08-0.14981855E-13    2
- 0.10314481E+06-0.03172578E+03 0.04769848E+02 0.02457279E+00-0.07561252E-04    3
--0.14806908E-07 0.09768053E-10 0.10485231E+06 0.03241530E+02                   4
-C6H2              Kee686C   6H   2          G  0300.00   5000.00  1000.00      1
- 0.12756519E+02 0.08034381E-01-0.02618215E-04 0.03725060E-08-0.01878850E-12    2
- 0.08075469E+06-0.04041262E+03 0.05751085E+02 0.02636719E+00-0.11667596E-04    3
--0.10714498E-07 0.08790297E-10 0.08262012E+06-0.04335532E+02                   4
-C6H3              Kee387C   6H   3          G  0300.00   5000.00  1000.00      1
- 0.12761181E+02 0.10385573E-01-0.03479192E-04 0.05109733E-08-0.02690965E-12    2
- 0.07477706E+06-0.03891745E+03 0.05007089E+02 0.02692851E+00-0.05919865E-04    3
--0.15272335E-07 0.09408310E-10 0.07713200E+06 0.02225621E+02                   4
-C6H5              Kee489C   6H   5          G  0300.00   4000.00  1000.00      1
- 0.15775887E+02 0.09651109E-01-0.09429416E-05-0.05469111E-08 0.10265216E-12    2
- 0.03302698E+06-0.06176280E+03 0.11435567E+00 0.03627324E+00 0.11582856E-05    3
--0.02196964E-06 0.08463556E-10 0.03836054E+06 0.02380117E+03                   4
-C6H5(L)            82489C   6H   5          G  0300.00   4000.00  1000.00      1
- 0.01721540e+03 0.08621068e-01-0.08221340e-05-0.04752164e-08 0.08844086e-12    2
- 0.06385819e+06-0.06139128e+03 0.04854269e+02 0.03031659e+00 0.01742893e-05    3
--0.01811010e-06 0.07392511e-10 0.06798734e+06 0.05854935e+02                   4
-C6H5O             Kee489C   6H   5O   1     G  0300.00   4000.00  1000.00      1
- 0.01822638E+03 0.10039851E-01-0.09915668E-05-0.05672804E-08 0.10683716E-12    2
--0.02620846E+05-0.07361390E+03 0.11074965E+01 0.03956945E+00 0.08497295E-05    3
--0.02436311E-06 0.09650659E-10 0.03159672E+05 0.01973496E+03                   4
-C6H5OH            Kee489C   6H   6O   1     G  0300.00   4000.00  1000.00      1
- 0.01821632E+03 0.11424269E-01-0.10966843E-05-0.06427442E-08 0.11988930E-12    2
--0.02053664E+06-0.07304233E+03 0.13914556E+01 0.03931957E+00 0.01777096E-04    3
--0.02277673E-06 0.08309659E-10-0.14721809E+05 0.01917813E+03                   4
-C6H6              Kee387C   6H   6          G  0300.00   5000.00  1000.00      1
- 0.12910740E+02 0.01723296E+00-0.05024210E-04 0.05893497E-08-0.01947521E-12    2
- 0.03664511E+05-0.05002699E+03-0.03138012E+02 0.04723103E+00-0.02962207E-04    3
--0.03262819E-06 0.01718691E-09 0.08890031E+05 0.03657573E+03                   4
-C6H7              Kee489C   6H   7          G  0300.00   4000.00  1000.00      1
- 0.01755221E+03 0.12270795E-01-0.11857424E-05-0.06959661E-08 0.13013259E-12    2
- 0.16245813E+05-0.07166588E+03 0.04639166E+01 0.03975928E+00 0.02529095E-04    3
--0.02223792E-06 0.07557053E-10 0.02225169E+06 0.02235387E+03                   4
-C10H8            Gardib8C  10H   8          G  0300.00   5000.00  1000.00      1
- 0.19726501E+02 0.28167639E-01-0.96896429E-05 0.14654855E-08-0.80134955E-13    2
- 0.85581797E+04-0.86023239E+02-0.46547480E+01 0.74611127E-01-0.53069607E-05    3
--0.54125859E-07 0.29066527E-10 0.16325324E+05 0.45005463E+02                   4
-CH               Kee1286C   1H   1          G  0300.00   5000.00  1000.00      1
- 0.02196223E+02 0.02340381E-01-0.07058201E-05 0.09007582E-09-0.03855040E-13    2
- 0.07086723E+06 0.09178373E+02 0.03200202E+02 0.02072875E-01-0.05134431E-04    3
- 0.05733890E-07-0.01955533E-10 0.07045259E+06 0.03331587E+02                   4
-CH2CO            Kee1686C   2H   2O   1     G  0300.00   5000.00  1000.00      1
- 0.06038817E+02 0.05804840E-01-0.01920953E-04 0.02794484E-08-0.14588676E-13    2
--0.08583402E+05-0.07657581E+02 0.02974970E+02 0.12118712E-01-0.02345045E-04    3
--0.06466685E-07 0.03905649E-10-0.07632636E+05 0.08673553E+02                   4
-CH2O             Kee1286C   1H   2O   1     G  0300.00   5000.00  1000.00      1
- 0.02995606E+02 0.06681321E-01-0.02628954E-04 0.04737153E-08-0.03212517E-12    2
--0.15320369E+05 0.06912572E+02 0.16527311E+01 0.12631439E-01-0.01888168E-03    3
- 0.02050031E-06-0.08413237E-10-0.14865404E+05 0.13784820E+02                   4
-CH2OH            Kee0186H   3C   1O   1     G  0250.00   4000.00  1000.00      1
- 0.06327520E+02 0.03608270E-01-0.03201547E-05-0.01938750E-08 0.03509704E-12    2
--0.04474509E+05-0.08329365E+02 0.02862628E+02 0.10015273E-01-0.05285435E-05    3
--0.05138539E-07 0.02246041E-10-0.03349678E+05 0.10397938E+02                   4
-CH3              Kee1286C   1H   3          G  0300.00   5000.00  1000.00      1
- 0.02844051E+02 0.06137974E-01-0.02230345E-04 0.03785161E-08-0.02452159E-12    2
- 0.16437809E+05 0.05452697E+02 0.02430442E+02 0.11124099E-01-0.01680220E-03    3
- 0.16218288E-07-0.05864952E-10 0.16423781E+05 0.06789794E+02                   4
-CH3O             Kee1686C   1H   3O   1     G  0300.00   3000.00  1000.00      1
- 0.03770799E+02 0.07871497E-01-0.02656384E-04 0.03944431E-08-0.02112616E-12    2
- 0.12783252E+03 0.02929575E+02 0.02106204E+02 0.07216595E-01 0.05338472E-04    3
--0.07377636E-07 0.02075610E-10 0.09786011E+04 0.13152177E+02                   4
-CH3OH            Kee1686C   1H   4O   1     G  0300.00   5000.00  1000.00      1
- 0.04029061E+02 0.09376593E-01-0.03050254E-04 0.04358793E-08-0.02224723E-12    2
--0.02615791E+06 0.02378195E+02 0.02660115E+02 0.07341508E-01 0.07170050E-04    3
--0.08793194E-07 0.02390570E-10-0.02535348E+06 0.11232631E+02                   4
-CO               Kee1286C   1O   1          G  0300.00   5000.00  1000.00      1
- 0.03025078E+02 0.14426885E-02-0.05630827E-05 0.10185813E-09-0.06910951E-13    2
--0.14268350E+05 0.06108217E+02 0.03262451E+02 0.15119409E-02-0.03881755E-04    3
- 0.05581944E-07-0.02474951E-10-0.14310539E+05 0.04848897E+02                   4
-CO2              Kee1286C   1O   2          G  0300.00   5000.00  1000.00      1
- 0.04453623E+02 0.03140168E-01-0.12784105E-05 0.02393996E-08-0.16690333E-13    2
--0.04896696E+06-0.09553959E+01 0.02275724E+02 0.09922072E-01-0.10409113E-04    3
- 0.06866686E-07-0.02117280E-10-0.04837314E+06 0.10188488E+02                   4
-H                Kee0186H   1               G  0300.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.02547162E+06-0.04601176E+01 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.02547162E+06-0.04601176E+01                   4
-H2               Kee1286H   2               G  0300.00   5000.00  1000.00      1
- 0.02991423E+02 0.07000644E-02-0.05633828E-06-0.09231578E-10 0.15827519E-14    2
--0.08350340E+04-0.13551101E+01 0.03298124E+02 0.08249441E-02-0.08143015E-05    3
--0.09475434E-09 0.04134872E-11-0.10125209E+04-0.03294094E+02                   4
-H2C4O            Kee0189H   2C   4O   1     G  0300.00   4000.00  1000.00      1
- 0.10268878E+02 0.04896164E-01-0.04885080E-05-0.02708566E-08 0.05107013E-12    2
- 0.02346902E+06-0.02815985E+03 0.04810971E+02 0.13139988E-01 0.09865073E-05    3
--0.06120720E-07 0.16400028E-11 0.02545803E+06 0.02113424E+02                   4
-H2CCCCH          Kee2489C   4H   3          G  0300.00   4000.00  1000.00      1
- 0.11314095E+02 0.05014414E-01-0.05350444E-05-0.02825309E-08 0.05403279E-12    2
- 0.05181211E+06-0.03062434E+03 0.06545799E+02 0.12424768E-01 0.05603226E-05    3
--0.05631141E-07 0.16652183E-11 0.05352502E+06-0.04264082E+02                   4
-H2CCCCH2         Kee2489C   4H   4          G  0300.00   4000.00  1000.00      1
- 0.10620828E+02 0.07199370E-01-0.06806234E-05-0.04021185E-08 0.07378498E-12    2
- 0.03358797E+06-0.03193583E+03 0.03849007E+02 0.01713169E+00 0.16442703E-05    3
--0.07761590E-07 0.01947859E-10 0.03608372E+06 0.05732120E+02                   4
-H2CCCH           Kee2489C   3H   3          G  0300.00   4000.00  1000.00      1
- 0.08831047E+02 0.04357194E-01-0.04109066E-05-0.02368723E-08 0.04376520E-12    2
- 0.03847419E+06-0.02177919E+03 0.04754199E+02 0.11080277E-01 0.02793323E-05    3
--0.05479212E-07 0.01949629E-10 0.03988883E+06 0.05854549E+01                   4
-H2O              Kee0387H   2O   1          G  0300.00   5000.00  1000.00      1
- 0.02672145E+02 0.03056293E-01-0.08730260E-05 0.12009964E-09-0.06391618E-13    2
--0.02989921E+06 0.06862817E+02 0.03386842E+02 0.03474982E-01-0.06354696E-04    3
- 0.06968581E-07-0.02506588E-10-0.03020811E+06 0.02590232E+02                   4
-H2O2             Kee0186H   2O   2          G  0300.00   5000.00  1000.00      1
- 0.04573167E+02 0.04336136E-01-0.14746888E-05 0.02348903E-08-0.14316536E-13    2
--0.01800696E+06 0.05011369E+01 0.03388753E+02 0.06569226E-01-0.14850125E-06    3
--0.04625805E-07 0.02471514E-10-0.01766314E+06 0.06785363E+02                   4
-HCCHCCH          Kee2489C   4H   3          G  0300.00   4000.00  1000.00      1
- 0.10752738E+02 0.05381153E-01-0.05549637E-05-0.03052266E-08 0.05761740E-12    2
- 0.06121419E+06-0.02973025E+03 0.04153881E+02 0.01726287E+00-0.02389374E-05    3
--0.10187000E-07 0.04340504E-10 0.06338070E+06 0.06036506E+02                   4
-HCCO             Kee2387H   1C   2O   1     G  0300.00   4000.00  1000.00      1
- 0.06758073E+02 0.02000400E-01-0.02027607E-05-0.10411318E-09 0.01965164E-12    2
- 0.01901513E+06-0.09071262E+02 0.05047965E+02 0.04453478E-01 0.02268282E-05    3
--0.14820945E-08 0.02250741E-11 0.01965891E+06 0.04818439E+01                   4
-HCCOH            Kee2387H   2C   2O   1     G  0300.00   4000.00  1000.00      1
- 0.07328324E+02 0.03336416E-01-0.03024705E-05-0.01781106E-08 0.03245168E-12    2
- 0.07598258E+05-0.14012140E+02 0.03899465E+02 0.09701075E-01-0.03119309E-05    3
--0.05537732E-07 0.02465732E-10 0.08701190E+05 0.04491874E+02                   4
-HCO              Kee1286H   1C   1O   1     G  0300.00   5000.00  1000.00      1
- 0.03557271E+02 0.03345572E-01-0.13350060E-05 0.02470572E-08-0.01713850E-12    2
- 0.03916324E+05 0.05552299E+02 0.02898329E+02 0.06199146E-01-0.09623084E-04    3
- 0.10898249E-07-0.04574885E-10 0.04159922E+05 0.08983614E+02                   4
-HO2              Kee0387H   1O   2          G  0300.00   5000.00  1000.00      1
- 0.04072191E+02 0.02131296E-01-0.05308145E-05 0.06112269E-09-0.02841164E-13    2
--0.15797270E+03 0.03476029E+02 0.02979963E+02 0.04996697E-01-0.03790997E-04    3
- 0.02354192E-07-0.08089024E-11 0.01762273E+04 0.09222724E+02                   4
-O                Kee0186O   1               G  0300.00   5000.00  1000.00      1
- 0.02542059E+02-0.02755061E-03-0.03102803E-07 0.04551067E-10-0.04368051E-14    2
- 0.02923080E+06 0.04920308E+02 0.02946428E+02-0.16381665E-02 0.02421031E-04    3
--0.16028431E-08 0.03890696E-11 0.02914764E+06 0.02963995E+02                   4
-O2               Kee1386O   2               G  0300.00   5000.00  1000.00      1
- 0.03697578E+02 0.06135197E-02-0.12588420E-06 0.01775281E-09-0.11364354E-14    2
--0.12339301E+04 0.03189165E+02 0.03212936E+02 0.11274864E-02-0.05756150E-05    3
- 0.13138773E-08-0.08768554E-11-0.10052490E+04 0.06034737E+02                   4
-OH               Kee1286O   1H   1          G  0300.00   5000.00  1000.00      1
- 0.02882730E+02 0.10139743E-02-0.02276877E-05 0.02174683E-09-0.05126305E-14    2
- 0.03886888E+05 0.05595712E+02 0.03637266E+02 0.01850910E-02-0.16761646E-05    3
- 0.02387202E-07-0.08431442E-11 0.03606781E+05 0.13588605E+01                   4
-CH2CHCCH2        Kee    C   4H   5          G   300.000  5000.000 1413.000     1
- 1.11854536E+01 1.06049024E-02-3.42268950E-06 5.10812979E-10-2.88272523E-14    2
- 3.24441710E+04-3.39237401E+01 1.05514961E+00 3.77996411E-02-3.15008221E-05    3
- 1.36464976E-08-2.36025391E-12 3.55501864E+04 1.91307649E+01                   4
-CH2CHCHCH        Kee    C   4H   5          G    300.000  5000.000 1413.000    1
- 1.11854536E+01 1.06049024E-02-3.42268950E-06 5.10812979E-10-2.88272523E-14    2
- 3.86847347E+04-3.39237401E+01 1.05514961E+00 3.77996411E-02-3.15008221E-05    3
- 1.36464976E-08-2.36025391E-12 4.17907501E+04 1.91307649E+01                   4
-C6H4OH            MOPAC C   6H   5O   1    0G   300.000  5000.000 1404.000     1
- 1.45068436E+01 1.59404980E-02-5.37246333E-06 8.26250158E-10-4.76347968E-14    2
- 9.52783213E+03-5.58395061E+01-3.09604127E+00 6.10439698E-02-4.99110690E-05    3
- 2.08646723E-08-3.49237193E-12 1.51688735E+04 3.71626206E+01                   4
-C8H8              EBG   C   8H   8    0    0G   300.000  5000.000 1397.000     1
- 1.97218275E+01 2.13671373E-02-7.18301846E-06 1.10346973E-09-6.35885595E-14    2
- 8.09327433E+03-8.32435075E+01-5.59026555E+00 8.59858562E-02-7.07697538E-05    3
- 2.96387500E-08-4.96343461E-12 1.62297563E+04 5.05773921E+01                   4
-C8H10             EBG   C   8H  10O   0    0G   300.000  5000.000 1390.000     1
- 2.14713086E+01 2.49558342E-02-8.42478694E-06 1.29835947E-09-7.49993230E-14    2
--7.46898472E+03-9.36428065E+01-6.24730659E+00 8.99995431E-02-6.56895331E-05    3
- 2.37336850E-08-3.37085410E-12 1.97071484E+03 5.48599202E+01                   4
-C7H7              T08/90C   7H   7    0    0G   200.000  6000.000              1
- 0.14043980E+02 0.23493873E-01-0.85375367E-05 0.13890841E-08-0.83614420E-13    2
- 0.18564203E+05-0.51665589E+02 0.48111540E+00 0.38512832E-01 0.32861492E-04    3
--0.76972721E-07 0.35423068E-10 0.23307027E+05 0.23548820E+02                   4
-C7H7O             EBG   C   7H   7O   1    0G   300.000  5000.000 1389.000     1
- 2.08644385E+01 1.85115130E-02-6.34591221E-06 9.88320326E-10-5.75152427E-14    2
--8.39231428E+03-9.15798540E+01-3.73786936E+00 7.52967730E-02-5.47150593E-05    3
- 1.89060939E-08-2.46715849E-12 2.67233477E+01 4.04727046E+01                   4
-C7H7OH            EBG   C   7H   8O   1    0G   300.000  5000.000 1398.000     1
- 2.05745245E+01 2.05513700E-02-6.88594427E-06 1.05580886E-09-6.07715527E-14    2
--2.54145704E+04-8.69178692E+01-4.48479735E+00 8.32792049E-02-6.68674735E-05    3
- 2.70252364E-08-4.34410399E-12-1.72753716E+04 4.59408329E+01                   4
-C10H7             mopac C  10H   7O   0    0G   300.000  5000.000 1431.000     1
- 1.77174588E+01 2.67239869E-02-8.72730540E-06 1.31405429E-09-7.46517931E-14    2
- 3.78635946E+04-7.55942936E+01-4.97706841E+00 7.81519562E-02-5.09523896E-05    3
- 1.59157709E-08-1.79646453E-12 4.56870324E+04 4.64894159E+01                   4
-N2                Kee286N   2               G  0300.00   5000.00  1000.00      1
- 0.02926640E+02 0.14879768E-02-0.05684760E-05 0.10097038E-09-0.06753351E-13    2
--0.09227977E+04 0.05980528E+02 0.03298677E+02 0.14082404E-02-0.03963222E-04    3
- 0.05641515E-07-0.02444854E-10-0.10208999E+04 0.03950372E+02                   4
-C2H3               Kee87C   2H   3          G  0300.00   5000.00  1000.00      1
- 0.05933468E+02 0.04017745E-01-0.03966739E-05-0.14412666E-09 0.02378643E-12    2
- 0.03185434E+06-0.08530313E+02 0.02459276E+02 0.07371476E-01 0.02109872E-04    3
--0.13216421E-08-0.11847838E-11 0.03335225E+06 0.11556202E+02                   4
-C8H6              A 6/83C   8H   6    0    0G   300.     3000.    1000.000     1
- 0.15638086E+02 0.22068432E-01-0.80253111E-05 0.13065013E-08-0.78679279E-13    2
- 0.32272867E+05-0.59610868E+02-0.87234720E+00 0.51839614E-01 0.66079738E-05    3
--0.55950961E-07 0.29284749E-10 0.37461628E+05 0.29096304E+02                   4
-C12H9  BIPHENYL O-L12/84C 12.H  9.   0.   0.G   300.000  5000.00  1000.000     1
- 0.23851303E 02 0.31960227E-01-0.11076719E-04 0.16847825E-08-0.92641173E-13    2
- 0.40171297E 05-0.10270549E 03-0.31376228E 01 0.82217276E-01-0.40171444E-05    3
--0.60809782E-07 0.32074482E-10 0.48868754E 05 0.42730362E 02                   4
-END
-REACTIONS
- C6H5+C6H5=C12H10                              7.01E+15   -1.0     1470.0 ! 1
- C6H5+C6H6=C12H10+H                            1.00E+12     .0     7000.0 ! 2
- H2CCCH+C7H7=C10H8+2H                          6.03E+11     .0         .0 ! 3
- 2C5H5=C10H8+H2                                4.30E+36   -6.3    45671.0 ! 4
- HCCHCCH+C6H5=C10H8                            3.18E+23   -3.2     4220.0 ! 5
- HCCHCCH+C6H5=C10H7+H                          2.00E-10    7.1     1560.0 ! 6
- C10H8+OH=C10H7+H2O                            2.10E+13     .0     4600.0 ! 7
- C10H7+H=C10H8                                 6.65E+15    -.1      560.0 ! 8
- C10H8+C2H3=C10H7+C2H4                         5.00E+13     .0    16000.0 ! 9
- C10H8+C2H=C10H7+C2H2                          5.00E+13     .0    16000.0 ! 10
- C10H8+H=C10H7+H2                              2.50E+14     .0    16000.0 ! 11
- C8H10+OH=C8H8+H2O+H                           8.34E+12     .0     2583.0 ! 12
- C8H10+H=C8H8+H2+H                             8.00E+13     .0     8235.0 ! 13
- C8H10+O2=C8H8+HO2+H                           2.00E+14     .0    41400.0 ! 14
- C7H7+CH3=C8H10                                3.14E+18   -1.8     2340.0 ! 15
- C7H7+CH3=C8H8+H2                              2.02E-11    7.2     8170.0 ! 16
- C8H10=C8H8+H2                                 5.01E+12     .0    64000.0 ! 17
- C8H10+H=C6H6+C2H5                             1.20E+13     .0     5100.0 ! 18
- C6H5+C2H3=C8H8                                1.06E+26   -4.0     5250.0 ! 19
- C6H5+C4H4=C8H8+C2H                            3.20E+11     .0     1900.0 ! 20
- C6H5+C4H6=C8H8+C2H3                           3.20E+11     .0     1900.0 ! 21
- C4H4+C4H4=C8H8                                1.83E+20   -1.9    40460.0 ! 22
- CH2CHCHCH+C4H4=C8H8+H                         3.16E+11     .0      600.0 ! 23
- C8H8+H=C8H6+H2+H                              6.92E+14     .0    14500.0 ! 24
- C6H6+C2H=C8H6+H                               1.00E+12     .0         .0 ! 25
- C6H5+C2H=C8H6                                 5.24E+14    -.5      700.0 ! 26
- C6H5+C4H2=C8H6+C2H                            2.00E+13     .0         .0 ! 27
- C6H5+C4H4=C8H6+C2H3                           3.20E+11     .0     1350.0 ! 28
- CH2CHCHCH+C4H2=C8H6+H                         3.16E+11     .0     1800.0 ! 29
-!
- C7H7+H=C6H5CH3                                9.01E+17   -1.1     1300.0 ! 30
- C6H5+CH3=C6H5CH3                              9.78E+18   -1.9     1650.0 ! 31
- C6H5CH3+O2=C7H7+HO2                           3.00E+14     .0    41400.0 ! 32
- C6H5CH3+OH=C7H7+H2O                           1.26E+13     .0     2583.0 ! 33
- C6H5CH3+H=C7H7+H2                             1.20E+14     .0     8235.0 ! 34
- C6H5CH3+H=C6H6+CH3                            1.20E+13     .0     5148.0 ! 35
- C6H5CH3+CH3=C7H7+CH4                          3.16E+11     .0     9500.0 ! 36
- C6H5CH3+C6H5=C7H7+C6H6                        2.10E+12     .0     4400.0 ! 37
- C6H5CH3+C2H3=C7H7+C2H4                        3.98E+12     .0     8000.0 ! 38
- C6H5CH3+O=C7H7O+H                             1.63E+13    0.0     3418.0 ! 39
- CH2CHCHCH+C3H4=C6H5CH3+H                      2.00E+11     .0     3700.0 ! 40
- CH2CHCHCH+C3H4P=C6H5CH3+H                     3.16E+11     .0     3700.0 ! 41
- C7H8O+H=C6H5CH3+OH                            2.21E+13     .0     7910.0 ! 42
- C7H8O+H=C6H5OH+CH3                            1.20E+13     .0     5148.0 ! 43
- C6H5O+CH3=C7H8O                               1.00E+12     .0         .0 ! 44
- C7H7+C6H5OH=C6H5CH3+C6H5O                     1.05E+11     .0     9500.0 ! 45
- C7H8O+C7H7=C7H7O+C6H5CH3                      1.05E+11    0.0     9500.0 ! 46
- C7H8O+OH=C7H7O+H2O                            6.00E+12    0.0        0.0 ! 47
- C7H8O+H=C7H7O+H2                              1.50E+14    0.0    12400.0 ! 48
- C7H7O+H=C7H8O                                 2.50E+14    0.0        0.0 ! 49
- C7H7O=C6H6+H+CO                               2.51E+11    0.0    43900.0 ! 50
- C6H5+CH3=C7H7+H                               5.70E-02    5.0    15700.0
- C7H7+OH=C6H5O+CH3                             2.28E+49  -10.9    14130.0
- C5H5+C2H2=C7H7                                1.16E+15   -1.1     9710.0
- C4H4+H2CCCH=C7H7                              1.10E+16   -2.4    12470.0
- C7H7+HO2=C6H5+CH2O+OH                         8.00E+13     .0         .0
- C7H7+O=C6H5CHO+H                              2.50E+14    0.0        0.0
- C7H7+O=C6H5+CH2O                              8.00E+13    0.0        0.0
- C7H7+HO2=C6H5CHO+H+OH                         2.50E+14    0.0        0.0
- C7H7+OH=C7H7OH                                6.00E+13    0.0        0.0
- C7H7OH+O2=C6H5CHO+H+HO2                       2.00E+14    0.0    41400.0
- C7H7OH+OH=C6H5CHO+H+H2O                       8.43E+12    0.0     2583.0
- C7H7OH+H=C6H5CHO+H+H2                         8.00E+13    0.0        0.0
- C7H7OH+H=C6H6+CH2OH                           1.20E+13    0.0     6148.0
- C7H7OH+C7H7=C6H5CHO+C6H5CH3+H                 2.11E+11    0.0     9500.0
- C7H7OH+C6H5=C6H5CHO+C6H6+H                    1.40E+12    0.0     4400.0
-   C6H5CHO+O2=C6H5CO+HO2       1.02E+13    0.0    38950.0 
-   C6H5CHO+OH=C6H5CO+H2O       1.71E+09    1.18    -447.0 
-   C6H5CHO+H=C6H5CO+H2         5.00E+13    0.0     4928.0 
-   C6H5CHO+H=C6H5+CH2O         2.00E+13    0.0     2000.0
-   C6H5CHO+H=C6H6+HCO          1.20E+13    0.0     5148.0
-   C6H5CHO+O=C6H5CO+OH         9.04E+12    0.0     3080.0
-   C6H5CHO+CH3=CH4+C6H5CO      2.77E+03    2.81    5773.0
-   C6H5CHO+C6H5=C6H6+C6H5CO    7.01E+11    0.0     4400.0
-   C6H5CO=C6H5+CO              3.98E+14    0.0    29400.0 
- C4H4+C2H2=C6H6                                4.47E+11     .0    30090.0
- C6H5+H=C6H6                                   2.20E+14     .0         .0
- C6H6+H=C6H5+H2                                2.50E+14     .0    16000.0
- C6H5O+H=C6H6+O                                3.02E+54  -11.2    64750.0
- C6H6+OH=C6H5+H2O                              1.45E+13     .0     4491.0
- C6H6+O2=C6H5+HO2                              6.30E+13     .0    60000.0
- C6H5+CH2O=C6H6+HCO                            1.75E+10     .0         .0
- C3H4+C3H2=C6H6                                7.38E+13    -.7      920.0
- C3H4P+C3H2=C6H6                               1.42E+14    -.8     1030.0
- C3H4+H2CCCH=C6H6+H                            2.20E+11     .0     2000.0
- C6H6+OH=C6H5OH+H                              3.54E+09    1.0     7906.0
- C5H6+CO=C6H5OH                                9.00E+09     .0    34600.0
- C6H5OH+H=C6H5O+H2                             1.15E+14     .0    12400.0
- C6H5OH+O=C6H5O+OH                             2.81E+13     .0     7352.0
- C6H5OH+OH=C6H5O+H2O                           2.95E+06    2.0     1312.0
- C6H5OH+OH=C6H4OH+H2O                          6.00E+12     .0         .0
- C6H5OH+HO2=C6H5O+H2O2                         3.00E+13     .0    15000.0
- C6H5OH+C2H3=C2H4+C6H5O                        6.00E+12     .0         .0
- C6H5OH+CH2CHCHCH=C4H6+C6H5O                   6.00E+12     .0         .0
- C6H5OH+CH2CHCCH2=C4H6+C6H5O                   6.00E+12     .0         .0
- C6H5OH+C6H5=C6H6+C6H5O                        4.91E+12     .0     4400.0
- C6H5O+H=C6H5OH                                7.24E+47   -9.7    20190.0
- C6H5O+C5H6=C5H5+C6H5OH                        3.16E+11     .0     8000.0
- C5H5+CO=C6H5O                                 2.41E+14   -1.9    22080.0
- C6H5O+H=C5H6+CO                               1.06E+53  -10.7    41360.0
- C6H5+O2=C6H5O+O                               2.09E+12     .0     7470.0
- C6H5+OH=C6H5O+H                               5.00E+13     .0         .0
- C6H5+O2=2CO+C2H2+C2H3                         7.50E+13     .0    15002.0
- C2H2+HCCHCCH=C6H5                             2.80E+03    2.9     1400.0
- C6H5=C6H5(L)                                  4.09E+21   -2.4    75346.0
- C6H5(L)+H=C6H4+H2                             2.00E+13     .0         .0
- HCCHCCH+C2H2=C6H5(L)                          8.32E+13   -1.3     4880.0
- C6H4+H=C6H5(L)                                3.31E+66  -15.4    20490.0
- C4H4+C2H2=C6H5+H                              1.00E+09     .0    29999.0
- C6H4+H=C6H3+H2                                1.50E+14     .0    10205.3
- C6H3+H=C6H4                                   6.04E+32   -6.0     7650.0
- C6H4+OH=C6H3+H2O                              7.00E+13     .0     3011.4
- C6H4+C2H=C6H3+C2H2                            2.00E+13     .0         .0
- C2H2+HCCHCCH=C6H4+H                           4.10E+10     .6    13550.0
- C5H5+CO=C6H4OH                                1.38E+11   -1.0    51190.0
- C6H3+H=C6H2+H2                                2.00E+13     .0         .0
- C4H2+C2H=C6H3                                 2.70E+31   -6.0     7450.0
- C6H2+H=C6H3                                   1.30E+22   -2.9     6130.0
- C6H2+M=C6H+H+M                                5.00E+16     .0    80065.0
- C6H2+OH=C6H+H2O                               1.10E+13     .0     7002.7
- C6H2+C2H=C6H+C2H2                             2.00E+13     .0         .0
- C4H2+C2H=C6H2+H                               4.00E+13     .0         .0
- 2C3H2=C6H2+H2                                 2.00E+13     .0    85000.0
- C6H2+C2H=C4H+C4H2                             1.00E+13     .0         .0
- C5H6+HO2=C5H5+H2O2                            1.99E+12     .0    11660.0
- C5H6+O2=C5H5+HO2                              2.00E+13     .0    25000.0
-!
- C5H6+O2=C5H5O+OH                              1.00E+13     .0    20712.0
- C5H6+O=C5H5+OH                                1.81E+13     .0     3080.0
- C5H6+C2H3=C5H5+C2H4                           6.00E+12     .0         .0
- C5H6+CH2CHCHCH=C5H5+C4H6                      6.00E+12     .0         .0
- C5H6+CH2CHCCH2=C5H5+C4H6                      6.00E+12     .0         .0
- C5H6+H=C3H5+C2H2                              1.00E+13     .0    12000.0
- C3H5+C5H5=C5H6+C3H4                           1.00E+12     .0         .0
- C5H5+H=C5H6                                   7.35E+32   -5.8     7470.0
- CH2CHCHCH+CO=C5H5O                            4.58E+01    1.4    31820.0
- C5H5+OH=C5H4OH+H                              3.00E+13     .0         .0
- C5H5+O=CH2CHCHCH+CO                           1.00E+14     .0         .0
- C5H5+HO2=C5H5O+OH                             3.00E+13     .0         .0
- H2CCCH+C2H2=C5H5                              5.08E+53  -12.5    57210.0
- C5H5+O=C5H5O                                  1.71E+24   -3.4     4500.0
- C5H4O+H=C5H4OH                                5.36E+31   -5.4    12420.0
- C5H4O=CO+C2H2+C2H2                            1.00E+15     .0    78000.0
- C4H2+CH2(3)=C5H3+H                            1.30E+13     .0         .0
- C4H2+CH2=C5H3+H                               3.00E+13     .0         .0
- C4H2+CH=C5H2+H                                1.00E+14     .0         .0
- C4H6+H2CCCH=CH2CHCCH2+C3H4                    1.00E+13     .0    22501.0
- C4H6+O=C2H4+CH2CO                             1.00E+12     .0         .0
- C4H6+O=C3H4+CH2O                              1.00E+12     .0         .0
- C4H6+OH=C3H5+CH2O                             1.00E+12     .0         .0
- C4H6+OH=C2H5+CH2CO                            1.00E+12     .0         .0
- C4H6+H=CH2CHCHCH+H2                           3.00E+07    2.0     6000.0
- CH2CHCCH2+M=C4H4+H+M                          2.00E+15     .0    42000.0
- CH2CHCHCH+M=C4H4+H+M                          1.00E+14     .0    30000.0
- CH2CHCCH2+O2=C4H4+HO2                         1.20E+11     .0         .0
- CH2CHCHCH+O2=C4H4+HO2                         1.20E+11     .0         .0
- CH2CHCHCH+H=CH2CHCCH2+H                       1.00E+14     .0         .0
- CH2CHCHCH+OH=C4H4+H2O                         2.00E+07    2.0     1000.0
- CH2CHCHCH+H=C4H4+H2                           3.00E+07    2.0     1000.0
- CH2CHCHCH+C2H2=C6H6+H                         2.80E+03    2.9     1400.0
- CH2CHCHCH+C2H3=C6H6+H2                        2.80E-07    5.6    -1890.0
- 2C2H3=CH2CHCCH2+H                             4.00E+13     .0         .0
- CH2CHCCH2+OH=C4H4+H2O                         2.00E+07    2.0     1000.0
- CH2CHCCH2+H=C4H4+H2                           3.00E+07    2.0     1000.0
- HCCHCCH+H+M=C4H4+M                            1.00E+15     .0         .0
- H2CCCCH+H+M=C4H4+M                            1.00E+15     .0         .0
- H+H2CCCCH=C4H4                                3.48E+25   -4.1    14150.0
- C4H4+OH=H2CCCCH+H2O                           7.50E+06    2.0     5000.0
- C4H4+C2H=H2CCCCH+C2H2                         4.00E+13     .0         .0
- C4H4+C2H=HCCHCCH+C2H2                         4.00E+13     .0         .0
- C4H4+H=H2CCCCH+H2                             3.00E+07    2.0     5000.0
- C4H4+H=HCCHCCH+H2                             2.00E+07    2.0    15000.0
- H2CCCH+CH2(3)=C4H4+H                          4.00E+13     .0         .0
- C4H4+C2H3=C2H4+H2CCCCH                        5.00E+11     .0    16300.0
- C4H4+C2H3=C2H4+HCCHCCH                        5.00E+11     .0    16300.0
-!
- C4H4+C2H=C4H2+C2H3                            1.00E+13     .0         .0
- C2H3+C2H=C4H4                                 9.22E+27   -4.3     5510.0
- C2H4+C2H=C4H4+H                               1.21E+13     .0         .0
- HCCHCCH+H=H2CCCCH+H                           1.00E+14     .0         .0
- H2CCCCH+M=C4H2+H+M                            2.00E+15     .0    48000.0
- HCCHCCH+M=C4H2+H+M                            1.00E+14     .0    30000.0
- H2CCCCH+O=CH2CO+C2H                           2.00E+13     .0         .0
- H2CCCCH+O=H2C4O+H                             2.00E+13     .0         .0
- H2CCCCH+O2=CH2CO+HCCO                         1.00E+12     .0         .0
- H2CCCCH+OH=C4H2+H2O                           3.00E+13     .0         .0
- H2CCCCH+H=C4H2+H2                             5.00E+13     .0         .0
- H2CCCCH+H2=C2H2+C2H3                          5.01E+10     .0    20000.0
- H2CCCCH+CH2(3)=C3H4+C2H                       2.00E+13     .0         .0
- C2H2+C2H=HCCHCCH                              4.17E+36   -7.3     8780.0
- H2CCCH+CH=H2CCCCH+H                           7.00E+13     .0         .0
- H2CCCH+CH=HCCHCCH+H                           7.00E+13     .0         .0
- C2H2+C2H2=HCCHCCH+H                           1.00E+13     .0    45888.0
- C3H2+CH2(3)=H2CCCCH+H                         3.00E+13     .0         .0
- C4H2+O=C3H2+CO                                1.20E+12     .0         .0
- 2C3H2=C4H2+C2H2                               2.00E+13     .0    85000.0
- C2H2+C2H=C4H2+H                               3.00E+13     .0         .0
- C4H2+M=C4H+H+M                                3.50E+17     .0    80065.0
- C4H2+C2H=C4H+C2H2                             2.00E+13     .0         .0
- C3H6+HO2=C3H5+H2O2                            9.64E+03    2.6    13910.0
- C3H6+CH3=C3H5+CH4                             2.21E+00    3.5     5675.0
- C3H6+O=C3H5+OH                                6.03E+10     .7     7633.0
- C3H6+O=C2H5+HCO                               1.21E+11     .1     8960.0
- C3H6+O2=C3H5+HO2                              6.03E+13     .0    47593.0
- C3H6+CH2OH=C3H5+CH3OH                         6.03E+01    3.0    11989.0
- C3H6+CH3O=C3H5+CH3OH                          9.00E+01    3.0    11987.0
- C3H6+C2H=C3H4P+C2H3                           1.21E+13     .0         .0
- C3H6+CH2=C3H5+CH3                             7.23E+11     .0     6192.0
- C3H6+HCO=C3H5+CH2O                            1.08E+07    1.9    17006.0
- C3H6+C2H5=C3H5+C2H6                           2.23E+00    3.5     6637.0
- C3H6+C2H3=C3H5+C2H4                           2.21E+00    3.5     4682.0
- C3H5+HCO=C3H6+CO                              6.03E+13     .0         .0
- C3H5+CH2OH=C3H6+CH2O                          1.81E+13     .0         .0
- C3H5+CH3O=C3H6+CH2O                           3.01E+13     .0         .0
- C3H5+C2H3=C3H6+C2H2                           4.82E+12     .0         .0
- C3H5+C2H5=C3H6+C2H4                           2.59E+12     .0     -131.0
- 2C3H5=C3H4+C3H6                               8.43E+10     .0     -262.0
- CH2+C2H5=C3H6+H                               9.03E+12     .0         .0
- CH2+C2H4=C3H6                                 9.03E+13     .0         .0
- C3H4+H=C3H5                                   1.20E+11     .7     3007.0
- C3H5+OH=C3H4+H2O                              6.03E+12     .0         .0
- CH3+C2H2=C3H5                                 2.43E+46  -10.9    19974.0
- C3H5+CH2=C4H6+H                               3.01E+13     .0         .0
- C2H+C3H5=C2H2+C3H4                            1.50E-01     .0         .0
- C2H+C3H5=C2H3+H2CCCH                          2.00E+01     .0         .0
- C3H5+C2H3=C3H4+C2H4                           2.41E+12     .0         .0
-!
- C3H5+C2H5=C3H4+C2H6                           9.64E+11     .0     -131.0
- C2H3+CH2OH=C3H5+OH                            1.21E+13     .0         .0
- C2H4+CH2(3)+M=C3H5+H+M                        3.19E+12     .0     5285.4
- C3H4=C3H4P                                    1.90E+29   -5.0    67303.0
- C3H4+C3H2=3C2H2                               1.70E+13     .0    15000.0
- C3H4P+C3H2=3C2H2                              1.70E+13     .0    15000.0
- C3H4+O=CO+C2H4                                1.50E+13     .0     2103.0
- C3H4+OH=HCO+C2H4                              1.00E+12     .0         .0
- C3H4+M=H2CCCH+H+M                             1.00E+17     .0    70000.0
- C3H4P+M=H2CCCH+H+M                            1.00E+17     .0    70000.0
- C3H4+CH3=H2CCCH+CH4                           2.00E+12     .0     7700.0
- C3H4P+CH3=H2CCCH+CH4                          2.00E+12     .0     7700.0
- C3H4+H=C2H2+CH3                               2.00E+13     .0     2400.0
- C2H+CH3=C3H4P                                 5.53E+38   -8.2    35420.0
- CH2(3)+C2H2+M=C3H4+M                          1.20E+13     .0     6600.0
- C2H2+CH2+M=C3H4P+M                            2.23E+14     .0         .0
- C2H3+CH2(3)=C3H4+H                            3.00E+13     .0         .0
- C2H2+CH2+M=C3H4+M                             2.23E+14     .0         .0
- C3H4P+C2H=C2H2+H2CCCH                         1.00E+13     .0         .0
- C3H4+C2H=C2H2+H2CCCH                          1.00E+13     .0         .0
- C3H4+O=CH2O+C2H2                              9.00E+12     .0     1870.0
- C3H4+O=HCO+C2H3                               9.00E+12     .0     1870.0
- C3H4P+O=CH2O+C2H2                             7.50E+12     .0     2102.0
- C3H4P+O=HCO+C2H3                              7.50E+12     .0     2102.0
- C3H4+OH=CH2CO+CH3                             3.37E+12     .0     -304.0
- C3H4P+OH=CH2CO+CH3                            4.28E+11     .0     -843.0
- H2CCCH+O=C3H2+OH                              3.20E+12     .0         .0
- CH3+C2H=H2CCCH+H                              2.41E+13     .0         .0
- C2H+CH2OH=H2CCCH+OH                           1.21E+13     .0         .0
- C2H+C2H5=CH3+H2CCCH                           1.81E+13     .0         .0
- C2H2+HCCO=H2CCCH+CO                           1.10E+11     .0     3000.0
- H2CCCH+O2=CH2CO+HCO                           3.00E+10     .0     2868.0
- C3H2+O=C2H+HCO                                6.80E+13     .0         .0
- H2C4O+H=C2H2+HCCO                             5.00E+13     .0     3000.0
- H2C4O+OH=CH2CO+HCCO                           1.00E+07    2.0     2000.0
- C2H6+CH3=C2H5+CH4                             5.50E-01    4.0     8300.0
- C2H6+H=C2H5+H2                                5.40E+02    3.5     5210.0
- C2H6+O=C2H5+OH                                3.00E+07    2.0     5115.0
- C2H6+OH=C2H5+H2O                              8.70E+09    1.1     1810.0
- C2H6+O2=C2H5+HO2                              1.00E+13     .0    51000.0
- C2H6+HO2=C2H5+H2O2                            3.00E+11     .0    11500.0
- HCO+C2H5=C2H6+CO                              1.21E+14     .0         .0
- C2H4+C2H5=C2H3+C2H6                           6.32E+02    3.1    18010.0
- 2CH3+M=C2H6+M                                 3.18E+41   -7.0     2762.0
-         H2 /2.0/ CO/2.0/ CO2/3.0/ H2O /5.0/
- CH2+C2H6=CH3+C2H5                             1.20E+14     .0         .0
- C2H6+HCO=C2H5+CH2O                            4.70E+04    2.7    18233.0
- 2C2H5=C2H6+C2H4                               1.39E+12     .0         .0
- C2H3+C2H5=C2H6+C2H2                           4.82E+11     .0         .0
- C2H2+C2H5=C2H6+C2H                            2.71E+11     .0    23446.6
- C2H5+O=C2H4+OH                                5.00E+13     .0         .0
- C2H5+O=CH2O+CH3                               1.61E+13     .0         .0
- HO2+C2H5=C2H4+H2O2                            3.01E+11     .0         .0
- CH2(3)+CH3=C2H5                               2.53E+20   -3.5     2030.0
- CH3+C2H5=C2H4+CH4                             1.95E+13    -.5         .0
- CH3+CH2=C2H5                                  1.11E+19   -3.2     1780.0
- C2H+C2H5=C2H2+C2H4                            1.81E+12     .0         .0
- C2H5+H=C2H4+H2                                1.81E+12     .0         .0
- C2H5+H=CH3+CH3                                1.00E+14     .0         .0
- C2H5+O2=C2H4+HO2                              8.43E+11     .0     3875.0
- C2H4+H+M=C2H5+M                               6.37E+27   -2.8      -54.0
- 2C2H4=C2H5+C2H3                               4.82E+14     .0    71539.0
- C2H5+OH=C2H4+H2O                              2.41E+13     .0         .0
- C2H5+HO2=CH3+CH2O+OH                          2.40E+13     .0         .0
- CH2+C2H5=C2H4+CH3                             9.03E+12     .0         .0
- CH2(3)+C2H5=CH3+C2H4                          1.81E+13     .0         .0
- C2H4+M=C2H2+H2+M                              2.60E+17     .0    79297.0
- C2H4+M=C2H3+H+M                               1.40E+16     .0    82360.0
- C2H4+O=CH2O+CH2                               2.51E+13     .0     5000.0
- C2H4+H=C2H3+H2                                1.33E+06    2.5    12241.0
- 2CH2(3)=C2H4                                  1.11E+20   -3.4     2070.0
- CH2(3)+CH3=C2H4+H                             4.20E+13     .0         .0
- CH3O+C2H3=CH2O+C2H4                           2.41E+13     .0         .0
- CH2CO+CH2=C2H4+CO                             1.60E+14     .0         .0
- C2H3+H2O2=C2H4+HO2                            1.21E+10     .0     -596.0
- C2H3+CH2O=C2H4+HCO                            5.43E+03    2.8     5862.0
- C2H3+CH2OH=C2H4+CH2O                          3.01E+13     .0         .0
- CH3+CH2=C2H4+H                                4.94E+13    -.1       94.0
- CH+CH4=C2H4+H                                 6.00E+13     .0         .0
- C2H4+O=CH3+HCO                                1.60E+09    1.2      746.0
- C2H4+OH=C2H3+H2O                              2.02E+13     .0     5955.0
- C2H4+OH=CH3+CH2O                              1.05E+12     .0     -916.0
- C2H4+O2=C2H3+HO2                              4.22E+13     .0    57594.0
- C2H4+CH3=C2H3+CH4                             4.16E+12     .0    11127.2
- C2H4+O=OH+C2H3                                1.51E+07    1.9     3736.0
- C2H4+C2H2=2C2H3                               2.41E+13     .0    68360.0
- C2H3+HCO=C2H4+CO                              9.04E+13     .0         .0
- C2H2+H2=C2H3+H                                4.02E+15    -.6    65800.0
- C2H3+O=CH2CO+H                                3.00E+13     .0         .0
- C2H3+O=C2H2+OH                                3.00E+13     .0         .0
- C2H3+O=CO+CH3                                 3.00E+13     .0         .0
- CH+CH2(3)=C2H3                                3.09E+14   -2.0      620.0
- CH+CH3=C2H3+H                                 3.00E+13     .0         .0
- CH2+CH2=C2H3+H                                2.00E+13     .0         .0
- 2CH2(3)=C2H3+H                                7.12E+21   -3.9     2460.0
- CH2OH+C2H2=C2H3+CH2O                          7.30E+11     .0     9004.0
- C2H3+O=HCO+CH2                                3.00E+13     .0         .0
- C2H3+O2=CH2O+HCO                              4.00E+12     .0     -250.0
- C2H3+O2=C2H2+HO2                              7.51E+14   -1.0     2376.0
- C2H3+OH=C2H2+H2O                              2.00E+13     .0         .0
- C2H3+C2H=2C2H2                                3.00E+13     .0         .0
- C2H3+CH=CH2(3)+C2H2                           5.00E+13     .0         .0
- C2H3+CH3=C2H2+CH4                             3.92E+11     .0         .0
- C2H3+CH2=CH3+C2H2                             1.81E+13     .0         .0
- CH2(3)+C2H3=CH3+C2H2                          1.81E+13     .0         .0
- C2H2+M=C2H+H+M                                4.20E+16     .0   107000.0
- C2H2+O2=C2H+HO2                               1.20E+13     .0    74475.0
- C2H2+H=CH+CH2                                 1.02E+16     .0   125076.0
- C2H+H2=C2H2+H                                 4.09E+05    2.4      864.0
- C2H3+M=C2H2+H+M                               3.00E+15     .0    32006.0
-         H2 /2.5/ H2O /16.0/ CO /1.9/ CO2 /3.8/ CH4 /16.0/ CH3OH /5.0/
- C2H2+OH=C2H+H2O                               3.37E+07    2.0    14000.0
- C2H2+OH=HCCOH+H                               5.04E+05    2.3    13500.0
- C2H2+OH=CH2CO+H                               2.18E-04    4.5    -1000.0
- C2H2+OH=CH3+CO                                4.83E-04    4.0    -2000.0
- CH3OH+C2H=CH3O+C2H2                           1.21E+12     .0         .0
- CH3OH+C2H=CH2OH+C2H2                          6.03E+12     .0         .0
- C2H+CH4=C2H2+CH3                              1.81E+12     .0      497.0
- HCCO+CH=C2H2+CO                               5.00E+13     .0         .0
- HCCO+HCCO=C2H2+2CO                            1.00E+13     .0         .0
- HO2+C2H2=CH2CO+OH                             6.03E+09     .0     7949.0
- HCO+C2H=C2H2+CO                               6.03E+13     .0         .0
- C+CH3=C2H2+H                                  5.00E+13     .0         .0
- CH2+C2H2=CH2(3)+C2H2                          4.00E+13     .0         .0
- CH2+CH2=C2H2+H2                               3.01E+13     .0         .0
- CH3O+C2H=CH2O+C2H2                            2.41E+13     .0         .0
- 2CH2(3)=C2H2+2H                               4.97E+12     .2     -150.0
- 2CH2(3)=C2H2+H2                               4.02E+14    -.5      480.0
- CH+CH2(3)=C2H2+H                              2.50E+12   -3.7     4190.0
- C2H+CH2OH=C2H2+CH2O                           3.61E+13     .0         .0
- C2H+C2H=C2H2+C2                               1.81E+12     .0         .0
- C2H+CH2=CH+C2H2                               1.81E+13     .0         .0
- C2H2+O=C2H+OH                                 3.16E+15    -.6    15000.0
- C2H2+O=CH2(3)+CO                              1.40E+06    2.1     1562.0
- C2H2+O=HCCO+H                                 5.80E+06    2.1     1562.0
- CH2(3)+C2H=CH+C2H2                            1.81E+13     .0         .0
- CH2CO+M=CH2(3)+CO+M                           3.60E+15     .0    59235.0
-         H2 /2.5/ H2O /16.0/ CO /1.9/ CO2 /3.8/ CH4 /16.0/ CH3OH /5.0/
- CH2CO+O=HCO+HCO                               2.00E+13     .0     2293.0
- CH2CO+O=CH2+CO2                               1.75E+12     .0     1350.0
- CH2CO+H=HCCO+H2                               5.00E+13     .0     8000.0
- CH2CO+O=HCCO+OH                               1.00E+13     .0     8000.0
- CH2O+CH=CH2CO+H                               9.46E+13     .0     -515.0
- CH2+CO=CH2CO                                  6.21E+08     .0         .0
- CH2CO+OH=HCCO+H2O                             7.50E+12     .0     2000.0
- CH2CO+OH=CH2O+HCO                             2.80E+13     .0         .0
- CH2CO+OH=CH3O+CO                              2.80E+13     .0         .0
- HCCOH+H=CH2CO+H                               1.00E+13     .0         .0
- HCCO+H=CH2+CO                                 1.00E+14     .0         .0
- HCCO+O=2CO+H                                  1.00E+14     .0         .0
- HCCO+H=HCCOH                                  7.42E+38   -8.4     6150.0
- HCCO+OH=C2O+H2O                               3.00E+13     .0         .0
- HCCO+O2=2CO+OH                                1.46E+12     .0     2500.0
- HO2+C2H=HCCO+OH                               1.81E+13     .0         .0
- C2H+O2=HCCO+O                                 5.00E+13     .0     1500.0
- C2H+OH=HCCO+H                                 2.00E+13     .0         .0
- C2H+M=C2+H+M                                  4.68E+16     .0   124000.0
- C2H+O=CO+CH                                   5.00E+13     .0         .0
- C2H+O2=HCO+CO                                 2.41E+12     .0         .0
- C2H+O2=H+CO+CO                                3.52E+13     .0         .0
- C2H+OH=CH2+CO                                 1.81E+13     .0         .0
- C2H+OH=C2+H2O                                 4.00E+07    2.0     8000.0
- C+CH2(3)=C2H+H                                5.00E+13     .0         .0
- CH+CH2(3)=C2H+2H                              5.49E+22   -2.4    11520.0
- C2+H2=C2H+H                                   4.00E+05    2.4     1000.0
- C2O+H=CH+CO                                   5.00E+13     .0         .0
- C2O+O=CO+CO                                   5.00E+13     .0         .0
- C2O+OH=CO+CO+H                                2.00E+13     .0         .0
- C2O+O2=2CO+O                                  2.00E+13     .0         .0
- C2+OH=C2O+H                                   5.00E+13     .0         .0
- C2+O2=2CO                                     5.00E+13     .0         .0
- CH4+O2=CH3+HO2                                7.94E+13     .0    56000.0
- CH4+H=CH3+H2                                  5.47E+07    2.0    11210.0
- CH4+OH=CH3+H2O                                5.72E+06    2.0     2639.0
- CH4+HO2=CH3+H2O2                              1.81E+11     .0    18580.0
- CH3OH+M=CH3+OH+M                              3.50E+16     .0    66444.0
- CH3OH+M=CH2OH+H+M                             1.75E+15     .0    66444.0
- CH3OH+M=CH2+H2O+M                             7.00E+15     .0    66444.0
- CH3OH+CH3=CH2OH+CH4                           3.19E+01    3.2     7172.0
- CH3OH+CH3=CH3O+CH4                            1.45E+01    3.1     6935.0
- CH3OH+HO2=H2O2+CH2OH                          9.64E+10     .0    12579.0
- CH3OH+O=OH+CH2OH                              3.80E+05    2.5     3080.0
- CH3OH+O=OH+CH3O                               1.00E+13     .0     4684.0
- CH3OH+O2=CH2OH+HO2                            2.05E+13     .0    44717.0
- CH3OH+OH=H2O+CH2OH                            1.00E+13     .0     1697.0
- CH3OH+OH=H2O+CH3O                             1.00E+13     .0     1697.0
- CH3OH+CH2OH=CH3OH+CH3O                        7.83E+09     .0    12062.0
- CH3OH+H=CH2OH+H2                              3.98E+13     .0     6095.0
- CH3OH+H=CH3O+H2                               3.98E+13     .0     6095.0
- CH3OH+CH2(3)=CH2OH+CH3                        1.58E+12     .0     5736.0
- CH3O+M=CH2O+H+M                               9.37E+24   -2.7    30590.0
- CH3O+H=CH2O+H2                                2.00E+13     .0         .0
- CH3O+OH=CH2O+H2O                              1.00E+13     .0         .0
- CH3O+O=CH2O+OH                                1.00E+13     .0         .0
- CH3O+O2=CH2O+HO2                              6.30E+10     .0     2600.0
- CH3O+HO2=CH2O+H2O2                            3.01E+11     .0         .0
- CH3O+CO=CH3+CO2                               1.75E+13     .0    11797.0
- CH2OH+M=CH2O+H+M                              1.67E+24   -2.5    34190.0
- CH2OH+O=CH2O+OH                               1.00E+13     .0         .0
- CH2OH+O2=CH2O+HO2                             2.41E+14     .0     5000.0
- CH2OH+OH=CH2O+H2O                             1.00E+13     .0         .0
- CH2OH+H=CH2O+H2                               2.00E+13     .0         .0
- CH2OH+HO2=CH2O+H2O2                           1.20E+13     .0         .0
- CH2OH+HCO=CH3OH+CO                            1.20E+14     .0         .0
- CH2OH+CH2O=CH3OH+HCO                          5.54E+03    2.8     5682.0
- 2CH2OH=CH3OH+CH2O                             4.82E+12     .0         .0
- CH2OH+HCO=2CH2O                               1.81E+14     .0         .0
- CH3+M=CH+H2+M                                 6.90E+14     .0    82500.0
- H+CH3(+M)=CH4(+M)                             1.00E+17    -.8      315.0
-      LOW  /.70000E+34  -.48800E+01   .22250E+04/
-      TROE /.70860E+00   .13400E+03   .17840E+04   .57400E+04/
-      H2 /2.0/ H2O /6.0/ CH4 /2.0/ CO /1.5/ CO2 /2.0/ C2H6 /3.0/ AR /0.7/
- CH3+HO2=CH3O+OH                               2.00E+13     .0     1076.0
- CH3+O=CH2O+H                                  6.03E+13     .0         .0
- CH3+O=CH3O                                    1.78E+14   -2.1      603.0
- CH3+O2=CH3O+O                                 7.26E+11     .4    27363.0
- CH3+O2=CH2OH+O                                1.29E+13     .0    26900.0
- CH3+OH=CH3OH                                  1.24E+43   -9.5    10471.0
- CH3+OH=CH2OH+H                                1.09E+11     .4     -708.0
- CH3+OH=CH3O+H                                 8.93E+11     .0    13073.0
- CH3+OH=CH2(3)+H2O                             7.50E+06    2.0     5000.0
- CH3+OH=CH2O+H2                                3.98E+10     .0     8765.0
- CH3+HO2=CH2OH+OH                              2.00E+13     .0         .0
- CH3+HCO=CH4+CO                                1.20E+14     .0         .0
- CH3+CH2OH=CH4+CH2O                            2.41E+12     .0         .0
- CH3+CH3O=CH4+CH2O                             2.41E+13     .0         .0
- CH3+CH2O=CH4+HCO                              5.54E+03    2.8     5863.0
- CH2(3)+H+M=CH3+M                              2.40E+31   -4.4         .0
- CH2(3)+H=CH+H2                                1.00E+18   -1.6         .0
- CH2(3)+O=CO+2H                                5.00E+13     .0         .0
- CH2(3)+O=CO+H2                                3.00E+13     .0         .0
- CH2(3)+O2=CO2+2H                              1.60E+12     .0     1000.0
- CH2(3)+O2=CH2O+O                              5.00E+13     .0     9000.0
- CH2(3)+O2=CO2+H2                              6.90E+11     .0      500.0
- CH2(3)+O2=CO+H2O                              1.90E+10     .0    -1000.0
- CH2(3)+O2=CO+OH+H                             8.60E+10     .0     -500.0
- CH2(3)+O2=HCO+OH                              4.30E+10     .0     -500.0
- CH2(3)+OH=CH+H2O                              1.13E+07    2.0     3000.0
- CH2(3)+OH=CH2O+H                              2.50E+13     .0         .0
- CH2(3)+CO2=CH2O+CO                            1.10E+11     .0     1000.0
- CH2+M=CH2(3)+M                                1.00E+13     .0         .0
-         H /0./ H2O /0./ C2H2 /0.0/
- CH2(3)+HCO=CH3+CO                             1.81E+13     .0         .0
- CH2(3)+CH3O=CH3+CH2O                          1.81E+13     .0         .0
- CH2+CH4=2CH3                                  4.00E+13     .0         .0
- CH2+H2=CH3+H                                  7.00E+13     .0         .0
- CH2+H2O=CH2(3)+H2O                            3.00E+13     .0         .0
- CH2+H=CH2(3)+H                                2.00E+14     .0         .0
- CH2+O=H+H+CO                                  3.00E+13     .0         .0
- CH2+O=H2+CO                                   7.83E+12     .0         .0
- CH2+O2=CO2+2H                                 7.83E+12     .0         .0
- CH2+O2=O+CH2O                                 7.83E+12     .0         .0
- CH2+O2=H2+CO2                                 7.83E+12     .0         .0
- CH2+O2=H+CO+OH                                7.83E+12     .0         .0
- CH2+OH=CH2O+H                                 3.01E+13     .0         .0
- CH2+H=CH+H2                                   3.01E+13     .0         .0
- CH2+CO2=CH2O+CO                               3.00E+12     .0         .0
- CH2+HO2=CH2O+OH                               3.01E+13     .0         .0
- CH2+H2O2=CH3O+OH                              3.01E+13     .0         .0
- CH2+HCO=CO+CH3                                1.81E+13     .0         .0
- CH2+CH2O=HCO+CH3                              1.20E+12     .0         .0
- CH2+O=CH+OH                                   3.00E+14     .0    11923.0
- CH2O+OH=HCO+H2O                               3.43E+09    1.2     -447.0
- CH2O+H=HCO+H2                                 2.19E+08    1.8     3000.0
- CH2O+M=HCO+H+M                                3.31E+16     .0    81000.0
- CH2O+O=HCO+OH                                 1.80E+13     .0     3080.0
- CH2O+O2=HO2+HCO                               1.23E+06    3.0    52000.0
- CH2O+HO2=HCO+H2O2                             4.40E+06    2.0    12000.0
- CH+O=C+OH                                     1.52E+13     .0     4732.0
- CH+O=CO+H                                     5.70E+13     .0         .0
- CH+O2=CO+OH                                   3.30E+13     .0         .0
- CH+O2=HCO+O                                   3.30E+13     .0         .0
- CH+OH=HCO+H                                   3.00E+13     .0         .0
- CH+OH=C+H2O                                   4.00E+07    2.0     3000.0
- CH+CO2=HCO+CO                                 3.40E+12     .0      690.0
- CH+H=C+H2                                     1.50E+14     .0         .0
- CH+H2O=CH2O+H                                 1.17E+15    -.8         .0
- CH+H2O=CH2OH                                  5.71E+12     .0     -755.0
- C+O2=CO+O                                     2.00E+13     .0         .0
- C+OH=CO+H                                     5.00E+13     .0         .0
- HCO+O=CO2+H                                   3.00E+13     .0         .0
- HCO+O2=CO2+OH                                 3.31E+12    -.4         .0
- HCO+HO2=CO2+OH+H                              3.00E+13     .0         .0
- HCO+CH3O=CH3OH+CO                             9.04E+13     .0         .0
- 2HCO=CH2O+CO                                  4.50E+13     .0         .0
- HCO+O2=CO+HO2                                 3.30E+13    -.4         .0
- HCO+OH=CO+H2O                                 3.02E+13     .0         .0
- HCO+M=H+CO+M                                  2.50E+14     .0    16802.0
- HCO+H=CO+H2                                   2.00E+14     .0         .0
- HCO+O=CO+OH                                   3.00E+13     .0         .0
- 2HCO=2CO+H2                                   3.01E+12     .0         .0
- CO+O+M=CO2+M                                  2.51E+13     .0    -4540.0
- CO+OH=CO2+H                                   3.09E+11     .0      735.0
- CO+O2=CO2+O                                   2.51E+12     .0    47690.0
- CO+HO2=CO2+OH                                 6.03E+13     .0    22950.0
- H2O2+M=OH+OH+M                                1.20E+17     .0    45500.0
- H2O2+H=HO2+H2                                 4.79E+13     .0     7950.0
- H2O2+H=OH+H2O                                 1.00E+13     .0     3590.0
- H2O2+O=OH+HO2                                 9.55E+06    2.0     3970.0
- H2O2+O=O2+H2O                                 9.55E+06    2.0     3970.0
- HO2+H=H2O+O                                   3.00E+13     .0     1070.0
- HO2+H=H2+O2                                   6.61E+13     .0     2130.0
- HO2+H=OH+OH                                   1.40E+14     .0     1073.0
- HO2+OH=H2O+O2                                 7.50E+12     .0         .0
- HO2+HO2=H2O2+O2                               2.00E+12     .0         .0
- H2+OH=H2O+H                                   2.14E+08    1.5     3430.0
- H2+O2=OH+OH                                   1.70E+13     .0    47780.0
- H+O2=OH+O                                     1.91E+14     .0    16440.0
- H+O2+M=HO2+M                                  3.61E+17    -.7         .0
-         H2O /18.6/ CO2 /4.2/ H2 /2.9/ CO /2.1/   
- 2H+M=H2+M                                     1.00E+18   -1.0         .0
- 2H+H2=2H2                                     9.20E+16    -.6         .0
- 2H+H2O=H2+H2O                                 6.00E+19   -1.2         .0
- 2H+CO2=H2+CO2                                 5.49E+20   -2.0         .0
- H+OH+M=H2O+M                                  2.24E+22   -2.0         .0
- H+O+M=OH+M                                    6.02E+16    -.6         .0
-         H2O /5.0/
- OH+H2O2=H2O+HO2                               7.08E+12     .0     1430.0
- OH+OH=O+H2O                                   1.23E+04    2.6    -1878.0
- O+HO2=OH+O2                                   1.74E+13     .0     -400.0
- O+H2=OH+H                                     5.13E+04    2.7     6290.0
- O+O+M=O2+M                                    6.17E+15    -.5         .0
- O+OH+M=HO2+M                                  1.00E+17     .0         .0
-END
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c8h18_egr b/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c8h18_egr
deleted file mode 100644
index c6e1d748e..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_c8h18_egr
+++ /dev/null
@@ -1,754 +0,0 @@
-ELEMENTS
- H   O    C   N   AR
-END
-SPECIES
-H	H2	H2O 	H2O2	HO2	HCO	HCCO
-O	O2	OH	CO	CO2	CH2O	CH4
-CH3	CH3O	CH2CO	CH2	CH	CH3OH	CH2OH
-CH3CHO	CH3CO	C2H6	C2H5	C2H4	C2H3    C2H2 
-C2H	C3H8	C3H6	C3H5	C3H4	C4H3    C4H2
-C4H	C4H10	IC4H7   C4H6	C5H10	C6H11   C6H12
-C6H10	IC3H7	IC4H8	IC4H9   PC4H9   SC4H9
-!
-IC8H18  IC8H16	IC7H15
-IC7H13	IC4H10	NC3H7	PC4H8
-SC4H8	TC4H9	AC8H17  BC8H17	CC8H17	DC8H17  AC7H14
-CC7H14  NEOC5H11  NEOC5H11O2  NEOC5H11O  NEOC5H11O2H  NEOC5H10OOH 
-R1C8H17OO  R2C8H17OO  C8H16OOH  R1C8H16OOHOO  R2C8H16OOHOO  C8H15O4H2  
-C7H14CHO(OOH) C6H13CHO  C6H13CO IC6H13 
-N2 N N2O NO NO2 AR
-END
-THERMO
-CH3CHO            120186C   2O   1H   4    0G  0300.00   5000.00  1000.00      1
- 0.05868650E+02 0.01079424E+00-0.03645530E-04 0.05412912E-08-0.02896844E-12    2
--0.02264569E+06-0.06012946E+02 0.02505695E+02 0.01336991E+00 0.04671953E-04    3
--0.01128140E-06 0.04263566E-10-0.02124589E+06 0.01335089E+03                   4
-CH3CO             T 9/92C   2H   3O   1    0G   200.000  6000.00  1000.0       1
- 0.59447731E+01 0.78667205E-02-0.28865882E-05 0.47270875E-09-0.28599861E-13    2
--0.37873075E+04-0.50136751E+01 0.41634257E+01-0.23261610E-03 0.34267820E-04    3
--0.44105227E-07 0.17275612E-10-0.26574529E+04 0.73468280E+01-0.12027167E+04    4
-C3H6   PROPYLENE  L 4/85C   3H   6    0    0G   300.000  5000.00  1000.0       1
- 0.67213974E 01 0.14931757E-01-0.49652353E-05 0.72510753E-09-0.38001476E-13    2
--0.92453149E 03-0.12155617E 02 0.14575157E 01 0.21142263E-01 0.40468012E-05    3
--0.16319003E-07 0.70475153E-11 0.10740208E 04 0.17399460E 02 0.24557265E 04    4
-C3H5 SYMMETRIC    T 9/96C   3H   5    0    0G   200.000  6000.00  1000.0       1
- 0.70094568D+01 0.13106629D-01-0.46533442D-05 0.74514323D-09-0.44350051D-13    2
- 0.16412909D+05-0.13946114D+02 0.14698036D+01 0.19034365D-01 0.14480425D-04    3
--0.35468652D-07 0.16647594D-10 0.18325831D+05 0.16724114D+02 0.19675772D+05    4
-C3H8     PROPANE  L 4/85C   3H   8    0    0G   300.000  5000.00  1000.0       1
- 0.75341368E 01 0.18872239E-01-0.62718491E-05 0.91475649E-09-0.47838069E-13    2
--0.16467516E 05-0.17892349E 02 0.93355381E 00 0.26424579E-01 0.61059727E-05    3
--0.21977499E-07 0.95149253E-11-0.13958520E 05 0.19201691E 02-0.12489986E 05    4
-C3H4      ALLENE  L 8/89C   3H   4    0    0G   200.000  6000.00  1000.0       1
- 0.63168722E+01 0.11133728E-01-0.39629378E-05 0.63564238E-09-0.37875540E-13    2
- 0.20117495E+05-0.10995766E+02 0.26130445E+01 0.12122575E-01 0.18539880E-04    3
--0.34525149E-07 0.15335079E-10 0.21541567E+05 0.10226139E+02 0.22962267E+05    4
-C4H3              L 9/89C   4H   3    0    0G   300.000  5000.000 1000.00      1
- 0.84762079E+01 0.88782327E-02-0.30328412E-05 0.47358302E-09-0.27716627E-13    2
- 0.54756540E+05-0.17170551E+02 0.24173247E+01 0.24104782E-01-0.12813470E-04    3
--0.28606237E-08 0.39194527E-11 0.56506476E+05 0.14471107E+02 0.58181574E+05    4
-C4H10              62090C   4H  10         0G  0300.00   4000.00  1500.00      1
- 0.01998785E+03 0.01037281E+00-0.09610818E-05-0.04623018E-08 0.08202828E-12    2
--0.02625571E+06-0.08837907E+03-0.02256618E+02 0.05881732E+00-0.04525783E-03    3
- 0.02037115E-06-0.04079458E-10-0.01760233E+06 0.03329595E+03                   4
-C4H7       2/14/95      C   4H   7    0    0G   300.000  5000.000 1392.00      1
- 0.90657617E+01 0.19477743E-01-0.73385554E-05 0.12863733E-08-0.85601393E-13    2
- 0.10187905E+05-0.24022063E+02-0.34391326E+01 0.67889035E-01-0.92118162E-04    3
- 0.75423011E-07-0.25411345E-10 0.13278011E+05 0.37956421E+02 0.14593283E+05    4
-IC4H7       CH2=CHCHCH3 C   4H   70   00   0G   300.00   3000.00  1000.00      1
-  0.5521420E+01  0.2683684E-01 -0.1286430E-04  0.3088640E-08 -0.3030856E-12    2
-  0.1198044E+05 -0.4495640E+01 -0.1080514E+01  0.4638686E-01 -0.3464697E-04    3
-  0.1401374E-07 -0.2395040E-11  0.1375538E+05  0.2933150E+02                   4
-C5H10              12/52C   5H  10    0    0G   300.000  5000.000 1000.00      1
- 0.12541454E 02 0.23941070E-01-0.77445529E-05 0.11157970E-08-0.57968116E-13    2
--0.87175352E 04-0.39854187E 02 0.17627859E 01 0.38902789E-01 0.58380774E-05    3
--0.30547188E-07 0.13839465E-10-0.48109883E 04 0.19929169E 02-0.25594116E 04    4
-C6H11      2/14/95      C   6H  11    0    0G   300.000  5000.000 1388.00      1
- 1.73781063E+01 2.52715626E-02-8.74710351E-06 1.36884407E-09-7.98569285E-14    2
- 1.33730775E+03-6.77269441E+01-1.78981302E+00 6.71660911E-02-4.34180588E-05    3
- 1.43931014E-08-1.96953043E-12 8.35230470E+03 3.63570478E+01                   4
-C6H10                   C   6H  10N   0O   0G   300.00   5000.00  1000.00      1
- 0.12656940E+02 0.28236120E-01-0.10406250E-04 0.18530920E-08-0.12592180E-12    2
- 0.39164010E+04-0.38104860E+02-0.94988270E+00 0.60725200E-01-0.30414580E-04    3
--0.35837280E-08 0.64369670E-11 0.79947620E+04 0.33574390E+02                   4
-IC3H7           I-L 9/84C   3H   7    0    0G   300.000  5000.00  1000.0       1
- 0.65294638E 01 0.17193288E-01-0.57153220E-05 0.83408080E-09-0.43663532E-13    2
- 0.77179102E 04-0.91399021E 01 0.14461584E 01 0.20988975E-01 0.77172672E-05    3
--0.18481391E-07 0.71269024E-11 0.98206094E 04 0.20108200E 02 0.11221480E 05    4
-IC4H8      5/27/97 THERMC   4H   8    0    0G   300.000  5000.000 1388.000     1
- 1.12258330E+01 1.81795798E-02-6.20348592E-06 9.61444458E-10-5.57088057E-14    2
--7.69983777E+03-3.73306704E+01 9.38433173E-01 3.90547287E-02-2.16437148E-05    3
- 5.87267077E-09-6.14435479E-13-3.74817891E+03 1.91442985E+01                   4
-IC4H9      9/19/91 THERMC   4H   9    0    0G   300.000  5000.000 1393.00      1
- 1.22753162E+01 1.95174006E-02-6.68773001E-06 1.03935193E-09-6.03374502E-14    2
- 1.69244882E+03-4.08932742E+01-1.00837472E+00 5.01087003E-02-3.41941210E-05    3
- 1.26025783E-08-1.97552053E-12 6.42407431E+03 3.07281021E+01                   4
-IC4H10     9/19/91 THERMC   4H  10    0    0G   300.000  5000.000 1389.00      1
- 1.25733114E+01 2.18926418E-02-7.52538350E-06 1.17205495E-09-6.81446681E-14    2
--2.31696746E+04-4.68044254E+01-1.01277508E+00 5.04683181E-02-3.00502072E-05    3
- 9.15435582E-09-1.15326683E-12-1.80495698E+04 2.74256872E+01                   4
-NC3H7           N-L 9/84C   3H   7    0    0G   300.000  5000.00  1000.0       1
- 0.77026987E 01 0.16044203E-01-0.52833220E-05 0.76298590E-09-0.39392284E-13    2
- 0.82984336E 04-0.15480180E 02 0.10515518E 01 0.25991980E-01 0.23800540E-05    3
--0.19609569E-07 0.93732470E-11 0.10631863E 05 0.21122559E 02 0.12087447E 05    4
-IC8H18              4/85C  8.H 18.   0.   0.G   300.000  5000.00  1000.00      1
- 0.23503891E 02 0.39657507E-01-0.13128325E-04 0.19592787E-08-0.10658157E-12    2
--0.36518059E 05-0.95243149E 02 0.18952761E 01 0.69645584E-01 0.14661359E-04    3
--0.60905563E-07 0.26589383E-10-0.28789637E 05 0.24422028E 02-0.25107010E 05    4
-IC8H16             12/52C  8.H 16.   0.   0.G   300.000  5000.00  1000.00      1
- 0.20831284E 02 0.38294513E-01-0.12417870E-04 0.17957589E-08-0.93705913E-13    2
--0.20133141E 05-0.79240051E 02 0.26075478E 01 0.64282537E-01 0.92502323E-05    3
--0.51046708E-07 0.23316557E-10-0.13597527E 05 0.21584656E 02-0.99738727E 04    4
-IC7H15             10/83C   7H 15     0    0G   200.000  5000.00  1000.00      1
- 0.12660566E+02 0.47893065E-01-0.19735835E-04 0.37298693E-08-0.26299814E-12    2
--0.64258434E+04-0.34510489E+02 0.10280414E+02 0.70155356E-03 0.15955135E-03    3
--0.20959318E-06 0.83344532E-10-0.36030731E+04-0.10315257E+02 0.52799263E+03    4
-IC6H13             10/83C   6H  13    0    0G   300.000  5000.00  1000.00      1
- 0.12759770E 02 0.37134279E-01-0.14256110E-04 0.25052556E-08-0.16459707E-12    2
--0.35693750E 04-0.36999527E 02 0.23062353E 01 0.50200045E-01 0.79387773E-05    3
--0.41260655E-07 0.18794369E-10 0.10269711E 03 0.20896637E 02 0.30188548E 04    4
-C6H12      2/14/95      C  6.H 12.O  0.   0.G   300.000  5000.000              1
- 1.78337529e+01 2.67377658e-02-9.10036773e-06 1.40819768e-09-8.15124244e-14    2
--1.42062860e+04-6.83818851e+01-1.35275205e+00 6.98655426e-02-4.59408022e-05    3
- 1.56967343e-08-2.21296175e-12-7.34368617e+03 3.53120691e+01                   4
-PC4H8               6/83C   4H   8    0    0G   300.000  5000.00  1000.0       1
- 0.20535841E+01 0.34350507E-01-0.15883197E-04 0.33089662E-08-0.25361045E-12    2
--0.21397231E+04 0.15556360E+02 0.11811380E+01 0.30853380E-01 0.50865247E-05    3
--0.24654888E-07 0.11110193E-10-0.17904004E+04 0.21075639E+02-0.06494670E+03    4
-SC4H8               6/83C   4H   8    0    0G   300.000  5000.00  1000.0       1
- 0.20535841E+01 0.34350507E-01-0.15883197E-04 0.33089662E-08-0.25361045E-12    2
--0.21397231E+04 0.15556360E+02 0.11811380E+01 0.30853380E-01 0.50865247E-05    3
--0.24654888E-07 0.11110193E-10-0.17904004E+04 0.21075639E+02-0.06494670E+03    4
-IC7H13     2/10/95      C   7H  13    0    0G   300.000  5000.000 1392.000     1
- 2.06977799E+01 2.93585249E-02-9.99754351E-06 1.54773305E-09-8.96230815E-14    2
--1.23454647E+03-8.35627043E+01-2.01707658E+00 8.08915559E-02-5.43383904E-05    3
- 1.88066108E-08-2.66059253E-12 6.81102828E+03 3.89797235E+01                   4
-PC4H9      1/14/95 THERMC   4H   9    0    0G   300.000  5000.000 1395.00      1
- 1.21510082E+01 1.94310717E-02-6.61577950E-06 1.02375136E-09-5.92529707E-14    2
- 3.17231942E+03-3.93425822E+01-4.37779725E-01 4.78972364E-02-3.14023159E-05    3
- 1.09786472E-08-1.62010664E-12 7.68945248E+03 2.86852732E+01                   4
-SC4H9      1/14/95 THERMC   4H   9    0    0G   300.000  5000.000 1373.00      1
- 1.18293992E+01 1.94203812E-02-6.55835141E-06 1.00989031E-09-5.82693176E-14    2
- 1.79315973E+03-3.68210535E+01 7.70280143E-01 3.86280904E-02-1.57100260E-05    3
- 7.16860109E-10 7.00801289E-13 6.28812837E+03 2.49106489E+01                   4
-TC4H9      9/19/91 THERMC   4H   9    0    0G   300.000  5000.000 1381.00      1
- 9.94382112E+00 2.16693078E-02-7.47001405E-06 1.16578454E-09-6.78791834E-14    2
--4.06100251E+02-2.98153785E+01-2.73729204E+00 4.55390345E-02-2.26390939E-05    3
- 4.56951052E-09-1.55321795E-13 4.65498223E+03 4.04683378E+01                   4
-AC8H17                  C   8H  17O   0     G  0300.00   5000.00  1000.00      1
- 1.65781E+01    4.79568E-02   -1.58330E-05    2.45887E-09   -1.47904E-13       2
--1.13886E+04   -5.77977E+01   -2.45792E+00    1.00416E-01   -5.52412E-05       3
- 8.18171E-10    7.48841E-12   -6.56307E+03    3.95814E+01                      4
-BC8H17                  C   8H  17O   0     G  0300.00   5000.00  1000.00      1
- 1.62241E+01    4.79657E-02   -1.57712E-05    2.44271E-09   -1.46688E-13       2
--1.16619E+04   -5.66316E+01   -2.80712E+00    1.03796E-01   -6.59900E-05       3
- 1.23120E-08    3.42374E-12   -6.98775E+03    3.99281E+01                      4
-CC8H17                  C   8H  17O   0     G  0300.00   5000.00  1000.00      1
- 1.54473E+01    4.88291E-02   -1.61009E-05    2.49663E-09   -1.49924E-13       2
--1.33788E+04   -5.27801E+01   -8.35087E-01    9.07781E-02   -3.96894E-05       3
--1.04780E-08    1.07794E-11   -9.15033E+03    3.11321E+01                      4
-DC8H17                  C   8H  17O   0     G  0300.00   5000.00  1000.00      1
- 1.65979E+01    4.79226E-02   -1.58133E-05    2.45430E-09   -1.47533E-13       2
--1.27049E+04   -5.83133E+01   -2.57455E+00    1.01220E-01   -5.71585E-05       3
- 2.71860E-09    6.82038E-12   -7.85889E+03    3.96706E+01                      4
-AC7H14             12/52C   7H  14    0    0G   298.150  5000.00  1000.00      1
- 0.13952881E+02 0.41712158E-01-0.16157950E-04 0.29187538E-08-0.19958112E-12    2
--0.14853311E+05-0.43649205E+02 0.19140427E+01 0.58601697E-01 0.16939333E-05    3
--0.38140418E-07 0.18157007E-10-0.10616395E+05 0.22793909E+02-0.74928962E+04    4
-CC7H14             12/52C   7H  14    0    0G   298.150  5000.00   1000.00     1
- 0.13952881E+02 0.41712158E-01-0.16157950E-04 0.29187538E-08-0.19958112E-12    2
--0.14853311E+05-0.43649205E+02 0.19140427E+01 0.58601697E-01 0.16939333E-05    3
--0.38140418E-07 0.18157007E-10-0.10616395E+05 0.22793909E+02-0.74928962E+04    4
-NEOC5H11   8/ 8/95 THERMC   5H  11    0    0G   300.000  5000.000 1396.00      1
- 1.66238394E+01 2.27037884E-02-7.71624835E-06 1.19289853E-09-6.90060600E-14    2
--3.96463755E+03-6.44711904E+01-1.58140132E+00 6.57175067E-02-4.68120314E-05    3
- 1.74732793E-08-2.68709925E-12 2.30933742E+03 3.31296742E+01                   4
-NEOC5H11O2 7/13/98      C   5H  11O   2    0G   300.000  5000.000 1396.000     1
- 2.02157247e+01 2.45786365e-02-8.41704919e-06 1.30775217e-09-7.59095109e-14    2
--2.31877371e+04-8.01387611e+01 7.30403748e-01 7.05036948e-02-5.02866599e-05    3
- 1.89083885e-08-2.94948183e-12-1.64308023e+04 2.44155402e+01                   4
-NEOC5H11O2H 7/13/98     C   5H  12O   2    0G   300.000  5000.000 1399.000     1
- 2.26835440e+01 2.46838700e-02-8.47310667e-06 1.31876182e-09-7.66483771e-14    2
--4.12877712e+04-9.44344738e+01-1.38233642e-01 7.89911468e-02-5.79776533e-05    3
- 2.18789315e-08-3.35549515e-12-3.34973569e+04 2.77192466e+01                   4
-NEOC5H11O  7/25/95      C   5H  11O   1    0G   300.000  5000.000 1399.00      1
- 1.91195281e+01 2.30837786e-02-7.83941709e-06 1.21152000e-09-7.00727365e-14    2
--2.15314869e+04-7.85283647e+01-2.41265702e+00 7.56872456e-02-5.73116804e-05    3
- 2.24731318e-08-3.58123651e-12-1.43300707e+04 3.62184819e+01                   4
-NEOC5H10OOH 7/13/98     C   5H  11O   2    0G   300.000  5000.000 1398.000     1
- 2.22450472e+01 2.26188828e-02-7.78497419e-06 1.21384469e-09-7.06396166e-14    2
--1.62363251e+04-8.81677091e+01 5.91196875e-01 7.45002878e-02-5.55445714e-05    3
- 2.13010197e-08-3.32171399e-12-8.87531001e+03 2.76174107e+01                   4
-R1C8H17OO               C   8H  17O   2     G  0300.00   5000.00  1000.00      1
- 2.61790E+01    4.02621E-02   -1.21840E-05    1.77416E-09   -1.01822E-13       2
--3.13354E+04   -1.06205E+02   -1.33130E+00    1.07392E-01   -5.66082E-05       3
--2.14473E-09    8.62014E-12   -2.33465E+04    3.80377E+01                      4
-R2C8H17OO               C   8H  17O   2     G  0300.00   5000.00  1000.00      1
- 2.62593E+01    4.03680E-02   -1.22510E-05    1.78708E-09   -1.02664E-13       2
--3.33124E+04   -1.07806E+02    2.94226E+00    7.88952E-02    1.36336E-05       3
--7.23591E-08    3.30247E-11   -2.59761E+04    1.82269E+01                      4
-C8H16OOH                C   8H  17O   2     G  0300.00   5000.00  1000.00      1
- 2.59673E+01    3.94986E-02   -1.17491E-05    1.69063E-09   -9.62759E-14       2
--2.86414E+04   -1.02359E+02    4.63771E+00    7.70682E-02    5.46587E-06       3
--6.02176E-08    2.84759E-11   -2.20723E+04    1.22966E+01                      4
-R1C8H16OOHOO            C   8H  17O   4     G  0300.00   5000.00  1000.00      1
- 3.12917E+01    3.92720E-02   -1.14955E-05    1.63072E-09   -9.17048E-14       2
--4.28382E+04   -1.25286E+02    7.66149E-01    1.15621E-01   -6.49312E-05       3
- 3.70399E-10    8.77610E-12   -3.41337E+04    3.41493E+01                      4
-R2C8H16OOHOO            C   8H  17O   4     G  0300.00   5000.00  1000.00      1
- 3.11894E+01    3.96996E-02   -1.17505E-05    1.68813E-09   -9.62085E-14       2
--4.47408E+04   -1.25460E+02    4.88546E+00    8.81941E-02    2.74357E-06       3
--6.72842E-08    3.22758E-11   -3.67468E+04    1.53975E+01                      4
-C8H15O4H2               C   8H  17O   4     G  0300.00   5000.00  1000.00      1
- 3.10304E+01    3.86064E-02   -1.11232E-05    1.56165E-09   -8.72809E-14       2
--4.01259E+04   -1.20761E+02    6.53997E+00    8.66547E-02   -6.12155E-06       3
--5.44439E-08    2.74796E-11   -3.28388E+04    9.64038E+00                      4
-C7H14CHO(OOH)           C   8H  16O   3     G  0300.00   5000.00  1000.00      1
- 2.34007E+01    4.58018E-02   -1.53548E-05    2.41072E-09   -1.46115E-13       2
--5.82798E+04   -8.43852E+01   -1.22819E+00    1.10258E-01   -6.32868E-05       3
- 2.95991E-09    7.38667E-12   -5.15453E+04    4.31889E+01                      4
-C6H13CHO                C   7H  14O   1     G  0300.00   5000.00  1000.00      1
- 1.98891043e+01 2.71869340e-02-9.27391515e-06 1.43744158e-09-8.33090761e-14    2
--3.97523444e+04-7.60741671e+01 1.37517192e+00 6.65669689e-02-4.04423050e-05    3
- 1.23836270e-08-1.52905857e-12-3.28740986e+04 2.48343934e+01                   4
-C6H13CO                 C   7H  13O   1     G  0300.00   5000.00  1000.00      1
- 1.94783812e+01 2.50466029e-02-8.54861346e-06 1.32557944e-09-7.68503296e-14    2
--2.07923937e+04-7.21995578e+01 2.14479069e+00 6.17863563e-02-3.74134690e-05    3
- 1.13283795e-08-1.36917698e-12-1.43451172e+04 2.23128045e+01                   4
-C5H11             T03/97C  5.H 11.   0.   0.G   298.150  5000.00  1000.00      1
- 1.13324106E+01 3.03659897E-02-1.13934480E-05 1.99539733E-09-1.32825012E-13    2
--5.95299959E+03-3.13564905E+01 3.57867617E+00 3.04236365E-02 3.27768270E-05    3
--5.86453147E-08 2.39315107E-11-2.60420265E+03 1.42591121E+01 6.68760000E+03    4
-END
-REACTIONS
-H+O2=O+OH                       5.13E+16   -0.8   16510.0 !1   
-H2+O=H+OH                       1.82E+10    1.0    8900.0 !2 
-H2O+O=OH+OH                     6.76E+13    0.0   18350.0 !3
-H2O+H=H2+OH                     9.55E+13    0.0   20300.0 !4
-H2O2+OH=H2O+HO2                 1.00E+13    0.0    1800.0 !5
-H2O+M=H+OH+M                    2.19E+16    0.0  105000.0 !6
-  H2O/2.0E+01/
-H+O2+M=HO2+M                    1.66E+15    0.0   -1000.0 !7 
-  H2O/2.1E+01/ CO2/5.0E+00/ CO/2.00E+00/ H2/3.3E+00/
-HO2+O=OH+O2                     5.01E+13    0.0    1000.0 !8
-HO2+H=OH+OH                     2.51E+14    0.0    1900.0 !9
-HO2+H=H2+O2                     2.51E+13    0.0     700.0 !10
-HO2+OH=H2O+O2                   5.01E+13    0.0    1000.0 !11   
-H2O2+O2=HO2+HO2                 3.98E+13    0.0   42640.0 !12
-H2O2(+M)=OH+OH(+M)              3.00E+14    0.0   48500.0 !13
-  LOW     /2.0E17      0.     48.5E3/
-  TROE    /1.0         1.0    1.0E8/
-  H2/2/ H2O/12/ CO/1.9/ CO2/3.8/
-H2O2+H=HO2+H2                   1.70E+12    0.0    3750.0 !14
-O+H+M=OH+M                      1.00E+16    0.0       0.0 !15
-O2+M=O+O+M                      5.13E+15    0.0  115000.0 !16  
-H2+M=H+H+M                      2.19E+14    0.0   96000.0 !17 
-  H2O/6.0E+00/ H/2.0E+00/ H2/3.0E+00/
-CO+OH=CO2+H                     1.51E+07    1.3    -770.0 !18  
-CO+HO2=CO2+OH                   1.51E+14    0.0   23650.0 !19
-CO+O+M=CO2+M                    5.89E+15    0.0    4100.0 !20
-CO2+O=CO+O2                     2.75E+12    0.0   43830.0 !21
-HCO+OH=CO+H2O                   1.00E+14    0.0       0.0 !22
-HCO+M=H+CO+M                    1.45E+14    0.0   19000.0 !23
-HCO+H=CO+H2                     2.00E+14    0.0       0.0 !24
-HCO+O=CO+OH                     1.00E+14    0.0       0.0 !25 
-!HCO+HO2=CH2O+O2                 1.20E+13    0.0    3000.0 !26
-CH2O+O2=HCO+HO2                 6.200E+13   0.0   37000.0 !
-HCO+O2=CO+HO2                   3.98E+12    0.0       0.0 !27
-CH2O+M=HCO+H+M                  3.31E+16    0.0   81000.0 !28
-CH2O+OH=HCO+H2O                 3.59E+11    0.0     170.0 !29
-CH2O+H=HCO+H2                   3.31E+14    0.0   10500.0 !30
-CH2O+O=HCO+OH                   5.01E+13    0.0    4600.0 !31
-CH2O+HO2=HCO+H2O2               2.00E+11    0.0    8000.0 !32
-CH4+M=CH3+H+M                   1.41E+17    0.0   88400.0 !33
-CH4+H=CH3+H2                    1.26E+14    0.0   11900.0 !34
-CH4+OH=CH3+H2O                  3.47E+03    3.1    2000.0 !35
-CH4+O=CH3+OH                    2.14E+06    2.2    6480.0 !36
-CH4+HO2=CH3+H2O2                2.00E+13    0.0   18000.0 !37
-CH3+HO2=CH3O+OH                 3.64E+13    0.0       0.0 !38    3.24
-CH4+CH2=CH3+CH3                 4.00E+12    0.00   -570.0 !
-CH3+OH=CH2O+H2                  3.98E+12    0.0       0.0 !39
-CH3+O=CH2O+H                    1.29E+14    0.0    2000.0 !40
-CH3+O2=CH3O+O                   3.79E+13    0.0   30000.0 !41
-CH3+O2=CH2O+OH                  4.80E+10    0.0    9000.0 ! 
-CH2O+CH3=CH4+HCO                1.00E+10    0.5    6000.0 !42
-CH3+HCO=CH4+CO                  3.02E+11    0.5       0.0 !43
-CH3+HO2=CH4+O2                  1.00E+12    0.0     400.0 !44
-CH3O+M=CH2O+H+M                 5.01E+13    0.0   21000.0 !45
-CH3O+O2=CH2O+HO2                7.59E+10    0.0    2700.0 !46
-!CH3+CH3  = C2H6                 2.70D+53  -12.0   19400.0 !47
-CH3+CH3  = C2H6                 2.02E+16  -0.97     620.0 !
-C2H6+CH3=C2H5+CH4               5.50E-01    4.0    8280.0 !48
-C2H6+H=C2H5+H2                  5.37E+02    3.5    5200.0 !49
-C2H6+OH=C2H5+H2O                8.71E+09    1.1    1810.0 !50
-C2H6+O=C2H5+OH                  1.12E+14    0.0    7850.0 !51
-C2H5+M=C2H4+H+M                 2.00E+15    0.0    3000.0 !52
-C2H5+O2=C2H4+HO2                1.00E+12    0.0    5000.0 !53
-C2H4+C2H4=C2H5+C2H3             5.01E+14    0.0   64700.0 !54
-C2H4+M=C2H2+H2                  9.33E+16    0.0   77200.0 !55
-C2H4+M=C2H3+H+M                 6.31E+18    0.0  108720.0 !56
-C2H4+O=CH3+HCO                  3.31E+12    0.0    1130.0 !57
-C2H4+O=CH2O+CH2                 2.51E+13    0.0    5000.0 !58
-C2H4+H=C2H3+H2                  1.51E+07    2.0    6000.0 !59
-C2H4+OH=C2H3+H2O                4.79E+12    0.0    1230.0 !60
-C2H4+OH=CH3+CH2O                2.00E+12    0.0     960.0 !61
-C2H3+M=C2H2+H+M                 7.94E+14    0.0   31500.0 !62
-C2H3+O2=C2H2+HO2                1.00E+12    0.0   10000.0 !63
-C2H2+M=C2H+H+M                  1.00E+14    0.0  114000.0 !64
-C2H2+O2=HCO+HCO                 3.98E+12    0.0   28000.0 !65
-C2H2+H=C2H+H2                   2.00E+14    0.0   19000.0 !66
-C2H2+OH=C2H+H2O                 6.03E+12    0.0    7000.0 !67
-C2H2+OH=CH2CO+H                 3.24E+11    0.0     200.0 !68
-C2H2+O=C2H+OH                   3.24E+15   -0.6   17000.0 !69
-C2H2+O=CH2+CO                   6.76E+13    0.0    4000.0 !70
-C2H+O2=HCO+CO                   1.00E+13    0.0    7000.0 !71
-C2H+O=CO+CH                     5.01E+13    0.0       0.0 !72
-CH2+O2=HCO+OH                   1.00E+14    0.0    3700.0 !73
-CH2+O=CH+OH                     1.91E+11    0.7   25000.0 !74
-CH2+H=CH+H2                     2.69E+11    0.7   25700.0 !75
-CH2+OH=CH+H2O                   2.69E+11    0.7   25700.0 !76 
-CH+O2=CO+OH                     1.35E+11    0.7   25700.0 !77
-CH+O2=HCO+O                     1.00E+13    0.0       0.0 !78
-CH3OH+M=CH3+OH+M                3.02E+17    0.0   80000.0 !79
-CH3OH+OH=CH2OH+H2O              3.98E+12    0.0    1370.0 !80
-CH3OH+O=CH2OH+OH                1.70E+12    0.0    2290.0 !81
-CH3OH+H=CH2OH+H2                3.02E+13    0.0    7000.0 !82  
-CH3OH+H=CH3+H2O                 5.25E+12    0.0    5340.0 !83
-CH3OH+CH3=CH2OH+CH4             1.82E+11    0.0    9800.0 !84
-CH3OH+HO2=CH2OH+H2O2            6.31E+12    0.0   19360.0 !85
-CH2OH+M=CH2O+H+M                2.51E+13    0.0   29000.0 !86
-CH2OH+O2=CH2O+HO2               8.31E+11    0.0       0.0 !87
-C2H2+C2H2=C4H3+H                1.00E+13    0.0   45000.0 !88
-C4H3+M=C4H2+H+M                 1.00E+16    0.0   60000.0 !89
-C2H2+C2H=C4H2+H                 3.98E+13    0.0       0.0 !90
-C4H2+M=C4H+H+M                  3.47E+17    0.0   80000.0 !91
-C2H3+H=C2H2+H2                  2.00E+13    0.0    2500.0 !92
-C3H8=CH3+C2H5                   1.70E+16    0.0   84840.0 !93
-CH3+C3H8=CH4+IC3H7              1.10E+15    0.0   25140.0 !94
-CH3+C3H8=CH4+NC3H7              1.10E+15    0.0   25140.0 !95
-H+C3H8=H2+IC3H7                 8.71E+06    2.0    5000.0 !96
-H+C3H8=H2+NC3H7                 5.62E+07    2.0    7700.0 !97
-IC3H7=H+C3H6                    6.31E+13    0.0   36900.0 !98
-IC3H7=CH3+C2H4                  2.00E+10    0.0   29500.0 !99
-NC3H7=CH3+C2H4                  9.55E+13    0.0   31000.0 !100
-NC3H7=H+C3H6                    1.26E+14    0.0   37000.0 !101
-IC3H7+C3H8=NC3H7+C3H8           3.02E+10    0.0   12900.0 !102
-C2H3+C3H8=C2H4+IC3H7            1.00E+11    0.0   10400.0 !103
-C2H3+C3H8=C2H4+NC3H7            1.00E+11    0.0   10400.0 !104
-C2H5+C3H8=C2H6+IC3H7            1.00E+11    0.0   10400.0 !105
-C2H5+C3H8=C2H6+NC3H7            1.00E+11    0.0   10400.0 !106
-C3H8+O=IC3H7+OH                 2.81E+13    0.0    5200.0 !107
-C3H8+O=NC3H7+OH                 1.12E+14    0.0    7850.0 !108
-C3H8+OH=IC3H7+H2O               4.79E+08    1.4     850.0 !109
-C3H8+OH=NC3H7+H2O               5.75E+08    1.4     850.0 !110
-C3H8+HO2=IC3H7+H2O2             3.39E+12    0.0   17000.0 !111
-C3H8+HO2=NC3H7+H2O2             1.12E+13    0.0   19400.0 !112
-C3H6+O=C2H4+CH2O                6.76E+04    2.6   -1130.0 !113
-IC3H7+O2=C3H6+HO2               1.00E+12    0.0    5000.0 !114
-NC3H7+O2=C3H6+HO2               1.00E+12    0.0    5000.0 !115
-C3H8+O2=IC3H7+HO2               3.98E+13    0.0   47500.0 !116
-C3H8+O2=NC3H7+HO2               3.98E+13    0.0   47500.0 !117      
-C3H6+OH=C2H5+CH2O               1.00E+12    0.0       0.0 !118
-C3H6+O=C2H5+HCO                 6.76E+04    2.6   -1130.0 !119 
-C3H6+OH=CH3+CH3CHO              1.00E+12    0.0       0.0 !120
-C3H6+O=CH3+CH3CO                6.67E+04    2.6   -1130.0 !121
-CH3CHO+H=CH3CO+H2               3.98E+13    0.0    4200.0 !122
-CH3CHO+OH=CH3CO+H2O             1.00E+13    0.0       0.0 !123
-CH3CHO+O=CH3CO+OH               5.01E+12    0.0    1790.0 !124              
-CH3CHO+CH3=CH3CO+CH4            1.73E+12    0.0    8440.0 !125
-CH3CHO+HO2=CH3CO+H2O2           1.70E+12    0.0   10700.0 !126     1.70
-CH3CHO=CH3+HCO                  7.08E+15    0.0   81780.0 !127
-CH3CHO+O2=CH3CO+HO2             2.00E+13    0.5   42200.0 !128
-CH3CO+M=CH3+CO+M                4.37E+15    0.0   10500.0 !129
-C3H6+H=C3H5+H2                  5.01E+12    0.0    1500.0 !130
-C3H6+CH3=C3H5+CH4               1.58E+12    0.0    8800.0 !131
-C3H6+C2H5=C3H5+C2H6             1.00E+12    0.0    9800.0 !132             
-C3H6+OH=C3H5+H2O                2.00E+11    0.0    3060.0 !133
-C3H8+C3H5=IC3H7+C3H6            2.00E+11    0.0   16100.0 !134
-C3H8+C3H5=NC3H7+C3H6            7.94E+11    0.0   20500.0 !135
-C3H5=C3H4+H                     3.98E+13    0.0   70000.0 !136
-C3H5=C2H2+CH3                   2.397E+48 -9.90  8.208E+04
-C3H5+O2=C3H4+HO2                6.03E+11    0.0   10000.0 !137     10000.
-PC4H8=C3H5+CH3                  1.51E+19   -1.0   73400.0 !138
-PC4H8=C2H3+C2H5                 1.00E+19   -1.0   96770.0 !139
-PC4H8+O=CH3CHO+C2H4             1.29E+13    0.0     850.0 !140
-PC4H8+O=CH3CO+C2H5              1.29E+13    0.0     850.0 !141
-PC4H8+OH=CH3CHO+C2H5            1.00E+11    0.0       0.0 !142
-PC4H8+OH=CH3CO+C2H6             1.00E+10    0.0       0.0 !143
-C3H4+O=CH2O+C2H2                1.00E+12    0.0       0.0 !144
-C3H4+O=HCO+C2H3                 1.00E+12    0.0       0.0 !145
-C3H4+OH=CH2O+C2H3               1.00E+12    0.0       0.0 !146
-C3H4+OH=HCO+C2H4                1.00E+12    0.0       0.0 !147
-C3H6=C3H5+H                     1.00E+13    0.0   78000.0 !148
-C2H2+O=HCCO+H                   3.55E+04    2.7    1390.0 !149 	 
-CH2CO+H=CH3+CO                  1.10E+13    0.0    3400.0 !150
-CH2CO+O=HCO+HCO                 1.00E+13    0.0    2400.0 !151
-CH2CO+OH=CH2O+HCO               2.82E+13    0.0       0.0 !152
-CH2CO+M=CH2+CO+M                2.00E+16    0.0   60000.0 !153
-CH2CO+O=HCCO+OH                 5.01E+13    0.0    8000.0 !154
-CH2CO+OH=HCCO+H2O               7.59E+12    0.0    3000.0 !155
-CH2CO+H=HCCO+H2                 7.59E+13    0.0    8000.0 !156
-HCCO+OH=HCO+HCO                 1.00E+13    0.0       0.0 !157
-HCCO+H=CH2+CO                   5.01E+13    0.0       0.0 !158
-HCCO+O=HCO+CO                   3.39E+13    0.0    2000.0 !159
-C3H6=C2H3+CH3                   6.31E+15    0.0   85800.0 !160
-C3H5+H=C3H4+H2                  1.00E+13    0.0       0.0 !161
-C3H5+CH3=C3H4+CH4               1.00E+12    0.0       0.0 !162
-C2H6+O2=C2H5+HO2                1.00E+13    0.0   51000.0 !163
-C2H6+HO2=C2H5+H2O2              1.12E+13    0.0   19400.0 !164
-CH3+C2H3=CH4+C2H2               1.00E+12    0.0       0.0 !165
-CH3+C2H5=CH4+C2H4               7.94E+11    0.0       0.0 !166
-C2H5+C3H5=C3H6+C2H4             1.26E+12    0.0       0.0 !167
-C2H5+C2H5=C2H6+C2H4             5.01E+11    0.0       0.0 !168
-CH3OH+CH2O=CH3O+CH3O            1.55E+12    0.0   79570.0 !169
-CH2O+CH3O=CH3OH+HCO             6.03E+11    0.0    3300.0 !170
-CH4+CH3O=CH3OH+CH3              2.00E+11    0.0    7000.0 !171
-C2H6+CH3O=CH3OH+C2H5            3.02E+11    0.0    7000.0 !172
-C3H8+CH3O=CH3OH+IC3H7           3.02E+11    0.0    7000.0 !173
-C3H8+CH3O=CH3OH+NC3H7           3.02E+11    0.0    7000.0 !174
-C4H10=C2H5+C2H5                 2.00E+16    0.0   81300.0 !175
-C4H10=NC3H7+CH3                 1.00E+17    0.0   85400.0 !176
-C4H10+O2=PC4H9+HO2              2.51E+13    0.0   49000.0 !177
-C4H10+O2=SC4H9+HO2              3.98E+13    0.0   47600.0 !178
-C4H10+H=PC4H9+H2                5.62E+07    2.0    7700.0 !179
-C4H10+H=SC4H9+H2          	1.74E+07    2.0    5000.0 !180
-C4H10+OH=PC4H9+H2O        	8.71E+09    1.1    1810.0 !181
-C4H10+OH=SC4H9+H2O        	2.57E+09    1.3     700.0 !182
-C4H10+O=PC4H9+OH          	1.12E+14    0.0    7850.0 !183
-C4H10+O=SC4H9+OH          	5.62E+13    0.0    5200.0 !184
-C4H10+CH3=PC4H9+CH4       	1.29E+12    0.0   11600.0 !185
-C4H10+CH3=SC4H9+CH4       	7.94E+11    0.0    9500.0 !186
-C4H10+C2H3=PC4H9+C2H4     	1.00E+12    0.0   18000.0 !187
-C4H10+C2H3=SC4H9+C2H4 		7.94E+11    0.0   16800.0 !188
-C4H10+C2H5=PC4H9+C2H6     	1.00E+11    0.0   13400.0 !189
-C4H10+C2H5=SC4H9+C2H6     	1.00E+11    0.0   10400.0 !190
-C4H10+C3H5=PC4H9+C3H6  	   	7.94E+11    0.0   20500.0 !191
-C4H10+C3H5=SC4H9+C3H6     	3.16E+11    0.0   16400.0 !192
-C4H10+HO2=PC4H9+H2O2      	1.12E+13    0.0   19400.0 !193
-C4H10+HO2=SC4H9+H2O2      	6.76E+12    0.0   17000.0 !194
-C4H10+CH3O=PC4H9+CH3OH    	3.02E+11    0.0    7000.0 !195
-C4H10+CH3O=SC4H9+CH3OH    	6.03E+11    0.0    7000.0 !196
-PC4H9=C2H5+C2H4           	2.51E+13    0.0   28800.0 !197
-PC4H9=PC4H8+H             	1.26E+13    0.0   38600.0 !198 
-PC4H9+O2=PC4H8+HO2        	1.00E+12    0.0    2000.0 !199
-SC4H9=SC4H8+H             	5.01E+12    0.0   37900.0 !200
-SC4H9=PC4H8+H                   2.00E+13    0.0   40400.0 !201
-!SC4H9=C3H6+CH3            	2.00E+14    0.0   33200.0 !202
-SC4H9=C3H6+CH3                 2.232E+17  -1.40   30830.0 !202
-SC4H9+O2=PC4H8+HO2        	1.00E+12    0.0    4500.0 !203
-SC4H9+O2=SC4H8+HO2        	2.00E+12    0.0    4250.0 !204
-PC4H8=IC4H7+H              	4.07E+18   -1.0   97350.0 !205
-SC4H8=IC4H7+H              	4.07E+18   -1.0   97350.0 !206
-PC4H8+H=IC4H7+H2           	5.01E+13    0.0    3900.0 !207
-SC4H8+H=IC4H7+H2           	5.01E+13    0.0    3800.0 !208
-PC4H8+OH=IC4H7+H2O         	1.41E+13    0.0    3060.0 !209
-SC4H8+OH=IC4H7+H2O         	2.29E+13    0.0    3060.0 !210
-PC4H8+CH3=IC4H7+CH4        	1.00E+11    0.0    7300.0 !211
-SC4H8+CH3=IC4H7+CH4        	1.00E+11    0.0    8200.0 !212
-PC4H8+O=C3H6+CH2O         	5.01E+12    0.0       0.0 !213
-SC4H8+O=IC3H7+HCO         	6.03E+12    0.0       0.0 !214
-SC4H8+O=C2H4+CH3CHO       	1.00E+12    0.0       0.0 !215
-PC4H8+OH=NC3H7+CH2O       	1.51E+12    0.0       0.0 !216
-SC4H8+OH=C2H5+CH3CHO      	3.02E+12    0.0       0.0 !217
-IC4H7=C4H6+H               	1.20E+14    0.0   49300.0 !218
-IC4H7=C2H4+C2H3            	1.00E+11    0.0   37000.0 !219
-IC4H7+O2=C4H6+HO2          	1.00E+11    0.0       0.0 !220
-IC4H7+H=C4H6+H2            	3.16E+13    0.0       0.0 !221
-IC4H7+C2H3=C4H6+C2H4       	3.98E+12    0.0       0.0 !222
-IC4H7+C2H5=C4H6+C2H6       	3.98E+12    0.0       0.0 !223
-IC4H7+C2H5=PC4H8+C2H4      	5.01E+11    0.0       0.0 !224
-IC4H7+C2H5=SC4H8+C2H4      	5.01E+11    0.0       0.0 !225
-IC4H7+C3H5=C4H6+C3H6       	6.31E+12    0.0       0.0 !226
-C4H6=C2H3+C2H3            	3.98E+19   -1.0   98150.0 !227
-C4H6+OH=C2H5+CH2CO        	1.00E+12    0.0       0.0 !228
-C4H6+OH=C3H5+CH2O         	1.00E+12    0.0       0.0 !229
-C4H6+OH=C2H3+CH3CHO       	1.00E+12    0.0       0.0 !230
-C4H6+O=C2H4+CH2CO         	1.00E+12    0.0       0.0 !231
-C4H6+O=C3H4+CH2O          	1.00E+12    0.0       0.0 !232
-C2H3+C2H4=C4H6+H          	5.01E+11    0.0    7300.0 !233
-C5H10=CH3+IC4H7            	1.00E+19   -1.0   81550.0 !234
-C5H10+O=PC4H8+CH2O        	8.51E+12    0.0       0.0 !235
-C5H10+O=C3H6+CH3CHO       	8.51E+12    0.0       0.0 !236
-C5H10+OH=PC4H9+CH2O       	1.00E+12    0.0       0.0 !237
-C5H10+OH=NC3H7+CH3CHO     	1.00E+12    0.0       0.0 !238
-C2H5+H=CH3+CH3            	3.16E+13    0.0       0.0 !239
-CH3OH+O2=CH2OH+HO2        	3.98E+13    0.0   50900.0 !240
-C2H4+O2=C2H3+HO2          	3.98E+13    0.0   61500.0 !241
-C2H4+CH3=C2H3+CH4         	1.00E+13    0.0   13000.0 !242
-C3H6+O2=C3H5+HO2          	1.00E+14    0.0   39000.0 !243
-!  forward and backward
-IC8H18=TC4H9+IC4H9              2.00E+16    0.0   78000.0 !244
-!      REV                     /1.00E+12    0.0       0.0 /
-IC8H18=IC3H7+NEOC5H11           2.00E+16    0.0   78000.0 !245   2.00E+16
-!      REV                     /1.00E+12    0.0       0.0 /
-IC8H18+H=AC8H17+H2              8.51E+07    2.0    7700.0 !246
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+H=BC8H17+H2              8.91E+07    2.0    5000.0 !247
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+H=CC8H17+H2              1.26E+13    0.0    7300.0 !248
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+H=DC8H17+H2              5.62E+07    2.0    7700.0 !249
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+O=AC8H17+OH              1.51E+13    0.0    7850.0 !250
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+O=BC8H17+OH              4.82E+13    0.0    5200.0 !251
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+O=CC8H17+OH              1.00E+13    0.0    3280.0 !252
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+O=DC8H17+OH              1.00E+13    0.0    7850.0 !253
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+OH=AC8H17+H2O            1.29E+10    1.1    1810.0 !254
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+OH=BC8H17+H2O            1.29E+09    1.3     700.0 !255
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+OH=CC8H17+H2O            1.95E+12    0.0     440.0 !256
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+OH=DC8H17+H2O            8.71E+09    1.1    1810.0 !257
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+O2=AC8H17+HO2            3.72E+13    0.0   49000.0 !258
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+O2=BC8H17+HO2            2.00E+13    0.0   48000.0 !259
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+O2=CC8H17+HO2            2.00E+12    0.0   46000.0 !260
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+O2=DC8H17+HO2            2.51E+13    0.0   49000.0 !261
-!      REV                     /1.00E+12    0.0   30000.0 /
-IC8H18+HO2=AC8H17+H2O2          1.70E+13    0.0   19400.0 !262
-!      REV                     /1.00E+12    0.0       0.0 /
-IC8H18+HO2=BC8H17+H2O2          3.39E+12    0.0   17000.0 !263
-!      REV                     /1.00E+12    0.0       0.0 /
-IC8H18+HO2=CC8H17+H2O2          2.02E+12    0.0   14400.0 !264  
-!      REV                     /1.00E+12    0.0       0.0 /
-IC8H18+HO2=DC8H17+H2O2          1.12E+13    0.0   19400.0 !265
-!      REV                     /1.00E+12    0.0       0.0 /
-IC8H18+CH3=AC8H17+CH4           1.17E+13    0.0   11600.0 !266
-!      REV                     /1.00E+12    0.0       0.0 /
-IC8H18+CH3=BC8H17+CH4           2.40E+12    0.0    9500.0 !267
-!      REV                     /1.00E+12    0.0       0.0 /
-IC8H18+CH3=CC8H17+CH4           2.00E+12    0.0    7900.0 !268
-!      REV                     /1.00E+12    0.0       0.0 /
-IC8H18+CH3=DC8H17+CH4           7.76E+12    0.0   11600.0 !269
-!      REV                     /1.00E+12    0.0       0.0 /
-AC8H17=AC7H14+CH3               4.00E+13    0.0   31000.0 !270
-!      REV                     /6.31E+09    0.0    7000.0 /
-AC8H17=IC4H8+IC4H9              1.09E+13    0.0   27600.0 !271    1.29
-!      REV                     /1.00E+11    0.0    8000.0 /
-BC8H17=CC7H14+CH3               1.00E+13    0.0   31000.0 !272    1.0
-!      REV                     /6.31E+10    0.0    7000.0 /
-CC8H17=IC4H8+IC4H9              1.01E+13    0.0   30700.0 !273
-!      REV                     /1.00E+11    0.0    8000.0 /
-CC8H17=IC8H16+H                 1.00E+13    0.0   38000.0 !274
-!      REV                     /1.00E+10    0.0    1500.0 /
-DC8H17=AC7H14+CH3               1.26E+13    0.0   32800.0 !275
-!      REV                     /6.31E+09    0.0    7000.0 /
-DC8H17=C3H6+NEOC5H11            3.29E+13    0.0   28700.0 !276    1.29
-!      REV                     /1.00E+10    0.0    1500.0 /
-DC8H17=IC8H16+H                 3.31E+13    0.0   36000.0 !277
-!      REV                     /1.00E+10    0.0    1500.0 /
-AC8H17+O2=IC8H16+HO2            1.51E+10    0.0   10000.0 !278
-!      REV                     /2.00E+11    0.0   20000.0 /
-BC8H17+O2=IC8H16+HO2            1.00E+10    0.0   10000.0 !279
-!      REV                     /2.00E+11    0.0   20000.0 /
-CC8H17+O2=IC8H16+HO2            1.00E+10    0.0   10000.0 !280
-!      REV                     /2.00E+11    0.0   20000.0 /
-DC8H17+O2=IC8H16+HO2            1.00E+10    0.0   10000.0 !281
-!      REV                     /2.00E+11    0.0   20000.0 /
-IC8H16+O=IC4H8+IC4H7+OH   	2.82E+13    0.0    5200.0 !282
-IC8H16+OH=IC4H8+IC4H7+H2O 	1.29E+09    1.3     700.0 !283
-IC8H16+O=IC7H15+HCO       	1.00E+11    0.0       0.0 !284
-!      REV                     /1.00E+10    0.0   30000.0 /
-IC7H15=IC4H8+IC3H7              2.51E+13    0.0   28000.0 !285
-!      REV                     /3.98E+10    0.0    6900.0 /
-IC7H15=AC7H14+H                 3.98E+13    0.0   40000.0 !286
-!      REV                     /1.58E+13    0.0    1200.0 /
-IC7H15=TC4H9+C3H6               2.51E+13    0.0   28200.0 !287
-!      REV                     /1.20E+11    0.0    8000.0 /
-IC7H15=CC7H14+H                 3.98E+13    0.0   40400.0 !288
-!      REV                     /1.58E+13    0.0    1200.0 /
-AC7H14+H=IC7H13+H2              2.82E+13    0.0    4000.0 !289
-!      REV                     /1.00E+12    0.0   14000.0 /
-CC7H14+H=IC7H13+H2              5.62E+13    0.0    4000.0 !290
-!      REV                     /1.00E+12    0.0   14000.0 /
-AC7H14+O=IC7H13+OH              5.13E+05    2.6   -1100.0 !291
-!      REV                     /1.41E+12    0.0   30000.0 /
-CC7H14+O=IC7H13+OH              5.13E+05    2.6   -1100.0 !292
-!      REV                     /1.41E+12    0.0   30000.0 /
-AC7H14+OH=IC7H13+H2O            1.35E+14    0.0    3100.0 !293
-!      REV                     /1.00E+13    0.0   27000.0 /
-CC7H14+OH=IC7H13+H2O            1.35E+14    0.0    3100.0 !294   14
-!      REV                     /1.00E+13    0.0   27000.0 /
-AC7H14+O=IC6H13+HCO             2.00E+11    0.0       0.0 !295
-!      REV                     /1.00E+12    0.0   30000.0 /
-CC7H14+O=NEOC5H11+CH3CO         1.00E+12    0.0       0.0 !296
-!      REV                     /1.00E+12    0.0   30000.0 /
-AC7H14+OH=IC6H13+CH2O           1.00E+11    0.0       0.0 !297
-!      REV                     /5.01E+12    0.0   27000.0 /
-AC7H14+OH=NEOC5H11+CH3CHO       1.00E+12    0.0       0.0 !298
-!      REV                     /1.00E+12    0.0   27000.0 /
-IC8H16=IC4H7+TC4H9              2.51E+16    0.0   71000.0 !299
-!      REV                     /1.00E+13    0.0       0.0 /
-IC8H16=C6H11+C2H5               2.51E+16    0.0   71000.0 !300
-!      REV                     /1.00E+13    0.0       0.0 /
-AC7H14=IC4H7+IC3H7              5.01E+16    0.0   71000.0 !301
-!      REV                     /1.00E+13    0.0       0.0 /
-AC7H14=TC4H9+C3H5               2.51E+16    0.0   71000.0 !302
-!      REV                     /1.00E+13    0.0       0.0 /
-CC7H14=C6H11+CH3                2.51E+16    0.0   71000.0 !303    16
-!      REV                     /1.00E+13    0.0       0.0 /
-IC8H16+OH=IC7H15+CH2O           1.00E+11    0.0       0.0 !304
-!      REV                     /1.00E+12    0.0       0.0 /
-IC7H13=IC4H8+C3H5               5.01E+13    0.0   30000.0 !305
-!      REV                     /1.26E+11    0.0   17000.0 /
-IC7H13=IC4H7+C3H6               5.01E+13    0.0   30000.0 !306
-!      REV                     /1.26E+11    0.0   17000.0 /
-IC7H13=C6H10+CH3                2.00E+14    0.0   32800.0 !307
-!      REV                     /6.46E+11    0.0    9100.0 /
-IC6H13=IC3H7+C3H6               2.51E+13    0.0   28200.0 !308
-!      REV                     /3.98E+10    0.0    6900.0 /
-IC6H13=TC4H9+C2H4               2.51E+13    0.0   28800.0 !309
-!      REV                     /3.98E+10    0.0    6900.0 /
-IC6H13=IC4H9+C2H4               2.51E+13    0.0   28800.0 !310
-!      REV                     /3.98E+10    0.0    6900.0 /
-C6H11=C3H5+C3H6 		2.51E+13    0.0   30000.0 !311
-!      REV                     /6.31E+10    0.0   17000.0 /
-C6H11=C6H10+H			1.26E+14    0.0   49300.0 !312
-!      REV                     /7.94E+12    0.0    1200.0 /
-C6H11+O2=C6H10+HO2		1.00E+11    0.0       0.0 !313
-!      REV                     /1.00E+11    0.0   17000.0 /
-C6H10=C3H5+C3H5		        5.07E+15    0.0   72800.0 !314
-!      REV                     /6.31E+12    0.0       0.0 /
-NEOC5H11=IC4H8+CH3		1.00E+11    0.0   26000.0 !315
-!      REV                     /1.00E+11    0.0    7200.0 /
-IC4H10=IC3H7+CH3		2.00E+17    0.0   83400.0 !316
-!      REV                     /1.58E+13    0.0       0.0 /
-IC4H10=TC4H9+H			1.00E+15    0.0   83400.0 !317
-!      REV                     /1.00E+11    0.0       0.0 /
-IC4H10=IC4H9+H			1.00E+15    0.0   83400.0 !318
-!      REV                     /1.00E+11    0.0       0.0 /
-IC4H10+H=TC4H9+H2		1.26E+14    0.0    7300.0 !319
-!      REV                     /1.00E+12    0.0   16000.0 /
-IC4H10+H=IC4H9+H2		1.00E+14    0.0    8400.0 !320
-!      REV                     /3.16E+12    0.0   15700.0 /
-IC4H10+OH=TC4H9+H2O		1.95E+12    0.0     440.0 !321
-!      REV                     /3.98E+12    0.0   22000.0 /
-IC4H10+OH=IC4H9+H2O		4.90E+03    0.0    -700.0 !322
-!      REV                     /8.91E+03    3.0   20800.0 /
-IC4H10+O=TC4H9+OH		1.10E+13    0.0    3280.0 !323 
-!      REV                     /2.00E+12    0.0    9600.0 /
-IC4H10+O=IC4H9+OH		3.16E+13    0.0    5760.0 !324
-!      REV                     /2.00E+12    0.0    9600.0 /
-IC4H10+CH3=TC4H9+CH4		1.00E+11    0.0    7900.0 !325
-!      REV                     /2.00E+11    0.0   21000.0 /
-IC4H10+CH3=IC4H9+CH4		8.91E+11    0.0   10340.0 !326
-!      REV                     /2.00E+11    0.0   15000.0 /
-IC4H10+HO2=TC4H9+H2O2		3.16E+12    0.0   14400.0 !327
-!      REV                     /3.16E+12    0.0    7400.0 /
-IC4H10+HO2=IC4H9+H2O2		1.70E+13    0.0   19400.0 !328
-!      REV                     /3.16E+12    0.0    7400.0 /
-IC4H10+O2=TC4H9+HO2		2.00E+12    0.0   46000.0 !329
-!      REV                     /2.00E+12    0.0    2000.0 /
-IC4H10+O2=IC4H9+HO2		3.72E+13    0.0   49000.0 !330
-!      REV                     /2.00E+12    0.0    2000.0 /
-IC4H10+C2H5=TC4H9+C2H6		1.00E+11    0.0    7900.0 !331
-!      REV                     /3.02E+11    0.0   21000.0 /
-IC4H10+C2H5=IC4H9+C2H6		1.51E+12    0.0   10400.0 !332
-!      REV                     /3.16E+11    0.0   12300.0 /
-IC4H9=C3H6+CH3                  1.00E+14    0.0   32800.0 !333                  
-!      REV                     /3.16E+11    0.0    9100.0 /
-IC4H9=IC4H8+H                	3.31E+14    0.0   36000.0 !334
-!      REV                     /1.00E+13    0.0    1200.0 /
-TC4H9=IC4H8+H    		1.00E+15    0.0   43600.0 !335
-!      REV                     /3.16E+13    0.0    1500.0 /
-TC4H9=C3H6+CH3      		1.58E+15    0.0   46300.0 !336
-!      REV                     /1.00E+11    0.0    7000.0 /
-TC4H9+O2=IC4H8+HO2  		1.00E+12    0.0    5000.0 !337
-!      REV                     /2.00E+11    0.0   17500.0 /
-IC4H9+O2=IC4H8+HO2  		1.00E+12    0.0    5000.0 !338
-!      REV                     /2.00E+11    0.0   17500.0 /
-IC4H8=C3H5+CH3			1.51E+19   -1.0   73400.0 !339
-!      REV                     /3.98E+12    0.0       0.0 /
-IC4H8=IC4H7+H			1.00E+17    0.0	  88000.0 !340
-!      REV                     /2.00E+13    0.0       0.0 /
-IC4H8+H=IC4H7+H2		1.00E+13    0.0	   3800.0 !341
-!      REV                     /3.02E+13    0.0   25000.0 /
-IC4H8+O=IC4H7+OH		2.51E+05    2.6	  -1130.0 !342
-!      REV                     /7.08E+11    0.0   29900.0 /
-IC4H8+OH=IC4H7+H2O		1.91E+12    0.0	   1230.0 !343
-!      REV                     /4.79E+12    0.0   26470.0 /
-IC4H8+O=IC3H7+HCO		7.24E+05    2.3   -1050.0 !344
-!      REV                     /2.00E+05    2.3   80280.0 /
-IC4H8+OH=IC3H7+CH2O		1.51E+12    0.0	      0.0 !345
-!      REV                     /1.95E+13    0.0   13230.0 /
-IC4H8+CH3=IC4H7+CH4		6.03E+11    0.0	   8900.0 !346
-!      REV                     /6.03E+11    0.0   29900.0 /
-IC4H7=C3H4+CH3			1.00E+13    0.0	  32600.0 !347
-!      REV                     /2.00E+11    0.0    7500.0 /
-C2H3+O2=CH2O+HCO		3.98E+12    0.0    -250.0 !348
-!      REV                     /3.98E+12    0.0   86300.0 /
-AC8H17=DC8H17	                6.03E+11    0.0	  14100.0 !349
-!      REV                     /8.91E+11    0.0   14200.0 /
-AC8H17=CC8H17           	1.00E+11    0.0   16100.0 !350
-!      REV                     /8.91E+11    0.0   21100.0 /
-NEOC5H11O2 = NEOC5H11+O2        3.472E+26  -3.68  3.604E+4 !351
-NEOC5H11+NEOC5H11O2=NEOC5H11O+NEOC5H11O  7.000E+12   0.00 -1.000E+03 !352
-NEOC5H11O2 = NEOC5H10OOH                 2.125E+13   0.00  2.440E+04 !353
-NEOC5H11O2+HO2 = NEOC5H11O2H+O2          1.750E+13   0.00 -3.275E+03 !354
-NEOC5H11O2+H2O2 = NEOC5H11O2H+HO2        2.400E+12   0.00  1.000E+04 !355
-NEOC5H11O2+NEOC5H11O2=O2+NEOC5H11O+NEOC5H11O  1.400E+16  -1.61  1.860E+03 !356
-NEOC5H11O2H = NEOC5H11O+OH               1.500E+16   0.00  4.250E+04 !357
-NEOC5H11O = CH2O+TC4H9                   1.349E+18  -2.34  1.899E+04 !358
-NEOC5H11+HO2 = NEOC5H11O+OH              1.000E+14   0.00  0.000E+00 !359
-NEOC5H10OOH = OH+CH2O+IC4H8              3.011E+18  -1.17  1.995E+04 !360
-NEOC5H11=C3H6+C2H5                       3.587E+16  -1.28  3.193E+04 !361
-AC8H17+HO2=IC6H13+C2H3+H2O2     1.00E+12    0.0       0.0 ! 362
-BC8H17+HO2=IC6H13+C2H3+H2O2     1.00E+12    0.0       0.0 ! 363
-CC8H17+HO2=IC6H13+C2H3+H2O2     1.00E+12    0.0       0.0 ! 364
-DC8H17+HO2=IC6H13+C2H3+H2O2     1.00E+12    0.0       0.0 ! 365
-IC8H18+C2H3=AC8H17+C2H4         1.00E+12    0.0       0.0 ! 366
-IC8H18+C2H3=BC8H17+C2H4         1.00E+12    0.0       0.0 ! 367
-IC8H18+C2H3=CC8H17+C2H4         1.00E+12    0.0       0.0 ! 368
-IC8H18+C2H3=DC8H17+C2H4         1.00E+12    0.0       0.0 ! 369
-CC7H14+OH=IC6H13+CH2O           1.00E+12    0.0       0.0 ! 370
-!
-AC8H17+O2=R1C8H17OO             2.50E+19   -2.5       0.0 ! 371
-BC8H17+O2=R1C8H17OO             2.50E+19   -2.5       0.0 ! 372
-CC8H17+O2=R2C8H17OO             2.50E+19   -2.5       0.0 ! 373
-DC8H17+O2=R2C8H17OO             2.50E+19   -2.5       0.0 ! 374
-!
-R1C8H17OO=C8H16OOH              2.00E+12    0.0   28500.0 ! 375
-R2C8H17OO=C8H16OOH              3.38E+12    0.0   28500.0 ! 376       !  1.38
-C8H16OOH+O2=R1C8H16OOHOO        2.20E+19   -2.5       0.0 ! 377
-C8H16OOH+O2=R2C8H16OOHOO        2.20E+19   -2.5       0.0 ! 378
-R1C8H16OOHOO=C8H15O4H2          4.62E+12    0.0   28500.0 ! 379
-R2C8H16OOHOO=C8H15O4H2          4.00E+12    0.0   28500.0 ! 380
-C8H15O4H2=OH+C7H14CHO(OOH)      2.00E+11    0.0    7500.0 ! 381
-C7H14CHO(OOH)=C6H13CO+CH2O+OH   2.05E+15    0.0  4.140E+4 ! 382       !  2.05
-C6H13CHO + O2= C6H13CO + HO2    1.00E+10    0.5  4.200E+4 ! 383
-C6H13CHO + OH= C6H13CO + H2O    1.00E+12    0.0       0.0 ! 384
-C6H13CHO + H = C6H13CO + H2     4.00E+13    0.0  4.200E+3 ! 385
-C6H13CHO + O = C6H13CO + OH     5.00E+12    0.0  1.790E+3 ! 386
-C6H13CHO +HO2= C6H13CO + H2O2   2.80E+12    0.0  1.360E+4 ! 387
-C6H13CHO +CH3= C6H13CO + CH4    1.70E+11    0.0  8.440E+3 ! 388
-C6H13CO=CO+IC6H13               1.00E+11    0.0  9.600E+3 ! 389
-IC6H13=C6H12+H                  3.345E+16  -0.9  3.795E+4 ! 390
-IC6H13=C2H4+PC4H9               2.805E+17  -1.29 3.018E+4 ! 391
-C6H12+OH=NEOC5H11+CH2O          1.000E+11   0.00 -4.000E+3! 392
-C6H12+OH=TC4H9+CH3CHO           1.000E+11   0.00 -4.000E+3! 393
-C6H12=C3H5+IC3H7                1.000E+16   0.00  7.100E+4! 394
-C6H12+OH=C6H11+H2O              3.000E+13   0.00  1.230E+3! 395
-C6H12+CH3=C6H11+CH4             1.000E+12   0.00  7.300E+3! 396
-!
-N       + NO      = N2      + O                3.500E+13   0.0     330.0!CGS
-N       + O2      = NO      + O                2.650E+12   0.0    6400.0!CGS
-N       + OH      = NO      + H                7.333E+13   0.0    1120.0!CGS
-N       + CO2     = NO      + CO               1.900E+11   0.0    3400.0!CGS
-N2O     + O       = N2      + O2               1.400E+12   0.0   10810.0!CGS
-N2O     + O       = NO      + NO               2.900E+13   0.0   23150.0!CGS
-N2O     + H       = N2      + OH               4.400E+14   0.0   18880.0!CGS
-N2O     + OH      = N2      + HO2              2.000E+12   0.0   21060.0!CGS
-N2O     + M       = N2      + O       + M      1.300E+11   0.0   59620.0!CGS
-NO      + HO2     = NO2     + OH               2.110E+12   0.0    -480.0!CGS
-NO2     + O       = NO      + O2               3.900E+12   0.0    -240.0!CGS
-NO2     + H       = NO      + OH               1.320E+14   0.0     360.0!CGS
-NO      + O   +M  = NO2     + M                1.060E+20  -1.41      0.0!CGS
-END
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_ch4 b/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_ch4
deleted file mode 100644
index 24d1fc3a9..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_ch4
+++ /dev/null
@@ -1,450 +0,0 @@
-ELEMENTS
- H   O    C   N  AR
-END
-SPECIES
-H2 O2 OH H H2O O H2O2 HO2
-CH4 CO CO2 HCO CH3O CH2OH CH2O CH3 CH2 CH2(S) CH HCCO CH3O2 CH4O2
-C2H6 C2H5 C2H4 C2H3 C2H2 C2H CH3CO CH2CO C3H2 C3H3 C3H4 C3H5 C3H6 HCCOH
-C2H5OH CH3HCO CH3CHOH CH3OH C4H2 C4H3 CH3OCH3 CH3OCH2 CH3OCH2OOH CH3OCH2OO
-CH3OCH2O HCOOCH3 HCOOH CH3OCO
-O3 N2 AR C
-C3H7 C3H8
-THERMO            ! 1995 NASA COMPILATION + EDGAR DATA
-CH3O2             L 1/84C   1H   3O   2N   0G   300.000  5000.00               1
- 0.66812963E 01 0.80057271E-02-0.27188507E-05 0.40631365E-09-0.21927725E-13    2
- 0.52621851E 03-0.99423847E 01 0.20986490E 01 0.15786357E-01 0.75683261E-07    3
--0.11274587E-07 0.56665133E-11 0.20695879E 04 0.15007068E 02                   4
-CH4O2             T12/93C   1H   4O   2N   0G   200.000  6000.000              1
- 0.61600316E+01 0.10239957E-01-0.36101507E-05 0.57550301E-09-0.34178147E-13    2
--0.17654526E+05-0.61911544E+01 0.49652507E+01 0.92343510E-03 0.34455956E-04    3
--0.44469600E-07 0.17456120E-10-0.16726970E+05 0.29880275E+01                   4
-C2H5OH            L 8/88C   2H   6O   1N   0G   200.000  6000.000              1
- 0.65624365E+01 0.15204222E-01-0.53896795E-05 0.86225011E-09-0.51289787E-13    2
--0.31525621E+05-0.94730202E+01 0.48586957E+01-0.37401726E-02 0.69555378E-04    3
--0.88654796E-07 0.35168835E-10-0.29996132E+05 0.48018545E+01-0.28257829E+05    4
-C3H3              BUR 92C   3H   3O   0N   0G   200.000  6000.000              1
- 6.64175821E+00 8.08587428E-03-2.84787887E-06 4.53525977E-10-2.68879815E-14    2
- 3.89793699E+04-1.04004255E+01 1.82840766E+00 2.37839036E-02-2.19228176E-05    3
- 1.00067444E-08-1.38984644E-12 4.01863058E+04 1.38447957E+01 4.16139977E+04    4
-C3H4              L12/92C   3H   4O   0N   0G   200.000  6000.000              1
- 6.31694869E+00 1.11336262E-02-3.96289018E-06 6.35633775E-10-3.78749885E-14    2
- 2.01174617E+04-1.09718862E+01 2.61307487E+00 1.21223371E-02 1.85405400E-05    3
--3.45258475E-08 1.53353389E-11 2.15415642E+04 1.02503319E+01 2.29622672E+04    4
-C3H5              BUR 92C   3H   5O   0N   0G   200.000  6000.000              1
- 6.54761132E+00 1.33152246E-02-4.78333100E-06 7.71949814E-10-4.61930808E-14    2
- 1.72714707E+04-9.27486841E+00 3.78794693E+00 9.48414335E-03 2.42343368E-05    3
--3.65604010E-08 1.48592356E-11 1.86261218E+04 7.82822499E+00 2.03259122E+04    4
-C3H7            N-L 9/84C   3H   7    0    0G   300.000  5000.000              1
- 0.77026987E 01 0.16044203E-01-0.52833220E-05 0.76298590E-09-0.39392284E-13    2
- 0.82984336E 04-0.15480180E 02 0.10515518E 01 0.25991980E-01 0.23800540E-05    3
--0.19609569E-07 0.93732470E-11 0.10631863E 05 0.21122559E 02 0.12087447E 05    4
-C4H2              L 2/93C   4H   2O   0N   0G   200.000  6000.000              1
- 8.66704895E+00 6.71505191E-03-2.35355060E-06 3.73635366E-10-2.21054043E-14    2
- 5.10016978E+04-2.18002050E+01-4.07132393E-01 5.20775143E-02-9.21138340E-05    3
- 8.08657403E-08-2.70422080E-11 5.25957367E+04 2.03240223E+01 5.41222513E+04    4
-C4H3              L 9/89C   4H   3O   0N   0G   298.150  6000.000              1
- 0.84762079E+01 0.88782327E-02-0.30328412E-05 0.47358302E-09-0.27716627E-13    2
- 0.54756540E+05-0.17170551E+02 0.24173247E+01 0.24104782E-01-0.12813470E-04    3
--0.28606237E-08 0.39194527E-11 0.56506476E+05 0.14471107E+02 0.58181574E+05    4
-C4H4              L 9/89C   4H   4O   0N   0G   200.000  6000.000              1
- 0.82948104E+01 0.11994381E-01-0.42624075E-05 0.68306978E-09-0.40680631E-13    2
- 0.33550866E+05-0.18426826E+02 0.14049083E+01 0.29531073E-01-0.15596302E-04    3
--0.32142002E-08 0.45436937E-11 0.35507830E+05 0.17450183E+02 0.37097268E+05    4
-CH3OCH3           L12/92C   2H   6O   1N   0G   200.000  6000.000              1
- 5.64844183E+00 1.63381899E-02-5.86802367E-06 9.46836869E-10-5.66504738E-14    2
--2.51074690E+04-5.96264939E+00 5.30562279E+00-2.14254272E-03 5.30873244E-05    3
--6.23147136E-08 2.30731036E-11-2.39866295E+04 7.13264209E-01-2.21432171E+04    4
-CH3OCH2           T11/82C   2H   5O   1N   0G   300.000  5000.0                1
- 0.65567484E+01 0.12180723E-01-0.40628420E-05 0.59495830E-09-0.31276214E-13    2
--0.40282515E+04-0.81302772E+01 0.35953999E+01 0.13379216E-01 0.53914910E-05    3
--0.10947097E-07 0.38193320E-11-0.27021975E+04 0.92850365E+01                   4
-CH3OCH2OOH        Jan96 C   2H   6O   3N   0G    300.00  3000.00   1000.     0 1
- 7.66981055E+00 2.35536769E-02-1.15031834E-05 2.84464629E-09-2.79520304E-13    2
--3.96295537E+04-1.39224857E+01 3.05518950E-02 4.90560834E-02-4.43030986E-05    3
- 2.21548123E-08-4.66587486E-12-3.80282020E+04 2.43189660E+01                   4
-CH3OCH2OO         Jan96 C   2H   5O   3N   0G    300.00  3000.00   1000.     0 1
- 8.06217488E+00 2.05153644E-02-1.00803231E-05 2.50244952E-09-2.46544863E-13    2
--2.19951127E+04-1.59505736E+01 4.74967287E-01 4.68199208E-02-4.55041928E-05    3
- 2.44627078E-08-5.51108848E-12-2.04517448E+04 2.17234867E+01                   4
-CH3OCH2O          Jan96 C   2H   5O   2N   0G    300.00  3000.00   1000.     0 1
- 5.98450336E+00 1.93302785E-02-9.44575204E-06 2.33651645E-09-2.29626013E-13    2
--2.12266609E+04-7.95685946E+00-1.22386711E-01 3.94270827E-02-3.47990406E-05    3
- 1.69073231E-08-3.44801024E-12-1.99352987E+04 2.26909497E+01                   4
-CH3OCHO           Jan96 C   2H   4O   2N   0G    300.00  3000.00   1000.       1
- 5.46071782E+00 1.70659166E-02-8.38236448E-06 2.08015776E-09-2.04870146E-13    2
--4.58756417E+04-3.33482124E+00-4.40150386E-01 3.69251939E-02-3.41468832E-05    3
- 1.73800460E-08-3.70831952E-12-4.46516329E+04 2.61277510E+01                   4
-HCOOCH3                 C   2H   4O   2N   0G   300.000  5000.000              1
- 0.83982000E 01 0.11267000E-01-0.41325000E-05 0.72745000E-09-0.48932000E-13    2
--0.48328000E 05-0.18820000E 02-0.15323000E 01 0.43051000E-01-0.45098000E-04    3
- 0.26064000E-07-0.63345000E-11-0.45711000E 05 0.31603000E 02                   4
-HCOOH             L 8/88H  2.C  1.O  2.   0.G   200.000  6000.000              1
- 5.69579404E+00 7.72237361E-03-3.18037808E-06 5.57949466E-10-3.52618226E-14    2
--4.81599723E+04-6.01680080E+00 3.23262453E+00 2.81129582E-03 2.44034975E-05    3
--3.17501066E-08 1.20631660E-11-4.67785606E+04 9.86205647E+00-4.55312460E+04    4
-CH3OCO                  C   2H   3O   2    0G   300.000  5000.000              1
- 0.76505900E 01 0.99082000E-02-0.37559700E-05 0.67845900E-09-0.46572100E-13    2
--0.24947700E 05-0.12937300E 02-0.89045900E 00 0.38842600E-01-0.42829300E-04    3
- 0.25682800E-07-0.63729700E-11-0.22835200E 05 0.29911300E 02                   4
-END
-REACTIONS
-CH4   + O2           = CH3   + HO2        7.900E+13  0.00  56000.
-CH4   + H            = CH3   + H2         6.600E+08  1.62  10840. ! 2.200E+04  3.00   8750.
-CH4   + OH           = CH3   + H2O        1.600E+06  2.10   2460.
-CH4   + O            = CH3   + OH         1.020E+09  1.50   8604.
-CH4   + HO2          = CH3   + H2O2       1.800E+11  0.00  18700.
-CH3   + HO2          = CH3O  + OH         2.000E+13  0.00      0.
-CH3   + O2           = CH3O  + O          2.720E+13  0.00  30900.
-CH3   + O2           = CH2O  + OH         3.800E+10  0.00   9000.  ! 3.8
-CH3   + CH2O         = CH4   + HCO        5.500E+03  2.82   6000.
-CH3   + HCO          = CH4   + CO         1.200E+14  0.00      0.
-CH3   + O            = CH2O  + H          8.000E+13  0.00      0.
-CH3   + OH           = CH2   + H2O        7.500E+06  2.00   5000.
-CH3   + OH           = CH2O  + H2         4.000E+12  0.00      0.
-CH3   + H            = CH4                1.900E+36 -7.00   9050.
-CH3   + CH3          = C2H6               1.900D+53 -12.0  19400.
-!
-CH3   + CH3O         = CH4   + CH2O       1.000E+13  0.00      0.
-CH3   + CH2OH        = CH4   + CH2O       1.000E+12  0.00      0.
-CH3   + C2H5         = CH4   + C2H4       2.000E+13 -0.50      0.
-CH3   + C2H4         = CH4   + C2H3       6.620E+00  3.70   9482.
-CH3   + C2H3         = CH4   + C2H2       1.000E+12  0.00      0.
-CH3   + C2H2         = CH4   + C2H        1.800E+11  0.00  17270.
-CH3   + CH3          = C2H4  + H2         1.000E+14  0.00  31000.
-CH3   + M            = CH2   + H     + M  1.000E+16  0.00  90600.
-CH3   + HCO          = CH2   + CH2O       2.000E+14  0.00      0.
-CH2   + H2           = CH3   + H          5.000E+05  2.00   7230.
-CH2   + CH3          = C2H4  + H          4.000E+13  0.00      0.
-!
-CH2(S)+ CH3          = C2H4  + H          3.000E+13  0.00   -570.
-CH2(S)+ H2           = CH3   + H          8.000E+13  0.00      0.
-CH2(S)+ CH4          = CH3   + CH3        4.000E+12  0.00   -570.
-CH2(S)+ C2H6         = CH3   + C2H5       4.000E+12  0.00   -550.
-CH2(S)+ C2H2         = C3H3  + H          3.000E+13  0.00      0.
-CH2(S)+ N2           = CH2   + N2         1.500E+13  0.00    600.
-CH2(S)+ AR           = CH2   + AR         9.000E+12  0.00    600.
-CH2(S)+ CO2          = CH2   + CO2        7.000E+12  0.00      0.
-CH2(S)+ CO2          = CH2O  + CO         1.400E+11  0.00   1000.
-CH2(S)+ H2O          = CH2   + H2O        3.000E+13  0.00      0.
-CH2(S)+ O2           = CO    + OH    + H  2.800E+12  0.00   -500.
-CH2(S)+ O2           = CO    + H2O        1.200E+12  0.00   -500.
-CH2(S)+ H            = CH    + H2         3.000E+13  0.00      0.
-CH2(S)+ O            = CO    + H2         3.000E+13  0.00      0.
-!
-CH2OH + H            = CH3   + OH         1.000E+14  0.00      0.
-CH3O  + H            = CH3   + OH         1.000E+14  0.00      0.
-CH3O  + M            = CH2O  + H     + M  1.000E+14  0.00  25000.
-CH2OH + M            = CH2O  + H     + M  1.000E+14  0.00  25000.
-CH3O  + H            = CH2O  + H2         2.000E+13  0.00      0.
-CH2OH + H            = CH2O  + H2         2.000E+13  0.00      0.
-CH3O  + OH           = CH2O  + H2O        1.000E+13  0.00      0.
-CH2OH + OH           = CH2O  + H2O        1.000E+13  0.00      0.
-CH3O  + O            = CH2O  + OH         1.000E+13  0.00      0.
-CH2OH + O            = CH2O  + OH         1.000E+13  0.00      0.
-CH3O  + O2           = CH2O  + HO2        6.300E+10  0.00   2600.    ! 6.3
-CH2OH + O2           = CH2O  + HO2        1.480E+13  0.00   1500.
-!CH2   + H            = CH    + H2         1.000E+18 -1.56      0.
-CH2   + OH           = CH    + H2O        1.130E+07  2.00   3000.
-CH2   + OH           = CH2O  + H          2.500E+13  0.00      0.
-CH2   + CH2          = C2H2  + H2         4.000E+13  0.00      0.
-CH2   + HCCO         = C2H3  + CO         3.000E+13  0.00      0.
-CH    + H2           = H     + CH2        1.107E+08  1.79   1670.
-CH    + O2           = HCO   + O          6.300E+13  0.00      0.
-CH    + O            = CO    + H          5.700E+13  0.00      0.
-CH    + OH           = HCO   + H          3.000E+13  0.00      0.
-CH    + CO2          = HCO   + CO         3.400E+12  0.00    690.
-CH    + H2O          = CH2O  + H          1.170E+15 -0.75      0.
-CH    + CH2O         = CH2CO + H          9.460E+13  0.00   -515.
-CH    + C2H2         = C3H2  + H          1.000E+14  0.00      0.
-CH    + CH2          = C2H2  + H          4.000E+13  0.00      0.
-CH    + CH3          = C2H3  + H          3.000E+13  0.00   -400.
-CH    + CH4          = C2H4  + H          3.000E+13  0.00      0.
-CH2   + O            = CO    + H     + H  5.000E+13  0.00      0.
-CH2   + O            = HCO   + H          8.000E+13  0.00      0.
-CH2   + O2           = CO2   + H     + H  1.600E+12  0.00   1000.
-CH2   + O2           = CH2O  + O          5.000E+13  0.00   9000.
-CH2   + O2           = CO2   + H2         6.900E+11  0.00    500.
-CH2   + O2           = HCO   + OH         4.300E+10  0.00   -500.
-CH2O  + OH           = HCO   + H2O        3.430E+09  1.18   -447.
-CH2O  + H            = HCO   + H2         2.190E+08  1.77   3000.
-CH2O  + M            = HCO   + H     + M  3.310E+16  0.00  81000.
-CH2O  + O            = HCO   + OH         1.800E+13  0.00   3080.
-CH2O  + O2           = HCO   + HO2        6.200E+13  0.00  39000.
-CH2O  + HO2          = HCO   + H2O2       1.000E+12  0.00   9000.
-CH2O  + HO2          = HCOOH + OH         1.000E+13  0.00  14900.
-!
-HCOOH + H            = H     + CO2  + H2  3.060E+10  1.00   3200.
-HCOOH + O            = H     + CO2  + OH  5.360E+11  0.60   2900.
-HCOOH + OH           = H     + CO2  + H2O 2.500E+11  0.00      0.
-HCOOH + HO2          = H2O2  + CO2  + H   2.500E+11  0.00      0.
-HCOOH + CH3          = CH4   + CO2  + H   1.100E-03  4.90   3480.
-HCOOH + CH3OCH2      = CH3OCH3 + CO2 + H  1.100E-03  4.90   3480.
-!
-HCO   + OH           = H2O   + CO         1.000E+14  0.00      0.
-!HCO   + M            = H     + CO    + M  2.500E+14  0.00  16802.
-HCO   + H2O          = H     + CO   + H2O 2.244E+18 -1.00  17000.
-HCO   + M            = H     + CO    + M  1.870E+17 -1.00  17000.
-H2/2.00/ H2O/ .00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/
-HCO   + H            = CO    + H2         1.190E+13  0.25      0.
-HCO   + O            = CO    + OH         3.000E+13  0.00      0.
-HCO   + O            = CO2   + H          3.000E+13  0.00      0.
-HCO   + O2           = HO2   + CO         3.300E+13 -0.40      0.
-HCO   + HCO          = CH2O  + CO         3.000E+13  0.00      0.
-HCO   + HCO          = H2    + CO   + CO  3.000E+12  0.00      0.
-CO    + O    + M     = CO2   + M          6.170E+14  0.00   3000.
-H2/2.00/ O2/6.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/3.50/ C2H6/3.00/ AR/0.50/
-CO    + OH           = CO2   + H          1.510E+07  1.30   -758.
-CO    + O2           = CO2   + O          1.600E+13  0.00  41000.
-HO2   + CO           = CO2   + OH         5.800E+13  0.00  22934.
-C2H6  + CH3          = C2H5  + CH4        5.500E-01  4.00   8300.
-C2H6  + H            = C2H5  + H2         5.400E+02  3.50   5210.
-C2H6  + O            = C2H5  + OH         3.000E+07  2.00   5115.
-C2H6  + OH           = C2H5  + H2O        8.700E+09  1.05   1810.
-C2H4  + H            = C2H3  + H2         1.100E+14  0.00   8500.
-C2H4  + O            = CH3   + HCO        1.600E+09  1.20    746.
-C2H4  + OH           = C2H3  + H2O        2.020E+13  0.00   5955.
-H     + C2H4         = C2H5               2.600E+43 -9.25  52580.
-C2H5  + H            = CH3   + CH3        1.000E+14  0.00      0.
-C2H5  + O2           = C2H4  + HO2        8.430E+11  0.00   3875.
-C2H2  + O            = CH2   + CO         1.020E+07  2.00   1900.
-C2H2  + O            = HCCO  + H          1.020E+07  2.00   1900.
-H2    + C2H          = C2H2  + H          4.090E+05  2.39    864.
-C2H3                 = C2H2  + H          4.600E+40 -8.80  46200.
-C2H3  + H            = C2H2  + H2         4.000E+13  0.00      0.
-C2H3  + O            = CH2CO + H          3.000E+13  0.00      0.
-C2H3  + O2           = CH2O  + HCO        4.000E+12  0.00   -250.
-C2H3  + O2           = C2H2  + HO2        1.580E+13  0.00  10060.
-C2H3  + OH           = C2H2  + H2O        5.000E+12  0.00      0.
-C2H3  + CH2          = C2H2  + CH3        3.000E+13  0.00      0.
-C2H3  + C2H          = C2H2  + C2H2       3.000E+13  0.00      0.
-C2H3  + CH           = CH2   + C2H2       5.000E+13  0.00      0.
-OH    + C2H2         = C2H   + H2O        3.370E+07  2.00  14000.
-OH    + C2H2         = HCCOH + H          5.040E+05  2.30  13500.
-OH    + C2H2         = CH2CO + H          2.180E-04  4.50  -1000.
-OH    + C2H2         = CH3   + CO         4.830E-04  4.00  -2000.
-C2H2  + O            = C2H   + OH         3.160E+15 -0.60  15000.
-HCCOH + H            = CH2CO + H          1.000E+13  0.00      0.
-!
-CH2CO + O            = CO2   + CH2        1.750E+12  0.00   1350.
-CH2CO + O            = HCO   + HCO        2.300E+13  0.00   2300.
-CH2CO + H            = CH3   + CO         1.130E+13  0.00   3428.
-CH2CO + H            = HCCO  + H2         5.000E+13  0.00   8000.
-CH2CO + O            = HCCO  + OH         1.000E+13  0.00   8000.
-CH2CO + OH           = HCCO  + H2O        7.500E+12  0.00   2000.
-CH2CO + M            = CH2   + CO   + M   3.000E+14  0.00  70980.
-C2H   + O2           = CO    + CO   + H   5.000E+13  0.00   1500.
-HCCO  + H            = CH2(S)+ CO         1.000E+14  0.00      0.
-HCCO  + O            = H     + CO   + CO  1.000E+14  0.00      0.
-HCCO  + O2           = OH    + CO   + CO  1.600E+12  0.00    854.
-HCCO  + CH           = C2H2  + CO         5.000E+13  0.00      0.
-HCCO  + HCCO         = C2H2  + CO   + CO  1.600E+12  0.00    854.
-C2H   + O            = CH    + CO         5.000E+13  0.00      0.
-C2H   + OH           = HCCO  + H          2.000E+13  0.00      0.
-C3H2  + O2           = HCCO  + HCO        1.000E+13  0.00      0.
-C3H3  + O2           = CH2CO + HCO        3.000E+10  0.00   2868.
-C3H3  + O            = CH2O  + C2H        2.000E+13  0.00      0.
-C3H3  + OH           = C3H2  + H2O        2.000E+13  0.00      0.
-C2H2  + O2           = HCCO  + OH         2.000E+08  1.50  30100.
-C2H2  + M            = C2H   + H     + M  4.200E+16  0.00 107000.
-C2H4  + M            = C2H2  + H2    + M  1.500E+15  0.00  55800.
-H2    + O2           = OH    + OH         1.700E+13  0.00  47780.
-H2    + OH           = H2O   + H          1.170E+09  1.30   3626.
-O     + OH           = O2    + H          8.000E+14 -0.60      0.
-!H     + O2           =  O    + OH         8.300E+13  0.00  14413.
-O     + H2           = OH    + H          5.060E+04  2.67   6290.
-H     + O2   + M     = HO2   + M          3.610E+17 -0.72      0.
-  H2O/21./  CO2/5.0/  H2/3.3/  CO/2.0/ AR/0.0/
-H     + O2   +    AR = HO2   + AR         7.000E+17 -0.80     0.
-OH    + HO2          = H2O   + O2         2.890E+13  0.00    497.
-H     + HO2          = OH    + OH         1.700E+14  0.00    874.
-O     + HO2          = O2    + OH         1.400E+13  0.00   1073.
-OH    + OH           = O     + H2O        6.000E+08  1.30      0.
-H     + H    + M     = H2    + M          1.000E+18 -1.00      0.
-  H2O/0./   H/2./  H2/0./ CO2/0./ AR/0.5/
-H     + H    + H2    = H2    + H2         9.200E+16 -0.60      0.
-H     + H    + H2O   = H2    + H2O        6.000E+19 -1.25      0.
-H     + H    + CO2   = H2    + CO2        5.490E+20 -2.00      0.
-H     + OH   + M     = H2O   + M          1.600E+22 -2.00      0.
-  H2/0.73/ H2O/3.65/ CH4/2.00/ C2H6/3.00/ AR/0.38/
-H     + O    + M     = OH    + M          5.000E+17 -1.00      0.
-  H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ AR/0.50/
-O     + O    + M     = O2    + M          1.200E+17 -1.00      0.
-  H2/ 2.40/ H2O/15.40/ CH4/ 2.00/ CO/ 1.75/ CO2/ 3.60/ C2H6/ 3.00/ AR/ 0.50/
-H     + HO2          = H2    + O2         4.280E+13  0.00   1411.
-HO2   + HO2          = H2O2  + O2         3.020E+12  0.00   1390.  ! 1.300E+11     .000   -1630.00
-H2O2  + M            = OH    + OH    + M  1.200E+17  0.00  45500.
-     AR/0.5/
-H2O2  + H            = HO2   + H2         4.790E+13  0.00   7950.
-H2O2  + OH           = H2O   + HO2        1.000E+13  0.00   1800.
-H     + HO2          = O     + H2O        3.100E+10  0.00   1720.
-O     + OH   + M     = HO2   + M          6.400E+15  0.00      0.
-     AR/0.5/
-H2O2  + H            = H2O   + OH         1.000E+13  0.00   3590.
-H2O2  + O            = H2O   + O2         8.400E+11  0.00   4260.
-H2O2  + O            = OH    + HO2        2.000E+13  0.00   5900.
-H2    + HO2          = H2O   + OH         6.500E+11  0.00  18800.
-C2H6  + CH           = H     + C3H6       1.100E+14  0.00   -263.
-C3H6  + O            = CH3CO + CH3        5.000E+12  0.00    454.
-C3H6  + O            = C2H5  + HCO        1.500E+12  0.00      0.
-CH3CO + H            = CH2CO + H2         2.000E+13  0.00      0.
-CH3CO + O            = CH3   + CO2        2.000E+13  0.00      0.
-CH3CO + CH3          = C2H6  + CO         5.000E+13  0.00      0.
-CH3CO                = CH3   + CO         2.300E+26 -5.00  17970.
-!C2H3  + CH3  + M     = C3H6  + M          5.000E+10  0.00      0.
-CH3   + C2H3         = C3H6               2.000E+13  0.00      0.
-CH3   + C2H2         = C3H5               6.000E+11  0.00  16000.
-C2H5  + C3H5         = C2H4  + C3H6       4.000E+11  0.00      0.
-C2H3  + C3H6         = C2H4  + C3H5       3.160E+12  0.00  31000.
-C3H5  + H            = C3H6               2.000E+13  0.00      0.
-C2H6  + O2           = C2H5  + HO2        1.000E+13  0.00  48960.
-C2H4  + O2           = C2H3  + HO2        4.200E+13  0.00  57590.
-C2H5  + HO2          = C2H4  + H2O2       3.000E+11  0.00      0.
-!
-O3    + M            = O2    + O     + M  3.000E+14  0.00  22180.
-O3    + O            = O2    + O2         1.000E+13  0.00   4570.
-O3    + H            = O2    + OH         1.000E+14  0.00    890.
-O3    + OH           = HO2   + O2         1.000E+12  0.00   1848.
-O3    + HO2          = OH    + O2    + O2 1.000E+13  0.00  11000.
-!
-CH3OH                = CH2OH + H          3.700E+15  0.00  96700.
-CH3OH                = CH3O  + H          4.500E+15  0.00  96700.
-CH3OH                = CH3   + OH         3.800E+15  0.00  91700.
-CH3OH + O2           = CH2OH + HO2        4.050E+13  0.0   44906.
-CH3OH + H            = CH2OH + H2         1.700E+07  2.10   4870.
-CH3OH + H            = CH3O  + H2         4.200E+06  2.10   4870.
-CH3OH + O            = OH    + CH2OH      3.880E+05  2.50   3100.
-CH3OH + O            = OH    + CH3O       1.300E+05  2.50   5000.
-CH3OH + OH           = CH2OH + H2O        1.440E+06  2.00   -840.
-CH3OH + OH           = CH3O  + H2O        6.300E+06  2.00   1500.
-CH3OH + HO2          = CH2OH + H2O2       5.200E+13  0.00  19360.
-CH3OH + CH3          = CH2OH + CH4        3.000E+07  1.50   9940.
-CH3OH + CH3          = CH3O  + CH4        1.000E+07  1.50   9940.
-CH3OH + CH3O         = CH3OH + CH2OH      3.00E+11   0.0    4000.
-CH3O  + CH3O         = CH3OH + CH2O       1.200E+12  0.0       0.
-CH2OH + CH2OH        = CH3OH + CH2O       1.200E+12  0.0       0.
-CH2OH + HCO          = CH3OH + CO         1.200E+12  0.0       0.
-!
-C2H5OH               = CH3     + CH2OH    3.020E+18  0.00  75470.
-C2H5OH + O2          = CH3CHOH + HO2      4.000E+10  0.00  50000.
-C2H5OH + OH          = CH3CHOH + H2O      3.020E+13  0.00   5960.
-C2H5OH + H           = CH3CHOH + H2       4.360E+12  0.00   4570.
-C2H5OH + O           = CH3CHOH + OH       6.760E+12  0.00   1510.
-C2H5OH + HO2         = CH3CHOH + H2O2     6.310E+12  0.00  15000.
-C2H5OH + CH3         = CH3CHOH + CH4      4.000E+12  0.00   9690.
-!
-CH3CHOH + M          = CH3HCO  + H   + M  5.000E+13  0.00  21850.
-CH3CHOH + O2         = CH3HCO  + HO2      1.000E+13  0.0    5560.
-C2H5OH  + H          = C2H5    + H2O      5.250E+12  0.00   5000.
-CH3HCO               = CH3     + HCO      7.080E+15  0.00  81760.
-CH3HCO               = CH3CO   + H        5.000E+14  0.00  87860.
-CH3HCO  + O2         = CH3CO   + HO2      2.000E+13  0.50  42200.
-CH3HCO  + H          = CH3CO   + H2       4.000E+13  0.00   4200.
-CH3HCO  + OH         = CH3CO   + H2O      1.000E+13  0.00      0.
-CH3HCO  + O          = CH3CO   + OH       5.000E+12  0.00   1790.
-CH3HCO  + CH3        = CH3CO   + CH4      1.700E+12  0.00   8430.
-CH3HCO  + HO2        = CH3CO   + H2O2     1.700E+12  0.00  10700.
-C2H2    + C2H2       = C4H3    + H        2.000E+12  0.00  45900.
-C4H3    + M          = C4H2    + H  + M   1.000E+16  0.00  59700.
-C4H2    + O          = C3H2    + CO       1.200E+12  0.00      0.
-C2H2    + C2H        = C4H2    + H        4.000E+13  0.00      0.
-C3H4    + O          = CH2O    + C2H2     1.000E+12  0.00      0.
-C3H4    + OH         = CH2O    + C2H3     1.000E+12  0.00      0.
-C3H4    + O          = HCO     + C2H3     1.000E+12  0.00      0.
-C3H4    + OH         = HCO     + C2H4     1.000E+12  0.00      0.
-C3H6    + O          = CH2O    + C2H4     5.900E+13  0.00      0.
-C3H6    + OH         = CH3     + CH3HCO   7.080E+12  0.00      0.
-C3H6    + OH         = C3H5    + H2O      4.000E+12  0.00      0.
-C3H6    + OH         = C2H5    + CH2O     8.000E+12  0.00      0.
-C3H6    + H          = C3H5    + H2       5.000E+12  0.00   1500.
-C3H6    + CH3        = C3H5    + CH4      1.000E+11  0.00   8500.
-C3H6    + C2H5       = C3H5    + C2H6     1.000E+11  0.00   9200.
-C3H5                 = C3H4    + H        4.000E+13  0.00  70000.
-C3H5    + O2         = C3H4    + HO2      6.020E+11  0.00  10000.
-C3H5    + H          = C3H4    + H2       1.000E+13  0.00      0.
-C3H5    + CH3        = C3H4    + CH4      1.000E+12  0.00      0.
-!
-CH3     + O2         = CH3O2              9.020E+58 -15.0  17204.
-CH3O2   + HO2        = CH4O2   + O2       4.630E+10   0.0  -2583.
-CH3O2   + CH4        = CH4O2   + CH3      1.810E+11   0.0  18480.
-CH3O2   + CH3        = CH3O    + CH3O     2.410E+13   0.0      0.
-CH3O2   + O          = CH3O    + O2       3.610E+13   0.0      0.
-CH3O2   + H          = CH3O    + OH       9.640E+13   0.0      0.
-CH3O2   + OH         = CH3OH   + O2       6.030E+13   0.0      0.
-CH3O2   + CH2O       = CH4O2   + HCO      1.000E+12   0.0  11665.
-CH3O2   + CH3OH      = CH4O2   + CH2OH    1.800E+12   0.0  13712.
-CH3O2   + C2H6       = CH4O2   + C2H5     2.950E+11   0.0  14944.
-CH4O2                = CH3O    + OH       4.000E+15   0.0  42924.
-CH4O2   + OH         = CH3O2   + H2O      8.200E+11   0.0   -258.
-!
-CH3OCH3 + H          = CH3OCH2 + H2       8.400E+07  2.00   7700.
-CH3OCH3 + O          = CH3OCH2 + OH       6.540E+06  2.40   5500.
-CH3OCH3 + OH         = CH3OCH2 + H2O      6.560E+09  1.00   1590.
-CH3OCH3 + HO2        = CH3OCH2 + H2O2     4.200E+12  0.00  13875.
-CH3OCH3 + CH3O       = CH3OCH2 + CH3OH    2.600E+12  0.00   7000.
-CH3OCH3 + O2         = CH3OCH2 + HO2      4.100E+13  0.00  44906.
-CH3OCH3 + CH3        = CH3OCH2 + CH4      1.950E+12  0.00  11600.
-CH3OCH3              = CH3+CH3O           2.620E+16  0.0   82202.
-CH3OCH3              = CH3OCH2 + H        2.588E+16  .265 104300.
-CH3OCH2              = CH3+CH2O           3.300E+14  0.0   31000.      !  4.3
-CH3OCH2 + CH3O       = CH3OCH3 + CH2O     6.030E+13  0.0       0.
-CH3OCH2 + O2         = CH3OCH2OO          2.000E+42 -10.3   6080.
-CH3OCH2 + O2         = HCOOCH3 + OH       5.480E+13  0.0    8370.
-CH3OCH2 + HO2        = CH2O   + CH3O + OH 3.000E+12  0.0       0.
-CH3OCH2 + H2O2       = CH2O  + CH3O + H2O 3.000E+12  0.0       0.
-CH3OCH2OO + CH3OCH3  = CH3OCH2OOH+CH3OCH2 1.200E+12  0.0   14000.      !  2.2
-CH3OCH2OOH           = CH3OCH2O  + OH     8.200E+08  3.65  34000.
-CH3OCH2O             = CH3O      + CH2O   4.000E+14  0.0   15600.           
-CH3OCH2O + O2        = HCOOCH3 + HO2      2.000E+12  0.0    6000.
-CH3OCH2OOH           = CH2O + CH2O + H2O  8.800E+12  0.0   16000.
-CH3OCH3   + CH3O2    = CH3OCH2   + CH4O2  1.500E+13  0.0   13700.      !  2.0
-CH3O2     + CH3O2    = CH3O + CH3O + O2   6.300E+10  0.0    -600.
-CH3O2     + CH3O2    = CH3OCH2O + HO2     6.300E+10  0.0    -600.
-! new termination reactions
-CH3OCH2O  + CH3      = CH4     + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + H        = H2      + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + HO2      = H2O2    + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + O        = OH      + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + OH       = H2O     + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + C2H5     = C2H6    + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + CH3OCH2  = CH3OCH3 + HCOOCH3  6.000E+13  0.0       0.
-CH3OCH2O  + CH3O     = CH3OH   + HCOOCH3  6.000E+13  0.0       0.
-HCOOCH3              = CH4     + CO2      6.000E+09  0.0   48520.
-HCOOCH3              = CH3O    + HCO      6.200E+09 1.61  102580.
-HCOOCH3   + O        = CH3OCO  + OH       5.360E+11  0.6    2900.
-HCOOCH3   + H        = CH3OCO  + H2       1.620E+08  1.6    1980.
-HCOOCH3   + OH       = CH3OCO  + H2O      1.200E+09  1.3    -280.
-HCOOCH3   + HO2      = CH3OCO  + H2O2     4.000E+12  0.0   12060.
-HCOOCH3   + CH3      = CH3OCO  + CH4      9.900E-03  4.5    3420.
-HCOOCH3   + CH3O     = CH3OCO  + CH3OH    1.020E+11  0.0    2980.
-HCOOCH3   + CH3OCH2  = CH3OCO  + CH3OCH3  1.100E-03  4.9    3480.
-CH3OCO               = CO2 +  CH3         1.000E+11  1.1     860. 
-!
-H         + CH       = C         + H2     1.100E+14  0.0       0.
-C         + O2       = O         + CO     5.800E+13  0.0     576.
-C         + CH2      = H         + C2H    5.000E+13  0.0       0.
-C         + CH3      = H         + C2H2   5.000E+13  0.0       0.
-!
-CH3+C2H5(+M)=C3H8(+M)                  .9430E+13     .000       .00
-     LOW/ 2.710E+74  -16.82  13065.0 /
-     TROE/ .1527  291.0  2742.0  7748.0 /
-H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ AR/ .70/
-O+C3H8=OH+C3H7                         1.930E+05    2.680   3716.00
-H+C3H8=C3H7+H2                         1.320E+06    2.540   6756.00
-OH+C3H8=C3H7+H2O                       3.160E+07    1.800    934.00
-C3H7+H2O2=HO2+C3H8                     3.780E+02    2.720   1500.00
-CH3+C3H8=C3H7+CH4                      0.903E+00    3.650   7154.00
-CH3+C2H4(+M)=C3H7(+M)                  2.550E+06    1.600   5700.00
-      LOW/ 3.00E+63  -14.6  18170./
-      TROE/ .1894  277.0  8748.0  7891.0 /
-H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ AR/ .70/
-O+C3H7=C2H5+CH2O                       9.640E+13     .000       .00
-H+C3H7(+M)=C3H8(+M)                    3.613E+13     .000       .00
-      LOW/ 4.420E+61  -13.545  11357.0/
-      TROE/ .315  369.0  3285.0  6667.0 /
-H2/2.00/ H2O/6.00/ CH4/2.00/ CO/1.50/ CO2/2.00/ C2H6/3.00/ AR/ .70/
-H+C3H7=CH3+C2H5                        4.060E+06    2.190    890.00
-OH+C3H7=C2H5+CH2OH                     2.410E+13     .000       .00
-HO2+C3H7=O2+C3H8                       2.550E+10    0.255   -943.00
-HO2+C3H7=OH+C2H5+CH2O                  2.410E+13     .000       .00
-CH3+C3H7=2C2H5                         1.927E+13   -0.320       .00
-END
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_france b/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_france
deleted file mode 100644
index 4cf7ee2a3..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_france
+++ /dev/null
@@ -1,917 +0,0 @@
-!*************************************************************************************!
-!                                                                                     !
-!                     DEPARTEMENT DE CHIMIE PHYSIQUE DES REACTIONS                    !
-!                                   ENSIC-CNRS                                        !
-!                            1 RUE GRANDVILLE, BP 451                                 !
-!                           54001 NANCY CEDEX - FRANCE                                !
-!                                                                                     !
-!*************************************************************************************!
-!                                                                                     !
-!                          REACTION DATABASE FOR C0-C2 COMPOUNDS                      !
-!                            FILE USABLE BY CHEMKIN II (SANDIA)                       !
-!                        AUTHORS : F. BATTIN-LECLERC AND P. BARBE                     !
-!                                    17 MARCH 1997                                    !
-!                                                                                     !
-!*************************************************************************************!
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!                                                                                     !
-!WARNING :   Reaction 347 have 2 temperature ranges                                   !
-!                                                                                     !
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-ELEMENT!
-H O C N AR
-END
-SPECIES
-N2 AR O2 CH4 C2H6 C2H4 C2H2 CH2O CO CO2 H2 H2O H2O2
-H C O OH HO2 CH3 CH2 CH2(S) CH C2H5 C2H3 C2H CH3O HCO HCCO CH2CO
-CH3OH CH2OH CH3CO CH2CHO CH3CHO C2H4O CH3CO3 CH3CO3H CH3O2 CH3O2H C2H5O 
-C2H5O2 C2H4O2H C2H5O2H C2H5OH C3H4 C3H6 C3H8 C4H2 C4H4 C4H6 UC4H8 
-NC4H10 C2H3CHO C2H5CHO CH3OCH3 CH3OOCH3 NC3H7OH HOCH2CH2OH CH3COCH3
-C2H5COCH3 CH3COCHO CH3COCH2OH CH3COCOCH3
-END
-THERMO 
-O                           0C   0H   0O   1G  0300.00   5000.00  1000.00      1 
- 0.02542060E+02-0.02755062E-03-0.03102803E-07 0.04551067E-10-0.04368052E-14    2
- 0.02923080E+06 0.04920308E+02 0.02946429E+02-0.01638166E-01 0.02421032E-04    3
--0.01602843E-07 0.03890696E-11 0.02914764E+06 0.02963995E+02                   4
-CO                          0C   1H   0O   1G  0300.00   5000.00  1000.00      1
- 0.03025078E+02 0.01442689E-01-0.05630828E-05 0.01018581E-08-0.06910952E-13    2
--0.01426835E+06 0.06108218E+02 0.03262452E+02 0.01511941E-01-0.03881755E-04    3
- 0.05581944E-07-0.02474951E-10-0.01431054E+06 0.04848897E+02                   4
-C                           0C   1H   0O   0G  0300.00   5000.00  1000.00      1
- 0.02602087E+02-0.01787081E-02 0.09087041E-06-0.01149933E-09 0.03310844E-14    2
- 0.08542154E+06 0.04195177E+02 0.02498585E+02 0.08085777E-03-0.02697697E-05    3
- 0.03040729E-08-0.01106652E-11 0.08545878E+06 0.04753459E+02                   4 
-CH                          0C   1H   1O   0G  0300.00   5000.00  1000.00      1 
- 0.02196223E+02 0.02340381E-01-0.07058201E-05 0.09007582E-09-0.03855040E-13    2 
- 0.07086723E+06 0.09178373E+02 0.03200202E+02 0.02072876E-01-0.05134431E-04    3 
- 0.05733890E-07-0.01955533E-10 0.07045259E+06 0.03331588E+02                   4 
-CH2                         0C   1H   2O   0G  0300.00   5000.00  1000.00      1 
- 0.03636408E+02 0.01933057E-01-0.01687016E-05-0.01009899E-08 0.01808256E-12    2 
- 0.04534134E+06 0.02156561E+02 0.03762237E+02 0.01159819E-01 0.02489585E-05    3 
- 0.08800836E-08-0.07332435E-11 0.04536791E+06 0.01712578E+02                   4 
-CH2(S)                      0C   1H   2O   0G  0300.00   5000.00  1000.00      1 
- 0.03552889E+02 0.02066788E-01-0.01914116E-05-0.01104673E-08 0.02021350E-12    2 
- 0.04984975E+06 0.01686570E+02 0.03971265E+02-0.01699089E-02 0.01025369E-04    3 
- 0.02492551E-07-0.01981266E-10 0.04989368E+06 0.05753207E+00                   4 
-H2                          0C   0H   2O   0G  0300.00   5000.00  1000.00      1 
- 2.50170E+00    1.78083E-03   -7.80013E-07    1.48437E-10   -1.03401E-14       2 
--6.86891E+02    1.25553E+00    3.43853E+00    1.44314E-04   -1.08191E-07       3 
- 2.16839E-10   -5.54307E-14   -1.03749E+03   -3.92682E+00                      4 
-H2O                         0C   0H   2O   1G  0300.00   5000.00  1000.00      1 
- 2.68039E+00    3.09623E-03   -9.31393E-07    1.34865E-10   -7.70007E-15       2 
--2.99236E+04    6.77857E+00    3.97559E+00   -4.41834E-04    2.45596E-06       3 
--1.24431E-09    2.26702E-13   -3.02810E+04    7.71523E-02                      4 
-O2                          0C   0H   0O   2G  0300.00   5000.00  1000.00      1 
- 3.19345E+00    1.56657E-03   -6.90657E-07    1.32082E-10   -9.23577E-15       2 
--1.05228E+03    5.96618E+00    3.08809E+00    1.60342E-03   -5.34550E-07       3 
- 2.80793E-11    2.98899E-15   -9.93828E+02    6.61069E+00                      4 
-H2O2                        0C   0H   2O   2G  0300.00   5000.00  1000.00      1 
- 5.20269E+00    3.07820E-03   -8.47786E-07    1.14867E-10   -6.24436E-15       2 
--1.81737E+04   -2.81106E+00    2.79724E+00    9.30806E-03   -3.27081E-06       3 
--3.91853E-09    2.63341E-12   -1.75951E+04    9.47142E+00                      4 
-CH4                         0C   1H   4O   0G  0300.00   5000.00  1000.00      1 
- 1.61991E+00    1.03080E-02   -3.71228E-06    6.14185E-10   -3.86748E-14       2 
--1.00748E+04    9.98982E+00    2.31954E+00    6.54738E-03   -7.48051E-07       3 
- 2.60912E-09   -1.95537E-12   -9.99764E+03    7.24965E+00                      4 
-CH2O                   0C   1H   2O   1     G  0300.00   5000.00  1000.00      1 
- 2.91430E+00    6.64407E-03   -2.45282E-06    4.12836E-10   -2.63040E-14       2 
--1.52827E+04    7.43680E+00    2.41049E+00    7.02041E-03   -4.22947E-06       3 
- 4.40116E-09   -2.12647E-12   -1.49519E+04    1.06246E+01                      4 
-CH3OH                  0C   1H   4O   1     G  0300.00   5000.00  1000.00      1 
- 3.27626E+00    1.05432E-02   -3.54918E-06    5.58743E-10   -3.39236E-14       2 
--2.58917E+04    6.60656E+00    1.85957E+00    1.25312E-02   -4.47107E-06       3 
- 1.73293E-09   -8.71066E-13   -2.52879E+04    1.46835E+01                      4 
-CO2                    0C   1H   0O   2     G  0300.00   5000.00  1000.00      1 
- 2.73827E+00    6.09914E-03   -2.81755E-06    5.57282E-10   -3.99470E-14       2 
--4.82637E+04    8.67355E+00    2.67844E+00    6.31159E-03    1.20975E-06       3 
--7.46647E-09    3.79399E-12   -4.84134E+04    8.57691E+00                      4 
-CH3O2H                 0C   1H   4O   2     G  0300.00   5000.00  1000.00      1 
- 6.37596E+00    1.07372E-02   -3.68666E-06    5.88827E-10   -3.61266E-14       2 
--1.84341E+04   -6.12840E+00    3.09218E+00    1.80223E-02   -7.11862E-06       3 
--1.47978E-09    1.45517E-12   -1.74300E+04    1.13028E+01                      4 
-C2H2                   0C   2H   2O   0     G  0300.00   5000.00  1000.00      1 
- 3.00338E+00    7.58476E-03   -3.11008E-06    5.64312E-10   -3.79570E-14       2 
- 2.62468E+04    5.29247E+00    2.54593E+00    1.14007E-02   -7.07123E-06       3 
--6.00363E-10    1.71894E-12    2.60564E+04    6.56609E+00                      4 
-C2H4                   0C   2H   4O   0     G  0300.00   5000.00  1000.00      1 
- 3.99720E-01    1.67299E-02   -6.80909E-06    1.22922E-09   -8.23928E-14       2 
- 5.63749E+03    1.97729E+01    1.31810E+00    1.44460E-02   -2.74335E-06       3 
--3.10835E-09    1.52772E-12    5.26817E+03    1.47233E+01                      4 
-C2H6                   0C   2H   6O   0     G  0300.00   5000.00  1000.00      1 
- 3.94109E-01    2.11928E-02   -8.08560E-06    1.39339E-09   -9.03005E-14       2 
--1.10714E+04    1.96366E+01    9.75454E-01    1.88110E-02   -1.46453E-06       3 
--6.38247E-09    2.84067E-12   -1.13111E+04    1.65514E+01                      4 
-CH2CO                  0C   2H   2O   1     G  0300.00   5000.00  1000.00      1 
- 5.35267E+00    6.94209E-03   -2.50061E-06    4.13231E-10   -2.59692E-14       2 
--7.81007E+03   -3.80283E+00    2.99539E+00    1.23540E-02   -4.06499E-06       3 
--3.34608E-09    2.24152E-12   -7.15097E+03    8.53716E+00                      4 
-CH3CHO                 0C   2H   4O   1     G  0300.00   5000.00  1000.00      1 
- 0.05869E+02    0.10794E-01   -0.03646E-04    0.05413E-08   -0.02897E-12       2 
--0.02265E+06   -0.06013E+02   -5.97842E+01    4.89059E-01   -1.27143E-03       3 
- 1.42135E-06   -5.67547E-10   -1.52478E+04    2.71669E+02                      4 
-!coefficients de CHEMKIN a haute temperature et THERGAS a basse temperature!
-C2H5OH                 0C   2H   6O   1     G  0300.00   5000.00  1000.00      1 
- 5.62516E+00    1.59916E-02   -5.36799E-06    8.43422E-10   -5.11406E-14       2 
--3.10498E+04   -3.61961E+00    9.39858E-01    2.61811E-02   -9.25134E-06       3 
--3.45825E-09    2.62098E-12   -2.96238E+04    2.12634E+01                      4 
-CH3OHCO                0C   2H   4O   2     G  0300.00   5000.00  1000.00      1 
- 6.49235E+00    1.37029E-02   -4.83813E-06    7.88065E-10   -4.90158E-14       2 
--5.52426E+04   -7.87675E+00    1.30241E+00    2.57455E-02   -9.76857E-06       3 
--4.88314E-09    3.69546E-12   -5.37616E+04    1.93510E+01                      4 
-C2H5O2                 0C   2H   5O   2     G  0300.00   5000.00  1000.00      1 
-  .11325327E+02  .82862452E-02 -.18620285E-05  .21820865E-09 -.10786769E-13    2 
- -.69868408E+04 -.32948765E+02  .67205608E+00  .36275715E-01 -.30000807E-04    3 
-  .13847888E-07 -.28458303E-11 -.37891184E+04  .22886873E+02                   4 
-C2H5O2H                0C   2H   6O   2     G  0300.00   5000.00  1000.00      1 
- 8.86549E+00    1.46991E-02   -4.66630E-06    7.03129E-10   -4.13262E-14       2 
--2.34663E+04   -1.74646E+01    2.03266E+00    3.20310E-02   -1.79773E-05       3 
- 2.38766E-09    1.07206E-12   -2.15063E+04    1.82187E+01                      4
-CH3CO3                 0C   2H   3O   3     G  0300.00   5000.00  1000.00      1
- .11077361E+02  .65959496E-02 -.14068501E-05  .15560973E-09 -.72247150E-14     2
- -.19400094E+05 -.29337929E+02 -.12573762E+01  .40412389E-01 -.36648889E-04    3
-  .17055577E-07 -.31536631E-11 -.15821930E+05  .34825279E+02                   4
-CH3CO3H                0C   2H   4O   3     G  0300.00   5000.00  1000.00      1 
- 7.87651E+00    1.42400E-02   -4.81648E-06    7.62396E-10   -4.65514E-14       2 
--4.39851E+04   -9.71105E+00    2.19569E-01    3.53131E-02   -2.24276E-05       3 
- 3.22888E-09    1.67243E-12   -4.19548E+04    2.96617E+01                      4 
-C2H5CHO                0C   3H   6O   1     G  0300.00   5000.00  1000.00      1 
- 7.00923E+00    1.80165E-02   -6.23156E-06    1.00111E-09   -6.17084E-14       2 
--2.56908E+04   -9.54021E+00    2.78861E+00    2.57043E-02   -6.85618E-06       3 
--4.35448E-09    2.43940E-12   -2.42672E+04    1.33993E+01                      4 
-C2H4O                  0C   2H   4O   1     G  0300.00   5000.00  1000.00      1 
- 4.47758E+00    1.35869E-02   -5.00744E-06    8.41742E-10   -5.35809E-14       2 
--8.75035E+03   -1.34619E+00   -9.24908E-01    2.64513E-02   -1.34725E-05       3 
- 3.74058E-10    1.40310E-12   -7.13279E+03    2.71327E+01                      4
-H                      0C   0H   1O   0     G  0300.00   5000.00  1000.00      1 
- 2.51730E+00   -2.10523E-06    1.23733E-09   -2.92977E-13    2.40914E-17       2 
- 2.54640E+04   -5.54129E-01    2.52530E+00   -6.39368E-05    1.54095E-07       3 
--1.54230E-10    5.47044E-14    2.54635E+04   -5.86360E-01                      4 
-OH                     0C   0H   1O   1     G  0300.00   5000.00  1000.00      1 
- 2.16403E+00    2.49996E-03   -1.20620E-06    2.46260E-10   -1.80763E-14       2 
- 4.19496E+03    9.54587E+00    3.67780E+00   -2.14153E-04    5.70231E-08       3 
- 1.71404E-10   -1.84629E-14    3.63597E+03    1.19670E+00                      4 
-HO2                    0C   0H   1O   2     G  0300.00   5000.00  1000.00      1 
- 4.72022E+00    1.38622E-03   -1.68457E-07    1.05843E-11   -2.40717E-16       2 
--2.41430E+02   -6.85165E-01    1.84854E+00    1.07988E-02   -8.54635E-06       3 
- 4.18415E-10    1.44074E-12    3.26446E+02    1.34319E+01                      4 
-CH3                    0C   1H   3O   0     G  0300.00   5000.00  1000.00      1 
- 1.02702E+00    9.49641E-03   -3.82860E-06    6.86498E-10   -4.57900E-14       2 
- 1.67624E+04    1.53006E+01    2.94974E+00    5.11940E-03   -8.75334E-07       3 
- 6.64224E-10   -5.42393E-13    1.61486E+04    5.05087E+00                      4 
-HCO                    0C   1H   1O   1     G  0300.00   5000.00  1000.00      1 
- 4.39893E+00    1.53560E-03   -1.99211E-07    1.43007E-11   -4.51357E-16       2 
- 1.46590E+03    1.23461E+00    2.96884E+00    5.16190E-03   -6.79642E-06       3 
- 7.15025E-09   -2.73201E-12    2.04422E+03    9.08982E+00                      4 
-CH2OH                  0C   1H   3O   1     G  0300.00   5000.00  1000.00      1 
- 6.72615E+00    2.58400E-03   -3.43695E-07    2.58671E-11   -8.92075E-16       2 
--5.93852E+03   -1.07401E+01    1.75181E+00    1.63562E-02   -2.19316E-05       3 
- 2.01041E-08   -7.28744E-12   -4.21651E+03    1.57722E+01                      4 
-CH3O                   0C   1H   3O   1     G  0300.00   5000.00  1000.00      1 
- 6.45804E+00    3.22182E-03   -5.09801E-07    4.41966E-11   -1.69366E-15       2 
--8.23233E+02   -1.22475E+01    2.40571E-01    1.87747E-02   -2.13180E-05       3 
- 1.81151E-08   -6.61230E-12    1.35827E+03    2.11815E+01                      4 
-CH2O2H                 0C   1H   3O   2     G  0300.00   5000.00  1000.00      1 
- 1.01575E+01    2.21923E-03   -2.71559E-07    1.97488E-11   -7.06327E-16       2 
- 9.23978E+02   -2.52115E+01    1.82419E+00    3.00692E-02   -4.32332E-05       3 
- 3.42492E-08   -1.07827E-11    3.25193E+03    1.72697E+01                      4 
-CH3O2                  0C   1H   3O   2     G  0300.00   5000.00  1000.00      1 
- 9.76413E+00    3.04276E-03   -4.67054E-07    3.87833E-11   -1.39425E-15       2 
--1.91174E+03   -2.69241E+01    1.48937E+00    2.40776E-02   -2.38748E-05       3 
- 1.51535E-08   -4.47557E-12    7.64340E+02    1.69852E+01                      4 
-C2H                    0C   2H   1O   0     G  0300.00   5000.00  1000.00      1 
- 6.02264E+00    8.77475E-04   -8.67941E-08    3.67081E-12    1.93550E-17       2 
- 6.20557E+04   -9.36163E+00    1.89603E+00    1.61116E-02   -1.74770E-05       3 
- 5.93645E-09    3.50654E-13    6.28086E+04    1.05397E+01                      4 
-C2H3                   0C   2H   3O   0     G  0300.00   5000.00  1000.00      1 
- 3.27253E+00    8.18550E-03   -2.26647E-06    3.09596E-10   -1.70006E-14       2 
- 3.39897E+04    7.07663E+00    2.29441E+00    1.02693E-02   -3.45618E-06       3 
- 3.18937E-10    6.99872E-14    3.43028E+04    1.23194E+01                      4 
-C2H5                   0C   2H   5O   0     G  0300.00   5000.00  1000.00      1 
- 3.50261E+00    1.26143E-02   -3.65730E-06    5.16642E-10   -2.90469E-14       2 
- 1.24032E+04    5.44236E+00    5.46580E-01    2.04368E-02   -1.16694E-05       3 
- 4.82541E-09   -1.19281E-12    1.32743E+04    2.09001E+01                      4 
-HCCO                   OC   2H   1O   1     G  0300.00   5000.00  1000.00      1 
- 0.06758073E+02 0.02000400E-01-0.02027607E-05-0.01041132E-08 0.01965165E-12    2 
- 0.01901513E+06-0.09071262E+02 0.05047965E+02 0.04453478E-01 0.02268283E-05    3 
--0.01482095E-07 0.02250742E-11 0.01965892E+06 0.04818439E+01                   4 
-CH2CHO                 0C   2H   3O   1     G  0300.00   5000.00  1000.00      1 
- 0.05976E+02    0.08131E-01   -0.02744E-04    0.04070E-08   -0.02176E-12       2 
- 0.04903E+04   -0.05045E+02   -5.49040E+01    4.51253E-01   -1.17037E-03       3 
- 1.30375E-06   -5.19201E-10    7.54530E+03    2.51103E+02                      4 
-!coefficients de CHEMKIN a haute temperature et THERGAS a basse temperature! 
-CH3CO                  0C   2H   3O   1     G  0300.00   5000.00  1000.00      1 
- 5.17844E+00    8.15192E-03   -2.10111E-06    2.71446E-10   -1.42897E-14       2 
--5.94327E+03   -2.17361E-01    3.78076E+00    5.97858E-03    8.17510E-06       3 
--8.25542E-09    1.81654E-12   -5.11877E+03    8.85731E+00                      4 
-C2H4OHP                0C   2H   5O   1     G  0300.00   5000.00  1000.00      1 
- 9.39205E+00    7.10512E-03   -1.46197E-06    1.56731E-10   -7.08032E-15       2 
--7.55283E+03   -2.24447E+01   -1.60895E-01    3.69785E-02   -4.20936E-05       3 
- 2.86827E-08   -8.21586E-12   -4.88243E+03    2.65306E+01                      4 
-C2H4OHS                0C   2H   5O   1     G  0300.00   5000.00  1000.00      1 
- 8.62875E+00    7.87632E-03   -1.71370E-06    1.94535E-10   -9.32452E-15       2 
--1.13847E+04   -1.81140E+01    1.77720E+00    2.41611E-02   -1.64825E-05       3 
- 6.75643E-09   -1.21081E-12   -9.15277E+03    1.84275E+01                      4 
-C2H5O                  0C   2H   5O   1     G  0300.00   5000.00  1000.00      1 
- 8.79327E+00    8.37917E-03   -1.93446E-06    2.29371E-10   -1.13191E-14       2 
--6.03107E+03   -2.23324E+01   -6.00093E-01    3.17670E-02   -2.42586E-05       3 
- 1.08137E-08   -2.26856E-12   -3.08491E+03    2.73650E+01                      4 
-CH2OHCO                0C   2H   3O   2     G  0300.00   5000.00  1000.00      1 
- 1.10189E+01    4.53439E-03   -8.65589E-07    8.88128E-11   -3.95962E-15       2 
--3.35939E+04   -3.29218E+01    1.28829E-01    3.46503E-02   -3.43482E-05       3 
- 1.86734E-08   -4.32868E-12   -3.03821E+04    2.38157E+01                      4 
-C2H4O2H                0C   2H   5O   2     G  0300.00   5000.00  1000.00      1 
- 1.19639E+01    6.99398E-03   -1.39221E-06    1.46301E-10   -6.56315E-15       2 
--1.64410E+02   -3.25611E+01    9.12805E-01    4.29306E-02   -5.09705E-05       3 
- 3.45647E-08   -9.73011E-12    2.78459E+03    2.35878E+01                      4 
-C3H4                   0C   3H   4          G  0300.00   5000.00  1000.00      1 
- .54693928E+01  .12151568E-01 -.43443515E-05 .71433565E-09  -.44747395E-13     2 
- .19852377E+05 -.54474335E+01  .22271647E+01 .19307628E-01  -.70081351E-05     3 
--.27282026E-08  .21393857E-11  .20828311E+05 .11726395E+02                     4 
-C3H6                   0C   3H   6          G  0300.00   5000.00  1000.00      1
- .50026493E+01  .17638993E-01 -.62266308E-05  .10151433E-08 -.63235977E-13     2 
--.27056152E+03 -.24723434E+01  .55598283E+00  .27091531E-01 -.10752104E-04     3 
--.97539210E-09  .14314721E-11  .11570190E+04  .21344173E+02                    4 
-C3H8                   0C   3H   8          G  0300.00   5000.00  1000.00      1 
- .54638848E+01  .22160569E-01  -.77296281E-05 .12495476E-08 -.77377605E-13     2 
--.15629374E+05 -.62309151E+01  -.31831896E+00 .34746405E-01 -.12885018E-04     3 
--.35057037E-08  .30165358E-11  -.13851594E+05 .24514595E+02                    4 
-C4H2                   0C   4H   2          G  0300.00   5000.00  1000.00      1
- .82167263E+01  .75165699E-02  -.28333620E-05 .48376197E-09 -.31125981E-13     2
- .53914359E+05 -.19323837E+02   .45411844E+01 .16946664E-01 -.58588685E-05     3
--.70578716E-08  .47811238E-11   .54806316E+05-.54062080E+00                    4
-C4H4                   0C   4H   4          G  0300.00   5000.00  1000.00      1 
- .74600129E+01  .13268776E-01  -.48047741E-05 .79804358E-09 -.50392033E-13     2 
- .33450691E+05 -.13594856E+02   .18884374E+01 .27130427E-01 -.11816426E-04     3 
--.46318047E-08  .40962659E-11   .34956789E+05 .15309685E+02                    4 
-C4H6                   0C   4H   6          G  0300.00   5000.00  1000.00      1 
- .80518456E+01  .17540889E-01  -.61760657E-05 .10047656E-08 -.62479542E-13     2 
- .95697949E+04 -.18611710E+02  -.29224473E+00 .38725201E-01 -.16706719E-04     3 
--.81080902E-08  .67421541E-11   .11749236E+05 .24444702E+02                    4 
-UC4H8                  0C   4H   8          G  0300.00   5000.00  1000.00      1 
- .12072002E+02  .17483519E-01  -.47358262E-05 .63614963E-09 -.34500855E-13     2 
- .34200605E+04 -.37559532E+02  -.86302972E+00 .53421453E-01 -.45552202E-04     3 
- .24475971E-07 -.60568863E-11   .72361128E+04 .29821739E+02                    4 
-NC4H10                 0C   4H  10          G  0300.00   5000.00  1000.00      1 
- .77133317E+01  .27767614E-01 -.96156327E-05  .15456056E-08 -.95281279E-13     2 
--.19425240E+05 -.16262451E+02  .59979584E-01  .44005580E-01 -.15532127E-04     3 
--.52806315E-08  .40442116E-11 -.17040045E+05  .24565849E+02                    4 
-C2H3CHO                0C   3H   4O   1     G  0300.00   5000.00  1000.00      1 
-  .12311886E+02  .12961588E-01 -.61774654E-05  .12501405E-08 -.91169971E-13    2 
- -.15218951E+05 -.42303177E+02  .93137437E+00  .35574418E-01 -.33347264E-04    3 
-  .28398034E-07 -.11395644E-10 -.10614329E+05  .21059492E+02                   4
-C2H5CHO                0C   3H   6O   1     G  0300.00   5000.00  1000.00      1 
-  .70107722E+01  .18013448E-01 -.62295217E-05  .10005839E-08 -.61661722E-13    2
- -.25691457E+05 -.95488281E+01  .28277023E+01  .25430365E-01 -.61913220E-05    3
- -.50245177E-08  .26785609E-11 -.24271348E+05  .13234089E+02                   4
-CH3OCH3                0C   2H   6O   1     G  0300.00   5000.00  1000.00      1
-  .48582563E+01  .17240373E-01 -.59518788E-05  .95503494E-09 -.58825550E-13    2 
- -.24755031E+05 -.13852615E+01  .20368140E+01  .21299208E-01 -.51627690E-05    3 
- -.20305686E-08  .88250571E-12 -.23667908E+05  .14411049E+02                   4 
-CH3OOCH3               0C   2H   6O   2     G  0300.00   5000.00  1000.00      1 
-  .83690472E+01  .14833436E-01 -.46565133E-05  .69703088E-09 -.40832690E-13    2 
- -.18533230E+05 -.15578167E+02  .30638237E+01  .28614834E-01 -.24377980E-04    3 
-  .19129631E-07 -.72663607E-11 -.16707926E+05  .12810528E+02                   4 
-NC3H7OH                0C   3H   8O   1     G  0300.00   5000.00  1000.00      1 
-  .71674681E+01  .22466624E-01 -.76292372E-05  .12097231E-08 -.73884075E-13    2 
- -.34686773E+05 -.95393562E+01  .12350693E+01  .34453284E-01 -.10589133E-04    3 
- -.54856804E-08  .35146994E-11 -.32804938E+05  .22268148E+02                   4 
-HOCH2CH2OH             0C   2H   6O   2     G  0300.00   5000.00  1000.00      1 
-  .94605846E+01  .00000000E+00  .00000000E+00  .00000000E+00  .00000000E+00    2 
- -.50706793E+05 -.15255096E+02  .94605846E+01  .00000000E+00  .00000000E+00    3 
-  .00000000E+00  .00000000E+00 -.50706793E+05 -.15255096E+02                   4 
-CH3COCH3               0C   3H   6O   1     G  0300.00   5000.00  1000.00      1 
-  .59975996E+01  .19679097E-01 -.70154574E-05  .11513579E-08 -.72035416E-13    2 
- -.29362656E+05 -.55254784E+01  .14577827E+01  .28063715E-01 -.90218518E-05    3 
- -.24536706E-08  .16730232E-11 -.27794104E+05  .19218454E+02                   4 
-C2H5COCH3              0C   4H   8O   1     G  0300.00   5000.00  1000.00      1 
-  .87888947E+01  .24174010E-01 -.83446403E-05  .13376648E-08 -.82271822E-13    2 
- -.33018367E+05 -.17819489E+02  .27316518E+01  .35815358E-01 -.11085016E-04    3 
- -.44516226E-08  .28435873E-11 -.31006189E+05  .14949604E+02                   4 
-CH3COCHO               0C   3H   4O   2     G  0300.00   5000.00  1000.00      1
-  .89256687E+01  .13401341E-01 -.45334914E-05  .71644690E-09 -.43629983E-13    2 
- -.36391773E+05 -.23305817E+02  .36583393E+01  .17818777E-01  .12335082E-04    3 
- -.25004601E-07  .96781515E-11 -.34470117E+05  .63711262E+01                   4 
-CH3COCH2OH             0C   3H   6O   2     G  0300.00   5000.00  1000.00      1
-  .18422323E+02  .15847507E-02  .22200786E-05 -.75747592E-09  .68857395E-13    2 
- -.52232094E+05 -.69094208E+02  .29494412E+01  .29086677E-01 -.10206494E-04    3 
- -.26419480E-09  .92838457E-13 -.46496102E+05  .16329613E+02                   4 
-CH3COCOCH3             0C   4H   6O   2     G  0300.00   5000.00  1000.00      1 
-  .10088178E+02  .20814884E-01 -.72801195E-05  .11796960E-08 -.73203515E-13    2 
- -.44156449E+05 -.21426254E+02  .20524170E+01  .39215170E-01 -.16422011E-04    3 
- -.39475361E-08  .38206075E-11 -.41770484E+05  .20989098E+02                   4 
-END
-REACTIONS 
-!REACTIONS DE LA MATRICE O(0)C(y)H(z)!
-!REACTIONS DE H2!
-H2+M=H+H+M                  2.2E14      0.      95.7E3 !(1,-1)<BAULCH94>
-!REACTIONS DE C
-C+H2=CH+H                   4.0E14      0.      23.3E3 !(2,-2)<DEAN91>
-!REACTIONS DE CH2(S)
-CH2(S)+M=CH2+M              6.0E12      0.          0. !(3,-3)<BAULCH94average>
-CH2(S)+H=CH+H2              3.0E13      0.          0. !(4,-4)<TSANG86>
-!REACTIONS DE CH2
-CH2+H=CH+H2                 6.0E12      0.      -1.8E3 !(5,-5)<BAULCH94>
-CH2+C=C2H+H                 5.0E13      0.         0.  !(6,-6)<RANZI94>
-CH2+CH2=>C2H2+H+H           1.2E14      0.       0.8E3 !(7)   <BAULCH94>
-!REACTIONS DE CH3
-CH3+M=CH2+H+M               1.0E16      0.      90.4E3 !(8,-8)<BAULCH94>
-CH3+H=CH2(S)+H2             6.0E13      0.      15.0E3 !(9,-9)<BAULCH94>
-CH3+CH=C2H3+H               3.0E13      0.         0.  !(10,-10)<DAGAUT91>
-CH3+CH2(S)=C2H4+H           1.8E13      0.         0.  !(11,-11)<TSANG86>
-CH3+CH2=C2H4+H              4.2E13      0.         0.  !(12,-12)<BAULCH94>
-CH3+C=C2H2+H                5.0E13      0.         0.  !(13,-13)<RANZI94>
-CH3+CH3(+M)=C2H6(+M)        3.6E13      0.         0.  !(14,-14)<BAULCH94>
-                    LOW     /1.3E41     -7.      3.0E3/
-!-------------------------------------------------------------------------------------! 
-!fittings  (20/12/94, F. Battin-Leclerc) on CH4-02 system in PSR between 500 and 1300C!
-!CH3+CH3(+M)=C2H6(+M)        1.5E14     0.         0.!  !(14,-14)<BAULCH94*4>!
-!                   LOW     /5.2E41     -7.      3.0E3/!
-!-------------------------------------------------------------------------------------!
-                    TROE    /0.62     73.       1180./  
-CH3+CH3=C2H5+H               3.0E13      0.     13.5E3 !(15,-15)<BAULCH94>
-!-------------------------------------------------------------------------------------! 
-!fittings  (20/12/94, F. Battin-Leclerc) on CH4-02 system in PSR between 500 and 1300C!
-!CH3+CH3=C2H5+H               1.5E14      0.     13.5E3! !(15,-15)<BAULCH94*5>!
-!-------------------------------------------------------------------------------------! 
-CH3+CH3=C2H4+H2              2.1E14      0.     19.3E3 !(16,-16)<FRANK86NIST>!  
-!REACTIONS DE CH4
-CH4(+M)=CH3+H(+M)            2.4E16      0.    104.5E3 !(17,-17)<BAULCH94>
-                   LOW     /4.5E17      0.     90.5E3/   
-                   TROE    /1.  1.   1350.     7830./ 
-CH4+H=CH3+H2                 1.3E4       3.      8.0E3 !(18,-18)<BAULCH94>
-CH4+CH=C2H4+H                3.0E13      0.     -0.4E3 !(19,-19)<DAGAUT91BAULCH94>
-CH4+CH2(S)=CH3+CH3           4.2E13      0.         0. !(20,-20)<TSANG86>
-!REACTIONS DE C2H
-C2H+CH2(S)=C2H2+CH           1.8E13      0.         0. !(21,-21)<TSANG86> 
-C2H+CH2=C2H2+CH              1.8E13      0.         0. !(22,-22)<TSANG86>
-C2H+CH4=C2H2+CH3             1.2E12      0.         0. !(23,-23)<BAULCH94>
-C2H+C2H=C4H2                 1.8E13      0.         0. !(24,-24)<TSANG86>
-!REACTIONS DE C2H2
-C2H2=C2H+H                   2.6E15      0.    123.9E3 !(25,-25)<TSANG86>
-C2H2+H=C2H+H2                6.6E13      0.     27.7E3 !(26,-26)<BAULCH94>
-C2H2+CH2(S)=C3H4             1.7E14      0.         0. !(27,-27)<BAULCH94>
-C2H2+CH2=C3H4                3.5E12      0.         0. !(28,-28)<TSANG86>
-C2H2+CH3=C3H4+H              6.7E19     -2.08   31.6E3 !(29,-29)<DEAN87>
-C2H2+C2H=C4H2+H              9.0E13      0.         0. !(30,-30)<BAULCH94>
-C2H2+C2H2=C4H4               5.5E12      0.     37.0E3 !(31,-31)<DURAN89>
-!REACTIONS DE C2H3
-C2H3(+M)=C2H2+H(+M)          2.0E14      0.     40.0E3 !(32,-32)<BAULCH94>
-                    LOW     /4.1E41     -7.5    45.3E3/
-                    TROE    /0.35        1.      1.0E8/
-C2H3+H=C2H2+H2               1.2E13      0.         0. !(33,-33)<BAULCH94>
-C2H3+CH2(S)=C2H2+CH3         1.8E13      0.         0. !(34,-34)<TSANG86>
-C2H3+CH2=C2H2+CH3            1.8E13      0.         0. !(35,-35)<TSANG86>
-C2H3+CH3=CH4+C2H2            3.9E11      0.         0. !(36,-36)<TSANG86>
-C2H3+CH3=C3H6                2.5E13      0.         0. !(37,-37)<TSANG86>
-C2H3+C2H=C4H4                1.8E13      0.         0. !(38,-38)<TSANG86>
-C2H3+C2H=2C2H2               9.6E11      0.         0. !(39,-39)<TSANG86>
-C2H3+C2H2=C4H4+H             2.0E12      0.      5.0E3 !(40,-40)<FAHR89>
-C2H3+C2H3=C4H6               9.6E12      0.         0. !(41,-41)<TSANG86>
-C2H3+C2H3=C2H4+C2H2          9.6E11      0.         0. !(42,-42)<TSANG86>
-!REACTIONS DE C2H4
-C2H4+M=C2H2+H2+M             3.5E16      0.     71.3E3 !(43,-43)<BAULCH94>
-C2H4+M=C2H3+H+M              2.6E17      0.     96.2E3 !(44,-44)<BAULCH94>
-C2H4+H=C2H3+H2               5.4E14      0      14.8E3 !(45,-45)<BAULCH94>
-C2H4+CH=C3H4+H               1.3E14      0.     -0.3E3 !(46,-46)<BAULCH94>
-C2H4+CH2(S)=C3H6             9.6E13      0.         0. !(47,-47)<BAULCH94>
-C2H4+CH2=C3H6                3.2E12      0.      5.1E3 !(48,-48)<BAULCH94>
-C2H4+CH3=CH4+C2H3            4.1E12      0.     11.1E3 !(49,-49)<BAULCH94>
-C2H4+C2H=C4H4+H              1.2E13      0.         0. !(50,-50)<TSANG86>
-C2H4+C2H3=C4H6+H             5.0E11      0.      7.3E3 !(51,-51)<TSANG86>
-!REACTIONS DE C2H5
-C2H5(+M)=C2H4+H(+M)          8.2E13      0.     40.0E3 !(52,-52)<BAULCH94>
-                    LOW     /1.0E18      0.     33.3E3/
-                    TROE    /0.75     97.       1379./
-C2H5+H=C2H4+H2               1.8E12      0.         0. !(53,-53)<TSANG86>
-C2H5+H=C2H6                  3.6E13      0.         0. !(54,-54><TSANG86>
-C2H5+CH2(S)=C2H4+CH3         9.0E12      0.         0. !(55,-55)<TSANG86>
-C2H5+CH2(S)=C3H6+H           9.0E12      0.         0. !(56,-56)<TSANG86>
-C2H5+CH2=C2H4+CH3            1.8E13      0.         0. !(57,-57)<TSANG86>
-C2H5+CH3=C2H4+CH4            1.1E12      0.         0. !(58,-58)<BAULCH94>
-C2H5+CH3=C3H8                3.4E13      0.         0. !(59,-59)<BAULCH94>
-C2H5+C2H=C2H2+C2H4           1.8E12      0          0. !(60,-60)<TSANG86>
-C2H5+C2H3=UC4H8              1.5E13      0.         0. !(61,-61)<TSANG86>
-C2H5+C2H3=2C2H4              4.8E11      0.         0. !(62,-62)<TSANG86>
-C2H5+C2H3=C2H2+C2H6          4.8E11      0.         0. !(63,-63)<TSANG86>
-C2H5+C2H5=C2H4+C2H6          1.4E12      0.         0. !(64,-64)<BAULCH94>
-C2H5+C2H5=NC4H10             1.1E13      0.         0. !(65,-65)<BAULCH94>
-!REACTIONS DE C2H6
-C2H6+M=C2H4+H2+M             2.3E17      0.     67.4E3 !(66,-66)<SCHULTZ85NIST>
-C2H6+H=C2H5+H2               1.4E9       1.5     7.4E3 !(67,-67)<BAULCH94>
-C2H6+CH=C3H6+H               1.1E14      0.     -0.3E3 !(68,-68)<BAULCH94>
-C2H6+CH2(S)=CH3+C2H5         1.1E14      0.         0. !(69,-69)<TSANG86>
-C2H6+CH3=C2H5+CH4            1.5E-7      6.0     5.8E3 !(70,-70)<BAULCH94>
-C2H6+C2H=C2H2+C2H5           3.6E12      0.         0. !(71,-71)<TSANG86>
-C2H6+C2H3=C2H5+C2H4          6.0E2       3.3    10.5E3 !(72,-72)<TSANG86>
-!REACTIONS DE LA MATRICE O(x)C(y)H(z)  x>0 
-!REACTIONS DE O
-O+H2=OH+H                    5.1E4       2.67    6.2E3 !(73,-73)<BAULCH94>
-O+CH=CO+H                    3.9E13      0.         0. !(74,-74)<BAULCH94>
-O+CH=C+OH                    1.5E13      0.      4.7E3 !(75,-75)<MURRELL86>
-O+CH2(S)=>CO+2H              1.5E13      0.         0. !(76)    <TSANG86>
-O+CH2(S)=CO+H2               1.5E13      0.         0. !(77,-77)<TSANG86>
-O+CH2=>CO+2H                 7.2E13      0.         0. !(78)    <BAULCH94>
-O+CH2=CO+H2                  4.8E13      0.         0. !(79,-79)<BAULCH94>
-O+CH3=CH2O+H                 8.4E13      0.         0. !(80,-80)<BAULCH94>
-O+CH3=CH3O                   8.0E15     -2.12    0.6E3 !(81,-81)<DEAN87>
-O+CH4=CH3+OH                 7.2E8       1.56    8.4E3 !(82,-82)<BAULCH94>
-O+C2H=CH+CO                  1.0E13      0.         0. !(83,-83)<DAGAUT91>
-O+C2H2=HCCO+H                6.5E3       2.8     0.5E3 !(84,-84)<DAGAUT91>
-O+C2H2=CH2+CO                1.5E4       2.8     0.5E3 !(85,-85)<DAGAUT91>
-O+C2H3=CH3+CO                3.0E13      0.         0. !(86,-86)<DAGAUT91>
-O+C2H3=CH2CO+H               9.6E13      0.         0. !(87,-87)<TSANG86>
-O+C2H4=CH3+HCO               8.1E6       1.88    0.2E3 !(88,-88)<BAULCH94>
-O+C2H4=CH2O+CH2              4.00E5      1.88    0.2E3 !(89,-89)<BAULCH94>
-O+C2H4=CH2CO+H2              6.6E5       1.88    0.2E3 !(90,-90)<BAULCH94>
-O+C2H4=CH2CHO+H              4.7E6       1.88    0.2E3 !(91,-91)<BAULCH94>
-O+C2H4=OH+C2H3               1.5E7       1.91    3.7E3 !(92,-92)<MAHMUD87>
-O+C2H5=CH2O+CH3              1.1E13      0.         0. !(93,-93)<BAULCH94>
-O+C2H5=CH3CHO+H              5.5E13      0.         0. !(94,-94)<BAULCH94>
-O+C2H5=C2H4+OH               3.0E13      0.         0. !(95,-95)<DAGAUT91>
-O+C2H6=C2H5+OH               1.0E9       1.5     5.8E3 !(96,-96)<BAULCH94>
-!REACTIONS DE OH
-OH+M=O+H+M                   2.4E15      0.     99.0E3 !(97,-97><TSANG86>
-OH+H+M=H2O+M                 2.4E22     -2.0        0. !(98,-98)<BAULCH94>
-OH+H2=H+H2O                  1.0E8       1.6     3.3E3 !(99,-99)<BAULCH94>
-OH+C=CO+H                    5.0E13      0.         0. !(100,-100)<RANZI94>
-OH+CH=HCO+H                  3.0E13      0.         0. !(101,-101)<DAGAUT91>
-OH+CH2(S)=CH2O+H             3.0E13      0.         0. !(102,-102)<TSANG86>
-OH+CH2=CH2O+H                1.8E13      0.         0. !(103,-103)<TSANG86>
-OH+CH3=CH2(S)+H2O            7.2E13      0.      2.7E3 !(104,-104)<BAULCH94>
-OH+CH3(+M)=CH3OH(+M)         6.0E13      0.         0. !(105,-105)<BAULCH94>
-                    LOW     /1.6E44     -8.2        0./
-                    TROE    /0.82    200.        1438./
-OH+CH3=CH2O+H2               3.2E12     -0.53   10.8E3 !(106,-106)<DAGAUT91>
-OH+CH3=CH3O+H                5.7E12     -0.23   13.9E3 !(107,-107)<DAGAUT91>
-OH+CH4=CH3+H2O               1.6E7       1.83    2.7E3 !(108,-108)<BAULCH94>
-OH+C2H=C2H2+O                1.8E13      0.         0. !(109,-109)<TSANG86>
-OH+C2H=CH2+CO                1.8E13      0.         0. !(110,-110)<TSANG86>
-OH+C2H=HCCO+H                2.0E13      0.         0. !(111,-111)<DAGAUT91>
-OH+C2H2=C2H+H2O              1.4E4       2.68   12.0E3 !(112,-112)<TSANG86>
-OH+C2H2=CH2CO+H              2.2E-4      4.5    -1.0E3 !(113,-113)<DAGAUT91>
-OH+C2H2=CH3+CO               4.8E-4      4.     -2.0E3 !(114,-114)<DAGAUT91>
-OH+C2H3=C2H2+H2O             3.0E13      0.         0. !(115,-115)<TSANG86>
-OH+C2H3=CH3CHO               3.0E13      0.         0. !(116,-116)<TSANG86>
-OH+C2H4=C2H3+H2O             2.0E13      0.      5.9E3 !(117,-117)<BAULCH94>
-OH+C2H4=CH3+CH2O             2.0E12      0.      0.9E3 !(118,-118)<GLARBORG86>
-OH+C2H5=C2H4+H2O             2.4E13      0.         0. !(119,-119)<TSANG86>
-OH+C2H5=>CH3+H+CH2O          2.4E13      0.         0. !(120)     <TSANG86>
-OH+C2H6=C2H5+H2O             7.2E6       2.      0.9E3 !(121,-121)<BAULCH94>
-OH+OH=H2O+O                  1.5E9       1.14    0.1E3 !(122,-122)<BAULCH94>
-!REACTIONS DE H2O
-H2O+CH=CH2OH                 5.7E12      0.     -0.8E3 !(123,-123)<BAULCH94>
-H2O+CH2(S)=CH3OH             1.8E13      0.         0. !(124,-124)<TSANG86>
-!REACTIONS DE CO
-CO+CH3(+M)=CH3CO(+M)         5.0E11      0.      6.9E3 !(125,-125)<BAULCH94> 
-                           LOW    /1.1E14      0.      3.8E3/
-                           TROE   /0.5         1.      1.0E8/
-CO+O+M=CO2+M                 6.2E14      0.      3.0E3 !(126,-126)<TSANG86>
-CO+OH=CO2+H                  6.3E6       1.5    -0.5E3 !(127,-127)<BAULCH94>
-!REACTIONS DE HCO
-HCO+M=H+CO+M                 1.6E14      0.     15.7E3 !(128,-128)<BAULCH94>
-HCO+H=H2+CO                  9.0E13      0.         0. !(129,-129)<BAULCH94>
-HCO+H=O+CH2                  4.0E13      0.    102.5E3 !(130,-130)<TSUBOI81>
-HCO+CH2(S)=CH3+CO            1.8E13      0.         0. !(131,-131)<TSANG86>
-HCO+CH2=CH3+CO               1.8E13      0.         0. !(132,-132)<TSANG86>
-HCO+CH3=CH4+CO               1.2E14      0.         0. !(133,-133)<TSANG86>
-HCO+CH3=CH3CHO               1.8E13      0.         0. !(134,-134)<TSANG86>
-HCO+CH4=CH3+CH2O             7.3E3       2.85   22.4E3 !(135,-135)<TSANG86>
-HCO+C2H=C2H2+CO              6.0E13      0.         0. !(136,-136)<TSANG86>
-HCO+C2H3=C2H4+CO             9.0E13      0.         0. !(137,-137)<TSANG86>
-HCO+C2H3=C2H3CHO             1.8E13      0.         0. !(138,-138)<TSANG86>
-HCO+C2H4=C2H3+CH2O           9.0E10      0.      5.4E3 !(139,-139)<LESCLAUX86NIST>
-HCO+C2H5=C2H6+CO             1.2E14      0.         0. !(140,-140)<TSANG86>
-HCO+C2H5=C2H5CHO             1.8E13      0.         0. !(141,-141)<TSANG86>
-HCO+C2H6=C2H5+CH2O           4.7E4       2.72   18.2E3 !(142,-142)<TSANG86>
-HCO+O=H+CO2                  3.0E13      0.         0. !(143,-143)<BAULCH94>
-HCO+O=OH+CO                  3.0E13      0.         0. !(144,-144)<BAULCH94>
-HCO+OH=H2O+CO                1.1E14      0.         0. !(145,-145)<BAULCH94>
-HCO+HCO=CH2O+CO              3.0E13      0.         0. !(146,-146)<BAULCH94>
-!REACTIONS DE CH2O
-CH2O+M=HCO+H+M               4.9E35     -5.54   96.3E3 !(147,-147)<BAULCH94>
-CH2O+M=CO+H2+M               1.1E36     -5.54   96.3E3 !(148,-148)<BAULCH94>
-CH2O+H=HCO+H2                1.3E8       1.62    2.1E3 !(149,-149)<BAULCH94>
-CH2O+CH=CH2CHO               9.6E13      0.     -0.5E3 !(150,-150)<BAULCH94average>
-CH2O+CH2(S)=CH3+HCO          1.2E12      0.         0. !(151,-151)<TSANG86>
-CH2O+O=HCO+OH                4.1E11      0.57    2.7E3 !(152,-152)<BAULCH94>
-CH2O+OH=HCO+H2O              3.4E9       1.18   -0.4E3 !(153,-153)<BAULCH94>
-!REACTIONS DE CH3O
-CH3O+M=CH2O+H+M              5.4E13      0.     13.4E3 !(154,-154)<BAULCH94>
-CH3O+H=CH2O+H2               1.8E13      0.         0. !(155,-155)<BAULCH94>
-CH3O+CH2(S)=CH3+CH2O         1.8E13      0.         0. !(156,-156)<TSANG86>
-CH3O+CH2=CH3+CH2O            1.8E13      0.         0. !(157,-157)<TSANG86>
-CH3O+CH3=CH2O+CH4            2.4E13      0.         0. !(158,-158)<TSANG86>
-CH3O+CH3=CH3OCH3             1.2E13      0.         0. !(159,-159)<TSANG86>
-CH3O+CH4=CH3+CH3OH           1.6E11      0.      8.8E3 !(160,-160)<TSANG86>
-CH3O+C2H=CH2O+C2H2           2.4E13      0.         0. !(161,-161)<TSANG86>
-CH3O+C2H3=CH2O+C2H4          2.4E13      0.         0. !(162,-162)<TSANG86>
-CH3O+C2H4=CH2O+C2H5          1.2E11      0.      6.7E3 !(163,-163)<TSANG86>
-CH3O+C2H5=CH2O+C2H6          2.4E13      0.         0. !(164,-164)<TSANG86>
-CH3O+C2H6=C2H5+CH3OH         2.4E11      0.      7.0E3 !(165,-165)<TSANG86>
-CH3O+O=CH2O+OH               1.8E12      0.         0. !(166,-166)<BAULCH94>
-CH3O+OH=CH2O+H2O             1.8E13      0.         0. !(167,-167)<TSANG86>
-CH3O+CO=CH3+CO2              1.6E13      0.     11.7E3 !(168,-168)<TSANG86>
-CH3O+HCO=CH3OH+CO            9.1E13      0.         0. !(169,-169)<TSANG86>
-CH3O+CH2O=CH3OH+HCO          1.0E11      0.      3.0E3 !(170,-170)<TSANG86>
-CH3O+CH3O=CH3OH+CH2O         6.0E13      0.         0. !(171,-171)<TSANG86>
-CH3O+CH3O=CH3OOCH3           1.8E12      0.         0. !(172,-172)<TSANG86>
-!REACTIONS DE CH2OH
-CH2OH+M=H+CH2O+M             4.5E25     -2.5    34.2E3 !(173,-173)<TSANG87>
-CH2OH+H=CH3+OH               9.6E13      0.         0. !(174,-174)<TSANG87>
-CH2OH+H=CH2O+H2              6.0E12      0.         0. !(175,-175)<TSANG87>
-CH2OH+H2=CH3OH+H             6.7E5       2.     13.4E3 !(176,-176)<TSANG87>
-CH2OH+CH2(S)=CH3CHO+H        1.8E13      0.         0. !(177,-177)<TSANG87>
-CH2OH+CH2=C2H4+OH            2.4E13      0.         0. !(178,-178)<TSANG87>
-CH2OH+CH2=CH3+CH2O           1.2E12      0.         0. !(179,-179)<TSANG87>
-CH2OH+CH3=CH4+CH2O           1.4E13      0.         0. !(180,-180)<TSANG87>
-CH2OH+CH3=C2H5OH             1.2E13      0.         0. !(181,-181)<TSANG87>
-CH2OH+CH4=CH3OH+CH3          21.7        3.1    16.2E3 !(182,-182)<TSANG87>
-CH2OH+C2H=C2H2+CH2O          4.8E13      0.         0. !(183,-183)<TSANG87average>
-CH2OH+C2H2=C2H3+CH2O         7.2E11      0.      9.0E3 !(184,-184)<TSANG87>
-CH2OH+C2H3=C2H4+CH2O         3.0E13      0.         0. !(186,-186)<TSANG87>
-CH2OH+C2H5=C2H4+CH3OH        2.4E12      0.         0. !(187,-187)<TSANG87>
-CH2OH+C2H5=C2H6+CH2O         2.4E12      0.         0. !(188,-188)<TSANG87>
-CH2OH+C2H5=NC3H7OH           1.2E13      0.         0. !(189,-189)<TSANG87>
-CH2OH+C2H6=CH3OH+C2H5        199.        3.     14.0E3 !(190,-190)<TSANG87>
-CH2OH+O=CH2O+OH              4.2E13      0.         0. !(191,-191)<TSANG87>
-CH2OH+OH=H2O+CH2O            2.4E13      0.         0. !(192,-192)<TSANG87>
-CH2OH+H2O=CH3OH+OH           1.6E14      0.     26.3E3 !(193,-193)<TSUBOI81NIST>
-CH2OH+HCO=CH3OH+CO           1.2E14      0.         0. !(194,-194)<TSANG87>
-CH2OH+HCO=CH2O+CH2O          1.8E14      0.         0. !(195,-195)<TSANG87>
-CH2OH+CH2O=CH3OH+HCO         5.5E3       2.8     5.9E3 !(196,-196)<TSANG87>
-CH2OH+CH3O=CH3OH+CH2O        2.4E13      0.         0. !(197,-197)<TSANG87>
-CH2OH+CH2OH=CH3OH+CH2O       4.8E12      0.         0. !(198,-198)<TSANG87>
-CH2OH+CH2OH=HOCH2CH2OH       9.6E12      0.         0. !(199,-199)<TSANG87>
-!REACTIONS DE CH3OH
-CH3OH+H=CH3+H2O              2.0E14      0.      5.3E3 !(200,-200)<HIDAKA89NIST>
-CH3OH+H=CH3O+H2              4.2E6       2.1     4.9E3 !(201,-201)<TSANG87>
-CH3OH+CH2(S)=CH2OH+CH3       1.5E12      0.         0. !(202,-202)<TSANG87>
-CH3OH+CH2=CH3+CH2OH          31.9        3.2     7.2E3 !(203,-203)<TSANG87>
-CH3OH+CH2=CH3+CH3O           14.4        3.1     6.9E3 !(204,-204)<TSANG87>
-CH3OH+C2H=C2H2+CH2OH         6.0E12      0.         0. !(205,-205)<TSANG87>
-CH3OH+C2H=C2H2+CH3O          1.2E12      0.         0. !(206,-206)<TSANG87>
-CH3OH+C2H3=C2H4+CH2OH        31.9        3.2     7.2E3 !(207,-207)<TSANG87>
-CH3OH+C2H3=C2H4+CH3O         14.4        3.1     6.9E3 !(208,-208)<TSANG87>
-CH3OH+O=CH2OH+OH             3.4E13      0.      5.5E3 !(209,-209)<GROTHEER81NIST>
-CH3OH+O=CH3O+OH              1.0E13      0.      4.7E3 !(210,-210)<WARNATZ84>
-CH3OH+OH=CH3O+H2O            1.0E13      0.      1.7E3 !(211,-211)<WARNATZ84>
-CH3OH+CH3O=CH3OH+CH2OH       3.0E11      0.      4.1E3 !(212,-212)<TSANG87>
-!REACTIONS DE HCCO
-HCCO+M=CH+CO+M               6.0E15      0.     58.8E3 !(213,-213)<DAGAUT91>
-HCCO+H=CH2+CO                1.5E14      0.         0. !(214,-214)<BAULCH94>
-HCCO+CH2=C2H+CH2O            1.0E13      0.      2.0E3 !(215,-215)<DAGAUT91>
-HCCO+CH2=C2H3+CO             3.0E13      0.         0. !(216,-216)<DAGAUT91>
-HCCO+O=>CO+CO+H              9.6E13      0.         0. !(217)     <BAULCH94>
-HCCO+OH=>HCO+CO+H            1.0E13      0.         0. !(218)     <DAGAUT91>
-!REACTIONS DE CH2CO
-CH2CO+M=CH2(S)+CO+M          4.1E15      0.     59.3E3 !(219,-219)<DAGAUT91>
-CH2CO+M=HCCO+H+M             2.7E17      0.     87.0E3 !(220,-220)<FRANK86NIST>
-CH2CO+H=CH3+CO               1.8E13      0.      3.4E3 !(221,-221)<BAULCH94>
-CH2CO+H=HCCO+H2              5.0E13      0.      8.0E3 !(222,-222)<DAGAUT91>
-CH2CO+CH2=C2H4+CO            1.3E14      0.         0. !(223,-223)<CANOSA-MAS84NIST>
-CH2CO+O=CH2+CO2              1.8E12      0.      1.3E3 !(224,-224)<DAGAUT91>
-CH2CO+O=HCCO+OH              1.0E13      0.      8.0E3 !(225,-225)<DAGAUT91>
-CH2CO+OH=HCCO+H2O            7.5E12      0.      2.0E3 !(226,-226)<DAGAUT91>
-CH2CO+OH=HCO+CH2O            2.8E13      0.         0. !(227,-227)<VANDOOREN77>
-!REACTIONS DE CH3CO
-CH3CO+H=CH3+HCO              9.6E13      0.         0. !(228,-228)<TSANG86>
-CH3CO+CH2(S)=CH3+CH2CO       1.8E13      0.         0. !(229,-229)<TSANG86>
-CH3CO+CH2=CH3+CH2CO          1.8E13      0.         0. !(230,-230)<TSANG86>
-CH3CO+CH3=CH3COCH3           4.0E15     -0.8        0. !(231,-231)<TSANG86>
-CH3CO+C2H5=C2H5COCH3         3.1E14     -0.5        0. !(232,-232)<TSANG86>
-CH3CO+O=CH3+CO2              9.6E12      0.         0. !(233,-233)<TSANG86>
-CH3CO+OH=CH2CO+H2O           1.2E13      0.         0. !(234,-234)<TSANG86>
-CH3CO+OH=CH3+CO+OH           3.0E13      0.         0. !(235,-235)<TSANG86>
-CH3CO+HCO=CH3CHO+CO          9.0E12      0.         0. !(236,-236)<TSANG86>
-CH3CO+HCO=CH3COCHO           1.8E13      0.         0. !(237,-237)<TSANG86>
-CH3CO+CH2O=CH3CHO+HCO        1.8E11      0.     12.9E3 !(238,-238)<TSANG86>
-CH3CO+CH3O=CH3OH+CH2CO       6.0E12      0.         0. !(239,-239)<TSANG86>
-CH3CO+CH3O=CH2O+CH3CHO       6.0E12      0.         0. !(240,-240)<TSANG86>
-CH3CO+CH2OH=CH3COCH2OH       1.2E13      0.         0. !(241,-241)<TSANG87>
-CH3CO+CH3OH=CH3CHO+CH2OH     4.85E3      3.     12.3E3 !(242,-242)<TSANG87>
-CH3CO+CH3CO=CH3COCOCH3       1.2E13      0.     12.3E3 !(243,-243)<TSANG86>
-CH3CO+CH3CO=CH3CHO+CH2CO     1.2E13      0.         0. !(244,-244)<TSANG86>
-!REACTIONS DE CH2CHO
-CH2CHO=CH3CO                 1.0E13      0.      47.0E3!(245,-245)<COLKET75>
-CH2CHO=H+CH2CO               1.6E13      0.      35.0E3!(246,-246)<COLKET75>
-!REACTIONS DE CH3CHO
-CH3CHO+H=H2+CH3CO            4.0E13      0.       4.2E3!(247,-247)<WARNATZ84>
-CH3CHO+CH3=CH3CO+CH4         1.2E11      0.         0. !(248,-248)<COX90mod>
-CH3CHO+C2H3=C2H4+CH3CO       8.1E10      0.       3.7E3!(249,-249)<SCHERZER87>
-CH3CHO+C2H5=C2H6+CH3CO       1.3E12      0.       8.5E3!(250,-250)<HOHLEIN70>
-CH3CHO+O=CH3CO+OH            1.4E13      0.       2.3E3!(251,-251)<COX90>
-CH3CHO+OH=CH3CO+H2O          4.2E12      0.       0.5E3!(252,-252)<COX90>
-CH3CHO+CH3O=CH3CO+CH3OH      2.4E11      0.       1.8E3!(253,-253)<COX90>
-CH3CHO+CH3CO=CH3COCH3+HCO    1.7E11      0.         0. !(254,-254)<GILL81>
-CH3CHO+CH2CHO=CH3CHO+CH3CO   2.5E7       0.         0. !(255,-255)<SCHUCHMANN70>
-!REACTIONS DE C2H4O
-C2H4O=CH4+CO                 1.2E13      0.      57.2E3!(256,-256)<LIFSHITZ83>
-C2H4O=CH3CHO                 7.3E13      0.      57.2E3!(257,-257)<LIFSHITZ83>
-C2H4O=CH3+HCO                3.6E13      0.      57.2E3!(258,-258)<LIFSHITZ83>
-C2H4O+H=H2+CH2CHO            2.0E13      0.       8.3E3!(259,-259)<LIFSHITZ83>
-C2H4O+H=H2O+C2H3             5.0E9       0.       5.0E3!(260,-260)<LIFSHITZ83>
-C2H4O+H=C2H4+OH              9.5E10      0.       5.0E3!(261,-261)<LIFSHITZ83>
-C2H4O+CH3=CH4+CH2CHO         1.1E12      0.      11.8E3!(262,-262)<BALDWIN84*>
-C2H4O+CH3=C2H5+CH2O          1.4E11      0.       7.6E3!(263,-263)<RANZI94>
-C2H4O+CH3=C2H4+CH3O          1.5E10      0.       7.6E3!(264,-264)<RANZI94>
-C2H4O+C2H=C2H2+CH2CHO        1.2E12      0.       9.8E3!(265,-265)<RANZI94>
-C2H4O+C2H3=C2H4+CH2CHO       2.0E12      0.       9.3E3!(266,-266)<RANZI94>
-C2H4O+C2H5=C2H6+CH2CHO       6.8E11      0.      11.4E3!(267,-267)<RANZI94>
-C2H4O+O=OH+CH2CHO            1.9E12      0.       5.2E3!(268,-268)<BOGAN78NIST>
-C2H4O+OH=H2O+CH2CHO          1.8E13      0.       3.6E3!(269,-269)<BALDWIN84*>
-C2H4O+HCO=CH2O+CH2CHO        3.7E12      0.      15.8E3!(270,-270)<RANZI94>
-C2H4O+CH3O=CH3OH+CH2CHO      1.3E12      0.       5.8E3!(271,-271)<RANZI94>
-C2H4O+CH2OH=CH3OH+CH2CHO     8.4E11      0.      13.4E3!(272,-272)<RANZI94>
-C2H4O+CH3CO=CH3CHO+CH2CHO    4.0E12      0.      17.5E3!(273,-273)<RANZI94>
-C2H4O+CH2CHO=CH3CHO+CH2CHO   6.8E11      0.      15.4E3!(274,-274)<RANZI94>
-!* assuming that C2H3O decompose rapidly to CH2CHO
-!REACTIONS DE C2H5O!
-C2H5O=CH2O+CH3               8.0E13      0.      21.5E3!(276,-276)<BAULCH94>
-C2H5O=CH3CHO+H               2.0E14      0.      23.3E3!(277,-277)<HEICKLEN88>
-!REACTIONS DE C2H5OH
-!C2H5OH+H, O, OH =products            no enough data 
-!REACTIONS DE O2
-O2+M=O+O+M                   1.8E18     -1.    118.1E3 !(278,-278)<TSANG86>
-O2+H=OH+O                    9.8E13      0.     14.8E3 !(279,-279)<BAULCH94>
-O2+H+M=HO2+M                 6.2E17     -0.8        0. !(280,-280)<BAULCH94>
-O2+C=CO+O                    1.2E14      0.         0. !(281,-281)<RANZI94>
-O2+CH=HCO+O                  3.3E13      0.         0. !(282,-282)<DAGAUT91>
-O2+CH=CO+OH                  2.0E13      0.         0. !(283,-283)<DAGAUT91>
-O2+CH2(S)=>CO+OH+H           3.1E12      0.         0. !(284)     <BAULCH94>
-O2+CH2=HCO+OH                4.3E10      0.     -0.5E3 !(285,-285)<DAGAUT91>
-O2+CH2=CO2+H2                6.9E11      0.      0.5E3 !(286,-286)<DAGAUT91>
-O2+CH2=>CO2+H+H              1.6E12      0.      1.0E3 !(287)     <DAGAUT91>
-O2+CH2=CO+H2O                1.9E10      0.     -1.0E3 !(288,-288)<DAGAUT91>
-O2+CH2=>CO+OH+H              8.6E10      0.     -0.5E3 !(289)     <DAGAUT91>
-O2+CH2=CH2O+O                1.0E14      0.      4.5E3 !(290,-290)<DAGAUT91>
-O2+CH3(+M)=CH3O2(+M)         7.8E8       1.2        0. !(291,-291)<BAULCH94>
-                            LOW   /5.6E25     -3.3        0./
-                            TROE  /0.36        1.      1.0E8/ 
-O2+CH3=CH3O+O                1.3E14      0.     31.3E3 !(292,-292)<BAULCH94>
-O2+CH3=CH2O+OH               3.0E30     -4.69   36.6E3 !(293,-293)<DAGAUT91>
-O2+CH4=CH3+HO2               4.0E13      0.     56.7E3 !(294,-294)<BAULCH94>
-O2+C2H=CO+HCO                2.4E12      0.         0. !(295,-295)<TSANG86>
-O2+C2H=HCCO+O                6.0E11      0.         0. !(296,-296)<TSANG86>
-O2+C2H2=C2H+HO2              1.2E13      0.     74.5E3 !(297,-297)<TSANG86>
-O2+C2H2=HCCO+OH              2.0E8       1.5    30.1E3 !(298,-298)<DAGAUT91>
-O2+C2H3=C2H2+HO2             1.2E11      0.         0. !(299,-299)<TSANG86>
-O2+C2H3=CH2O+HCO             3.0E12      0.     -0.3E3 !(300,-300)<DAGAUT91>
-O2+C2H4=C2H3+HO2             4.2E13      0.     57.4E3 !(301,-301)<TSANG86>
-O2+C2H5=C2H5O2               2.2E10      0.77   -0.6E3 !(301,-301)<WAGNER90>
-O2+C2H5=C2H4+HO2             8.4E11      0.      3.9E3 !(303,-303)<TSANG86>
-O2+C2H5=C2H5O+O              1.2E13     -0.2    27.9E3 !(304,-304)<BOZZELLI90>
-O2+C2H5=CH3CHO+OH            6.0E10      0.      6.9E3 !(305,-305)<TSANG86>
-O2+C2H6=C2H5+HO2             6.0E13      0.     51.7E3 !(306,-306)<BAULCH94>
-O2+OH=HO2+O                  2.2E13      0.     52.5E3 !(307,-307)<TSANG86>
-O2+CO=CO2+O                  2.5E12      0.     47.7E3 !(308,-308)<TSANG86>
-O2+HCO=CO+HO2                5.1E13      0.      1.7E3 !(309,-309)<TSANG86>
-O2+CH2O=HCO+HO2              2.0E13      0.     38.8E3 !(310,-310)<TSANG86>
-O2+CH3O=CH2O+HO2             2.2E10      0.      1.7E3 !(311,-311)<BAULCH94>
-O2+CH2OH=CH2O+HO2            1.2E12      0.         0. !(312,-312)<TSANG87>
-O2+CH3OH=CH2OH+HO2           2.0E13      0.     44.9E3 !(313,-313)<TSANG87>
-O2+HCCO=>CO+CO+OH            1.5E12      0.      2.5E3 !(314)    <DAGAUT91>
-O2+CH2CO=CH2O+CO2            1.0E8       0.         0. !(315,-315)<DAGAUT91>
-O2+CH3CO=CH3CO3              2.4E12      0.         0. !(316,-316)<COX90>
-O2+CH2CHO=>CH2O+OH+CO        5.9E9       0.     -1.4E3 !(317)     <COX90>
-O2+CH2CHO=CH2CO+HO2          1.0E10      0.     -1.4E3 !(318,-318)<COX90>
-O2+CH3CHO=CH3CO+HO2          5.0E13      0.     36.4E3 !(319,-319)<COX90>
-O2+C2H4O=HO2+CH2CHO          5.0E13      0.     48.0E3 !(320,-320)<RANZI94>
-O2+C2H5O=CH3CHO+HO2          6.0E10      0.      1.7E3 !(321,-321)<BAULCH94>
-!REACTIONS DE HO2
-HO2+H=H2+O2                  4.3E13      0.      1.4E3 !(322,-322)<BAULCH94>
-HO2+H=2OH                    1.7E14      0.      0.9E3 !(323,-323)<BAULCH94>
-HO2+H=H2O+O                  3.0E13      0.      1.7E3 !(324,-324)<BAULCH94>
-HO2+CH2(S)=CH2O+OH           3.0E13      0.         0. !(325,-325)<TSANG86>
-HO2+CH2=CH2O+OH              1.8E13      0.         0. !(326,-326)<TSANG86>
-HO2+CH3=CH3O+OH              1.8E13      0.         0. !(327,-327)<BAULCH94>
-HO2+CH4=CH3+H2O2             9.0E12      0.     24.6E3 !(328,-328)<BAULCH94>
-HO2+C2H=HCCO+OH              1.8E13      0.         0. !(329,-329)<TSANG86>
-HO2+C2H2=CH2CO+OH            6.0E9       0.      8.0E3 !(330,-330)<TSANG86>
-HO2+C2H3=>OH+CH3+CO          3.0E13      0.         0. !(331)     <TSANG86>
-HO2+C2H4=CH3CHO+OH           6.0E9       0.      7.9E3 !(332,-332)<TSANG86>
-HO2+C2H4=C2H4O+OH            2.2E12      0.     17.2E3 !(333,-333)<BAULCH94>
-HO2+C2H5=>CH3+CH2O+OH        2.4E13      0.         0. !(334)     <TSANG86>
-HO2+C2H5=C2H4+H2O2           3.0E11      0.         0. !(335,-335)<TSANG86>
-HO2+C2H6=C2H5+H2O2           1.3E13      0.     20.4E3 !(336,-336)<BAULCH94>
-HO2+OH=H2O+O2                2.9E13      0.     -0.5E3 !(337,-337)<BAULCH94>
-HO2+CO=CO2+OH                1.5E14      0.     23.6E3 !(338,-338)<TSANG86>
-!-------------------------------------------------------------------------------------!
-!fittings  (20/12/94, F. Battin-Leclerc) on CH4-02 system in PSR between 500 and 1300C!
-!HO2+CO=CO2+OH                3.0E13      0.     23.6E3! !(338,-338)<TSANG86/5>
-!-------------------------------------------------------------------------------------! 
-HO2+HCO=>OH+H+CO2            3.0E13      0.         0. !(339)     <TSANG86>
-HO2+CH2O=HCO+H2O2            3.0E12      0.     13.0E3 !(340,-340)<BAULCH94>
-HO2+CH3O=CH2O+H2O2           3.0E11      0.         0. !(341,-341)<TSANG86>
-HO2+CH2OH=CH2O+H2O2          1.2E13      0.         0. !(342,-342)<TSANG87>
-HO2+CH3OH=CH2OH+H2O2         9.6E10      0.     12.6E3 !(343,-343)<TSANG87>
-HO2+CH3CO=>CH3+CO2+OH        3.0E13      0.         0. !(344)<TSANG86>
-HO2+CH3CHO=CH3CO+H2O2        1.0E12      0.     10.0E3 !(345,-345)<COX90>
-HO2+C2H4O=H2O2+CH2CHO        1.6E12      0.     15.0E3 !(346,-346)<RANZI94>
-HO2+HO2=H2O2+O2              1.9E12      0.      1.5E3 !(347,-347)<BAULCH92>
-     DUPLICATE
-HO2+HO2=H2O2+O2              1.3E11      0.     -1.7E3 !(347,-347)<BAULCH 94>
-     DUPLICATE
-!REACTIONS DE H2O2
-H2O2(+M)=OH+OH(+M)           3.0E14      0.     48.3E3 !(348,-348)<BAULCH94>
-                    LOW     /1.2E17      0.     45.3E3/
-H2O2+H=H2+HO2                1.7E12      0.      3.7E3 !(349,-349)<BAULCH94>
-H2O2+H=H2O+OH                1.0E13      0.      3.6E3 !(350,-350)<BAULCH94>
-H2O2+CH2(S)=CH3O+OH          3.0E13      0.         0. !(351,-351)<TSANG86>
-H2O2+C2H3=C2H4+HO2           1.2E10      0.     -0.6E3 !(352,-352)<TSANG86>
-H2O2+O=OH+HO2                6.6E11      0.      4.0E3 !(353,-353)<BAULCH94>
-H2O2+OH=H2O+HO2              7.8E12      0.      1.3E3 !(354,-354)<BAULCH94>
-!REACTIONS DE CO2
-CO2+CH2=CH2O+CO              2.3E10      0.         0. !(355,-355)<TSANG86>
-!REACTIONS DE CH3O2
-CH3O2=CH2O+OH                1.5E13      0.     47.0E3 !(356,-356)<RANZI94>
-CH3O2+H=CH3O+OH              9.6E13      0.         0. !(357,-357)<TSANG86>
-CH3O2+H2=CH3O2H+H            3.0E13      0.     26.0E3 !(358,-358)<TSANG86>
-CH3O2+CH2(S)=CH2O+CH3O       1.8E13      0.         0. !(359,-359)<TSANG86>
-CH3O2+CH2=CH2O+CH3O          1.8E13      0.         0. !(360,-360)<TSANG86>
-CH3O2+CH3=CH3O+CH3O          5.0E12      0.     -1.4E3 !(361,-361)<COX90>
-CH3O2+CH4=CH3O2H+CH3         1.8E11      0.     18.5E3 !(362,-362)<TSANG86>
-CH3O2+C2H=CH3O+HCCO          2.4E13      0.         0. !(363,-363)<TSANG86>
-CH3O2+C2H2=CH3O2H+C2H        5.6E11      0.     24.5E3 !(364,-364)<RANZI94>
-CH3O2+C2H3=CH3O+CH2CHO       2.4E13      0.         0. !(365,-365)<TSANG86>
-!* assuming that C2H3O decompose rapidly to CH2CHO
-CH3O2+C2H4=CH3O+C2H4O        1.1E15      0.     20.0E3 !(366,-366)<NIKISHA81/MOSHKINA80>
-CH3O2+C2H4=CH3O2H+C2H3       3.9E12      0.     24.5E3 !(367,-367)<RANZI94>
-CH3O2+C2H5=CH3O+C2H5O        2.4E13      0.         0. !(368,-368)<TSANG86>
-CH3O2+C2H6=CH3O2H+C2H5       2.9E11      0.     14.9E3 !(369,-369)<TSANG86>
-CH3O2+O=CH3O+O2              3.6E13      0.         0. !(370,-370)<TSANG86>
-CH3O2+OH=CH3OH+O2            6.0E13      0.         0. !(371,-371)<TSANG86>
-CH3O2+OH=CH3O+HO2            3.0E12      0.         0. !(372,-372)<RANZI94>
-CH3O2+CO=CH3O+CO2            1.0E14      0.     24.0E3 !(373,-373)<RANZI94>
-CH3O2+HCO=>CH3O+H+CO2        3.0E13      0.         0. !(374)<TSANG86>
-CH3O2+CH2O=CH3O2H+HCO        1.0E12      0.     12.1E3 !(375,-375)<COX90>
-CH3O2+CH3O=CH2O+CH3O2H       3.0E11      0.         0. !(376,-376)<TSANG86>
-CH3O2+CH2OH=>CH3O+OH+CH2O    1.2E13      0.         0. !(377)<TSANG87>
-CH3O2+CH3OH=CH3O2H+CH2OH     1.8E12      0.     13.7E3 !(378,-378)<TSANG87>
-CH3O2+CH3OH=CH3O2H+CH3O      2.8E11      0.     18.8E3 !(379,-379)<RANZI94>
-CH3O2+CH2CO=CH3O2H+HCCO      1.7E12      0.     27.0E3 !(380,-380)<RANZI94>
-CH3O2+CH3CO=CH3+CO2+CH3O     2.4E13      0.         0. !(381,-381)<TSANG86>
-CH3O2+CH3CHO=CH3O2H+CH3CO    1.0E12      0.     12.1E3 !(382,-382)<COX90>
-CH3O2+CH3CHO=CH3O2H+CH2CHO   1.7E12      0.     19.2E3 !(383,-383)<RANZI94>
-CH3O2+C2H4O=CH3O2H+CH2CHO    2.2E12      0.     16.0E3 !(384,-384)<RANZI94>
-CH3O2+HO2=CH3O2H+O2          2.5E11      0.     -1.6E3 !(385,-385)<BAULCH94>
-CH3O2+HO2=>O2+CH2O+H2O       5.0E10      0.         0. !(386)<RANZI94>
-CH3O2+H2O2=CH3O2H+HO2        2.4E12      0.      9.9E3 !(387,-387)<TSANG86>
-CH3O2+CH3O2=CH3OH+CH2O+O2    2.5E10      0.     -0.8E3 !(388,-388)<BAULCH94>
-CH3O2+CH3O2=CH3O+CH3O+O2     2.5E10      0.     -0.8E3 !(389,-389)<BAULCH94>
-!REACTIONS DE CH3O2H
-CH3O2H=CH3O+OH               6.0E14      0.     42.3E3 !(390,-390)<BAULCH94>
-CH3O2H+O=CH3O2+OH            2.0E13      0.      4.8E3 !(391,-391)<BAULCH94average>
-CH3O2H+OH=H2O+CH3O2          1.8E12      0.    -0.37E3 !(392,-392)<BAULCH94average>
-CH3O2H+CH3O=>CH3OH+OH+CH2O   1.5E11      0.      6.5E3 !(393)<RANZI94>
-!REACTIONS DE C2H5O2
-C2H5O2=C2H4O2H               4.2E12      0.     36.9E3 !(394,-394)<PILLING94>
-C2H5O2+H2=C2H5O2H+H          7.9E12      0.     21.0E3 !(395,-395)<RANZI94>
-C2H5O2+CH3=C2H5O+CH3O        2.0E12      0.     -1.2E3 !(396,-396)<RANZI94>
-C2H5O2+CH4=C2H5O2H+CH3       3.9E12      0.     24.0E3 !(397,-397)<RANZI94>
-C2H5O2+C2H2=C2H5O2H+C2H      5.6E11      0.     24.4E3 !(398,-398)<RANZI94>
-C2H5O2+C2H4=C2H5O2H+C2H3     3.9E12      0.     24.4E3 !(399,-399)<RANZI94>
-C2H5O2+C2H4=C2H5O+C2H4O      2.3E16      0.     21.9E3 !(400,-400)<MOSHKINA80>
-C2H5O2+C2H6=C2H5O2H+C2H5     5.1E12      0.     19.5E3 !(401,-401)<RANZI94>
-C2H5O2+H2O=C2H5O2H+OH        5.6E12      0.     30.6E3 !(402,-402)<RANZI94>
-C2H5O2+CO=CO2+C2H5O          1.0E14      0.     24.0E3 !(403,-403)<RANZI94>
-C2H5O2+CH2O=C2H5O2H+HCO      4.5E12      0.     14.4E3 !(404,-404)<RANZI94>
-C2H5O2+CH3OH=C2H5O2H+CH3O    2.8E11      0.     18.4E3 !(405,-405)<RANZI94>
-C2H5O2+CH3OH=C2H5O2H+CH2OH   2.8E12      0.     19.5E3 !(406,-406)<RANZI94>
-C2H5O2+CH2CO=C2H5O2H+HCCO    1.7E12      0.     24.4E3 !(407,-407)<RANZI94>
-C2H5O2+CH3CHO=C2H5O2H+CH3CO  3.9E12      0.     14.4E3 !(408,-408)<RANZI94>
-C2H5O2+CH3CHO=C2H5O2H+CH2CHO 1.7E12      0.     19.5E3 !(409,-409)<RANZI94>
-C2H5O2+C2H4O=C2H5O2H+CH2CHO  2.2E12      0.     16.3E3 !(410,-410)<RANZI94>
-C2H5O2+HO2=O2+C2H5O2H        3.9E11      0.     -1.3E3 !(411,-411)<BAULCH89>
-!Rate constant measured between 240 and 380K
-C2H5O2+H2O2=C2H5O2H+HO2      4.5E11      0.     10.8E3 !(412,-412)<RANZI94>
-C2H5O2+CH3O2=>C2H5O+CH3O+O2  2.0E11      0.         0. !(413)<RANZI94>
-C2H5O2+CH3O2H=C2H5O2H+CH3O2  1.1E12      0.     16.3E3 !(414,-414)<RANZI94>
-C2H5O2+C2H5O2=2C2H5O+O2      4.1E10      0.      0.2E3 !(415,-415)<LIGHTFOOT92>
-C2H5O2+C2H5O2=C2H5OH+CH3CHO+O2  1.8E10   0.       0.2E3 !(416,-416)<LIGHTFOOT92>
-!REACTIONS DE C2H4O2H
-C2H4O2H=C2H4O+OH             1.5E11      0.     20.0E3 !(417,-417)<RANZI94>
-C2H4O2H=CH2OH+CH2O           2.5E13      0.     27.5E3 !(418,-418)<RANZI94>
-C2H4O2H=C2H4+HO2             2.0E13      0.     23.5E3 !(419,-419)<RANZI94>
-!REACTIONS DE C2H5O2H
-C2H5O2H=C2H5O+OH             4.0E15      0.     42.9E3 !(420,-420)<BAULCH94>
-C2H5O2H+H=>CH3CHO+OH+H2      3.2E13      0.      7.7E3 !(421)<RANZI94>
-C2H5O2H+CH3=>CH3CHO+OH+CH4   5.7E11      0.      8.7E3 !(422)<RANZI94>
-C2H5O2H+C2H=>CH3CHO+OH+C2H2  6.0E11      0.      9.2E3 !(423)<RANZI94>
-C2H5O2H+C2H3=>CH3CHO+OH+C2H4 1.0E12      0.      8.7E3 !(424)<RANZI94>
-C2H5O2H+C2H5=>CH3CHO+OH+C2H6 3.4E11      0.     11.4E3 !(425)<RANZI94>
-C2H5O2H+OH=>CH3CHO+OH+H2O    5.9E12      0.      0.9E3 !(426)<RANZI94>
-C2H5O2H+HCO=>CH3CHO+OH+CH2O  1.8E12      0.     16.7E3 !(427)<RANZI94>
-C2H5O2H+CH3O=>CH3CHO+OH+CH3OH  6.3E11    0.      5.5E3 !(428)<RANZI94>
-C2H5O2H+CH2OH=>CH3CHO+OH+CH3OH  4.2E11   0.     13.6E3 !(429)<RANZI94>
-C2H5O2H+CH3CO=>2CH3CHO+OH    2.0E12      0.     18.5E3 !(430)<RANZI94>
-C2H5O2H+CH2CHO=>2CH3CHO+OH   3.4E11      0.     15.7E3 !(431)<RANZI94>
-C2H5O2H+HO2=>CH3CHO+OH+H2O2  8.0E11      0.     16.2E3 !(432)<RANZI94>
-C2H5O2H+CH3O2=>CH3CHO+OH+CH3O2H   1.1E12      0.     16.7E3 !(433)<RANZI94>
-C2H5O2H+C2H5O2=>CH3CHO+OH+C2H5O2H   1.1E12    0.     16.7E3 !(434)<RANZI94>
-!REACTIONS DE CH3CO3
-CH3CO3+C2H4O=CH3CO3H+CH2CHO  1.0E12      0.      9.3E3 !(435,-436)<RANZI94>
-CH3CO3+HO2=CH3CO3H+O2        5.5E10      0.     -2.6E3 !(436,-436)<COX90>
-CH3CO3+C2H5O2H=CH3CO3H+C2H5O2   5.0E11   0.      9.2E3 !(437,-437)<RANZI94>
-CH3CO3+C2H5O2H=>CH3CHO+OH+CH3CO3H  5.0E11    0.  9.2E3 !(438)<RANZI94>
-CH3CO3+CH3CO3=>2CH3+O2+2CO2  1.7E12      0.     -1.0E3 !(439)<COX90>
-!REACTIONS DE CH3CO3H
-CH3CO3H=>CH3+CO2+OH          1.0E16      0.     40.0E3 !(440)<COX90>
-END
-!REFERENCES!
-!Aders, W.-K.; und Wagner, H.Gg.(1973), "Untersuchungen zur Reaktion von
-!Wasserstoffatomen mit Aethanol und ter.Butanol, Ber. Bunsenges. Phys. Chem.,
-!77, 712.
-!Baulch, D. L.; Cobos, C. J.; Cox, R. A.; Frank, P.; Hayman, G.; Just, Th.;
-!Kerr, J. A.; Murrells, T.; Pilling, M. J.; Troe, J.; Walker, R. W. and 
-!Warnatz, J. (1994), "Summary Table of Evaluated Kinetic Data for Combustion
-!Modeling : Supplement 1", Comb. Flam., 98, 59.
-!Baulch, D. L.; Cobos, C. J.; Cox, R. A.; Esser, C.; Frank, P.; Just, Th; 
-!Kerr, J. A.; Pilling, M. J.; Troe, J.; Walker, R. W. and Warnatz, J.(1992),
-!"Evaluated kinetic data for combustion modelling", J. Phys. Chem. Ref. Data,
-!21, 411.
-!Bogan, D.J.; Hand, C.W.(1978), "Absolute Rate Constant, Kinetic Isotope 
-!Effect,and Mechanism of the Reaction of Ethylene Oxide with Oxygen(3P)atoms,
-!J. Phys. Chem., 82, 2067.
-!Bozzelli, J.W.; Dean, A.M. (1990), "Chemical activation analysis of the 
-!reaction of C2H5 with O2, J. Phys. Chem., 94, 3313.
-!Canosa-Mas, C.E.; Frey, H. M. and Walsh, R. (1984), "Studies of Methylene 
-!Chemistry by Pulsed Laser-Induced Decomposition of Ketene. Part 1.-Ketene in
-!the presence of noble gases", J. Chem. Soc. Faraday Trans. 2, 80, 561.
-!Cavanagh, J.; Cox, R. A. and Olson, G. (1990), "Computer Modeling of Cool 
-!Flames and Ignition of Acetaldehyde", Combustion and Flame, 82, 15-39.
-!Colket, M. B., III.; Naegeli, D. W. and Glassman, I. (1975),
-!"High-Temperature Pyrolysis of Acetaldehyde", Int. J. Chem. Kinet., 7, 223.
-!Dagaut, P.; Boettner, J. C. and Cathonnet, M. (1991), "Methane Oxidation: 
-!Experimental and Kinetic Modeling Study", Combust. Sci. and Tech., 77, 127.
-!Dean, A. J.; Davidson, D. F.; Hanson, R. K. (1991), "A shock tube study of
-!reactions of C atoms with H2 and O2 using excimer photolysis of C3O2 and C
-!atom atomic resonance absorption spectroscopy", J. Phys. Chem., 95, 183.
-!Dean, A. M.; Westmoreland, P. R. (1987), "Bimolecular QRRK analyses of 
-!methyl radical reactions, Int. J. Chem. Kinet., 19, 207.
-!Duran, R. P.; Amorebieta, V. T.; Colussi, A. J. (1989), "Lack of kinetic
-!hydrogen isotope effect in acetylene pyrolysis", Int. J. Chem. Kinet., 21,
-!847.
-!Fahr, A.; Stein, S. E. (1989), "Reactions of vinyl and phenyl radicals with 
-!ethyne, ethene and benzene", Symp. (Int.) Combust., <Proc.>, 22, 1023.
-!Frank, P. (1986), "A high temperature shock tube study on fast reactions of 
-!methylene and methyl radicals", Proc. Int. Symp. Rarefield Gas Dyn., 2, 422.
-!Frank, P.; Bhaskaren, K.A. and Just, Th. (1986), "High-temperature reaction 
-!of triplet methylene and ketene with radicals", J. Phys. Chem., 90, 2226.
-!Glarborg, P.; Kee, R. J. and Miller, J. A. (1986), Combust. Flame, 65, 177.
-!Grotheer, H. H. and Just, Th. (1981), "Kinetics of the Oxidation of Methanol
-!by Ground-State Atomic Oxygen", Chem. Phys. Lett., 78, 71.
-!Herron, J.T.(1988), "Evaluated chemical kinetic data for the reactions of
-!atomic oxygen O(3P) with saturated organic compounds in the gas phase,
-!J. Phys. Chem. Ref. Data, 17, 967.
-!Hidaka, Y.; Oki, T. and Kawano, H. (1989), "Thermal decomposition of
-!methanol in shock Waves", J. Phys. Chem., 93, 7134. 
-!Hohlein, G.; Freeman, G. R. (1970), "Radiation-sensitized pyrolysis of 
-!diethyl ether. Free-radical rate parameters", J. Am. Chem. Soc., 92, 6118.
-!Lesclaux, R.; Roussel, P.; Veyret, B. and Pouchan, C. (1986), "Gas-Phase
-!reactivity of the HCO radical with unsaturated hydrocarbons : An 
-!experimental and theoretical study", J. Am. Chem. Soc., 108, 3872.
-!Lifshitz, A. and Ben-Hamou, H.(1983), "Thermal reactions of cyclic ethers
-!at high temperatures.1. Pyrolysis of ethylene oxide behind reflected shocks,
-!J. Phys. Chem., 87, 1782.
-!Lightfoot, P.D.; Cox, R.A.; Crowley, J.N.; Destriau, M.; hayman, G.D.;
-!Jenkin, M.E.; Moortgat, G.K.; Zabel, F. (1992),
-!"Organic peroxy radicals: kinetics, spectroscopy and tropospheric chemistry"! Atmos. Environ.,
-! A, 26, 1805-1961.
-!Mahmud, K.; Marshall, P.; Fontijn, A. (1987), "A high-temperature 
-!photochemistry kinetics study of the reaction of O(3P) atoms with ethylene
-!from 290 to 1510 K", J. Phys. Chem., 91, 1568.
-!Moshkina, R.I.; Polyak, S.S.; Sokolova, N.A.; Masterovoi, I.F.and Nalbandyan!, A.B. (1980),
-!"Study of the ethane oxidation reaction by the kinetic tracer method",
-!Int. J. Chem. Kinet., 12, 315.
-!Murrell, J. N.; Rodriguez, J. A. (1986), "Predicted rate constants for the
-!exothermic reactions of ground state oxygen atoms and CH radicals",
-!J. Molec. Struct. (Theochem), 139, 267.
-!Nikisha, L.V.; Moshkina, R.I.; Polyak, S.S.; Vedeneev, V.I.(1981),
-!"Reactions of Methyl Peroxide Radicals with Ethylene",Kinet. Catal.,22,1104.
-!Pilling, M.J. (1994), "Elemetary Radical Reactions and Autoignition",
-!13th International Symposium on Gas kinetics - University College Dublin.
-!Ranzi, E.; Faravelli, T.; Gaffuri, P. and Sogaro, A. (1994), 
-!"Low temperature combustion : automatic generation of primary oxidation reactions",
-!Comb. Flam. (submitted)
-!Scherzer, K.; Loser, U.; Stiller, W. (1987), "BSBL-Rechnungen zu 
-!Wasserstoffabspaltungsreaktionen durch alkenylradikale; Vinylradikale", 
-!Z. Chem., 27, 300.
-!Schumann, H.-P.; Laidler, K. J., "The ethenoxy radical in the pyrolysis of
-!acetaldehyde", Can. J. Chem., 48, 2315.
-!Tsang, W. (1976),"Thermal stability of alcohols",Int. J. Chem. Kinet.,8,173.
-!Tsang, W. and Hampson, R. F.(1986), "Chemical Kinetic Data Base for 
-!Combustion Chemistry. Part I. Methane and Related Compounds", J. Phys. Chem.
-!Ref. Data, 15(3), 1087.
-!Tsang, W. (1987), "Chemical Kinetic Data Base for Combustion Chemistry. Part
-!2. Methanol", J. Phys. Chem. Ref. Data, 16(3), 471.
-!Tsuboi, T. and Hashimoto, K. (1981), "Shock Tube Study on Homogeneous 
-!Oxidation of Methanol", Combust. Flame, 42, 61.
-!Vandooren, J.; Van Tiggelen, P. J. (1977), "Reaction mechanisms of 
-!combustion in low pressure acetylene-oxygen flames", Symp. Int. Combust. 
-!Proc., 16, 1133.
-!Wagner, A. F., Slage, I. R.; Sarzynski, D.; Gutman, D. (1990), "Experimental
-!and theoretical studies of the C2H5+O2 reaction kinetics", J. Phys. Chem.,
-!94, 1853.
-!Warnatz, J. (1984), "Rate coefficients in the C/H/O system", Combustion
-!Chemistry (ed. W. C. Gardiner, Jr.) Springer-Verlag, NY, 197.
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_sih4 b/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_sih4
deleted file mode 100644
index 19ceca3b3..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/chem.inp_sih4
+++ /dev/null
@@ -1,117 +0,0 @@
-ELEMENTS
- H   O  N   SI
-END
-SPECIES
-H2 O2 OH H H2O O H2O2 HO2 
-SIH4 SIH3 SIH2 SIH SIO SIO2 HSIO SIH2O SIH3O SIH3O2 SIH4O2
-N2
-END
-THERMO
-SIH3O                   SI 1.H  3.O 1. N 0. G   300.000  5000.000              1
- 0.37707966E+01 0.78711497E-02-0.26563839E-05 0.39444314E-09-0.21126164E-13    2
--0.13296131E+04 0.59295750E+01 0.21062040E+01 0.72165951E-02 0.53384720E-05    3
--0.73776363E-08 0.20756105E-11-0.47884505E+03 0.16152177E+02                   4
-SIH3O2                  SI 1.H  3.O 2. N 0. G   300.000  5000.000              1
- 0.66812963E+01 0.80057271E-02-0.27188507E-05 0.40631365E-09-0.21927725E-13    2
--0.42105544E+04-0.99423847E+01 0.20986490E+01 0.15786357E-01 0.75683261E-05    3
--0.11274587E-07 0.56665133E-11-0.26671854E+04 0.15007068E+02                   4
-SIH4O2                  SI 1.H  4.O 2. N 0. G   300.000  5000.000              1
- 0.66812963E+01 0.80057271E-02-0.27188507E-05 0.40631365E-09-0.21927725E-13    2
--0.42105544E+04-0.99423847E+01 0.20986490E+01 0.15786357E-01 0.75683261E-05    3
--0.11274587E-07 0.56665133E-11-0.26671854E+04 0.15007068E+02                   4
-SIH2O                   SI 1.H  2.O 1. N 0. G   300.000  5000.000              1
- 0.32939910E+01 0.59522360E-02-0.21083880E-05 0.33459980E-09-0.19750180E-13    2
--0.13283760E+04 0.70293210E+01 0.32032740E+01 0.44987760E-02-0.45214720E-05    3
- 0.10444300E-07-0.61720710E-11-0.12958860E+05 0.84842740E+01                   4
-HSIO                    SI 1.H  1.O 1. N 0. G   300.000  5000.000              1
- 0.34714290E+01 0.31057530E-02-0.11005030E-05 0.17477250E-09-0.10263730E-13    2
- 0.30103527E+04 0.79153820E+01 0.30781400E+01 0.10178940E-01-0.31701710E-04    3
- 0.43635320E-08-0.19549500E-10 0.31101614E+04 0.92575020E+01                   4
-SIO                     SI 1.H  0.O 1. N 0. G   300.000  5000.000              1
- 3.74788350E+00 8.19919430E-04-3.25253960E-07 5.73249620E-11-3.51089440E-15    2
--1.33174300E+04 3.66100339E+00 3.25282760E+00 4.18231260E-04 3.78062020E-06    3
--5.10244830E-09 1.94713170E-12-1.30903400E+04 6.66174329E+00                   4
-SIO2                    SI 1.H  0.O 2. N 0. S   300.000  5000.000              1
- 0.63467463E+01 0.21952215E-02 0.0            0.0            0.0               2
--0.11154241E+06-0.32060643E+02 0.63467463E+01 0.21952215E-02 0.0               3
- 0.0            0.0           -0.11154241E+06-0.32060643E+02                   4
-END
-REACTIONS
- H2    + O2            = OH    + OH           6.700E+13  0.00  47780.
- H2    + OH            = H2O   + H            1.170E+09  1.30   3626.
- O     + OH            = O2    + H            5.000E+14 -0.50      0.
-!H     + O2            = O     + OH           1.940E+14  0.00  16440.
- O     + H2            = OH    + H            5.060E+04  2.67   6290.
- H     + O2    + M     = HO2   + M            2.800E+19 -1.25      0.
-   H2/2.5/  H2O/12.5/
-!OH    + HO2           = H2O   + O2           7.500E+12  0.00      0.
- OH    + HO2           = H2O   + O2           7.890E+13  0.00   -497.
-!H     + HO2           = OH    + OH           1.400E+14  0.00   1073.
- H     + HO2           = OH    + OH           1.690E+14  0.00    874.
- O     + HO2           = O2    + OH           2.400E+13  0.00   1073.   !  1.4
- OH    + OH            = O     + H2O          6.000E+08  1.30      0.
- H     + H     + M     = H2    + M            1.000E+18 -1.00      0.
-   H2/0.0/ H2O/0./
- H     + H     + H2    = H2    + H2           9.200E+16 -0.60      0.
- H     + H     + H2O   = H2    + H2O          6.000E+19 -1.25      0.
- H     + OH    + M     = H2O   + M            1.600E+22 -2.00      0.
- H     + O     + M     = OH    + M            6.200E+16 -0.60      0.
- O     + O     + M     = O2    + M            1.890E+13  0.00  -1788.
-!H     + HO2           = H2    + O2           1.250E+13  0.00      0.
- H     + HO2           = H2    + O2           6.280E+13  0.00   1411.
-!HO2   + HO2           = H2O2  + O2           2.000E+12  0.00      0.
- HO2   + HO2           = H2O2  + O2           4.200E+14  0.00  12000.
-DUPLICATE
- HO2   + HO2           = H2O2  + O2           1.300E+11  0.00  -1640.
-DUPLICATE
- H2O2  + M             = OH    + OH    + M    6.300E+17  0.00  45500.
- H2O2  + H             = HO2   + H2           1.600E+12  0.00   3800.
- H2O2  + OH            = H2O   + HO2          1.300E+11  0.00  -1630.
-DUPLICATE
- H2O2  + OH            = H2O   + HO2          5.800E+14  0.00   9560.
-DUPLICATE
- H     + HO2           = O     + H2O          3.100E+10  0.00   3590.
- O     + OH    + M     = HO2   + M            1.000E+16  0.00      0.
- H2O2  + H             = H2O   + OH           1.000E+13  0.00   3590.
- H2O2  + O             = H2O   + O2           8.400E+11  0.00   4260.
- H2O2  + O             = OH    + HO2          2.000E+13  0.00   5900.
- H2    + HO2           = H2O   + OH           2.100E+13  0.00  18800.
- SIH4                  = SIH2  + H2           1.000E+13  0.00  52700.
- SIH2  + O2            = HSIO  + OH           3.200E+14  0.00   8000.
- SIH2  + H2O           = SIH2O + H2           3.000E+12  0.00  11400.
- SIH4  + O2            = SIH3  + HO2          4.000E+13  0.00  42800.
- SIH4  + H             = SIH3  + H2           5.000E+12  0.00   2500.
- SIH4  + O             = SIH3  + OH           4.200E+12  0.00   1600.
- SIH4  + OH            = SIH3  + H2O          9.400E+12  0.00    100.
- SIH4  + HO2           = SIH3  + H2O2         2.000E+12  0.00  10000.
- SIH4  + SIH3O2        = SIH3  + SIH4O2       1.100E+13  0.00  18500.
- SIH3  + O2            = SIH3O2               2.000E+15  0.00   1200.
- SIH3O2                = SIH3O + O            2.000E+13  0.00  34000.          !   5.e12
- SIH3O2                = SIH2O + OH           3.000E+12  0.00   4000.
- SIH3O2+ HO2           = SIH4O2+ O2           3.000E+11  0.00      0.
- SIH4O2+ H             = SIH3O2+ H2           4.800E+13  0.00   7950.
- SIH4O2                = SIH3O + OH           6.500E+14  0.0   48700.
- SIH3  + O2            = SIH3O + O            1.000E+13  0.00      0.          !   2
- SIH3O + O2            = SIH2O + HO2          2.000E+13  0.00      0.
- SIH3  + H             = SIH2  + H2           2.000E+13  0.00      0.
- SIH3  + O             = SIH2O + H            2.000E+13  0.00      0.
- SIH3  + OH            = SIH2O + H2           6.000E+12  0.00      0.
- SIH3  + HO2           = SIH2  + H2O2         2.000E+13  0.00      0.
- SIH3  + SIH3          = SIH2  + SIH4         2.000E+12  0.00      0.
- SIH2O + O2            = HSIO  + HO2          4.000E+14  0.00  35000.
- SIH2O + M             = HSIO  + H     + M    2.000E+15  0.00  84500.
- SIH2O + H             = HSIO  + H2           5.300E+14  0.00  10500.
- SIH2O + O             = HSIO  + OH           1.800E+13  0.00   3080.
- SIH2O + OH            = HSIO  + H2O          7.500E+12  0.00    170.
- SIH2O + HO2           = HSIO  + H2O2         1.000E+13  0.00  12000.
- HSIO  + M             = H     + SIO   + M    5.000E+14  0.00  29000.
- HSIO  + O2            = SIO   + HO2          3.000E+13  0.00      0.
- HSIO  + H             = SIO   + H2           2.000E+14  0.00      0.
- HSIO  + O             = SIO   + OH           1.000E+14  0.00      0.
- HSIO  + OH            = SIO   + H2O          1.000E+14  0.00      0.
- HSIO  + HO2           = SIO   + H2O2         1.000E+14  0.00      0.
- SIO   + OH            = SIO2  + H            4.000E+12  0.00   5700.
- SIO   + HO2           = SIO2  + OH           1.000E+12  0.00      0.
- SIO   + O     + M     = SIO2  + M            2.500E+15  0.00   4370.
- SIO   + O2            = SIO2  + O            4.000E+13  0.00   6500.
-END
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/ckinterp.f b/applications/test/readCHEMKINIII/CHEMKINdata/ckinterp.f
deleted file mode 100644
index 01f418422..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/ckinterp.f
+++ /dev/null
@@ -1,3296 +0,0 @@
-C
-      PROGRAM CKINTP
-C
-C----------------------------------------------------------------------C
-C     VERSION 3.6
-C     CHANGES FROM VERSION 1.0
-C     1.  Changed from REAL*8 to DOUBLE PRECISION
-C     CHANGES FROM VERSION 1.1
-C     1.  Changed CHARACTER*100 to CHARACTER*80
-C     2.  Added THERMO "ALL" option
-C     3.  Write LENICK, LENRCK, LENCCK to binary file
-C     4.  Allow reaction species to end in '=' or '-'
-C     5.  Allow real values of elemental composition in THERMO cards
-C     6.  Allow upper/lower case input
-C     CHANGES FROM VERSION 1.2
-C     1.  Reaction delimiters are now "=" or "<=>" if reversible,
-C                                            " =>" if irreversible.
-C     2.  Fixed an error with IFIRCH(LINE) in IPPLEN
-C     CHANGES FROM VERSION 1.3
-C     1.  Add "unix" change blocks
-C     CHANGES FROM VERSION 1.4
-C     1.  Modify OPEN statements
-C     CHANGES FROM VERSION 1.5
-C     1.  Correct molecules to moles unit conversion
-C     2.  Correct UPCASE to avoid dimensioning errors
-C     CHANGES FROM VERSION 1.7
-C     1.  Further correction of molecules conversion for fall-off
-C         and third-body reactions
-C     CHANGES FOR VERSION 1.8
-C     1.  Change Subroutine CKUNIT to parse LINE instead of SUB(*)
-C         in order to correct misinterpretation of unit strings
-C         with slashes.
-C     CHANGES FOR VERSION 1.9
-C     1.  First record of binary file now consists of a character
-C         string version, precision, and logical error flag
-C     CHANGES FOR VERSION 2.0
-C     1.  Error in UPCASE could cause interpreter to ignore some
-C         keywords.
-C     CHANGES FOR VERSION 2.1
-C     1.  10/18/90 (F. Rupley):
-C         Error in scaling the pre-exponential constants RPAR(3,*)
-C         where REV is declared, and FPAL(3,*) for fall-off reactions,
-C         as RPAR(3,II)*EFAC should read RPAR(3,NREV), and
-C            FPAL(3,II)*EFAC should read FPAL(3,NFAL).
-C         This error was introduced in CKINTERP.15 during refinement
-C         Dof units conversion routines.
-C     2.  Subroutine CKDUP modified to recognize that two reactions
-C         may be duplicate except for a third-body species in a
-C         fall-off reaction.
-C     CHANGES FOR VERSION 2.2
-C     1.  11/14/90 (F. Rupley per M. Coltrin):
-C         Initialize variable NCHRG
-C      CHANGES FOR VERSION 2.3
-C     1.  In CKPREAC, error correction of 10/18/90 (above, V2.1).
-C     CHANGES FOR VERSION 2.4
-C     1.  Additional checking of TLO,TMID,THI for species -
-C         a) set initial values at -1.
-C         b) if user has not provided a TLO,TMID, or THI, use the
-C            values provided by THERMO.DAT.
-C         c) check that TLO < THI, TLO <= TMID <= THI
-C     CHANGES FOR VERSION 2.5
-C     1.  Need to get TLO,THI,TMID from database BEFORE reading
-C         user's THERMO data (unless THERMO ALL option is used)
-C     CHANGES FOR VERSION 2.6
-C     1.  LENRCK lengthened by II+NREV to reflect additional
-C         work space needed by CKRAT for a 4th parameter
-C         (perturbation factor).
-C     CHANGES FOR VERSION 2.7
-C     1.  Two otherwise duplicate reactions are unique if one
-C         is a third body reaction and the other not.
-C     CHANGES FOR VERSION 2.8
-C     1.  Change output format to print all 16 characters for
-C         a species name.
-C     CHANGES FOR VERSION 2.9 (2/24/92 F. Rupley)
-C     1.  Check that reverse (REV) parameters were given when
-C         RTL reverse Teller-Landauer parameters are given.
-C     2.  Add 2*II to length of real work space
-C     CHANGES FOR VERSION 3.0 (4/13/92 F. Rupley per M. Coltrin)
-C     1.  Correct logic in CKDUP, add argument to call list.
-C     CHANGES FOR VERSION 3.1 (2/24/93 F. Rupley per C. Westbrook,LLNL)
-C     1.  Problem in CKREAC for species starting with "M", where
-C         "+M" is signal for third-body.
-C     CHANGES FOR VERSION 3.2 (11/11/93 F. Rupley per T.U.Delft)
-C     1.  Ensure that SUBROUTINE CKUNIT does not check for units beyond
-C         end of LINE.
-C     CHANGES FOR VERSION 3.3 (1/26/94 F. Rupley per R. Kee)
-C     1.  Real stoichometric coefficients used in a supplemental way;
-C         NRNU total number of reactions using real stoichometry,
-C         IRNU array of reaction numbers, RNU real coefficients.
-C     CHANGES FOR VERSION 3.4 (3/15/94 F. Rupley)
-C     1.  DOS/PC compatibility effort includes adding file names to
-C         OPEN statements, removing unused variables in CALL lists,
-C         unusued but possibly initialized variables.
-C     CHANGES FOR VERSION 3.5 (4/19/94 F. Rupley)
-C     1.  Fix bug with index KSPEC(N) for CKBAL and CKRBAL.
-C
-C     CKINTP interprets a formatted ASCII representation of a
-C     chemical reaction mechanism and creates the binary file LINK
-C     required by CHEMKIN.  CKINTP is dimensioned as follows:
-C
-C     MDIM = maximum number of elements in a problem;             (10)
-C     KDIM = maximum number of species in a problem;             (100)
-C     MAXTP= maximum number of temperatures used to fit            (3)
-C            thermodynamic properties of species
-C     NPC  = number of polynomial coefficients to fits             (5)
-C     NPCP2= number of fit coefficients for a temperature range    (7)
-C     IDIM = maximum number of reactions in a mechanism;         (500)
-C     NPAR = number of Arrhenius parameters in a reaction;         (3)
-C     NLAR = number of Landau-Teller parameters in a reaction;     (2)
-C     NFAR = number of fall-off parameters in a reaction;          (8)
-C     MAXSP= maximum number of species in a reaction               (6)
-C     MAXTB= maximum number of third bodies for a reaction        (10)
-C     LSYM = character string length of element and species names (16)
-C
-C     User input is read from LIN (Unit15), a thermodynamic database
-C     is read from LTHRM (Unit17), printed output is assigned to LOUT
-C     (Unit16), and binary data is written to LINC (Unit25).
-C
-C     REQUIRED ELEMENT INPUT: (Subroutine CKCHAR)          (DIMENSION)
-C
-C        The word 'ELEMENTS' followed by a list of element
-C        names, terminated by the word 'END';
-C
-C        The resulting element data stored in LINK is:
-C        MM       - integer number of elements found
-C        ENAME(*) - CHARACTER*(*) array of element names        (MDIM)
-C        AWT(*)   - real array of atomic weights;               (MDIM)
-C                   default atomic weights are those on
-C                   atomic weight charts; if an element
-C                   is not on the periodic chart, or if
-C                   it is desirable to alter its atomic
-C                   weight, this value must be included
-C                   after the element name, enclosed by
-C                   slashed, i.e., D/2.014/
-C
-C     REQUIRED SPECIES INPUT: (Subroutine CKCHAR)
-C
-C        The word 'SPECIES' followed by a list of species
-C        names, terminated by the word 'END';
-C
-C        The resulting species data stored in LINK is:
-C        KK       - integer number of species found
-C        KNAME(*) - CHARACTER*(*) array of species names        (KDIM)
-C
-C     OPTIONAL THERMODYNAMIC DATA: (Subroutine CKTHRM)
-C     (If this feature is not used, thermodynamic properties are
-C     obtained from a CHEMKIN database.)  The format for this option
-C     is the word 'THERMO' followed by any number of 4-line data sets:
-C
-C     Line 1: species name, optional comments, elemental composition,
-C             phase, T(low), T(high), T(mid), additional elemental
-C             composition, card number (col. 80);
-C             format(A10,A14,4(A2,I3),A1,E10.0,E10.0,E8.0,(A2,I3),I1)
-C     Line 2: coefficients a(1--5) for upper temperature range,
-C             card number (col. 80);
-C             format(5(e15.0),I1)
-C     Line 3: coefficients a(6--7) for upper temperature range,
-C             coefficients a(1--3) for lower temperature range,
-C             card number (col. 80);
-C             format(5(e15.0),I1)
-C     Line 4: coefficients a(4--7) for lower temperature range,
-C             card number (col. 80);
-C             format(4(e15.0),I1)
-C
-C     End of THERMO data is indicated by 'END' line or new keyword.
-C
-C        The resulting thermodynamic data stored in LINK are:
-C        WTM(*)   - real array of molecular weights             (KDIM)
-C        KNCF(*,*)- integer composition of species         (MDIM,KDIM)
-C        KPHSE(*) - integer phase of a species;                 (KDIM)
-C                   -1(solid), 0(gas), +1(liquid).
-C        KCHRG(*) - ionic charge of a species;                  (KDIM)
-C                   = 0 except in presence/absence of electrons
-C                   = +n in absence of n electrons
-C                   = -n in presence of n electons
-C        NCHRG    - integer number of species with KCHRG<>0
-C        NT(*)    - array of number of temperatures used        (KDIM)
-C                   in fits
-C        T(*,*)   - array of temperatures used in fits    (MAXTP,KDIM)
-C        A(N,L,K) - Thermodynamic properties for      (NPC+2,NTR,KDIM)
-C                   species K consists of polynomial
-C                   coefficients for fits to
-C                   CP/R = SUM (A(N,L,K)*Temperature**(N-1), N=1,NPC+2)
-C                          where  T(L,K) <= Temperature < T(L+1,K),
-C                   and,
-C                   N=NPC+1 is formation enthalpy HO/R = A(NPC+1,L,K),
-C                   N=NPC+2 is formation entropy  SO/R = A(NPC+2,L,K)
-C
-C     OPTIONAL REACTION INPUT:
-C     Reaction data is input after all ELEMENT, SPECIES and THERMO
-C     data in the following format:
-C
-C     1) (Subroutine CKREAC)
-C        The first line contains the keyword 'REACTIONS' and an
-C        optional description of units:
-C
-C           'MOLES' - (default), pre-exponential units are moles-sec-K;
-C           'MOLECULES' - pre-exponential units are molecules and
-C                         will be converted to moles.
-C           'KELVINS' - activation energies are Kelvins, else the
-C                       activation energies are converted to Kelvins;
-C           'CAL/MOLE' - (default), activation energies are cal/mole;
-C           'KCAL/MOLE' - activation energies are Kcal/mole;
-C           'JOULES/MOLE' - activation energies are joules/mole;
-C           'KJOULES/MOLE' - activation energies are Kjoules/mole.
-C
-C        A description of each reaction is expected to follow.
-C        Required format for a reaction is a list of '+'-delimited
-C        reactants, followed by a list of '+'-delimited reactants,
-C        each preceded by its stoichiometric coefficient if greater
-C        than 1;  separating the reactants from the products is a '='
-C        if reversible reaction, else a '=>'.  Following the reaction
-C        string on the same line are the space-delimited Arrhenius
-C        coefficients.
-C
-C        If the reaction contains a third body, this is indicated by
-C        by the presence of an 'M' as a reactant or product or both,
-C        and enhancement factors for third-bodies may be defined on
-C        additional lines as described in (2).
-C
-C        If the reaction contains a radiation wavelength, this is
-C        indicated by the presence of an 'HV' either as a reactant
-C        or as a product.  Unless otherwise defined on additional
-C        lines as described in (2), the value of the wavelength is
-C        -1.0 if a reactant or +1.0 if a product.
-C
-C        If the reaction is a fall-off reaction, this is indicated
-C        either by a '(+M)' or a '(+KNAME(K))', and there must be
-C        additional lines as described in (2) to define fall-off
-C        parameters.
-C
-C    2)  (Subroutine CKAUXL)
-C        Additional information for a reaction is given on lines
-C        immediately following the reaction description; this data
-C        will consist of a 'keyword' to denote the type of data,
-C        followed by a '/', then the required parameters for the
-C        keyword, followed by another '/'.  There may be more than
-C        one keyword per line, and there may be any number of lines.
-C        The keywords and required parameters are as follows:
-C
-C        KNAME(K)/efficiency value/ - species (K) is an enhanced
-C                third body in the reaction
-C        HV/wavelength/ - radiation wavelength parameter
-C        LT/val1 val2/ - Landau-Teller coefficients
-C        LOW/val1 val2 val3/ - low fall-off parameters
-C        TROE/val1 val2 val3 val4/ - Troe fall-off parameters;
-C                                    if val4 is omitted, a default
-C                                    parameter will be used
-C        SRI/val1 val2 val3 val4/ - SRI fall-off parameters;
-C                                   if val4 is omitted, a default
-C                                   parameter will be used
-C           (it is an error to have both LT and Fall-off defined)
-C        REV/par1 par2 par3/ - reverse parameters given
-C        RLT/val1 val2/ - Landau-Teller coefficients for reverse
-C           (it is an error if REV given and not RLT)
-C
-C     The end of all reaction data is indicated by an 'END' card or
-C     <eof>.
-C
-C     Resulting reaction data stored in LINC are:
-C       II        - integer number of reactions found
-C       PAR(*,*)  - array of real Arrhenius coefficients   (NPAR,IDIM)
-C       NSPEC(*)  - total number of species in a reaction       (IDIM)
-C                   if NSPEC < 0, reaction is irreversible
-C       NREAC(*)  - number of reactants only                    (IDIM)
-C       NUNK(*,*) - array of species numbers for reaction (MAXSP,IDIM)
-C       NU(*,*)   - array of stoichiometric coefficients  (MAXSP,IDIM)
-C                   of species in a reaction, negative=reactant,
-C                   positive=product
-C
-C       NWL       - number of reactions with radiation wavelength
-C       IWL(*)    - integer reaction numbers                    (IDIM)
-C       WL(*)     - real radiation wavelengths                  (IDIM)
-C
-C       NTHB      - number of reactions with third bodies
-C       ITHB      - integer reaction numbers                    (IDIM)
-C       NTBS(*)   - total number of enhanced species for NTHB   (IDIM)
-C       NKTB(*,*) - species numbers of enhanced species   (MAXTB,IDIM)
-C       AIK(*,*)  - enhancement factors                   (MAXTB,IDIM)
-C
-C       NFAL      - number of fall-off reactions
-C       IFAL(*)   - integer reaction numbers                    (IDIM)
-C       KFAL(*)   - integer species number for which
-C                   concentrations are a factor in fall-off
-C                   calculation
-C       IFOP(*)   - integer fall-off type number                (IDIM)
-C                   = 0 if fall-off reaction is found
-C                   = 1 for Lindemann form
-C                   = 2 for 6-parameter Troe form
-C                   = 3 for 7-parameter Troe form
-C                   = 4 for SRI form
-C       PFAL(*,*) - fall-off parameters                    (NFAR,IDIM)
-C
-C       NLAN      - number of reactions with Landau-Teller
-C       ILAN      - integer reaction numbers                    (IDIM)
-C       PLAN      - Landau-Teller parameters               (NLAR,IDIM)
-C
-C       NREV      - number of reactions with reverse parameters
-C       IREV(*)   - integer reaction numbers                    (IDIM)
-C       RPAR(*,*) - parameters                             (NPAR,IDIM)
-C
-C       NRLT      - number of reactions with reverse parameters
-C                   and Landau-Teller parameters
-C       IRLT(*)   - integer reaction numbers                    (IDIM)
-C       RLAN(*,*) - reverse Teller-Laudauer parameters     (NLAR,IDIM)
-C
-C----------------------------------------------------------------------C
-C*****precision > double
-      IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      PARAMETER (MDIM=50, KDIM=500, MKDIM=MDIM*KDIM, IDIM=500, LSYM=16,
-     1           NPAR=3, NPIDIM=IDIM*NPAR, NPC=5, NPCP2=NPC+2, MAXTP=3,
-     2           NTR=MAXTP-1, NKTDIM=NTR*NPCP2*KDIM, MAXSP=6, MAXTB=10,
-     3           NLAR=2, NSIDIM=MAXSP*IDIM, NTIDIM=MAXTB*IDIM,
-     4           NLIDIM=NLAR*IDIM, NFAR=8, NFIDIM=NFAR*IDIM,
-     5           NTDIM=KDIM*MAXTP, NIDIM=11*IDIM, LIN=15, LOUT=16,
-     6           LTHRM=17, LINC=25, CKMIN=1.0E-3, MAXORD=10, 
-     7           NOIDIM=MAXORD*IDIM)
-C
-      CHARACTER KNAME(KDIM)*(LSYM), ENAME(MDIM)*(LSYM), SUB(80)*80,
-     1          KEY(5)*4, LINE*80, IUNITS*80, AUNITS*4, EUNITS*4,
-     2          UPCASE*4, VERS*(LSYM), PREC*(LSYM)
-C
-      DIMENSION AWT(MDIM), KNCF(MDIM,KDIM), WTM(KDIM), KPHSE(KDIM),
-     1          KCHRG(KDIM), A(NPCP2,NTR,KDIM), T(MAXTP,KDIM), NT(KDIM),
-     2          NSPEC(IDIM), NREAC(IDIM), NU(MAXSP,IDIM),
-     3          NUNK(MAXSP,IDIM), PAR(NPAR,IDIM), IDUP(IDIM),IREV(IDIM),
-     4          RPAR(NPAR,IDIM), ILAN(IDIM), PLAN(NLAR,IDIM),
-     5          IRLT(IDIM), RLAN(NLAR,IDIM), IWL(IDIM),  WL(IDIM),
-     6          IFAL(IDIM), IFOP(IDIM), KFAL(IDIM), PFAL(NFAR,IDIM),
-     7          ITHB(IDIM),NTBS(IDIM),AIK(MAXTB,IDIM),NKTB(MAXTB,IDIM),
-     8          IRNU(IDIM), RNU(MAXSP,IDIM), IORD(IDIM), 
-     9          KORD(MAXORD,IDIM), RORD(MAXORD,IDIM)
-      DIMENSION VALUE(5)
-C
-      LOGICAL KERR, THERMO, ITHRM(KDIM)
-C
-C     Initialize variables
-C
-      DATA KEY/'ELEM','SPEC','THER','REAC','END'/, KERR/.FALSE./,
-     1     ITASK,NCHRG,MM,KK,II,NLAN,NFAL,NTHB,NREV,NRLT,NWL,
-     *     NRNU,NORD/13*0/,
-     2     ENAME,AWT/MDIM*' ',MDIM*0.0/, THERMO/.TRUE./,
-     3     T/NTDIM*-1.0/, KNAME,WTM,NT,KPHSE,KCHRG,ITHRM
-     4     /KDIM*' ', KDIM*0.0, KDIM*3, KDIM*0, KDIM*0, KDIM*.FALSE./,
-     5     WL,IFOP,NTBS,IDUP /IDIM*0.0, IDIM*-1, IDIM*0, IDIM*0/,
-     6     NSPEC,NREAC,IREV,ILAN,IRLT,IWL,IFAL,KFAL,ITHB,IRNU,IORD
-     7     /NIDIM*0/
-C
-      DATA NUNK,NU/NSIDIM*0, NSIDIM*0/, NKTB,AIK/NTIDIM*0,NTIDIM*-1.0/
-      DATA RNU/NSIDIM*0.0/, KORD/NOIDIM*0/, RORD/NOIDIM*0.0/
-      DATA PAR,RPAR/NPIDIM*0.0, NPIDIM*0.0/
-      DATA PLAN,RLAN/NLIDIM*0.0, NLIDIM*0.0/
-      DATA PFAL/NFIDIM*0.0/, KNCF/MKDIM*0.0/, A/NKTDIM*0.0/
-C----------------------------------------------------------------------C
-C
-      OPEN (LOUT, FORM='FORMATTED', STATUS='UNKNOWN', FILE='chem.out')
-C
-      VERS = '3.6'
-      WRITE  (LOUT, 15) VERS(:3)
-   15 FORMAT (/
-     1' CHEMKIN INTERPRETER OUTPUT: CHEMKIN-II Version ',A,' Apr. 1994'
-C*****precision > double
-     2/'                              DOUBLE PRECISION'/)
-      PREC = 'DOUBLE'
-C*****END precision > double
-C*****precision > single
-C     2/'                              SINGLE PRECISION'/)
-C      PREC = 'SINGLE'
-C*****END precision > single
-C
-C        START OF MECHANISM INTERPRETATION
-C
-      OPEN (LIN, FORM='FORMATTED', STATUS='UNKNOWN', FILE='chem.inp')
-C
-  100 CONTINUE
-      LINE = ' '
-      READ (LIN,'(A)',END=5000) LINE
-  105 CONTINUE
-      ILEN = IPPLEN(LINE)
-      IF (ILEN .EQ. 0) GO TO 100
-C
-      CALL CKISUB (LINE(:ILEN), SUB, NSUB)
-C
-C        IS THERE A KEYWORD?
-C
-      CALL CKCOMP ( UPCASE(SUB(1), 4) , KEY, 5, NKEY)
-      IF (NKEY .GT. 0) ITASK = 0
-C
-      IF (NKEY.EQ.1 .OR. NKEY.EQ.2) THEN
-C
-C        ELEMENT OR SPECIES DATA
-C
-         ITASK = NKEY
-         IF (NSUB .EQ. 1) GO TO 100
-C
-         DO 25 N = 2, NSUB
-            SUB(N-1) = ' '
-            SUB(N-1) = SUB(N)
-   25    CONTINUE
-         NSUB = NSUB-1
-C
-      ELSEIF (NKEY .EQ. 3) THEN
-C
-C        THERMODYNAMIC DATA
-C
-         IF (NSUB .GT. 1) THEN
-            IF ( UPCASE(SUB(2), 3) .EQ. 'ALL') THEN
-               THERMO = .FALSE.
-               READ (LIN,'(A)') LINE
-               CALL IPPARR (LINE, -1, 3, VALUE, NVAL, IER, LOUT)
-               IF (NVAL .NE. 3 .OR. IER.NE.0) THEN
-                  KERR = .TRUE.
-                  WRITE (LOUT, 333)
-               ELSE
-                  TLO = VALUE(1)
-                  TMID = VALUE(2)
-                  THI = VALUE(3)
-               ENDIF
-            ENDIF
-         ELSE
-C
-C           USE THERMODYNAMIC DATABASE FOR DEFAULT TLO,TMID,THI
-            OPEN (LTHRM, FORM='FORMATTED', STATUS='UNKNOWN', 
-     1                   FILE='therm.dat')
-C
-            READ (LTHRM,'(A)') LINE
-            READ (LTHRM,'(A)') LINE
-            CALL IPPARR (LINE, -1, 3, VALUE, NVAL, IER, LOUT)
-            IF (NVAL .NE. 3 .OR. IER.NE.0) THEN
-               KERR = .TRUE.
-               WRITE (LOUT, 333)
-            ELSE
-               TLO = VALUE(1)
-               TMID = VALUE(2)
-               THI = VALUE(3)
-            ENDIF
-            CLOSE (LTHRM)
-         ENDIF
-C
-         CALL CKTHRM (LIN, MDIM, ENAME, MM, AWT, KNAME, KK, KNCF,
-     1                KPHSE, KCHRG, WTM, MAXTP, NT, NTR, TLO, TMID,
-     2                THI, T, NPCP2, A, ITHRM, KERR, LOUT, LINE)
-C
-         IF (.NOT. THERMO)
-     1      CALL CKPRNT (MDIM, MAXTP, MM, ENAME, KK, KNAME, WTM, KPHSE,
-     2                   KCHRG, NT, T, TLO, TMID, THI, KNCF, ITHRM,
-     3                   LOUT, KERR)
-         I1 = IFIRCH(LINE)
-         IF (UPCASE(LINE(I1:), 4) .EQ. 'REAC') GO TO 105
-C
-      ELSEIF (NKEY .EQ. 4) THEN
-C
-         ITASK = 4
-C        START OF REACTIONS; ARE UNITS SPECIFIED?
-         CALL CKUNIT (LINE(:ILEN), AUNITS, EUNITS, IUNITS)
-C
-         IF (THERMO) THEN
-C
-C           THERMODYNAMIC DATA
-            OPEN (LTHRM, FORM='FORMATTED', STATUS='UNKNOWN', 
-     1                   FILE='therm.dat')
-            READ (LTHRM,'(A)') LINE
-            READ (LTHRM,'(A)') LINE
-            CALL IPPARR (LINE, -1, 3, VALUE, NVAL, IER, LOUT)
-            IF (NVAL .NE. 3 .OR. IER.NE.0) THEN
-               KERR = .TRUE.
-               WRITE (LOUT, 333)
-            ELSE
-               TLO = VALUE(1)
-               TMID = VALUE(2)
-               THI = VALUE(3)
-            ENDIF
-            CALL CKTHRM (LTHRM, MDIM, ENAME, MM, AWT, KNAME, KK, KNCF,
-     1                   KPHSE, KCHRG, WTM, MAXTP, NT, NTR, TLO, TMID,
-     2                   THI, T, NPCP2, A, ITHRM, KERR, LOUT, LINE)
-            CALL CKPRNT (MDIM, MAXTP, MM, ENAME, KK, KNAME, WTM, KPHSE,
-     1                   KCHRG, NT, T, TLO, TMID, THI, KNCF, ITHRM,
-     2                   LOUT, KERR)
-            THERMO = .FALSE.
-            CLOSE (LTHRM)
-         ENDIF
-C
-         WRITE (LOUT, 1800)
-         GO TO 100
-      ENDIF
-C
-      IF (ITASK .EQ. 1) THEN
-C
-C        ELEMENT DATA
-C
-         IF (MM .EQ. 0) THEN
-            WRITE (LOUT, 200)
-            WRITE (LOUT, 300)
-            WRITE (LOUT, 200)
-         ENDIF
-C
-         IF (NSUB .GT. 0) THEN
-            M1 = MM +1
-            CALL CKCHAR (SUB, NSUB, MDIM, ENAME, AWT, MM, KERR, LOUT)
-            DO 110 M = M1, MM
-               IF (AWT(M) .LE. 0) CALL CKAWTM (ENAME(M), AWT(M))
-               WRITE (LOUT, 400) M,ENAME(M)(:4),AWT(M)
-               IF (AWT(M) .LE. 0) THEN
-                  KERR = .TRUE.
-                  WRITE (LOUT, 1000) ENAME(M)
-               ENDIF
-  110       CONTINUE
-         ENDIF
-C
-      ELSEIF (ITASK .EQ. 2) THEN
-C
-C        PROCESS SPECIES DATA
-C
-         IF (KK .EQ. 0) WRITE (LOUT, 200)
-         IF (NSUB .GT. 0)
-     1   CALL CKCHAR (SUB, NSUB, KDIM, KNAME, WTM, KK, KERR, LOUT)
-C
-      ELSEIF (ITASK .EQ. 4) THEN
-C
-C        PROCESS REACTION DATA
-C
-         IND = 0
-         DO 120 N = 1, NSUB
-            IND = MAX(IND, INDEX(SUB(N),'/'))
-            IF (UPCASE(SUB(N), 3) .EQ. 'DUP') IND = MAX(IND,1)
-  120    CONTINUE
-         IF (IND .GT. 0) THEN
-C
-C           AUXILIARY REACTION DATA
-C
-            CALL CKAUXL (SUB, NSUB, II, KK, KNAME, LOUT, MAXSP, NPAR,
-     1                   NSPEC, NTHB, ITHB, NTBS, MAXTB, NKTB, AIK,
-     2                   NFAL, IFAL, IDUP, NFAR, PFAL, IFOP, NLAN,
-     3                   ILAN, NLAR, PLAN, NREV, IREV, RPAR, NRLT, IRLT, 
-     4                   RLAN, NWL, IWL, WL, KERR, NORD, IORD, MAXORD, 
-     5                   KORD, RORD, NUNK, NU, NRNU, IRNU, RNU)
-C
-         ELSE
-C
-C           THIS IS A REACTION STRING
-C
-            IF (II .LT. IDIM) THEN
-C
-               IF (II .GT. 0)
-C
-C              CHECK PREVIOUS REACTION FOR COMPLETENESS
-C
-     1         CALL CPREAC (II, MAXSP, NSPEC, NPAR, PAR, RPAR,
-     2                      AUNITS, EUNITS, NREAC, NUNK, NU, KCHRG,
-     3                      MDIM, MM, KNCF, IDUP, NFAL, IFAL, KFAL,
-     4                      NFAR, PFAL, IFOP, NREV, IREV, NTHB, ITHB,
-     5                      NLAN, ILAN, NRLT, IRLT, KERR, LOUT, NRNU,
-     6                      IRNU, RNU, CKMIN)
-C
-C              NEW REACTION
-C
-               II = II+1
-               CALL CKREAC (LINE(:ILEN), II, KK, KNAME, LOUT, MAXSP,
-     1                      NSPEC, NREAC, NUNK, NU, NPAR, PAR,
-     2                      NTHB, ITHB, NFAL, IFAL, KFAL, NWL,
-     3                      IWL, WL, NRNU, IRNU, RNU, KERR)
-C
-            ELSE
-               WRITE (LOUT, 1070)
-               KERR = .TRUE.
-            ENDIF
-C
-         ENDIF
-      ENDIF
-      GO TO 100
-C
- 5000 CONTINUE
-C
-C     END OF INPUT
-C
-      IF (II .GT. 0) THEN
-C
-C              CHECK FINAL REACTION FOR COMPLETENESS
-C
-          CALL CPREAC (II, MAXSP, NSPEC, NPAR, PAR, RPAR, AUNITS,
-     1                 EUNITS, NREAC, NUNK, NU, KCHRG, MDIM, MM,
-     2                 KNCF, IDUP, NFAL, IFAL, KFAL, NFAR, PFAL, IFOP,
-     3                 NREV, IREV, NTHB, ITHB, NLAN, ILAN, NRLT,
-     4                 IRLT, KERR, LOUT, NRNU, IRNU, RNU, CKMIN)
-C
-C              CHECK REACTIONS DECLARED AS DUPLICATES
-C
-         DO 500 I = 1, II
-            IF (IDUP(I) .LT. 0) THEN
-               KERR = .TRUE.
-               WRITE (LOUT, 1095) I
-            ENDIF
-  500    CONTINUE
-C
-         WRITE (LOUT, '(/1X,A)') ' NOTE: '//IUNITS(:ILASCH(IUNITS))
-C
-      ELSEIF (THERMO) THEN
-C
-C        THERE WAS NO REACTION DATA, MAKE SURE SPECIES DATA IS COMPLETE
-         OPEN (LTHRM, FORM='FORMATTED', STATUS='UNKNOWN', 
-     1                FILE='therm.dat')
-C
-         READ (LTHRM,'(A)') LINE
-         READ (LTHRM,'(A)') LINE
-         CALL IPPARR (LINE, -1, 3, VALUE, NVAL, IER, LOUT)
-         IF (NVAL .NE. 3 .OR. IER.NE.0) THEN
-            KERR = .TRUE.
-            WRITE (LOUT, 333)
-         ELSE
-            TLO = VALUE(1)
-            TMID = VALUE(2)
-            THI = VALUE(3)
-         ENDIF
-         CALL CKTHRM (LTHRM, MDIM, ENAME, MM, AWT, KNAME, KK, KNCF,
-     1                KPHSE, KCHRG, WTM, MAXTP, NT, NTR, TLO, TMID,
-     2                THI, T, NPCP2, A, ITHRM, KERR, LOUT, LINE)
-         CALL CKPRNT (MDIM, MAXTP, MM, ENAME, KK, KNAME, WTM, KPHSE,
-     1                KCHRG, NT, T, TLO, TMID, THI, KNCF, ITHRM,
-     2                LOUT, KERR)
-         CLOSE  (LTHRM)
-      ENDIF
-C
-      IF (KERR) THEN
-C
-         WRITE (LOUT, '(//A)')
-     1   ' WARNING...THERE IS AN ERROR IN THE LINKING FILE'
-          DO 1150 K = 1, KK
-            IF (KCHRG(K) .NE. 0) NCHRG = NCHRG+1
- 1150    CONTINUE
-         STOP
-      ENDIF
-C
-      LENICK = 1 + (3 + MM)*KK + (2 + 2*MAXSP)*II + NLAN + NRLT
-     1           + 3*NFAL + (2 + MAXTB)*NTHB + NREV + NWL + NRNU
-     2           + NORD*(1 + MAXORD)
-      LENCCK = MM + KK
-      LENRCK = 3 + MM + KK*(5 + MAXTP + NTR*NPCP2) + II*7 + NREV
-     1           + NPAR*(II + NREV) + NLAR*(NLAN + NRLT)
-     2           + NFAR*NFAL + MAXTB*NTHB + NWL + NRNU*MAXSP
-     3           + NORD*MAXORD
-C
-C     OPEN LINKING FILE
-C
-      OPEN (LINC, FORM='UNFORMATTED', STATUS='UNKNOWN', 
-     1            FILE='chem.bin')
-C
-      WRITE (LINC) VERS, PREC, KERR
-      WRITE (LINC) LENICK, LENRCK, LENCCK, MM, KK, II, MAXSP,
-     1             MAXTB, MAXTP, NPC, NPAR, NLAR, NFAR, NREV, NFAL,
-     2             NTHB, NLAN, NRLT, NWL, NCHRG, NRNU, NORD,
-     3             MAXORD, CKMIN
-      WRITE (LINC) (ENAME(M), AWT(M), M = 1, MM)
-      WRITE (LINC) (KNAME(K), (KNCF(M,K),M=1,MM), KPHSE(K),
-     1              KCHRG(K), WTM(K), NT(K), (T(L,K),L=1,MAXTP),
-     2              ((A(M,L,K), M=1,NPCP2), L=1,NTR), K = 1, KK)
-C
-      IF (II .GT. 0) THEN
-C
-         WRITE (LINC) (NSPEC(I), NREAC(I), (PAR(N,I), N = 1, NPAR),
-     1         (NU(M,I), NUNK(M,I), M = 1, MAXSP), I = 1, II)
-C
-         IF (NREV .GT. 0) WRITE (LINC)
-     1      (IREV(N),(RPAR(L,N),L=1,NPAR),N=1,NREV)
-C
-         IF (NFAL .GT. 0) WRITE (LINC)
-     1      (IFAL(N),IFOP(N),KFAL(N),(PFAL(L,N),L=1,NFAR), N = 1, NFAL)
-C
-         IF (NTHB .GT. 0) WRITE (LINC)
-     1      (ITHB(N),NTBS(N),(NKTB(M,N),AIK(M,N),M=1,MAXTB),N=1,NTHB)
-C
-         IF (NLAN .GT. 0) WRITE (LINC)
-     1      (ILAN(N), (PLAN(L,N), L = 1, NLAR), N = 1, NLAN)
-C
-         IF (NRLT .GT. 0) WRITE (LINC)
-     1      (IRLT(N), (RLAN(L,N), L = 1, NLAR), N=1,NRLT)
-C
-         IF (NWL .GT. 0) WRITE (LINC) (IWL(N), WL(N), N = 1, NWL)
-C
-         IF (NRNU .GT. 0) WRITE (LINC)
-C
-C            NRNU, total number of reactions with real stochio. coeff.
-C
-     1      (IRNU(N), (RNU(M,N), M = 1, MAXSP), N = 1, NRNU)
-C
-C            IRNU, indices of reaction numbers
-C            RNU,   matrix of real stochiometric coefficients
-C
-         IF (NORD .GT. 0) WRITE (LINC)
-C
-C            NORD, total number of reactions which use "ORDER"
-C
-     1      (IORD(N), (KORD(L,N), RORD(L,N), L=1, MAXORD), N=1,NORD)
-C
-C            IORD, array of reaction numbers
-C            KORD, array of species numbers with "ORDER" specified,
-C                  -K for forward species, K for reverse species 
-C            RORD, array of order coefficients
-      ELSE
-         WRITE (LOUT, '(/A)')
-     1      ' WARNING...NO REACTION INPUT FOUND; ',
-     2      ' LINKING FILE HAS NO REACTION INFORMATION ON IT.'
-      ENDIF
-C
-      WRITE (LOUT, '(///A)')
-     1   ' NO ERRORS FOUND ON INPUT...CHEMKIN LINKING FILE WRITTEN.'
-C
-      WRITE (LOUT, '(/A,3(/A,I6))')
-     1      ' WORKING SPACE REQUIREMENTS ARE',
-     2      '    INTEGER:   ',LENICK,
-     3      '    REAL:      ',LENRCK,
-     4      '    CHARACTER: ',LENCCK
-      CLOSE (LINC)
-      CLOSE (LIN)
-      CLOSE (LOUT)
-C
-C----------------------------------------------------------------------C
-C
-C     FORMATS
-C
-  200 FORMAT (26X,20('-'))
-  300 FORMAT (26X,'ELEMENTS',5X,'ATOMIC',/26X,'CONSIDERED',3X,'WEIGHT')
-  333 FORMAT (/6X,'Error...no TLO,TMID,THI given for THERMO ALL...'/)
-  400 FORMAT (25X,I3,'. ',A4,G15.6)
-C
- 1000 FORMAT (6X,'Error...no atomic weight for element ',A)
- 1070 FORMAT (6X,'Error...more than IDIM reactions...')
- 1095 FORMAT (6X,'Error...no duplicate declared for reaction no.',I3)
- 1800 FORMAT (///54X, '(k = A T**b exp(-E/RT))',/,
-     1        6X,'REACTIONS CONSIDERED',30X,'A',8X,'b',8X,'E',/)
-C
-      STOP
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CKCHAR (SUB, NSUB, NDIM, STRAY, RAY, NN, KERR, LOUT)
-C
-C     Extracts names and real values from an array of CHAR*(*)
-C     substrings; stores names in STRAY array, real values in RAY;
-C     i.e. can be used to store element and atomic weight data,
-C     species names, etc.
-C
-C     Input:   SUB(N),N=1,NSUB  - array of CHAR*(*) substrings
-C              NSUB             - number of substrings
-C              NDIM             - size of STRAY,RAY arrays
-C              NN               - actual number of STRAY found
-C              STRAY(N),N=1,NN  - CHAR*(*) array
-C              RAY(N),N=1,NN    - Real array
-C              LOUT             - output unit for error messages
-C     Output:  NN               - incremented if more STRAY found
-C              STRAY(N),N=1,NN  - incremented array of STRAY
-C              RAY(N),N=1,NN    - incremented array of reals
-C              KERR             - logical, .TRUE. = error in data
-C
-C                                       F. Rupley, Div. 8245, 2/5/88
-C----------------------------------------------------------------------C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      DIMENSION RAY(*), PAR(1)
-      CHARACTER SUB(*)*(*), STRAY(*)*(*), ISTR*80, UPCASE*4
-      LOGICAL KERR
-C
-      ILEN = LEN(STRAY(1))
-C
-      DO 200 N = 1, NSUB
-         IF ( UPCASE(SUB(N), 3) .EQ. 'END') RETURN
-         ISTR = ' '
-         I1 = INDEX(SUB(N),'/')
-         IF (I1 .EQ .1) THEN
-            KERR = .TRUE.
-            WRITE (LOUT, 130) SUB(N)(:ILASCH(SUB(N)))
-         ELSE
-            IF (I1 .LE. 0) THEN
-               ISTR = SUB(N)
-            ELSE
-               ISTR = SUB(N)(:I1-1)
-            ENDIF
-            CALL CKCOMP (ISTR, STRAY, NN, INUM)
-C
-            IF (INUM .GT. 0) THEN
-               WRITE (LOUT, 100) SUB(N)(:ILASCH(SUB(N)))
-            ELSE
-               IF (NN .LT. NDIM) THEN
-                  IF (ISTR(ILEN+1:) .NE. ' ') THEN
-                     WRITE (LOUT, 120) SUB(N)(:ILASCH(SUB(N)))
-                     KERR = .TRUE.
-                  ELSE
-                     NN = NN + 1
-                     STRAY(NN) = ' '
-                     STRAY(NN) = ISTR(:ILEN)
-                     IF (I1 .GT. 0) THEN
-                        I2 = I1 + INDEX(SUB(N)(I1+1:),'/')
-                        ISTR = ' '
-                        ISTR = SUB(N)(I1+1:I2-1)
-                        CALL IPPARR (ISTR, 1, 1, PAR, NVAL, IER, LOUT)
-                        IF (IER .EQ. 0) THEN
-                           RAY(NN) = PAR(1)
-                        ELSE
-                           KERR = .TRUE.
-                        ENDIF
-                     ENDIF
-                  ENDIF
-               ELSE
-                  WRITE (LOUT, 110) SUB(N)(:ILASCH(SUB(N)))
-                  KERR = .TRUE.
-               ENDIF
-            ENDIF
-         ENDIF
-  200 CONTINUE
-C
-  100 FORMAT (6X,'Warning...duplicate array element ignored...',A)
-  110 FORMAT (6X,'Error...character array size too small for  ...',A)
-  120 FORMAT (6X,'Error...character array element name too long...',A)
-  130 FORMAT (6X,'Error...misplaced value...',A)
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CKAWTM (ENAME, AWT)
-C
-C     Returns atomic weight of element ENAME.
-C     Input:   ENAME - CHAR*(*) element name
-C     Output:  AWT   - real atomic weight
-C
-C                                       F. Rupley, Div. 8245, 11/11/86
-C----------------------------------------------------------------------C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      PARAMETER (NATOM = 102)
-      DIMENSION ATOM(NATOM)
-      CHARACTER ENAME*(*), IATOM(NATOM)*2, UPCASE*2
-C
-      DATA (IATOM(I),ATOM(I),I=1,40) /
-     *'H ',  1.00797, 'HE',  4.00260, 'LI',  6.93900, 'BE',  9.01220,
-     *'B ', 10.81100, 'C ', 12.01115, 'N ', 14.00670, 'O ', 15.99940,
-     *'F ', 18.99840, 'NE', 20.18300, 'NA', 22.98980, 'MG', 24.31200,
-     *'AL', 26.98150, 'SI', 28.08600, 'P ', 30.97380, 'S ', 32.06400,
-     *'CL', 35.45300, 'AR', 39.94800, 'K ', 39.10200, 'CA', 40.08000,
-     *'SC', 44.95600, 'TI', 47.90000, 'V ', 50.94200, 'CR', 51.99600,
-     *'MN', 54.93800, 'FE', 55.84700, 'CO', 58.93320, 'NI', 58.71000,
-     *'CU', 63.54000, 'ZN', 65.37000, 'GA', 69.72000, 'GE', 72.59000,
-     *'AS', 74.92160, 'SE', 78.96000, 'BR', 79.90090, 'KR', 83.80000,
-     *'RB', 85.47000, 'SR', 87.62000, 'Y ', 88.90500, 'ZR', 91.22000/
-C
-      DATA (IATOM(I),ATOM(I),I=41,80) /
-     *'NB', 92.90600, 'MO', 95.94000, 'TC', 99.00000, 'RU',101.07000,
-     *'RH',102.90500, 'PD',106.40000, 'AG',107.87000, 'CD',112.40000,
-     *'IN',114.82000, 'SN',118.69000, 'SB',121.75000, 'TE',127.60000,
-     *'I ',126.90440, 'XE',131.30000, 'CS',132.90500, 'BA',137.34000,
-     *'LA',138.91000, 'CE',140.12000, 'PR',140.90700, 'ND',144.24000,
-     *'PM',145.00000, 'SM',150.35000, 'EU',151.96000, 'GD',157.25000,
-     *'TB',158.92400, 'DY',162.50000, 'HO',164.93000, 'ER',167.26000,
-     *'TM',168.93400, 'YB',173.04000, 'LU',174.99700, 'HF',178.49000,
-     *'TA',180.94800, 'W ',183.85000, 'RE',186.20000, 'OS',190.20000,
-     *'IR',192.20000, 'PT',195.09000, 'AU',196.96700, 'HG',200.59000/
-C
-      DATA (IATOM(I),ATOM(I),I=81,NATOM) /
-     *'TL',204.37000, 'PB',207.19000, 'BI',208.98000, 'PO',210.00000,
-     *'AT',210.00000, 'RN',222.00000, 'FR',223.00000, 'RA',226.00000,
-     *'AC',227.00000, 'TH',232.03800, 'PA',231.00000, 'U ',238.03000,
-     *'NP',237.00000, 'PU',242.00000, 'AM',243.00000, 'CM',247.00000,
-     *'BK',249.00000, 'CF',251.00000, 'ES',254.00000, 'FM',253.00000,
-     *'D ',002.01410, 'E',5.45E-4/
-C
-      CALL CKCOMP ( UPCASE(ENAME, 2), IATOM, NATOM, L)
-      IF (L .GT. 0) AWT = ATOM(L)
-      RETURN
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CKTHRM (LUNIT, MDIM, ENAME, MM, AWT, KNAME, KK, KNCF,
-     1                   KPHSE, KCHRG, WTM, MAXTP, NT, NTR, TLO, TMID,
-     2                   THI, T, NPCP2, A, ITHRM, KERR, LOUT, ISTR)
-C
-C     Finds thermodynamic data and elemental composition for species
-C     Input:  LUNIT  - unit number for input of thermo properties
-C             MDIM   - maximum number of elements allowed
-C             ENAME(M),M=1,MM  - array of CHAR*(*) element names
-C             MM     - total number of elements declared
-C             AWT(M),M=1,MM    - array of atomic weights for elements
-C             KNAME(K),K=1,KK  - array of CHAR*(*) species names
-C             KK     - total number of species declared
-C             LOUT   - output unit for messages
-C             NT(K),K=1,KK - number of temperature values
-C             NTR - number of temperature ranges
-C     Output: KNCF(M,K) - elemental composition of species
-C             KPHSE(K),K=1,KK - integer array, species phase
-C             KCHRG(K),K=1,KK - integer array of species charge
-C                      =0, if no electrons,
-C                      =(-1)*number of electrons present
-C             WTM(K),K=1,KK - array of molecular weights of species
-C             A(M,L,K)- array of thermodynamic coefficients
-C             T(N),N=1,NT - array of temperatures
-C             KERR   - logical error flag
-C----------------------------------------------------------------------C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      DIMENSION WTM(*), NT(*), T(MAXTP,*), KPHSE(*), KNCF(MDIM,*),
-     1          KCHRG(*), A(NPCP2,NTR,*), AWT(*), VALUE(5)
-      CHARACTER ENAME(*)*(*), KNAME(*)*(*), LINE(4)*80, ELEM*16
-      CHARACTER UPCASE*4, ISTR*80, SUB(80)*80
-      LOGICAL KERR, ITHRM(*)
-C
-      IF (MM.LE.0 .OR. KK.LE.0) WRITE (LOUT, 80)
-C
-      GO TO 20
-   10 CONTINUE
-      ISTR = ' '
-      READ (LUNIT,'(A)',END=40) ISTR
-   20 CONTINUE
-      ILEN = IPPLEN(ISTR)
-      IF (ILEN .LE. 0) GO TO 10
-C
-      CALL CKISUB (ISTR(:ILEN), SUB, NSUB)
-      CALL CKCOMP (SUB(1), KNAME, KK, K)
-      IF (K .EQ. 0) THEN
-         IF (UPCASE(SUB(1), 3) .EQ. 'END' .OR.
-     1       UPCASE(SUB(1), 4) .EQ. 'REAC') RETURN
-         GO TO 10
-      ENDIF
-C
-      IF (ITHRM(K)) GO TO 10
-      ITHRM(K) = .TRUE.
-      LINE(1) = ' '
-      LINE(1) = ISTR
-      DO 25 L = 2, 4
-         LINE(L) = ' '
-         READ (LUNIT,'(A)',END=40) LINE(L)
-   25 CONTINUE
-C
-      ICOL = 20
-      DO 60 I = 1, 5
-         ICOL = ICOL + 5
-         IF (I .EQ. 5) ICOL = 74
-         ELEM  = LINE(1)(ICOL:ICOL+1)
-         IELEM = 0
-C
-         IF (LINE(1)(ICOL+2:ICOL+4) .NE. ' ') THEN
-            CALL IPPARR
-     1      (LINE(1)(ICOL+2:ICOL+4), 0, 1, VALUE, NVAL, IER, LOUT)
-            IELEM = VALUE(1)
-         ENDIF
-C
-         IF (ELEM.NE.' ' .AND. IELEM.NE.0) THEN
-            IF (UPCASE(ELEM, 1) .EQ. 'E')
-     1             KCHRG(K)=KCHRG(K)+IELEM*(-1)
-            CALL CKCOMP (ELEM, ENAME, MM, M)
-            IF (M .GT. 0) THEN
-               KNCF(M,K) = IELEM
-               WTM(K) = WTM(K) + AWT(M)*FLOAT(IELEM)
-            ELSE
-               WRITE (LOUT, 100) ELEM,KNAME(K)(:10)
-               KERR = .TRUE.
-            ENDIF
-         ENDIF
-   60 CONTINUE
-C
-      IF (UPCASE(LINE(1)(45:),1) .EQ. 'L') KPHSE(K)=1
-      IF (UPCASE(LINE(1)(45:),1) .EQ. 'S') KPHSE(K)=-1
-C
-C-----Currently allows for three temperatures, two ranges;
-C     in future, NT(K) may vary, NTR = NT(K)-1
-C
-      T(1,K) = TLO
-      IF (LINE(1)(46:55) .NE. ' ') CALL IPPARR
-     1   (LINE(1)(46:55), 0, 1, T(1,K), NVAL, IER, LOUT)
-C
-      T(2,K) = TMID
-      IF (LINE(1)(66:73) .NE. ' ') CALL IPPARR
-     1   (LINE(1)(66:73), 0, 1, T(2,K), NVAL, IER, LOUT)
-C
-      T(NT(K),K) = THI
-      IF (LINE(1)(56:65) .NE. ' ') CALL IPPARR
-     1   (LINE(1)(56:65), 0, 1, T(NT(K),K), NVAL, IER, LOUT)
-C
-      READ (LINE(2)(:75),'(5E15.8)') (A(I,NTR,K),I=1,5)
-      READ (LINE(3)(:75),'(5E15.8)')
-     1            (A(I,NTR,K),I=6,7),(A(I,1,K),I=1,3)
-      READ (LINE(4)(:60),'(4E15.8)') (A(I,1,K),I=4,7)
-      GO TO 10
-C
-   40 RETURN
-   80 FORMAT (6X,'Warning...THERMO cards misplaced will be ignored...')
-  100 FORMAT (6X,'Error...element...',A,'not declared for...',A)
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CKREAC (LINE, II, KK, KNAME, LOUT, MAXSP, NSPEC, NREAC,
-     1                   NUNK, NU, NPAR, PAR, NTHB, ITHB,
-     2                   NFAL, IFAL, KFAL, NWL, IWL, WL, 
-     3                   NRNU, IRNU, RNU, KERR)
-C
-C     CKREAC parses the main CHAR*(*) line representing a gas-phase
-C     reaction; first, the real Arrhenius parameters are located and
-C     stored in PAR(N,I),N=1,NPAR, where I is the reaction number;
-C     then a search is made over the reaction string:
-C
-C     '=','<=>': reaction I is reversible;
-C     '=>'     : reaction I is irreversible;
-C
-C     '(+[n]KNAME(K))': reaction I is a fall-off reaction;
-C                       NFAL is incremented, the total number of
-C                       fall-off reactions;
-C                       IFAL(NFAL)=I, KFAL(NFAL)=K;
-C                       this species is eliminated from consideration
-C                       as a reactant or product in this reaction.
-C
-C     '(+M)'   : reaction I is a fall-off reaction;
-C                NFAL is incremented, IFAL(NFAL)=I, KFAL(NFAL)=0;
-C
-C     '+[n]KNAME(K)': NSPEC(I) is incremented, the total number of
-C                     species for this reaction;
-C                     n is an optional stoichiometric coefficient
-C                     of KNAME(K), if omitted, n=1;
-C                     if this string occurs before the =/-,
-C                     NREAC(I) is incremented, the total number of
-C                     reactants for this reaction, NUNK(N,I)=K, and
-C                     NU(N,I) = -n, where N=1-3 is reserved for
-C                     reactants;
-C                     if this string occurs after the =/-,
-C                     NUNK(N,I) = K, and NU(N,I) = n, where N=4-6
-C                     is reserved for products;
-C
-C     '+M' : I is a third-body reaction; NTHB is incremented, the
-C            total number of third-body reactions, and ITHB(NTHB)=I.
-C
-C     Input:  LINE  - a CHAR*(*) line (from data file)
-C             II    - the index of this reaction, and the total number
-C                     of reactions found so far.
-C             KK    - actual integer number of species
-C             KNAME(K),K=1,KK - array of CHAR*(*) species names
-C             LOUT  - output unit for error messages
-C             MAXSP - maximum number of species allowed in reaction
-C             NPAR  - number of parameters expected
-C     A '!' will comment out a line, or remainder of the line.
-C
-C     Output: NSPEC - total number of reactants+products in reaction
-C             NREAC - number of reactants
-C             NUNK  - species numbers for the NSPEC species
-C             NU    - stoichiometric coefficients for the NSPEC spec.
-C             NFAL  - total number of fall-off reactions
-C             IFAL  - reaction numbers for the NFAL reactions
-C             KFAL  - 3rd body species numbers for the NFAL reactions
-C             NTHB  - total number of 3rd-body reactions
-C             ITHB  - reaction numbers for the NTHB reactions
-C             NWL   - number of radiation-enhanced reactions
-C             IWL   - reaction numbers for the NWL reactions
-C             WL    - radiation wavelengths for the NWL reactions
-C             KERR  - logical, .TRUE. = error in data file
-C
-C                                      F. Rupley, Div. 8245, 5/13/86
-C----------------------------------------------------------------------C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      DIMENSION NSPEC(*), NREAC(*), NUNK(MAXSP,*), NU(MAXSP,*),
-     1          PAR(NPAR,*), IFAL(*), KFAL(*), ITHB(*), IWL(*), WL(*),
-     2          IRNU(*), RNU(MAXSP,*), IPLUS(20)
-      CHARACTER KNAME(*)*(*), LINE*(*), CNUM(11)*1, UPCASE*4
-      CHARACTER*80 ISTR, IREAC, IPROD, ISPEC, INAME, ITEMP
-      LOGICAL KERR, LTHB, LWL, LRSTO
-      DATA CNUM/'.','0','1','2','3','4','5','6','7','8','9'/
-C
-      LTHB = .FALSE.
-      LWL = .FALSE.
-      NSPEC(II) = 0
-      NREAC(II) = 0
-C
-C----------Find NPAR real parameters------------------------
-C
-      CALL IPNPAR (LINE, NPAR, ISTR, ISTART)
-      CALL IPPARR (ISTR, 1, NPAR, PAR(1,II), NVAL, IER, LOUT)
-      IF (IER .NE. 0) KERR = .TRUE.
-C
-C-----Remove blanks from reaction string
-C
-      INAME = ' '
-      ILEN = 0
-      DO 10 I = 1, ISTART-1
-         IF (LINE(I:I) .NE. ' ') THEN
-            ILEN = ILEN+1
-            INAME(ILEN:ILEN) = LINE(I:I)
-         ENDIF
-   10 CONTINUE
-C
-C-----Find reaction string, product string
-C
-      I1 = 0
-      I2 = 0
-      DO 25 I = 1, ILEN
-         IF (I1 .LE. 0) THEN
-            IF (INAME(I:I+2) .EQ. '<=>') THEN
-               I1 = I
-               I2 = I+2
-               IR = 1
-            ELSEIF (INAME(I:I+1) .EQ. '=>') THEN
-               I1 = I
-               I2 = I+1
-               IR = -1
-            ELSEIF (I.GT.1 .AND. INAME(I:I).EQ.'='
-     1                  .AND. INAME(I-1:I-1).NE.'=') THEN
-               I1 = I
-               I2 = I
-               IR = 1
-            ENDIF
-         ENDIF
-   25 CONTINUE
-C
-      IF (ILASCH(INAME).GE.45 .AND. I1.GT.0) THEN
-         WRITE (LOUT, 1900) II,INAME(:I1-1),(PAR(N,II),N=1,NPAR)
-         WRITE (LOUT, 1920) INAME(I1:)
-      ELSE
-          WRITE (LOUT, 1900) II,INAME(:45),(PAR(N,II),N=1,NPAR)
-      ENDIF
-C
-      IREAC = ' '
-      IPROD = ' '
-      IF (I1 .GT. 0) THEN
-         IREAC = INAME(:I1-1)
-         IPROD = INAME(I2+1:)
-      ELSE
-C
-C-----did not find delimiter
-C
-         WRITE (LOUT, 660)
-         KERR = .TRUE.
-         RETURN
-      ENDIF
-C
-      LRSTO = ((INDEX(IREAC,'.').GT.0) .OR. (INDEX(IPROD,'.').GT.0))
-      IF (LRSTO) THEN
-         NRNU = NRNU + 1
-         IRNU(NRNU) = II
-      ENDIF
-C
-      IF (INDEX(IREAC,'=>').GT.0 .OR. INDEX(IPROD,'=>').GT.0) THEN
-C
-C-----more than one '=>'
-C
-         WRITE (LOUT, 800)
-         KERR = .TRUE.
-         RETURN
-      ENDIF
-C
-C-----Is this a fall-off reaction?
-C
-      IF (INDEX(IREAC,'(+').GT.0 .OR. INDEX(IPROD,'(+').GT.0) THEN
-         KRTB = 0
-         KPTB = 0
-         DO 300 J = 1, 2
-            ISTR = ' '
-            KTB  = 0
-            IF (J .EQ. 1) THEN
-               ISTR = IREAC
-            ELSE
-               ISTR = IPROD
-            ENDIF
-C
-            DO 35 N = 1, ILASCH(ISTR)-1
-               IF (ISTR(N:N+1) .EQ. '(+') THEN
-                  I1 = N+2
-                  I2 = I1 + INDEX(ISTR(I1:),')')-1
-                  IF (I2 .GT. I1) THEN
-                     IF (ISTR(I1:I2-1).EQ.'M' .OR.
-     1                   ISTR(I1:I2-1).EQ.'m') THEN
-                         IF (KTB .NE. 0) THEN
-                            WRITE (LOUT, 630)
-                            KERR = .TRUE.
-                            RETURN
-                         ELSE
-                            KTB = -1
-                         ENDIF
-                     ELSE
-                        CALL CKCOMP (ISTR(I1:I2-1), KNAME, KK, KNUM)
-                        IF (KNUM .GT. 0) THEN
-                           IF (KTB .NE. 0) THEN
-                              WRITE (LOUT, 630)
-                              KERR = .TRUE.
-                              RETURN
-                           ELSE
-                              KTB = KNUM
-                           ENDIF
-                        ENDIF
-                     ENDIF
-                     IF (KTB .NE. 0) THEN
-                        ITEMP = ' '
-                        IF (I1 .EQ. 1) THEN
-                           ITEMP = ISTR(I2+1:)
-                        ELSE
-                           ITEMP = ISTR(:I1-3)//ISTR(I2+1:)
-                        ENDIF
-                        IF (J .EQ. 1) THEN
-                           IREAC = ' '
-                           IREAC = ITEMP
-                           KRTB = KTB
-                        ELSE
-                           IPROD = ' '
-                           IPROD = ITEMP
-                           KPTB = KTB
-                        ENDIF
-                     ENDIF
-                  ENDIF
-               ENDIF
-   35       CONTINUE
-  300    CONTINUE
-C
-         IF (KRTB.NE.0 .OR. KPTB.NE.0) THEN
-C
-C           does product third-body match reactant third-body
-C
-            IF (KRTB.LE.0 .AND. KPTB.LE.0) THEN
-C
-               NFAL = NFAL + 1
-               IFAL(NFAL) = II
-               KFAL(NFAL) = 0
-C
-               LTHB = .TRUE.
-               NTHB = NTHB + 1
-               ITHB(NTHB) = II
-C
-            ELSEIF (KRTB .EQ. KPTB) THEN
-               NFAL = NFAL + 1
-               IFAL(NFAL) = II
-               KFAL(NFAL) = KRTB
-C
-            ELSE
-C
-               WRITE (LOUT, 640)
-               KERR = .TRUE.
-               RETURN
-            ENDIF
-         ENDIF
-      ENDIF
-C
-C----------Find reactants, products-------------------------
-C
-      DO 600 J = 1, 2
-         ISTR = ' '
-         LTHB = .FALSE.
-         IF (J .EQ. 1) THEN
-            ISTR = IREAC
-            NS = 0
-         ELSE
-            ISTR = IPROD
-            NS = 3
-         ENDIF
-C
-C-----------store pointers to '+'-signs
-C
-         NPLUS = 1
-         IPLUS(NPLUS) = 0
-         DO 500 L = 2, ILASCH(ISTR)-1
-            IF (ISTR(L:L).EQ.'+') THEN
-               NPLUS = NPLUS + 1
-               IPLUS(NPLUS) = L
-            ENDIF
-  500    CONTINUE
-         NPLUS = NPLUS + 1
-         IPLUS(NPLUS) = ILASCH(ISTR)+1
-C
-         NSTART = 1
-  505    CONTINUE
-         N1 = NSTART
-         DO 510 N = NPLUS, N1, -1
-            ISPEC = ' '
-            ISPEC = ISTR(IPLUS(N1)+1 : IPLUS(N)-1)
-C
-            IF (UPCASE(ISPEC, 1).EQ.'M' .AND.
-     1               (ISPEC(2:2).EQ.' ' .OR. ISPEC(2:2).EQ.'+')) THEN
-               IF (LTHB) THEN
-                  WRITE (LOUT, 900)
-                  KERR = .TRUE.
-                  RETURN
-               ELSEIF (NFAL.GT.0 .AND. IFAL(NFAL).EQ.II) THEN
-                  WRITE (LOUT, 640)
-                  KERR = .TRUE.
-                  RETURN
-               ELSE
-                  LTHB = .TRUE.
-                  IF (NTHB.EQ.0 .OR.
-     1               (NTHB.GT.0.AND.ITHB(NTHB).NE.II)) THEN
-                      NTHB = NTHB + 1
-                      ITHB(NTHB) = II
-                  ENDIF
-                  IF (N .EQ. NPLUS) GO TO 600
-                  NSTART = N
-                  GO TO 505
-               ENDIF
-C
-            ELSEIF (UPCASE(ISPEC, 2) .EQ. 'HV') THEN
-               IF (LWL) THEN
-                  WRITE (LOUT, 670)
-                  KERR = .TRUE.
-                  RETURN
-               ELSE
-                  LWL = .TRUE.
-                  NWL = NWL + 1
-                  IWL(NWL) = II
-                  WL(NWL) = 1.0
-                  IF (J .EQ. 1) WL(NWL) = -1.0
-                  IF (N .EQ. NPLUS) GO TO 600
-                  NSTART = N
-                  GO TO 505
-               ENDIF
-            ENDIF
-C
-C-----------does this string start with a number?
-C
-            IND = 0
-            DO 334 L = 1, LEN(ISPEC)
-               NTEST = 0
-               DO 333 M = 1, 11
-                  IF (ISPEC(L:L) .EQ. CNUM(M)) THEN
-                     NTEST=M
-                     IND = L
-                  ENDIF
-  333          CONTINUE
-               IF (NTEST .EQ. 0) GO TO 335
-  334       CONTINUE
-  335       CONTINUE
-C
-            RVAL = 1.0
-            IVAL = 1
-            IF (IND .GT. 0) THEN
-               IF (LRSTO) THEN
-                  CALL IPPARR (ISPEC(:IND), 1, 1, RVAL, NVAL, 
-     1                         IER, LOUT)
-               ELSE
-                  CALL IPPARI (ISPEC(:IND), 1, 1, IVAL, NVAL,
-     1                        IER, LOUT)
-               ENDIF
-               IF (IER .EQ. 0) THEN
-                  ITEMP = ' '
-                  ITEMP = ISPEC(IND+1:)
-                  ISPEC = ' '
-                  ISPEC = ITEMP
-               ELSE
-                  KERR = .TRUE.
-                  RETURN
-               ENDIF
-            ENDIF
-C
-            CALL CKCOMP (ISPEC, KNAME, KK, KNUM)
-            IF (KNUM .EQ. 0) THEN
-               IF ((N-N1) .GT. 1) GO TO 510
-               WRITE (LOUT, 680) ISPEC(:ILASCH(ISPEC))
-               KERR = .TRUE.
-            ELSE
-C
-C--------------a species has been found
-C
-               IF (J .EQ. 1) THEN
-                  IVAL = -IVAL
-                  RVAL = -RVAL
-               ENDIF
-C
-C--------------increment species coefficient count
-C
-               NNUM = 0
-               IF (LRSTO) THEN
-                  DO 110 K = 1, NS
-                     IF (KNUM.EQ.NUNK(K,II) .AND.
-     1                   RNU(K,NRNU)/RVAL.GT.0) THEN
-                         NNUM = K
-                         RNU(NNUM,NRNU) = RNU(NNUM,NRNU) + RVAL
-                     ENDIF
-  110             CONTINUE
-               ELSE
-                  DO 111 K = 1, NS
-                     IF (KNUM.EQ.NUNK(K,II) .AND.
-     1                   NU(K,II)/IVAL.GT.0) THEN
-                        NNUM=K
-                        NU(NNUM,II) = NU(NNUM,II) + IVAL
-                     ENDIF
-  111             CONTINUE
-               ENDIF
-C
-               IF (NNUM .LE. 0) THEN
-C
-C-----------------are there too many species?
-C
-                  IF (J.EQ.1 .AND. NS.EQ.3) THEN
-                     WRITE (LOUT, 690)
-                     KERR = .TRUE.
-                     RETURN
-                  ELSEIF (J.EQ.2 .AND. NS.EQ.MAXSP) THEN
-                     WRITE (LOUT, 700)
-                     KERR = .TRUE.
-                     RETURN
-                  ELSE
-C
-C--------------------increment species count
-C
-                     NS = NS + 1
-                     NSPEC(II) = NSPEC(II)+1
-                     IF (J .EQ. 1) NREAC(II) = NS
-                     NUNK(NS,II) = KNUM
-                     IF (LRSTO) THEN
-                        RNU(NS,NRNU) = RVAL
-                     ELSE
-                        NU(NS,II)   = IVAL
-                     ENDIF
-                  ENDIF
-               ENDIF
-            ENDIF
-            IF (N .EQ. NPLUS) GO TO 600
-            NSTART = N
-            GO TO 505
-C
-  510    CONTINUE
-  600 CONTINUE
-C
-      NSPEC(II) = IR*NSPEC(II)
-C
-  630 FORMAT (6X,'Error...more than one fall-off declaration...')
-  640 FORMAT (6X,'Error in fall-off declaration...')
-  650 FORMAT (6X,'Error...reaction string not found...')
-  660 FORMAT (6X,'Error in reaction...')
-  670 FORMAT (6X,'Error in HV declaration...')
-  680 FORMAT (6X,'Error...undeclared species...',A)
-  690 FORMAT (6X,'Error...more than 3 reactants...')
-  700 FORMAT (6X,'Error...more than 3 products...')
-  800 FORMAT (6X,'Error in reaction delimiter...')
-  900 FORMAT (6X,'Error in third-body declaration...')
-C 1900 FORMAT (I4,'. ',A,T51,E10.3,F7.3,F11.3)
- 1900 FORMAT (I4,'. ', A, T53, 1PE8.2, 2X, 0PF5.1, 2X, F9.1)
- 1920 FORMAT (6X,A)
-      RETURN
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CKAUXL (SUB, NSUB, II, KK, KNAME, LOUT, MAXSP, NPAR,
-     1                   NSPEC, NTHB, ITHB, NTBS, MAXTB, NKTB, AIK, 
-     2                   NFAL, IFAL, IDUP, NFAR, PFAL, IFOP, NLAN,
-     3                   ILAN, NLAR, PLAN, NREV, IREV, RPAR, NRLT, IRLT, 
-     4                   RLAN, NWL, IWL, WL, KERR, NORD, IORD, MAXORD, 
-     5                   KORD, RORD, NUNK, NU, NRNU, IRNU, RNU)
-C
-C     CKAUXL parses the auxiliary CHAR*(*) lines representing
-C     additional options for a gas-phase reaction; data is stored
-C     based on finding a 'keyword' followed by its required
-C     parameters:
-C
-C     KNAME(K)/val1/: this is an enhanced third-body;
-C
-C        if ITHB(NTHB) <> I, this is an error, reaction I is not a
-C                            third-body reaction;
-C        else NTBS(NTHB) is incremented,
-C             AIK(NTBS(NTHB),NTHB) = K,
-C             NKTB(NTBS(NTHB)),NTHB) = val1;
-C
-C     (LOW,TROE, and SRI define fall-off data):
-C
-C     LOW/val1 val2 val3/: PFAL(N,NFAL) = val(N),N=1,3;
-C
-C        if IFAL(NFAL)<>I, this is an error, reaction I is not a
-C                          fall-off reaction;
-C        if ILAN(NLAN)=I, this is an error, cannot have T-L numbers.
-C        if IRLT(NRLT)=I, this is an error,         "
-C        if IREV(NREV)=I, this is an error, cannot declare reverse
-C                         parameters;
-C        if IFOP(NFAL)>0, this is an error, LOW already declared;
-C        else
-C           IFOP(NFAL) = ABS(IFOP(NFAL))
-C
-C     TROE/val1 val2 val3 [val4]/: PFAL(N,NFAL) = val(N),N=4,7;
-C
-C        if IFAL(NFAL)<>I, this is an error, reaction I is not a
-C                          fall-off reaction;
-C        if ILAN(NLAN)=I, this is an error, cannot have T-L numbers.
-C        if IRLT(NRLT)=I, this is an error,         "
-C        if IREV(NREV)=I, this is an error, cannot declare reverse
-C                         parameters;
-C        if ABS(IFOP(NFAL)).GT.1, this is an error,
-C        else
-C        if 3 TROE values, IFOP(NFAL) = 3*IFOP(NFAL);
-C        if 4 TROE values, IFOP(NFAL) = 4*IFOP(NFAL);
-C
-C     SRI/val1 val2 val3/: PFAL(N,NFAL) = val(N),N=4,6;
-C
-C        if IFAL(NFAL)<>I, this is an error, reaction I is not a
-C                          fall-off reaction;
-C        if ILAN(NLAN)=I, this is an error, cannot have T-L numbers.
-C        if IRLT(NRLT)=I, this is an error,         "
-C        if IREV(NREV)=I, this is an error, cannot declare reverse
-C                         parameters;
-C        if ABS(IFOP(NFAL))>1, this is an error;
-C        else
-C        if IFOP(NFAL)= 2*IFOP(NFAL);
-C
-C     LT/val1 val2/:
-C        if IFAL(NFAL)=I, this is an error, cannot have fall-off and
-C                         T-L numbers;
-C        else increment NLAN, the number of T-L reactions,
-C             ILAN(NLAN)=I, PLAN(N,NLAN)=val(N),N=1,2
-C        if IREV(NREV)=I, need IRLT(NRLT)=I.
-C
-C     REV[ERSE]/val1 val2 val3/ :
-C        if IFAL(NFAL)=I, this is an error;
-C        if IREV(NREV)=I, this is an error, REV already declared;
-C        if NSPEC(I)<0, this an error, as I is irreversible;
-C        else increment NREV, the number of reactions with reverse
-C             parameters given,
-C             IREV(NREV)=I, RPAR(N,NREV)=val(N),N=1,3;
-C             if ILAN(NLAN)=I, need IRLT(NRLT)=I;
-C             if IRLT(NRLT)=I, need ILAN(NRLT)=I.
-C
-C     RLT/val1 val2/:
-C       if IFAL(NFAL)=I, this is an error, cannot have fall-off and
-C                        T-L numbers;
-C       if IRLT(NRLT)=I, this is an error, RLT already declared;
-C       else increment NRLT, the number of reactions with BOTH
-C                      reverse parameters given, and T-L numbers;
-C            IRLT(NRLT)=I, RLAN(N,NRLT)=val(N),N=1,2;
-C            if IREV(NREV)<>I, need IREV(NREV)=I;
-C            if ILAN(NREV)<>I, need ILAN(NLAN)=I;
-C
-C    DUP[LICATE]:
-C       This reaction is allowed to be duplicated.
-C
-C     Input:  LINE - CHAR*(*) auxiliary information string
-C             KK   - total number of species declared
-C             KNAME- CHAR*(*) species names
-C             LOUT - output unit for error messages
-C             MAXSP- maximum third bodies allowed in a reaction
-C     Output: NTHB - total number of reactions with third bodies
-C             ITHB - array of third-body reaction numbers
-C             AIK  - non-zero third body enhancement factors
-C             NKTB - array of species numbers for the third body
-C                         enchancement factors
-C             NFAL - total number of fall-off reactions
-C             IFAL - array of fall-off reaction numbers
-C             IFOP - array of fall-off type
-C             PFAL - fall-off parameters
-C             NLAN - total number of Landau-Teller reactions
-C             ILAN - array of T-L reaction numbers
-C             NLAR - number of Landau-Teller numbers allowed
-C             PLAN - array of Landau-Teller numbers
-C             NRLT - total number of 'reverse' T-L reactions
-C             IRLT - array of 'reverse' T-L reaction numbers
-C             RLAN - array of 'reverse' Landau-Teller numbers
-C             NWL  - total number of radiation-enhanced reactions
-C             IWL  - array of radiation-enhanced reaction numbers
-C             WL   - array of wavelengths
-C             KERR - logical, = .TRUE. if error found
-C                                        F. Rupley, Div. 8245, 5/27/87
-C----------------------------------------------------------------------C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      DIMENSION NSPEC(*), ITHB(*), NTBS(*), NKTB(MAXTB,*), IDUP(*),
-     1          AIK(MAXTB,*), IFAL(*), IFOP(*), PFAL(NFAR,*),
-     2          ILAN(*), PLAN(NLAR,*), IREV(*), RPAR(NPAR,*), IRLT(*),
-     3          RLAN(NLAR,*), IWL(*), WL(*), VAL(1), IORD(*), 
-     4          KORD(MAXORD,*), RORD(MAXORD,*), NUNK(MAXSP,*),
-     5          NU(MAXSP,*), IRNU(*), RNU(MAXSP,*)
-      CHARACTER SUB(*)*(*), KNAME(*)*(*), KEY*80, RSTR*80, UPCASE*4,
-     1          ISTR*80
-      LOGICAL KERR, LLAN, LRLT, LTHB, LFAL, LTRO, LSRI, LWL, LREV,
-     1        LFORD, LRORD
-C
-      LTHB = (NTHB.GT.0 .AND. ITHB(NTHB).EQ.II)
-      LFAL = (NFAL.GT.0 .AND. IFAL(NFAL).EQ.II)
-      LWL  = (NWL .GT.0 .AND. IWL(NWL)  .EQ.II)
-      LREV = (NREV.GT.0 .AND. IREV(NREV).EQ.II)
-      LLAN = (NLAN.GT.0 .AND. ILAN(NLAN).EQ.II)
-      LRLT = (NRLT.GT.0 .AND. IRLT(NRLT).EQ.II)
-      LTRO = (NFAL.GT.0 .AND. IFAL(NFAL).EQ.II .AND. IFOP(NFAL).GT.2)
-      LSRI = (NFAL.GT.0 .AND. IFAL(NFAL).EQ.II .AND. IFOP(NFAL).EQ.2)
-C
-      DO 500 N = 1, NSUB
-         ILEN = ILASCH(SUB(N))
-         KEY = ' '
-C
-         IF ( UPCASE(SUB(N), 3) .EQ. 'DUP') THEN
-            IDUP(II) = -1
-            WRITE (LOUT, 4000)
-            GO TO 500
-         ELSE
-            I1 = INDEX(SUB(N),'/')
-            I2 = INDEX(SUB(N)(I1+1:),'/')
-            IF (I1.LE.0 .OR. I2.LE.0) THEN
-               KERR = .TRUE.
-               WRITE (LOUT, 2090) SUB(N)(:ILEN)
-               GO TO 500
-            ENDIF
-            KEY = SUB(N)(:I1-1)
-            RSTR = ' '
-            RSTR = SUB(N)(I1+1:I1+I2-1)
-         ENDIF
-C
-         IF (UPCASE(KEY, 3).EQ.'LOW' .OR.
-     1       UPCASE(KEY, 4).EQ.'TROE'.OR.
-     2       UPCASE(KEY, 3).EQ.'SRI') THEN
-C
-C        FALL-OFF DATA
-C
-            IF ((.NOT.LFAL) .OR. LLAN .OR. LRLT .OR. LREV) THEN
-               KERR = .TRUE.
-               IF (.NOT. LFAL) WRITE (LOUT, 1050) SUB(N)(:ILEN)
-               IF (LLAN)       WRITE (LOUT, 1060) SUB(N)(:ILEN)
-               IF (LRLT)       WRITE (LOUT, 1070) SUB(N)(:ILEN)
-               IF (LREV)       WRITE (LOUT, 1090) SUB(N)(:ILEN)
-            ELSE
-C
-               IF (UPCASE(KEY, 3) .EQ. 'LOW') THEN
-                  IF (IFOP(NFAL) .GT. 0) THEN
-                     WRITE (LOUT, 2000) SUB(N)(:ILEN)
-                     KERR = .TRUE.
-                  ELSE
-                     IFOP(NFAL) = ABS(IFOP(NFAL))
-                     CALL IPPARR (RSTR,1,3,PFAL(1,NFAL),NVAL,IER,LOUT)
-                     IF (IER .NE. 0) KERR = .TRUE.
-                     WRITE (LOUT, 3050) (PFAL(L,NFAL),L=1,3)
-                  ENDIF
-C
-               ELSEIF (UPCASE(KEY, 4) .EQ. 'TROE') THEN
-                  IF (LTRO .OR. LSRI) THEN
-                     KERR = .TRUE.
-                     IF (LTRO) WRITE (LOUT, 2010) SUB(N)(:ILEN)
-                     IF (LSRI) WRITE (LOUT, 2030) SUB(N)(:ILEN)
-                  ELSE
-                     LTRO = .TRUE.
-                     CALL IPPARR (RSTR,1,-4,PFAL(4,NFAL),NVAL,IER,LOUT)
-                     IF (NVAL .EQ. 3) THEN
-                        IFOP(NFAL) = 3*IFOP(NFAL)
-                        WRITE (LOUT, 3080) (PFAL(L,NFAL),L=4,6)
-                     ELSEIF (NVAL .EQ. 4) THEN
-                        IFOP(NFAL) = 4*IFOP(NFAL)
-                        WRITE (LOUT, 3090) (PFAL(L,NFAL),L=4,7)
-                     ELSE
-                        WRITE (LOUT, 2020) SUB(N)(:ILEN)
-                        KERR = .TRUE.
-                     ENDIF
-                  ENDIF
-C
-               ELSEIF (UPCASE(KEY, 3) .EQ. 'SRI') THEN
-                  IF (LTRO .OR. LSRI) THEN
-                     KERR = .TRUE.
-                     IF (LTRO) WRITE (LOUT, 2030) SUB(N)(:ILEN)
-                     IF (LSRI) WRITE (LOUT, 2040) SUB(N)(:ILEN)
-                  ELSE
-                     LSRI = .TRUE.
-                     IFOP(NFAL) = 2*IFOP(NFAL)
-                     CALL IPPARR (RSTR,1,-5,PFAL(4,NFAL),NVAL,IER,LOUT)
-                     IF (NVAL .EQ. 3) THEN
-                        PFAL(7,NFAL) = 1.0
-                        PFAL(8,NFAL) = 0.0
-                        WRITE (LOUT, 3060) (PFAL(L,NFAL),L=4,6)
-                     ELSEIF (NVAL .EQ. 5) THEN
-                        WRITE (LOUT, 3070) (PFAL(L,NFAL),L=4,8)
-                     ELSE
-                        WRITE (LOUT, 2020) SUB(N)(:ILEN)
-                        KERR = .TRUE.
-                     ENDIF
-                  ENDIF
-               ENDIF
-            ENDIF
-C
-         ELSEIF (UPCASE(KEY, 3) .EQ. 'REV') THEN
-C
-C        REVERSE ARRHENIUS PARAMETERS
-C
-            IF (LFAL .OR. LREV .OR. NSPEC(II).LT.0) THEN
-               KERR = .TRUE.
-               IF (LFAL) WRITE (LOUT, 1090) SUB(N)(:ILEN)
-               IF (LREV) WRITE (LOUT, 2050) SUB(N)(:ILEN)
-               IF (NSPEC(II) .LT. 0) WRITE (LOUT, 2060) SUB(N)(:ILEN)
-            ELSE
-               LREV = .TRUE.
-               NREV = NREV+1
-               IREV(NREV) = II
-               CALL IPPARR (RSTR,1,NPAR,RPAR(1,NREV),NVAL,IER,LOUT)
-               IF (IER .NE. 0) KERR = .TRUE.
-               WRITE (LOUT, 1900) '   Reverse Arrhenius coefficients:',
-     1                           (RPAR(L,NREV),L=1,3)
-            ENDIF
-C
-         ELSEIF (UPCASE(KEY, 3) .EQ. 'RLT') THEN
-C
-C        REVERSE LANDAU-TELLER PARAMETERS
-C
-            IF (LFAL .OR. LRLT .OR. NSPEC(II).LT.0) THEN
-               KERR = .TRUE.
-               IF (LFAL) WRITE (LOUT, 1070) SUB(N)(:ILEN)
-               IF (LRLT) WRITE (LOUT, 2080) SUB(N)(:ILEN)
-               IF (NSPEC(II) .LT. 0) WRITE (LOUT, 1080) SUB(N)(:ILEN)
-            ELSE
-               LRLT = .TRUE.
-               NRLT = NRLT + 1
-               IRLT(NRLT) = II
-               CALL IPPARR (RSTR,1,NLAR,RLAN(1,NRLT),NVAL,IER,LOUT)
-               IF (IER .NE. 0) KERR = .TRUE.
-               WRITE (LOUT, 3040) (RLAN(L,NRLT),L=1,2)
-            ENDIF
-C
-         ELSEIF (UPCASE(KEY, 2) .EQ. 'HV') THEN
-C
-C        RADIATION WAVELENGTH ENHANCEMENT FACTOR
-C
-            IF (.NOT.LWL) THEN
-               WRITE (LOUT, 1000) SUB(N)(:ILEN)
-               KERR = .TRUE.
-            ELSE
-               CALL IPPARR (RSTR,1,1,VAL,NVAL,IER,LOUT)
-               IF (IER .EQ. 0) THEN
-                  WL(NWL) = WL(NWL)*VAL(1)
-                  WRITE (LOUT, 3020) ABS(WL(NWL))
-               ELSE
-                  WRITE (LOUT, 1000) SUB(N)(:ILEN)
-                  KERR = .TRUE.
-               ENDIF
-            ENDIF
-C
-         ELSEIF (UPCASE(KEY, 2) .EQ. 'LT') THEN
-C
-C        LANDAU-TELLER PARAMETERS
-C
-            IF (LFAL .OR. LLAN) THEN
-               KERR = .TRUE.
-               IF (LFAL) WRITE (LOUT, 1060) SUB(N)(:ILEN)
-               IF (LLAN) WRITE (LOUT, 2070) SUB(N)(:ILEN)
-            ELSE
-               LLAN = .TRUE.
-               NLAN = NLAN + 1
-               ILAN(NLAN) = II
-               CALL IPPARR (RSTR,1,NLAR,PLAN(1,NLAN),NVAL,IER,LOUT)
-               IF (IER .NE. 0) THEN
-                  WRITE (LOUT, 1010) SUB(N)(:ILEN)
-                  KERR = .TRUE.
-               ENDIF
-               WRITE (LOUT, 3000) (PLAN(L,NLAN),L=1,2)
-            ENDIF
-C
-         ELSEIF (UPCASE(KEY,4).EQ.'FORD' .OR.
-     1           UPCASE(KEY,4).EQ.'RORD') THEN
-             LFORD = (UPCASE(KEY,4) .EQ. 'FORD')
-             LRORD = (UPCASE(KEY,4) .EQ. 'RORD')
-             IF (NORD.EQ.0 .OR.(NORD.GT.0 .AND. IORD(NORD).NE.II)) THEN
-                NORD = NORD + 1
-                IORD(NORD) = II
-                NKORD = 0
-C
-                IF (NRNU.GT.0 .AND. IRNU(NRNU).EQ.II) THEN
-                   DO 111 L = 1, 6
-                      IF (NUNK(L,II) .NE. 0) THEN
-                         NKORD = NKORD + 1
-                         IF (RNU(L,NRNU) .LT. 0.0) THEN
-                            KORD(NKORD,NORD) = -NUNK(L,II)
-                            RORD(NKORD,NORD) = ABS(RNU(L,NRNU))
-                         ELSE
-                            KORD(NKORD,NORD) = NUNK(L,II)
-                            RORD(NKORD,NORD) = RNU(L,NRNU)
-                         ENDIF
-                      ENDIF
-  111              CONTINUE
-               ELSE
-                   DO 113 L = 1, 6
-                      IF (NUNK(L,II) .NE. 0) THEN
-                         NKORD = NKORD + 1
-                         IF (NU(L,II) .LT. 0) THEN
-                            KORD(NKORD,NORD) = -NUNK(L,II)
-                            RORD(NKORD,NORD) =  IABS(NU(L,II))
-                         ELSE
-                            KORD(NKORD,NORD) = NUNK(L,II)
-                            RORD(NKORD,NORD) = NU(L,II)
-                         ENDIF
-                      ENDIF
-  113              CONTINUE
-                ENDIF
-             ENDIF
-C
-             CALL IPNPAR (RSTR, 1, ISTR, ISTART)
-             IF (ISTART .GE. 1) THEN
-                CALL IPPARR (ISTR, 1, 1, VAL, NVAL, IER, LOUT)
-                CALL CKCOMP (RSTR(:ISTART-1), KNAME, KK, K)
-                IF (LFORD) K = -K
-                NK = 0
-                DO 121 L = 1, MAXORD
-C
-                   IF (KORD(L,NORD).EQ.0) THEN
-                      NK = L
-                      GO TO 122
-                   ELSEIF (KORD(L,NORD).EQ.K) THEN
-                      IF (LFORD) THEN
-                         WRITE (LOUT,*)
-     1'       Warning...changing order for reactant...',
-     2                   KNAME(-K)
-                      ELSE
-                         WRITE (LOUT,*)
-     1'       Warning...changing order for product...',
-     2                   KNAME(K)
-                      ENDIF
-                      NK = L
-                      GO TO 122
-                   ENDIF
-  121           CONTINUE
-  122           CONTINUE
-                KORD(NK,NORD) = K
-                RORD(NK,NORD) = VAL(1)
-                IF (LFORD) THEN
-                   WRITE (LOUT, 3015) KNAME(-K),VAL(1)
-                ELSE
-                   WRITE (LOUT, 3016) KNAME(K),VAL(1)
-                ENDIF
-            ENDIF
-C
-
-         ELSE
-C
-C        ENHANCED THIRD BODIES
-C
-            CALL CKCOMP (KEY, KNAME, KK, K)
-            IF (K .EQ. 0) THEN
-               WRITE (LOUT, 1040) KEY(:ILASCH(KEY))
-               KERR = .TRUE.
-            ELSE
-               IF (.NOT.LTHB) THEN
-                  KERR = .TRUE.
-                  WRITE (LOUT, 1020) SUB(N)(:ILEN)
-               ELSE
-                  IF (NTBS(NTHB) .EQ. MAXTB) THEN
-                     KERR = .TRUE.
-                     WRITE (LOUT, 1030) SUB(N)(:ILEN)
-                  ELSE
-                     CALL IPPARR (RSTR, 1, 1, VAL, NVAL, IER, LOUT)
-                     IF (IER .EQ. 0) THEN
-                        WRITE (LOUT, 3010) KNAME(K),VAL(1)
-                        NTBS(NTHB) = NTBS(NTHB) + 1
-                        NKTB(NTBS(NTHB),NTHB) = K
-                        AIK(NTBS(NTHB),NTHB) = VAL(1)
-                     ELSE
-                        WRITE (LOUT, 1020) SUB(N)(:ILEN)
-                        KERR = .TRUE.
-                     ENDIF
-                  ENDIF
-               ENDIF
-            ENDIF
-         ENDIF
-  500 CONTINUE
-C
-C     FORMATS
-C
- 1000 FORMAT (6X,'Error in HV declaration...',A)
- 1010 FORMAT (6X,'Error in LT declaration..',A)
- 1020 FORMAT (6X,'Error in third body declaration...',A)
- 1030 FORMAT (6X,'Error...more than MAXTB third bodies...',A)
- 1040 FORMAT (6X,'Error...undeclared species...',A)
- 1050 FORMAT (6X,'Error...this is not a fall-off reaction...',A)
- 1060 FORMAT (6X,'Error...LT declared in fall-off reaction...',A)
- 1070 FORMAT (6X,'Error...RLT declared in fall-off reaction...',A)
- 1080 FORMAT (6X,'Error...RLT declared in irreversible reaction...',A)
- 1090 FORMAT (6X,'Error...REV declared in fall-off reaction...',A)
- 2000 FORMAT (6X,'Error...LOW declared more than once...',A)
- 2010 FORMAT (6X,'Error...TROE declared more than once...',A)
- 2020 FORMAT (6X,'Error in fall-off parameters...',A)
- 2030 FORMAT (6X,'Error...cannot use both TROE and SRI...',A)
- 2040 FORMAT (6X,'Error...SRI declared more than once...',A)
- 2050 FORMAT (6X,'Error...REV declared more than once...',A)
- 2060 FORMAT (6X,'Error...REV declared for irreversible reaction...',A)
- 2070 FORMAT (6X,'Error...LT declared more than once...',A)
- 2080 FORMAT (6X,'Error...RLT declared more than once...',A)
- 2090 FORMAT (6X,'Error in auxiliary data...',A)
- 3000 FORMAT (9X,'Landau-Teller parameters: B=',E12.5,', C=',E12.5)
- 3010 FORMAT (9X,A16,' Enhanced by ',1PE12.3)
- 3015 FORMAT (7X,A16,' Forward order ',1PE12.3)
- 3016 FORMAT (7X,A16,' Reverse order ',1PE12.3)
- 3020 FORMAT (9X,'Radiation wavelength (A): ',F10.2)
-C 1900 FORMAT (6X,A,T51,E10.3,F7.3,F11.3)
- 1900 FORMAT (6X, A, T53, 1PE8.2, 2X, 0PF5.1, 2X, F9.1)
- 3040 FORMAT (9X,'Reverse Landau-Teller parameters: B=',E12.5,
-     1           ', C=',E12.5)
- 3050 FORMAT (6X,'Low pressure limit:',3E13.5)
- 3060 FORMAT (6X,'SRI centering:     ',3E13.5)
- 3070 FORMAT (6X,'SRI centering:     ',5E13.5)
- 3080 FORMAT (6X,'TROE centering:    ',3E13.5)
- 3090 FORMAT (6X,'TROE centering:    ',4E13.5)
- 4000 FORMAT (6X,'Declared duplicate reaction...')
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CKPRNT (MDIM, MAXTP, MM, ENAME, KK, KNAME, WTM,
-     1                   KPHSE, KCHRG, NT, T, TLO, TMID, THI, KNCF,
-     2                   ITHRM, LOUT, KERR)
-C
-C     Prints species interpreter output and checks for completeness.
-C----------------------------------------------------------------------C
-C*****precision > double
-      IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      DIMENSION WTM(*), KPHSE(*), KCHRG(*), T(MAXTP,*),
-     1          NT(*), KNCF(MDIM,*), IPLUS(10)
-      LOGICAL KERR, ITHRM(*)
-      CHARACTER ENAME(*)*(*), KNAME(*)*(*), IPHSE(3)*1, INUM(10)*1
-      DATA IPHSE/'S','G','L'/
-      DATA INUM/'0','1','2','3','4','5','6','7','8','9'/
-C
-      WRITE (LOUT, 400) (ENAME(M), M = 1, MM)
-      WRITE (LOUT, 300)
-C
-      DO 100 K = 1, KK
-C
-         IF (T(1,K) .LT. 0.0) T(1,K) = TLO
-         IF (T(2,K) .LT. 0.0) T(2,K) = TMID
-         IF (T(3,K) .LT. 0.0) T(NT(K),K) = THI
-         WRITE (LOUT, 500) K, KNAME(K), IPHSE(KPHSE(K)+2), KCHRG(K),
-     1                    WTM(K), T(1,K), T(NT(K),K), (KNCF(M,K),M=1,MM)
-         IF (T(1,K) .GE. T(NT(K),K)) THEN
-            KERR = .TRUE.
-            WRITE (LOUT, 240)
-         ENDIF
-         IF (T(1,K) .GT. T(2,K)) THEN
-            WRITE (LOUT, 250)
-            KERR = .TRUE.
-         ENDIF
-         IF (T(NT(K),K) .LT. T(2,K)) THEN
-            WRITE (LOUT, 260)
-            KERR = .TRUE.
-         ENDIF
-C
-C        each species must have thermodynamic data
-C
-         IF (.NOT. ITHRM(K)) THEN
-            KERR = .TRUE.
-            WRITE (LOUT, 200)
-         ENDIF
-C
-C        a species cannot start with a number
-C
-         CALL CKCOMP (KNAME(K)(:1), INUM, 10, I)
-         IF (I .GT. 0) THEN
-            KERR = .TRUE.
-            WRITE (LOUT, 210)
-         ENDIF
-C
-C        if '+' sign is used in a species name,
-C           examples of legal species symbols with + are:
-C           OH(+)2, OH(+2), OH+, OH++, OH+++, OH(+), OH(++),
-C           OH[+OH], OH2+, OH+2
-C
-C           examples of illegal species symbols with + are:
-C           +OH        (symbol starts with a +, this will cause
-C                       confusion in a reaction)
-C           OH(+OH)    (symbol in parentheses is another species-
-C                       this arrangement is reserved for a fall-off
-C                       reaction)
-C           OH+OH      (plus delimits other species names, this
-C                       will cause confusion in a reaction)
-C
-         NPLUS = 0
-         DO 50 N = 1, ILASCH(KNAME(K))
-            IF (KNAME(K)(N:N) .EQ. '+') THEN
-               NPLUS = NPLUS + 1
-               IPLUS(NPLUS) = N
-            ENDIF
-   50    CONTINUE
-         DO 60 N = 1, NPLUS
-            I1 = IPLUS(N)
-            IF (I1 .EQ. 1) THEN
-               WRITE (LOUT, 220)
-               KERR = .TRUE.
-            ELSE
-C
-C              is there another species name in parentheses
-C
-               IF (KNAME(K)(I1-1:I1-1) .EQ. '(') THEN
-                  I1 = I1 + 1
-                  I2 = I1 + INDEX(KNAME(K)(I1:),')')-1
-                  IF (I2 .GT. I1) THEN
-                     CALL CKCOMP (KNAME(K)(I1:I2-1), KNAME, KK, KNUM)
-                     IF (KNUM .GT. 0) THEN
-                        WRITE (LOUT, 230)
-                        KERR = .TRUE.
-                     ENDIF
-                  ENDIF
-               ENDIF
-C
-C              is there another species name after a +
-C
-               I1 = I1 + 1
-               IF (N .LT. NPLUS) THEN
-                  DO 55 L = N+1, NPLUS
-                     I2 = IPLUS(L)
-                     IF (I2 .GT. I1) THEN
-                        CALL CKCOMP (KNAME(K)(I1:I2-1),KNAME,KK,KNUM)
-                        IF (KNUM .GT. 0) THEN
-                           WRITE (LOUT, 230)
-                           KERR = .TRUE.
-                        ENDIF
-                     ENDIF
-   55             CONTINUE
-               ENDIF
-C
-               I2 = ILASCH(KNAME(K))
-               IF (I2 .GE. I1) THEN
-                  CALL CKCOMP (KNAME(K)(I1:I2), KNAME, KK, KNUM)
-                  IF (KNUM .GT. 0) THEN
-                     WRITE (LOUT, 230)
-                     KERR = .TRUE.
-                  ENDIF
-               ENDIF
-            ENDIF
-   60    CONTINUE
-C
-  100 CONTINUE
-      WRITE (LOUT, 300)
-      RETURN
-C
-  200 FORMAT (6X,'Error...no thermodynamic properties for species')
-  210 FORMAT (6X,'Error...species starts with a number')
-  220 FORMAT (6X,'Error...species starts with a plus')
-  230 FORMAT (6X,'Error...illegal + in species name')
-  240 FORMAT (6X,'Error...High temperature must be < Low temperature')
-  250 FORMAT (6X,'Error...Low temperature must be <= Mid temperature')
-  260 FORMAT (6X,'Error...High temperature must be => Mid temperature')
-  300 FORMAT (1X,79('-'))
-C  400 FORMAT (1X,79('-'),/21X,'C',/18X,'P',2X,'H',/18X,'H',2X,'A',
-C     1        /18X,'A',2X,'R',/1X,'SPECIES',10X,'S',2X,'G',2X,
-C     2        'MOLECULAR',3X,'TEMPERATURE',4X,'ELEMENT COUNT',/1X,
-C     3        'CONSIDERED',7X,'E',2X,'E',2X,'WEIGHT',6X,'LOW',5X,
-C     4        'HIGH',3X,15(A3),/1X,79('-'))
-C  500 FORMAT (I4,'. ',A10,2X,A1,I3,F11.5,2(F8.1),15(I3))
-C
-  400 FORMAT (1X,79('-'),/T26,'C',/T24,'P H',/T24,'H A',/T24,'A R',
-     1       /1X,'SPECIES',T24,'S G',T28,'MOLECULAR',T38,'TEMPERATURE',
-     2       T52,'ELEMENT COUNT',
-     3       /1X,'CONSIDERED',T24,'E E',T28,'WEIGHT',T38,'LOW',
-     4       T45,'HIGH',T52,15(A3))
-  500 FORMAT (1X,I3,'. ',A16,T24,A1,T26,I1,T28,F9.5,T38,F6.1,T45,F6.1,
-     1       T51,15(I3))
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CPREAC (II, MAXSP, NSPEC, NPAR, PAR, RPAR, AUNITS,
-     1                   EUNITS, NREAC, NUNK, NU, KCHRG, MDIM, MM, KNCF,
-     2                   IDUP, NFAL, IFAL, KFAL, NFAR, PFAL, IFOP, NREV,
-     3                   IREV, NTHB, ITHB, NLAN, ILAN, NRLT, IRLT, KERR,
-     4                   LOUT, NRNU, IRNU, RNU, CKMIN)
-C
-C     Prints reaction interpreter output and checks for reaction
-C     balance, duplication, and missing data in 'REV' reactions;
-C     correct units of Arrhenius parameters
-C
-C     Input: II     - the index number of the reaction
-C            MAXSP  - maximum number of species allowed in a reaction
-C            NSPEC  - array of the number of species in the reactions
-C            NPAR   - the number of Arrhenius parameters required
-C            PAR    - matrix of Arrhenius parameters for the reactions
-C            RPAR   - matrix of reverse Arrhenius parameters for the
-C                     reactions which declared them
-C            AUNITS - character string which describes the input units
-C                     of A, the pre-exponential factor PAR(1,I)
-C            EUNITS - character string which describes the input units
-C                     of E, the activation energy PAR(3,I)
-C            NREAC  - array of the number of reactants in the reactions
-C            NUNK   - matrix of the species numbers of the reactants
-C                     and products in the reactions
-C            NU     - matrix of the stoichiometric coefficients of the
-C                     reactants and products in the reactions
-C            KCHRG  - array of the electronic charges of the species
-C            MDIM   - the maximum number of elements allowed
-C            MM     - the actual number of elements declared
-C            KNCF   - matrix of elemental composition of the species
-C            IDUP   - array of integer flags to indicate duplicate
-C                     reactions
-C            NFAL   - total number of reactions with fall-off
-C            IFAL   - array of the NFAL reaction numbers
-C            NFAR   - maximum number of fall-off parameters allowed
-C            PFAL   - matrix of fall-off parameters for the NFAL
-C                     reactions
-C            IFOP   - array of integer fall-off types for the NFAL
-C                     reactions
-C            NREV   - total number of reactions with reverse parameters
-C            IREV   - array of the NREV reaction numbers
-C            NTHB   - total number of reactions with third-bodies
-C            ITHB   - array of the NTHB reaction numbers
-C            NLAN   - total number of reactions with Landauer-Teller
-C                     parameters
-C            ILAN   - array of the NLAN reaction numbers
-C            NRLT   - total number of reactions with reverse
-C                     Landauer-Teller parameters
-C            IRLT   - array of the NRLT reaction numbers
-C            KERR   - logical error flag
-C            LOUT   - unit number for output messages
-C
-C----------------------------------------------------------------------C
-C
-C*****precision > double
-      IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      DIMENSION NSPEC(*), PAR(NPAR,*), RPAR(NPAR,*), NREAC(*),
-     1          NUNK(MAXSP,*), NU(MAXSP,*), KCHRG(*), KNCF(MDIM,*),
-     2          IDUP(*), IFAL(*), KFAL(*), PFAL(NFAR,*), IFOP(*),
-     3          IREV(*), ITHB(*), ILAN(*), IRLT(*), IRNU(*),
-     4          RNU(MAXSP,*)
-      CHARACTER*(*) AUNITS, EUNITS
-      LOGICAL IERR,KERR,LREV,LLAN,LRLT
-C
-      IF (NRNU.GT.0 .AND. (II.EQ.IRNU(NRNU))) THEN
-         CALL CKRBAL (MAXSP, NUNK(1,II), RNU(1,NRNU), MDIM, MM, KCHRG, 
-     1                KNCF, CKMIN, IERR)
-      ELSE
-         CALL CKBAL (MAXSP, NUNK(1,II), NU(1,II), MDIM, MM, KCHRG, KNCF,
-     1               IERR)
-      ENDIF
-C
-      IF (IERR) THEN
-         KERR = .TRUE.
-         WRITE (LOUT, 1060)
-      ENDIF
-C
-      CALL CKDUP (II, MAXSP, NSPEC, NREAC, NU, NUNK, NFAL, IFAL, KFAL,
-     1            ISAME)
-C
-      IF (ISAME .GT. 0) THEN
-         IF (IDUP(ISAME).NE.0 .AND. IDUP(II).NE.0) THEN
-            IDUP(ISAME) = ABS(IDUP(ISAME))
-            IDUP(II)    = ABS(IDUP(II))
-         ELSE
-            N1 = 0
-            N2 = 0
-            IF (NTHB .GT. 1) THEN
-               DO 150 N = 1, NTHB
-                  IF (ITHB(N) .EQ. ISAME) N1 = 1
-                  IF (ITHB(N) .EQ. II)    N2 = 1
-  150          CONTINUE
-            ENDIF
-            IF (N1 .EQ. N2) THEN
-               KERR = .TRUE.
-               WRITE (LOUT, 1050) ISAME
-            ENDIF
-         ENDIF
-      ENDIF
-C
-      IF (NFAL.GT.0 .AND. IFAL(NFAL).EQ.II .AND. IFOP(NFAL).LT.0) THEN
-         KERR = .TRUE.
-         WRITE (LOUT, 1020)
-      ENDIF
-C
-      LREV = (NREV.GT.0 .AND. IREV(NREV).EQ.II)
-      LLAN = (NLAN.GT.0 .AND. ILAN(NLAN).EQ.II)
-      LRLT = (NRLT.GT.0 .AND. IRLT(NRLT).EQ.II)
-      IF (LREV .AND. LLAN .AND. (.NOT.LRLT)) THEN
-         KERR = .TRUE.
-         WRITE (LOUT, 1030)
-      ENDIF
-      IF (LRLT .AND. (.NOT.LLAN)) THEN
-         KERR = .TRUE.
-         WRITE (LOUT, 1040)
-      ENDIF
-      IF (LRLT .AND. (.NOT.LREV)) THEN
-         KERR = .TRUE.
-         WRITE (LOUT, 1045)
-      ENDIF
-C
-      IF (EUNITS .EQ. 'KELV') THEN
-         EFAC = 1.0
-      ELSEIF (EUNITS .EQ. 'CAL/') THEN
-C        convert E from cal/mole to Kelvin
-         EFAC = 1.0 / 1.987
-      ELSEIF (EUNITS .EQ. 'KCAL') THEN
-C        convert E from kcal/mole to Kelvin
-         EFAC = 1000.0 / 1.987
-      ELSEIF (EUNITS .EQ. 'JOUL') THEN
-C        convert E from Joules/mole to Kelvin
-         EFAC = 1.0 / 8.314
-      ELSEIF (EUNITS .EQ. 'KJOU') THEN
-C        convert E from Kjoules/mole to Kelvin
-         EFAC = 1000.0 / 8.314
-      ENDIF
-      PAR(3,II) = PAR(3,II) * EFAC
-C
-C      IF (NREV.GT.0 .AND. IREV(NREV).EQ.II) RPAR(3,II)=RPAR(3,II)*EFAC
-C      IF (NFAL.GT.0 .AND. IFAL(NFAL).EQ.II) PFAL(3,II)=PFAL(3,II)*EFAC
-C
-      IF (NREV.GT.0 .AND. IREV(NREV).EQ.II)
-     1    RPAR(3,NREV) = RPAR(3,NREV) * EFAC
-      IF (NFAL.GT.0 .AND. IFAL(NFAL).EQ.II)
-     1    PFAL(3,NFAL) = PFAL(3,NFAL) * EFAC
-C
-      IF (AUNITS .EQ. 'MOLC') THEN
-         NSTOR = 0
-         NSTOP = 0
-         DO 50 N = 1, MAXSP
-            IF (NU(N,II) .LT. 0) THEN
-C              sum of stoichiometric coefficients of reactants
-               NSTOR = NSTOR + ABS(NU(N,II))
-            ELSEIF (NU(N,II) .GT. 0) THEN
-C              sum of stoichiometric coefficients of products
-               NSTOP = NSTOP + NU(N,II)
-            ENDIF
-   50    CONTINUE
-C
-         AVAG = 6.023E23
-C
-         IF (NFAL.GT.0 .AND. IFAL(NFAL).EQ.II) THEN
-C
-C           fall-off reaction, "(+M)" or "(+species name)" does not
-C           count except in "LOW" A-factor;
-C           reverse-rate declarations are not allowed
-C
-            IF (NSTOR.GT.0) PAR(1,II) = PAR(1,II) * AVAG**(NSTOR-1)
-            NSTOR = NSTOR + 1
-            IF (NSTOR.GT.0) PFAL(1,NFAL) = PFAL(1,NFAL)*AVAG**(NSTOR-1)
-C
-         ELSEIF (NTHB.GT.0 .AND. ITHB(NTHB).EQ.II) THEN
-C
-C           third body reaction, "+M" counts as species in
-C           forward and reverse A-factor conversion
-C
-            NSTOR = NSTOR + 1
-            NSTOP = NSTOP + 1
-            IF (NSTOR.GT.0) PAR(1,II) = PAR(1,II) * AVAG**(NSTOR-1)
-            IF (NREV.GT.0 .AND. IREV(NREV).EQ.II .AND. NSTOP.GT.0)
-     1          RPAR(1,NREV) = RPAR(1,NREV) * AVAG**(NSTOP-1)
-C
-         ELSE
-C
-C           not third-body or fall-off reaction, but may have
-C           reverse rates.
-C
-            IF (NSTOR .GT. 0) PAR(1,II) = PAR(1,II) * AVAG**(NSTOR-1)
-            IF (NREV.GT.0 .AND. IREV(NREV).EQ.II .AND. NSTOP.GT.0)
-     1          RPAR(1,NREV) = RPAR(1,NREV) * AVAG**(NSTOP-1)
-         ENDIF
-      ENDIF
-C
- 1020 FORMAT (6X,'Error...no LOW parameters given for fall-off...')
- 1030 FORMAT (6X,'Error...reverse T-L required...')
- 1040 FORMAT (6X,'Error...forward T-L required...')
- 1045 FORMAT (6X,'Error...REV parameters must be given with RTL...')
- 1050 FORMAT (6X,'Error...undeclared duplicate to reaction number ',I3)
- 1060 FORMAT (6X,'Error...reaction does not balance...')
-      RETURN
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CKBAL (MXSPEC, KSPEC, KCOEF, MDIM, MM, KCHRG, KNCF,
-     1                  IERR)
-C
-C     Checks elemental balance of reactants vs. products.
-C     Checks charge balance of reaction.
-C
-C     Input:  MXSPEC - number of species allowed in a reaction
-C             KSPEC(N),N=1,MXSPEC- array of species numbers in reaction
-C             KCOEF(N) - stoichiometric coefficients of the species
-C             MDIM  - maximum number of elements allowed
-C             MM    - actual integer number of elements
-C             KCHRG(K) - ionic charge Kth species
-C             KNCF(M,K)- integer elemental composition of Kth species
-C     Output: KERR  - logical, =.TRUE. if reaction does not balance
-C                                      F. Rupley, Div. 8245, 5/13/86
-C----------------------------------------------------------------------C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      DIMENSION KSPEC(*), KCOEF(*), KNCF(MDIM,*), KCHRG(*)
-      LOGICAL IERR
-C
-      IERR = .FALSE.
-C
-C     charge balance
-C
-      KBAL = 0
-      DO 50 N = 1, MXSPEC
-         IF (KSPEC(N) .NE. 0) 
-     1   KBAL = KBAL + KCOEF(N)*KCHRG(KSPEC(N))
-   50 CONTINUE
-      IF (KBAL .NE. 0) IERR = .TRUE.
-C
-C     element balance
-C
-      DO 100 M = 1, MM
-         MBAL = 0
-         DO 80 N = 1, MXSPEC
-            IF (KSPEC(N) .NE. 0)
-     1      MBAL = MBAL + KCOEF(N)*KNCF(M,KSPEC(N))
-   80    CONTINUE
-         IF (MBAL .NE. 0) IERR = .TRUE.
-  100 CONTINUE
-      RETURN
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CKRBAL (MXSPEC, KSPEC, RCOEF, MDIM, MM, KCHRG, KNCF,
-     1                   CKMIN, IERR)
-C
-C     Checks elemental balance of reactants vs. products.
-C     Checks charge balance of reaction.
-C
-C     Input:  MXSPEC - number of species allowed in a reaction
-C             KSPEC(N),N=1,MXSPEC- array of species numbers in reaction
-C             RCOEF(N) - stoichiometric coefficients of the species
-C             MDIM  - maximum number of elements allowed
-C             MM    - actual integer number of elements
-C             KCHRG(K) - ionic charge Kth species
-C             KNCF(M,K)- integer elemental composition of Kth species
-C     Output: KERR  - logical, =.TRUE. if reaction does not balance
-C                                      F. Rupley, Div. 8245, 5/13/86
-C----------------------------------------------------------------------C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      DIMENSION KSPEC(*), RCOEF(*), KNCF(MDIM,*), KCHRG(*)
-      LOGICAL IERR
-C
-      IERR = .FALSE.
-C
-C     charge balance
-C
-      SBAL = 0
-      DO 50 N = 1, MXSPEC
-         IF (KSPEC(N) .NE. 0)
-     1   SBAL = SBAL + RCOEF(N)*KCHRG(KSPEC(N))
-   50 CONTINUE
-      IF (ABS(SBAL) .GT. CKMIN) IERR = .TRUE.
-C
-C     element balance
-C
-      DO 100 M = 1, MM
-         SMBAL = 0
-         DO 80 N = 1, MXSPEC
-            IF (KSPEC(N) .NE. 0)
-     1      SMBAL = SMBAL + RCOEF(N)*KNCF(M,KSPEC(N))
-   80    CONTINUE
-         IF (ABS(SMBAL) .GT. CKMIN) IERR = .TRUE.
-  100 CONTINUE
-      RETURN
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CKDUP (I, MAXSP, NS, NR, NU, NUNK, NFAL, IFAL, KFAL,
-     1                  ISAME)
-C
-C     Checks reaction I against the (I-1) reactions for duplication
-C----------------------------------------------------------------------C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      DIMENSION NS(*), NR(*), NU(MAXSP,*), NUNK(MAXSP,*), IFAL(*),
-     1          KFAL(*)
-C
-      ISAME = 0
-      NRI = NR(I)
-      NPI = ABS(NS(I)) - NR(I)
-C
-      DO 500 J = 1, I-1
-C
-         NRJ = NR(J)
-         NPJ = ABS(NS(J)) - NR(J)
-C
-         IF (NRJ.EQ.NRI .AND. NPJ.EQ.NPI) THEN
-C
-            NSAME = 0
-            DO 20 N = 1, MAXSP
-               KI = NUNK(N,I)
-               NI = NU(N,I)
-C
-               DO 15 L = 1, MAXSP
-                  KJ = NUNK(L,J)
-                  NJ = NU(L,J)
-                  IF (NJ.NE.0 .AND. KJ.EQ.KI .AND. NJ.EQ.NI)
-     1            NSAME = NSAME + 1
-   15          CONTINUE
-   20       CONTINUE
-C
-            IF (NSAME .EQ. ABS(NS(J))) THEN
-C
-C           same products, reactants, coefficients, check fall-off
-C           third body
-C
-               IF (NFAL.GT.0 .AND. IFAL(NFAL).EQ.I) THEN
-                  DO 22 N = 1, NFAL-1
-                     IF (J.EQ.IFAL(N) .AND. KFAL(N).EQ.KFAL(NFAL)) THEN
-                        ISAME = J
-                        RETURN
-                     ENDIF
-   22             CONTINUE
-                  RETURN
-               ENDIF
-C
-               ISAME = J
-               RETURN
-            ENDIF
-         ENDIF
-C
-         IF (NPI.EQ.NRJ .AND. NPJ.EQ.NRI) THEN
-C
-            NSAME = 0
-            DO 30 N = 1, MAXSP
-               KI = NUNK(N,I)
-               NI = NU(N,I)
-C
-               DO 25 L = 1, MAXSP
-                  KJ = NUNK(L,J)
-                  NJ = NU(L,J)
-                  IF (NJ.NE.0 .AND. KJ.EQ.KI .AND. -NJ.EQ.NI)
-     1            NSAME = NSAME + 1
-   25          CONTINUE
-   30       CONTINUE
-C
-            IF (NSAME.EQ.ABS(NS(J)) .AND.
-     1          (NS(J).GT.0 .OR. NS(I).GT.0)) THEN
-C
-C           same products as J reactants, and vice-versa
-C
-               IF (NFAL.GT.0 .AND. IFAL(NFAL).EQ.I) THEN
-                  DO 32 N = 1, NFAL-1
-                     IF (J.EQ.IFAL(N) .AND. KFAL(N).EQ.KFAL(NFAL)) THEN
-                        ISAME = J
-                        RETURN
-                     ENDIF
-   32             CONTINUE
-                  RETURN
-               ENDIF
-C
-               ISAME = J
-               RETURN
-            ENDIF
-         ENDIF
-C
-  500 CONTINUE
-      RETURN
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE CKISUB (LINE, SUB, NSUB)
-C
-C     Generates an array of CHAR*(*) substrings from a CHAR*(*) string,
-C     using blanks or tabs as delimiters
-C
-C     Input:  LINE  - a CHAR*(*) line
-C     Output: SUB   - a CHAR*(*) array of substrings
-C             NSUB  - number of substrings found
-C     A '!' will comment out a line, or remainder of the line.
-C                                      F. Rupley, Div. 8245, 5/15/86
-C----------------------------------------------------------------------C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      CHARACTER*(*) SUB(*), LINE
-      NSUB = 0
-C
-      DO 5 N = 1, LEN(LINE)
-        IF (ICHAR(LINE(N:N)) .EQ. 9) LINE(N:N) = ' '
-    5 CONTINUE
-C
-      IF (IPPLEN(LINE) .LE. 0) RETURN
-C
-      ILEN = ILASCH(LINE)
-C
-      NSTART = IFIRCH(LINE)
-   10 CONTINUE
-      ISTART = NSTART
-      NSUB = NSUB + 1
-      SUB(NSUB) = ' '
-C
-      DO 100 I = ISTART, ILEN
-         ILAST = INDEX(LINE(ISTART:),' ') - 1
-         IF (ILAST .GT. 0) THEN
-            ILAST = ISTART + ILAST - 1
-         ELSE
-            ILAST = ILEN
-         ENDIF
-         SUB(NSUB) = LINE(ISTART:ILAST)
-         IF (ILAST .EQ. ILEN) RETURN
-C
-         NSTART = ILAST + IFIRCH(LINE(ILAST+1:))
-C
-C        Does SUB have any slashes?
-C
-         I1 = INDEX(SUB(NSUB),'/')
-         IF (I1 .LE. 0) THEN
-            IF (LINE(NSTART:NSTART) .NE. '/') GO TO 10
-            NEND = NSTART + INDEX(LINE(NSTART+1:),'/')
-            IND = INDEX(SUB(NSUB),' ')
-            SUB(NSUB)(IND:) = LINE(NSTART:NEND)
-            IF (NEND .EQ. ILEN) RETURN
-            NSTART = NEND + IFIRCH(LINE(NEND+1:))
-            GO TO 10
-         ENDIF
-C
-C        Does SUB have 2 slashes?
-C
-         I2 = INDEX(SUB(NSUB)(I1+1:),'/')
-         IF (I2 .GT. 0) GO TO 10
-C
-         NEND = NSTART + INDEX(LINE(NSTART+1:),'/')
-         IND = INDEX(SUB(NSUB),' ') + 1
-         SUB(NSUB)(IND:) = LINE(NSTART:NEND)
-         IF (NEND .EQ. ILEN) RETURN
-         NSTART = NEND + IFIRCH(LINE(NEND+1:))
-C        GO TO 10
-  100 CONTINUE
-      RETURN
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE IPNPAR (LINE, NPAR, IPAR, ISTART)
-C
-C     Returns CHAR*(*) IPAR substring of CHAR*(*) string LINE which
-C     contains NPAR real parameters
-C
-C     Input:     LINE - a CHAR*(*) line
-C                NPAR - number of parameters expected
-C     Output:    IPAR - the substring of parameters only
-C                ISTART - the starting location of IPAR substring
-C     A '!' will comment out a line, or remainder of the line.
-C                                      F. Rupley, Div. 8245, 5/14/86
-C----------------------------------------------------------------------C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      CHARACTER*(*) LINE,IPAR
-C
-C----------Find Comment String (! signifies comment)
-C
-      ILEN = IPPLEN(LINE)
-      ISTART = 0
-      N = 0
-      IF (ILEN.GT.0) THEN
-         DO 40 I = ILEN, 1, -1
-            ISTART = I
-            IPAR = ' '
-            IPAR = LINE(ISTART:ILEN)
-            IF (LINE(I:I).NE.' ') THEN
-               IF (I .EQ. 1) RETURN
-               IF (LINE(I-1:I-1) .EQ. ' ') THEN
-                  N = N + 1
-                  IF (N .EQ. NPAR) RETURN
-               ENDIF
-            ENDIF
-   40    CONTINUE
-      ENDIF
-      RETURN
-      END
-C----------------------------------------------------------------------C
-      SUBROUTINE IPPARI(STRING, ICARD, NEXPEC, IVAL, NFOUND, IERR, LOUT)
-C   BEGIN PROLOGUE  IPPARI
-C   REFER TO  IPGETI
-C   DATE WRITTEN  850625   (YYMMDD)
-C   REVISION DATE 851725   (YYMMDD)
-C   CATEGORY NO.  J3.,J4.,M2.
-C   KEYWORDS  PARSE
-C   AUTHOR  CLARK,G.L.,GROUP C-3 LOS ALAMOS NAT'L LAB
-C   PURPOSE  Parses integer variables from a character variable.  Called
-C            by IPGETI, the IOPAK routine used for interactive input.
-C   DESCRIPTION
-C
-C-----------------------------------------------------------------------
-C  IPPARI may be used for parsing an input record that contains integer
-C  values, but was read into a character variable instead of directly
-C  into integer variables.
-C  The following benefits are gained by this approach:
-C    - specification of only certain elements of the array is allowed,
-C      thus letting the others retain default values
-C    - variable numbers of values may be input in a record, up to a
-C      specified maximum
-C    - control remains with the calling program in case of an input
-C      error
-C    - diagnostics may be printed by IPPARI to indicate the nature
-C      of input errors
-C
-C   The contents of STRING on input indicate which elements of IVAL
-C   are to be changed from their entry values, and values to which
-C   they should be changed on exit.  Commas and blanks serve as
-C   delimiters, but multiple blanks are treated as a single delimeter.
-C   Thus, an input record such as:
-C     '   1,   2,,40000   , ,60'
-C   is interpreted as the following set of instructions by IPGETR:
-C
-C     (1) set IVAL(1) = 1
-C     (2) set IVAL(2) = 2
-C     (3) leave IVAL(3) unchanged
-C     (4) set IVAL(4) = 40000
-C     (5) leave IVAL(5) unchanged
-C     (6) set IVAL(6) = 60
-C
-C   IPPARI will print diagnostics on the default output device, if
-C   desired.
-C
-C   IPPARI is part of IOPAK, and is written in ANSI FORTRAN 77
-C
-C   Examples:
-C
-C      Assume IVAL = (0, 0, 0) and NEXPEC = 3 on entry:
-C
-C   input string           IVAL on exit            IERR    NFOUND
-C   -------------          ----------------------  ----    ------
-C  '  2 ,   3 45 '         (2, 3, 45)                0       3
-C  '2.15,,3'               (2, 0, 3)                 1       0
-C  '3X, 25, 2'             (0, 0, 0)                 1       0
-C  '10000'                 (10000, 0, 0)             2       1
-C
-C      Assume IVAL = (0, 0, 0, 0) and NEXPEC = -4 on entry:
-C
-C   input string           IVAL on exit            IERR    NFOUND
-C   -------------          ----------------------  ----    ------
-C  '1, 2'                  (1, 2)                    0       2
-C  ',,37  400'             (0, 0, 37, 400)           0       4
-C  ' 1,,-3,,5'             (1, 0, -3, 0)             3       4
-C
-C  arguments: (I=input,O=output)
-C  -----------------------------
-C  STRING (I) - the character string to be parsed.
-C
-C  ICARD  (I) - data statement number, and error processing flag
-C         < 0 : no error messages printed
-C         = 0 : print error messages, but not ICARD
-C         > 0 : print error messages, and ICARD
-C
-C  NEXPEC (I) - number of real variables expected to be input.  If
-C         < 0, the number is unknown, and any number of values
-C         between 0 and abs(nexpec) may be input.  (see NFOUND)
-C
-C  PROMPT (I) - prompting string, character type.  A question
-C         mark will be added to form the prompt at the screen.
-C
-C  IVAL (I,O) - the integer value or values to be modified.  On entry,
-C       the values are printed as defaults.  The formal parameter
-C       corresponding to IVAL must be dimensioned at least NEXPEC
-C       in the calling program if NEXPEC > 1.
-C
-C  NFOUND (O) - the number of real values represented in STRING,
-C         only in the case that there were as many or less than
-C         NEXPEC.
-C
-C  IERR (O) - error flag:
-C       = 0 if no errors found
-C       = 1 syntax errors or illegal values found
-C       = 2 for too few values found (NFOUND < NEXPEC)
-C       = 3 for too many values found (NFOUND > NEXPEC)
-C-----------------------------------------------------------------------
-C
-C   REFERENCES  (NONE)
-C   ROUTINES CALLED  IFIRCH,ILASCH
-C   END PROLOGUE  IPPARI
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-C
-      CHARACTER STRING*(*), ITEMP*80
-      DIMENSION IVAL(*)
-      CHARACTER *8 FMT(14)
-      LOGICAL OKINCR
-C
-C   FIRST EXECUTABLE STATEMENT  IPPARI
-      IERR   = 0
-      NFOUND = 0
-      NEXP = IABS(NEXPEC)
-      IE = ILASCH(STRING)
-      IF (IE .EQ. 0) GO TO 500
-      NC = 1
-C
-C--- OKINCR is a flag that indicates it's OK to increment
-C--- NFOUND, the index of the array into which the value
-C--- should be read.  It is set false when a space follows
-C--- an integer value substring, to keep incrementing from
-C--- occurring if a comma should be encountered before the
-C--- next value.
-C
-      OKINCR = .TRUE.
-C
-C--- begin overall loop on characters in string
-C
-100   CONTINUE
-C
-      IF (STRING(NC:NC) .EQ. ',') THEN
-         IF (OKINCR .OR. NC .EQ. IE) THEN
-            NFOUND = NFOUND + 1
-         ELSE
-            OKINCR = .TRUE.
-         ENDIF
-C
-         GO TO 450
-      ENDIF
-      IF (STRING(NC:NC) .EQ. ' ') GO TO 450
-C
-C--- first good character (non-delimeter) found - now find
-C--- last good character
-C
-      IBS = NC
-160   CONTINUE
-      NC = NC + 1
-      IF (NC .GT. IE) GO TO 180
-      IF (STRING(NC:NC) .EQ. ' ')THEN
-         OKINCR = .FALSE.
-      ELSEIF (STRING(NC:NC) .EQ. ',')THEN
-         OKINCR = .TRUE.
-      ELSE
-         GO TO 160
-      ENDIF
-C
-C--- end of substring found - read value into integer array
-C
-180   CONTINUE
-      NFOUND = NFOUND + 1
-      IF (NFOUND .GT. NEXP) THEN
-         IERR = 3
-         GO TO 500
-      ENDIF
-C
-      IES = NC - 1
-      NCH = IES - IBS + 1
-      DATA FMT/' (I1)', ' (I2)', ' (I3)', ' (I4)', ' (I5)',
-     1   ' (I6)', ' (I7)', ' (I8)', ' (I9)', '(I10)',
-     2   '(I11)', '(I12)', '(I13)', '(I14)'/
-      ITEMP = ' '
-      ITEMP = STRING(IBS:IES)
-      READ (ITEMP(1:NCH), FMT(NCH), ERR = 400) IVAL(NFOUND)
-      GO TO 450
-400   CONTINUE
-      IERR = 1
-      GO TO 510
-450   CONTINUE
-      NC = NC + 1
-      IF (NC .LE. IE) GO TO 100
-C
-500   CONTINUE
-      IF (NEXPEC .GT. 0 .AND. NFOUND .LT. NEXP) IERR = 2
-510   CONTINUE
-C
-      IF (IERR .EQ. 0 .OR. ICARD .LT. 0)RETURN
-      IF (ICARD .NE. 0) WRITE (LOUT, '(A,I3)')
-     1   '!! ERROR IN DATA STATEMENT NUMBER', ICARD
-      IF (IERR .EQ. 1)
-     1    WRITE (LOUT, '(A)')'SYNTAX ERROR, OR ILLEGAL VALUE'
-      IF (IERR .EQ. 2) WRITE (LOUT, '(A,I2, A, I2)')
-     1   ' TOO FEW DATA ITEMS.  NUMBER FOUND = ' , NFOUND,
-     2   '  NUMBER EXPECTED = ', NEXPEC
-      IF (IERR .EQ. 3) WRITE (LOUT, '(A,I2)')
-     1   ' TOO MANY DATA ITEMS.  NUMBER EXPECTED = ', NEXPEC
-      END
-C
-      SUBROUTINE IPPARR(STRING, ICARD, NEXPEC, RVAL, NFOUND, IERR, LOUT)
-C   BEGIN PROLOGUE  IPPARR
-C   REFER TO  IPGETR
-C   DATE WRITTEN  850625   (YYMMDD)
-C   REVISION DATE 851625   (YYMMDD)
-C   CATEGORY NO.  J3.,J4.,M2.
-C   KEYWORDS  PARSE
-C   AUTHOR  CLARK,G.L.,GROUP C-3 LOS ALAMOS NAT'L LAB
-C   PURPOSE  Parses real variables from a character variable.  Called
-C            by IPGETR, the IOPAK routine used for interactive input.
-C   DESCRIPTION
-C
-C-----------------------------------------------------------------------
-C  IPPARR may be used for parsing an input record that contains real
-C  values, but was read into a character variable instead of directly
-C  into real variables.
-C  The following benefits are gained by this approach:
-C    - specification of only certain elements of the array is allowed,
-C      thus letting the others retain default values
-C    - variable numbers of values may be input in a record, up to a
-C      specified maximum
-C    - control remains with the calling program in case of an input
-C      error
-C    - diagnostics may be printed by IPPARR to indicate the nature
-C      of input errors
-C
-C   The contents of STRING on input indicate which elements of RVAL
-C   are to be changed from their entry values, and values to which
-C   they should be changed on exit.  Commas and blanks serve as
-C   delimiters, but multiple blanks are treated as a single delimeter.
-C   Thus, an input record such as:
-C     '   1.,   2,,4.e-5   , ,6.e-6'
-C   is interpreted as the following set of instructions by IPGETR:
-C
-C     (1) set RVAL(1) = 1.0
-C     (2) set RVAL(2) = 2.0
-C     (3) leave RVAL(3) unchanged
-C     (4) set RVAL(4) = 4.0E-05
-C     (5) leave RVAL(5) unchanged
-C     (6) set RVAL(6) = 6.0E-06
-C
-C   IPPARR will print diagnostics on the default output device, if
-C   desired.
-C
-C   IPPARR is part of IOPAK, and is written in ANSI FORTRAN 77
-C
-C   Examples:
-C
-C      Assume RVAL = (0., 0., 0.) and NEXPEC = 3 on entry:
-C
-C   input string           RVAL on exit            IERR    NFOUND
-C   -------------          ----------------------  ----    ------
-C  '  2.34e-3,  3 45.1'    (2.34E-03, 3.0, 45.1)     0       3
-C  '2,,3.-5'               (2.0, 0.0, 3.0E-05)       0       3
-C  ',1.4,0.028E4'          (0.0, 1.4, 280.0)         0       3
-C  '1.0, 2.a4, 3.0'        (1.0, 0.0, 0.0)           1       1
-C  '1.0'                   (1.0, 0.0, 0.0)           2       1
-C
-C      Assume RVAL = (0.,0.,0.,0.) and NEXPEC = -4 on entry:
-C
-C   input string           RVAL on exit            IERR    NFOUND
-C   -------------          ----------------------  ----    ------
-C  '1.,2.'                 (1.0, 2.0)                0       2
-C  ',,3  4.0'              (0.0, 0.0, 3.0, 4.0)      0       4
-C  '1,,3,,5.0'             (0.0, 0.0, 3.0, 0.0)      3       4
-C
-C  arguments: (I=input,O=output)
-C  -----------------------------
-C  STRING (I) - the character string to be parsed.
-C
-C  ICARD  (I) - data statement number, and error processing flag
-C         < 0 : no error messages printed
-C         = 0 : print error messages, but not ICARD
-C         > 0 : print error messages, and ICARD
-C
-C  NEXPEC (I) - number of real variables expected to be input.  If
-C         < 0, the number is unknown, and any number of values
-C         between 0 and abs(nexpec) may be input.  (see NFOUND)
-C
-C  PROMPT (I) - prompting string, character type.  A question
-C         mark will be added to form the prompt at the screen.
-C
-C  RVAL (I,O) - the real value or values to be modified.  On entry,
-C       the values are printed as defaults.  The formal parameter
-C       corresponding to RVAL must be dimensioned at least NEXPEC
-C       in the calling program if NEXPEC > 1.
-C
-C  NFOUND (O) - the number of real values represented in STRING,
-C         only in the case that there were as many or less than
-C         NEXPEC.
-C
-C  IERR (O) - error flag:
-C       = 0 if no errors found
-C       = 1 syntax errors or illegal values found
-C       = 2 for too few values found (NFOUND < NEXPEC)
-C       = 3 for too many values found (NFOUND > NEXPEC)
-C-----------------------------------------------------------------------
-C
-C   REFERENCES  (NONE)
-C   ROUTINES CALLED  IFIRCH,ILASCH
-C   END PROLOGUE  IPPARR
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      CHARACTER STRING*(*), ITEMP*80
-      DIMENSION RVAL(*)
-      CHARACTER *8 FMT(22)
-      LOGICAL OKINCR
-C
-C   FIRST EXECUTABLE STATEMENT  IPPARR
-      IERR   = 0
-      NFOUND = 0
-      NEXP = IABS(NEXPEC)
-      IE = ILASCH(STRING)
-      IF (IE .EQ. 0) GO TO 500
-      NC = 1
-C
-C--- OKINCR is a flag that indicates it's OK to increment
-C--- NFOUND, the index of the array into which the value
-C--- should be read.  It is set negative when a space follows
-C--- a real value substring, to keep incrementing from
-C--- occurring if a comma should be encountered before the
-C--- next value.
-C
-      OKINCR = .TRUE.
-C
-C--- begin overall loop on characters in string
-C
-100   CONTINUE
-C
-      IF (STRING(NC:NC) .EQ. ',') THEN
-         IF (OKINCR) THEN
-            NFOUND = NFOUND + 1
-         ELSE
-            OKINCR = .TRUE.
-         ENDIF
-C
-         GO TO 450
-      ENDIF
-      IF (STRING(NC:NC) .EQ. ' ') GO TO 450
-C
-C--- first good character (non-delimeter) found - now find
-C--- last good character
-C
-      IBS = NC
-160   CONTINUE
-      NC = NC + 1
-      IF (NC .GT. IE) GO TO 180
-      IF (STRING(NC:NC) .EQ. ' ')THEN
-         OKINCR = .FALSE.
-      ELSEIF (STRING(NC:NC) .EQ. ',')THEN
-         OKINCR = .TRUE.
-      ELSE
-         GO TO 160
-      ENDIF
-C
-C--- end of substring found - read value into real array
-C
-180   CONTINUE
-      NFOUND = NFOUND + 1
-      IF (NFOUND .GT. NEXP) THEN
-         IERR = 3
-         GO TO 500
-      ENDIF
-C
-      DATA FMT/     ' (E1.0)', ' (E2.0)', ' (E3.0)', ' (E4.0)',
-     1   ' (E5.0)', ' (E6.0)', ' (E7.0)', ' (E8.0)', ' (E9.0)',
-     2   '(E10.0)', '(E11.0)', '(E12.0)', '(E13.0)', '(E14.0)',
-     3   '(E15.0)', '(E16.0)', '(E17.0)', '(E18.0)', '(E19.0)',
-     4   '(E20.0)', '(E21.0)', '(E22.0)'/
-      IES = NC - 1
-      NCH = IES - IBS + 1
-      ITEMP = ' '
-      ITEMP = STRING(IBS:IES)
-      READ (ITEMP(1:NCH), FMT(NCH), ERR = 400) RVAL(NFOUND)
-      GO TO 450
-400   CONTINUE
-      WRITE (LOUT, 555) STRING(IBS:IES)
-  555 FORMAT (A)
-      IERR = 1
-      GO TO 510
-450   CONTINUE
-      NC = NC + 1
-      IF (NC .LE. IE) GO TO 100
-C
-500   CONTINUE
-      IF (NEXPEC .GT. 0 .AND. NFOUND .LT. NEXP) IERR = 2
-510   CONTINUE
-C
-      IF (IERR .EQ. 0 .OR. ICARD .LT. 0) RETURN
-      IF (ICARD .NE. 0) WRITE (LOUT, '(A,I3)')
-     1   '!! ERROR IN DATA STATEMENT NUMBER', ICARD
-      IF (IERR .EQ. 1)
-     1   WRITE (LOUT, '(A)')'SYNTAX ERROR, OR ILLEGAL VALUE'
-      IF (IERR .EQ. 2) WRITE (LOUT, '(A,I2, A, I2)')
-     1   ' TOO FEW DATA ITEMS.  NUMBER FOUND = ' , NFOUND,
-     2   '  NUMBER EXPECTED = ', NEXPEC
-      IF (IERR .EQ. 3) WRITE (LOUT, '(A,I2)')
-     1   ' TOO MANY DATA ITEMS.  NUMBER EXPECTED = ', NEXPEC
-      END
-C
-      FUNCTION IFIRCH(STRING)
-C   BEGIN PROLOGUE  IFIRCH
-C   DATE WRITTEN   850626
-C   REVISION DATE  850626
-C   CATEGORY NO.  M4.
-C   KEYWORDS  CHARACTER STRINGS,SIGNIFICANT CHARACTERS
-C   AUTHOR  CLARK,G.L.,GROUP C-3 LOS ALAMOS NAT'L LAB
-C   PURPOSE  Determines first significant (non-blank) character
-C            in character variable
-C   DESCRIPTION
-C
-C-----------------------------------------------------------------------
-C  IFIRCH locates the first non-blank character in a string of
-C  arbitrary length.  If no characters are found, IFIRCH is set = 0.
-C  When used with the companion routine ILASCH, the length of a string
-C  can be determined, and/or a concatenated substring containing the
-C  significant characters produced.
-C-----------------------------------------------------------------------
-C
-C   REFERENCES  (NONE)
-C   ROUTINES CALLED  (NONE)
-C   END PROLOGUE IFIRCH
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      CHARACTER* (*)STRING
-C
-C   FIRST EXECUTABLE STATEMENT IFIRCH
-      NLOOP = LEN(STRING)
-C
-      IF (NLOOP .EQ. 0) THEN
-         IFIRCH = 0
-         RETURN
-      ENDIF
-C
-      DO 100 I = 1, NLOOP
-         IF (STRING(I:I) .NE. ' ') GO TO 120
-100   CONTINUE
-C
-      IFIRCH = 0
-      RETURN
-120   CONTINUE
-      IFIRCH = I
-      END
-      FUNCTION ILASCH(STRING)
-C   BEGIN PROLOGUE  ILASCH
-C   DATE WRITTEN   850626
-C   REVISION DATE  850626
-C   CATEGORY NO.  M4.
-C   KEYWORDS  CHARACTER STRINGS,SIGNIFICANT CHARACTERS
-C   AUTHOR  CLARK,G.L.,GROUP C-3 LOS ALAMOS NAT'L LAB
-C   PURPOSE  Determines last significant (non-blank) character
-C            in character variable
-C   DESCRIPTION
-C
-C-----------------------------------------------------------------------
-C  IFIRCH locates the last non-blank character in a string of
-C  arbitrary length.  If no characters are found, ILASCH is set = 0.
-C  When used with the companion routine IFIRCH, the length of a string
-C  can be determined, and/or a concatenated substring containing the
-C  significant characters produced.
-C  Note that the FORTRAN intrinsic function LEN returns the length
-C  of a character string as declared, rather than as filled.  The
-C  declared length includes leading and trailing blanks, and thus is
-C  not useful in generating 'significant' substrings.
-C-----------------------------------------------------------------------
-C
-C   REFERENCES  (NONE)
-C   ROUTINES CALLED  (NONE)
-C   END PROLOGUE IFIRCH
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      CHARACTER*(*) STRING
-C
-C***FIRST EXECUTABLE STATEMENT ILASCH
-      NLOOP = LEN(STRING)
-      IF (NLOOP.EQ.0) THEN
-         ILASCH = 0
-         RETURN
-      ENDIF
-C
-      DO 100 I = NLOOP, 1, -1
-         IF (STRING(I:I) .NE. ' ') GO TO 120
-100   CONTINUE
-C
-120   CONTINUE
-      ILASCH = I
-      END
-C----------------------------------------------------------------------C
-C
-      SUBROUTINE CKCOMP (IST, IRAY, II, I)
-C
-C  START PROLOGUE
-C
-C  SUBROUTINE CKCOMP (IST, IRAY, II, I)*
-C     Returns the index of an element of a reference character
-C     string array which corresponds to a character string;
-C     leading and trailing blanks are ignored.
-C
-C
-C  INPUT
-C     IST   - A character string.
-C                  Data type - CHARACTER*(*)
-C     IRAY  - An array of character strings;
-C             dimension IRAY(*) at least II
-C                  Data type - CHARACTER*(*)
-C     II    - The length of IRAY.
-C                  Data type - integer scalar.
-C
-C  OUTPUT
-C     I     - The first integer location in IRAY in which IST
-C             corresponds to IRAY(I); if IST is not also an
-C             entry in IRAY, I=0.
-C
-C  END PROLOGUE
-C
-C*****precision > double
-      IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      CHARACTER*(*) IST, IRAY(*)
-C
-      I = 0
-      DO 10 N = II, 1, -1
-         IS1 = IFIRCH(IST)
-         IS2 = ILASCH(IST)
-         IR1 = IFIRCH(IRAY(N))
-         IR2 = ILASCH(IRAY(N))
-         IF ( IS2.GE.IS1 .AND. IS2.GT.0 .AND.
-     1        IR2.GE.IR1 .AND. IR2.GT.0 .AND.
-     2        IST(IS1:IS2).EQ.IRAY(N)(IR1:IR2) ) I=N
-   10 CONTINUE
-      RETURN
-      END
-C
-C----------------------------------------------------------------------C
-      SUBROUTINE CKUNIT (LINE, AUNITS, EUNITS, IUNITS)
-C
-C*****precision > double
-      IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-      CHARACTER*(*) LINE, IUNITS, AUNITS, EUNITS
-      CHARACTER*4 UPCASE
-C
-      AUNITS = ' '
-      EUNITS = ' '
-      IUNITS = ' '
-      LCHAR = ILASCH(LINE)
-      DO 85 N = 1, ILASCH(LINE)-3
-         IND = ILASCH(IUNITS)
-         IF (EUNITS .EQ. ' ') THEN
-            IF (UPCASE(LINE(N:), 4)     .EQ. 'CAL/') THEN
-               EUNITS = 'CAL/'
-               IF (IUNITS .EQ. ' ') THEN
-                  IUNITS = 'E units cal/mole'
-               ELSE
-                  IUNITS(IND:) = ', E units cal/mole'
-               ENDIF
-            ELSEIF (UPCASE(LINE(N:), 4) .EQ. 'KCAL') THEN
-               EUNITS = 'KCAL'
-               IF (IUNITS .EQ. ' ') THEN
-                  IUNITS = 'E units Kcal/mole'
-               ELSE
-                  IUNITS(IND:) = ', E units Kcal/mole'
-               ENDIF
-            ELSEIF (UPCASE(LINE(N:), 4) .EQ. 'JOUL') THEN
-               EUNITS = 'JOUL'
-               IF (IUNITS .EQ. ' ') THEN
-                  IUNITS = 'E units Joules/mole'
-               ELSE
-                  IUNITS(IND:) = ', E units Joules/mole'
-               ENDIF
-            ELSEIF (UPCASE(LINE(N:), 4) .EQ. 'KJOU') THEN
-               EUNITS = 'KJOU'
-               IF (IUNITS .EQ. ' ') THEN
-                  IUNITS = 'E units Kjoule/mole'
-               ELSE
-                  IUNITS(IND:) = ', E units Kjoule/mole'
-               ENDIF
-            ELSEIF (UPCASE(LINE(N:), 4) .EQ. 'KELV') THEN
-               EUNITS = 'KELV'
-               IF (IUNITS .EQ. ' ') THEN
-                  IUNITS = 'E units Kelvins'
-               ELSE
-                  IUNITS(IND:) = ', E units Kelvins'
-               ENDIF
-            ENDIF
-         ENDIF
-         IF (AUNITS .EQ. ' ') THEN
-            IF (UPCASE(LINE(N:), 4) .EQ. 'MOLE') THEN
-               IF (N+4.LE.ILASCH(LINE) .AND. 
-     1                    UPCASE(LINE(N+4:),1).EQ.'C') THEN
-C
-                  AUNITS = 'MOLC'
-                  IF (IUNITS .EQ. ' ') THEN
-                     IUNITS = 'A units molecules'
-                  ELSE
-                      IUNITS(IND:) = ', A units molecules'
-                  ENDIF
-               ELSE
-                  AUNITS = 'MOLE'
-                  IF (IUNITS .EQ. ' ') THEN
-                     IUNITS = 'A units mole-cm-sec-K'
-                  ELSE
-                     IUNITS(IND:) = ', A units mole-cm-sec-K'
-                  ENDIF
-               ENDIF
-            ENDIF
-         ENDIF
-   85 CONTINUE
-C
-      IF (AUNITS .EQ. ' ') THEN
-         AUNITS = 'MOLE'
-         IND = ILASCH(IUNITS) + 1
-         IF (IND .GT. 1) THEN
-            IUNITS(IND:) = ', A units mole-cm-sec-K'
-         ELSE
-            IUNITS(IND:) = ' A units mole-cm-sec-K'
-         ENDIF
-      ENDIF
-C
-      IF (EUNITS .EQ. ' ') THEN
-         EUNITS = 'CAL/'
-         IND = ILASCH(IUNITS) + 1
-         IF (IND .GT. 1) THEN
-            IUNITS(IND:) = ', E units cal/mole'
-         ELSE
-            IUNITS(IND:) = ' E units cal/mole'
-         ENDIF
-      ENDIF
-C
-      RETURN
-      END
-C
-C----------------------------------------------------------------------C
-C
-      INTEGER FUNCTION IPPLEN (LINE)
-C
-C  BEGIN PROLOGUE
-C
-C  FUNCTION IPPLEN (LINE)
-C     Returns the effective length of a character string, i.e.,
-C     the index of the last character before an exclamation mark (!)
-C     indicating a comment.
-C
-C  INPUT
-C     LINE  - A character string.
-C
-C  OUTPUT
-C     IPPLEN - The effective length of the character string.
-C
-C  END PROLOGUE
-C
-C*****precision > double
-       IMPLICIT DOUBLE PRECISION (A-H,O-Z), INTEGER (I-N)
-C*****END precision > double
-C*****precision > single
-C      IMPLICIT REAL (A-H,O-Z), INTEGER (I-N)
-C*****END precision > single
-C
-      CHARACTER LINE*(*)
-C
-      IN = IFIRCH(LINE)
-      IF (IN.EQ.0 .OR. LINE(IN:IN).EQ.'!') THEN
-         IPPLEN = 0
-      ELSE
-         IN = INDEX(LINE,'!')
-         IF (IN .EQ. 0) THEN
-            IPPLEN = ILASCH(LINE)
-         ELSE
-            IPPLEN = ILASCH(LINE(:IN-1))
-         ENDIF
-      ENDIF
-      RETURN
-      END
-C
-      CHARACTER*(*) FUNCTION UPCASE(ISTR, ILEN)
-      CHARACTER ISTR*(*), LCASE(26)*1, UCASE(26)*1
-      DATA LCASE /'a','b','c','d','e','f','g','h','i','j','k','l','m',
-     1            'n','o','p','q','r','s','t','u','v','w','x','y','z'/,
-     2     UCASE /'A','B','C','D','E','F','G','H','I','J','K','L','M',
-     3            'N','O','P','Q','R','S','T','U','V','W','X','Y','Z'/
-C
-      UPCASE = ' '
-      UPCASE = ISTR(:ILEN)
-      JJ = MIN (LEN(UPCASE), LEN(ISTR), ILEN)
-      DO 10 J = 1, JJ
-         DO 10 N = 1,26
-            IF (ISTR(J:J) .EQ. LCASE(N)) UPCASE(J:J) = UCASE(N)
-   10 CONTINUE
-      RETURN
-      END
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/test.inp b/applications/test/readCHEMKINIII/CHEMKINdata/test.inp
deleted file mode 100644
index e61e47222..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/test.inp
+++ /dev/null
@@ -1,128 +0,0 @@
-ELEMENTS
- H   O  SI
-END
-SPECIES
-H2 O2 OH H H2O O H2O2 HO2
-SIH4 SIH3 SIH2 SIH SIO SIO2 HSIO SIH2O SIH3O SIH3O2+ SIH4O2
-N2
-END
-THERMO
-SIH3O                   SI 1.H  3.O 1.      G   300.000  5000.000              1
- 0.37707966E+01 0.78711497E-02-0.26563839E-05 0.39444314E-09-0.21126164E-13    2
--0.13296131E+04 0.59295750E+01 0.21062040E+01 0.72165951E-02 0.53384720E-05    3
--0.73776363E-08 0.20756105E-11-0.47884505E+03 0.16152177E+02                   4
-SIH3O2+                 SI 1.H  3.O 2. N 0. G   300.000  5000.000              1
- 0.66812963E+01 0.80057271E-02-0.27188507E-05 0.40631365E-09-0.21927725E-13    2
--0.42105544E+04-0.99423847E+01 0.20986490E+01 0.15786357E-01 0.75683261E-05    3
--0.11274587E-07 0.56665133E-11-0.26671854E+04 0.15007068E+02                   4
-SIH4O2                  SI 1.H  4.O 2. N 0. G   300.000  5000.000              1
- 0.66812963E+01 0.80057271E-02-0.27188507E-05 0.40631365E-09-0.21927725E-13    2
--0.42105544E+04-0.99423847E+01 0.20986490E+01 0.15786357E-01 0.75683261E-05    3
--0.11274587E-07 0.56665133E-11-0.26671854E+04 0.15007068E+02                   4
-SIH2O                   SI 1.H  2.O 1. N 0. G   300.000  5000.000              1
- 0.32939910E+01 0.59522360E-02-0.21083880E-05 0.33459980E-09-0.19750180E-13    2
--0.13283760E+04 0.70293210E+01 0.32032740E+01 0.44987760E-02-0.45214720E-05    3
- 0.10444300E-07-0.61720710E-11-0.12958860E+05 0.84842740E+01                   4
-HSIO                    SI 1.H  1.O 1. N 0. G   300.000  5000.000              1
- 0.34714290E+01 0.31057530E-02-0.11005030E-05 0.17477250E-09-0.10263730E-13    2
- 0.30103527E+04 0.79153820E+01 0.30781400E+01 0.10178940E-01-0.31701710E-04    3
- 0.43635320E-08-0.19549500E-10 0.31101614E+04 0.92575020E+01                   4
-SIO                     SI 1.H  0.O 1. N 0. G   300.000  5000.000              1
- 3.74788350E+00 8.19919430E-04-3.25253960E-07 5.73249620E-11-3.51089440E-15    2
--1.33174300E+04 3.66100339E+00 3.25282760E+00 4.18231260E-04 3.78062020E-06    3
--5.10244830E-09 1.94713170E-12-1.30903400E+04 6.66174329E+00                   4
-SIO2                    SI 1.H  0.O 2. N 0. S   300.000  5000.000              1
- 0.63467463E+01 0.21952215E-02 0.0            0.0            0.0               2
--0.11154241E+06-0.32060643E+02 0.63467463E+01 0.21952215E-02 0.0               3
- 0.0            0.0           -0.11154241E+06-0.32060643E+02                   4
-END
-REACTIONS
- H2    + O2            = OH+OH                1.170E+09 0 0
- H2    + OH            = H2O   + H            1.170E+09 0 0
- O     + OH            = O2    + H            5.000E+14 -0.50      0.
-!H     + O2            = O     + OH           1.940E+14  0.00  16440.
- O     + H2            = OH    + H            5.060E+04  2.67   6290.
- H     + O2    + M     = HO2   + M            2.800E+19 -1.25      0.
-   H2/2.5/  H2O/12.5/
-!OH    + HO2           = H2O   + O2           7.500E+12  0.00      0.
- OH    + HO2           = H2O   + O2           7.890E+13  0.00   -497.
-!H     + HO2           = OH    + OH           1.400E+14  0.00   1073.
- H     + HO2           = OH    + OH           1.690E+14  0.00    874.
- O     + HO2           = O2    + OH           2.400E+13  0.00   1073.   !  1.4
- OH    + OH            = O     + H2O          6.000E+08  1.30      0.
- H     + H     + M     = H2    + M            1.000E+18 -1.00      0.
-   H2/0.0/ H2O/0./
- H     + H     + H2    = H2    + H2           9.200E+16 -0.60      0.
- H     + H     + H2O   = H2    + H2O          6.000E+19 -1.25      0.
- H     + OH    + M     = H2O   + M            1.600E+22 -2.00      0.
- H     + O     + M     = OH    + M            6.200E+16 -0.60      0.
- O     + O     + M     = O2    + M            1.890E+13  0.00  -1788.
-!H     + HO2           = H2    + O2           1.250E+13  0.00      0.
- H     + HO2           = H2    + O2           6.280E+13  0.00   1411.
-!HO2   + HO2           = H2O2  + O2           2.000E+12  0.00      0.
- HO2   + HO2           = H2O2  + O2           4.200E+14  0.00  12000.
-DUPLICATE
- HO2   + HO2           = H2O2  + O2           1.300E+11  0.00  -1640.
-DUPLICATE
- H2O2  + M             = OH    + OH    + M    6.300E+17  0.00  45500.
- H2O2  + H             = HO2   + H2           1.600E+12  0.00   3800.
- H2O2  + OH            = H2O   + HO2          1.300E+11  0.00  -1630.
-DUPLICATE
- H2O2  + OH            = H2O   + HO2          5.800E+14  0.00   9560.
-DUPLICATE
- H     + HO2           = O     + H2O          3.100E+10  0.00   3590.
- O     + OH    + M     = HO2   + M            1.000E+16  0.00      0.
- H2O2  + H             = H2O   + OH           1.000E+13  0.00   3590.
- H2O2  + O             = H2O   + O2           8.400E+11  0.00   4260.
- H2O2  + O             = OH    + HO2          2.000E+13  0.00   5900.
- H2    + HO2           = H2O   + OH           2.100E+13  0.00  18800.
- SIH4                  = SIH2  + H2           1.000E+13  0.00  52700.
- SIH2  + O2            = HSIO  + OH           3.200E+14  0.00   8000.
- SIH2  + H2O           = SIH2O + H2           3.000E+12  0.00  11400.
- SIH4  + O2            = SIH3  + HO2          4.000E+13  0.00  42800.
- SIH4  + H             = SIH3  + H2           5.000E+12  0.00   2500.
- SIH4  + O             = SIH3  + OH           4.200E+12  0.00   1600.
- SIH4  + OH            = SIH3  + H2O          9.400E+12  0.00    100.
- SIH4  + HO2           = SIH3  + H2O2         2.000E+12  0.00  10000.
- SIH4  + SIH3O2+        = SIH3  + SIH4O2       1.100E+13  0.00  18500.
- SIH3  + O2            = SIH3O2+               2.000E+15  0.00   1200.
- SIH3O2+                = SIH3O + O            2.000E+13  0.00  34000.          !   5.e12
- SIH3O2+                = SIH2O + OH           3.000E+12  0.00   4000.
- SIH3O2+ + HO2           = SIH4O2 + O2           3.000E+11  0.00      0.
- SIH4O2 + H             = SIH3O2+ + H2           4.800E+13  0.00   7950.
- SIH4O2                = SIH3O + OH           6.500E+14  0.0   48700.
- SIH3  + O2            = SIH3O + O            1.000E+13  0.00      0.          !   2
- SIH3O + O2            = SIH2O + HO2          2.000E+13  0.00      0.
- SIH3  + H             = SIH2  + H2           2.000E+13  0.00      0.
- SIH3  + O             = SIH2O + H            2.000E+13  0.00      0.
- SIH3  + OH            = SIH2O + H2           6.000E+12  0.00      0.
- SIH3  + HO2           = SIH2  + H2O2         2.000E+13  0.00      0.
- SIH3  + SIH3          = SIH2  + SIH4         2.000E+12  0.00      0.
- SIH2O + O2            = HSIO  + HO2          4.000E+14  0.00  35000.
- SIH2O + M             = HSIO  + H     + M    2.000E+15  0.00  84500.
- SIH2O + H             = HSIO  + H2           5.300E+14  0.00  10500.
- SIH2O + O             = HSIO  + OH           1.800E+13  0.00   3080.
- SIH2O + OH            = HSIO  + H2O          7.500E+12  0.00    170.
- SIH2O + HO2           = HSIO  + H2O2         1.000E+13  0.00  12000.
- HSIO  + M             = H     + SIO   + M    5.000E+14  0.00  29000.
- HSIO  + O2            = SIO   + HO2          3.000E+13  0.0   0.0
- HSIO  + H             = SIO   + H2           2.000E+14  0.00      0.
-	REV /1 2 3/
-	LT /1 2/
-    RLT /3 4/
- HSIO  + O             = SIO   + OH           1.000E+14  0.00      0.
-     FIT1 /1 2 3 4/
- HSIO  + OH            = SIO   + H2O          1.000E+14  0.00      0.
- HSIO  + HO2          = SIO   + H2O2      1.000E+14  0.00      0.
- SIO   + OH     (+H)       = SIO2  + H  (+H)     4.000E+12  0.00   5700.
-	LOW /1 2 3/
-    TROE /1 2 3 4/
- SIO   + HO2           = SIO2  + OH           1.000E+12  0.00      0.
-    LT /1.0 3.0/
- SIO   + O  + M     = SIO2 + M           0.0E+13 0.0 0.0
-	UNITS /KCAL/
- SIO   + O2            = SIO2  + O            4.000E+13 0 1
-    RORD /SIO2 3/
-    FORD /O2 4/
-    REV /1 2 3/
-END
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/therm.dat b/applications/test/readCHEMKINIII/CHEMKINdata/therm.dat
deleted file mode 100644
index 96aa77553..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/therm.dat
+++ /dev/null
@@ -1,2979 +0,0 @@
-THERMO ALL
-   300.000  1000.000  5000.000
-(CH2O)3            70590C   3H   6O   3     G  0300.00   4000.00  1500.00      1
- 0.01913678E+03 0.08578044E-01-0.08882060E-05-0.03574819E-08 0.06605143E-12    2
--0.06560876E+06-0.08432507E+03-0.04662286E+02 0.06091547E+00-0.04710536E-03    3
- 0.01968843E-06-0.03563271E-10-0.05665404E+06 0.04525265E+03                   4
-(CH3)2SICH2        61991H   8C   3SI  1     G  0300.00   2500.00  1500.00      1
- 0.01547852E+03 0.01065700E+00-0.01234345E-05-0.01293352E-07 0.02528715E-11    2
--0.06693076E+04-0.05358884E+03 0.02027522E+02 0.04408673E+00-0.03370024E-03    3
- 0.01484466E-06-0.02830898E-10 0.03931454E+05 0.01815821E+03                   4
-AL                 62987AL  1               G  0300.00   5000.00  0600.00      1
- 0.02559589E+02-0.01063224E-02 0.07202828E-06-0.02121105E-09 0.02289429E-13    2
- 0.03890214E+06 0.05234522E+02 0.02736825E+02-0.05912374E-02-0.04033938E-05    3
- 0.02322343E-07-0.01705599E-10 0.03886795E+06 0.04363880E+02                   4
-AL2H6              62987AL  2H   6          G  0300.00   1500.00  0600.00      1
- 0.02634884E+02 0.02135952E+00 0.03154151E-05-0.07684674E-07 0.02335832E-10    2
- 0.08871346E+05 0.09827515E+02-0.06800681E+02 0.05080744E+00 0.01039747E-03    3
--0.01119582E-05 0.08459155E-09 0.01060537E+06 0.05554526E+03                   4
-AL2ME6             62987AL  2C   6H  18     G  0300.00   1500.00  0600.00      1
- 0.01773147E+03 0.04935747E+00 0.01196854E-04-0.01639826E-06 0.04890867E-10    2
--0.03855560E+06-0.05053298E+03-0.07159750E+01 0.01067109E+01 0.02117605E-03    3
--0.02193212E-05 0.01644144E-08-0.03515546E+06 0.03890763E+03                   4
-ALAS               62987AL  1AS  1          G  0300.00   1500.00  0600.00      1
- 0.04790027E+02-0.01908226E-03-0.01983390E-05 0.02239358E-08-0.06904706E-12    2
- 0.05259290E+06 0.03259703E+02 0.05047764E+02-0.06419947E-02-0.01432071E-04    3
- 0.04754391E-07-0.03297621E-10 0.05254264E+06 0.01985206E+02                   4
-ALH                62987AL  1H   1          G  0300.00   5000.00  1000.00      1
- 0.03392644E+02 0.01215399E-01-0.04676595E-05 0.08691625E-09-0.06022669E-13    2
- 0.03006845E+06 0.02758899E+02 0.03071503E+02 0.02165549E-01-0.03275638E-04    3
- 0.04136984E-07-0.01877121E-10 0.03021221E+06 0.04548855E+02                   4
-ALH2               62987AL  1H   2          G  0300.00   1500.00  0600.00      1
- 0.04486543E+02 0.03128832E-01-0.01969438E-05-0.01016030E-07 0.03497468E-11    2
- 0.01960959E+06 0.08167897E+01 0.02442137E+02 0.09915913E-01 0.02471083E-05    3
--0.02119583E-06 0.01710234E-09 0.01997588E+06 0.01065270E+03                   4
-ALH3               62987AL  1H   3          G  0300.00   1500.00  0600.00      1
- 0.04186838E+02 0.06159249E-01-0.03877593E-06-0.02061928E-07 0.06600276E-11    2
- 0.07908079E+05 0.05134396E+01 0.01008323E+02 0.01640324E+00 0.01976746E-04    3
--0.03528558E-06 0.02753378E-09 0.08484656E+05 0.01585838E+03                   4
-ALME               62987AL  1C   1H   3     G  0300.00   1500.00  0600.00      1
- 0.04662737E+02 0.07097939E-01 0.02520013E-05-0.02114863E-07 0.06097489E-11    2
- 0.08203228E+05 0.01769245E+02 0.02664176E+02 0.01324914E+00 0.02525848E-04    3
--0.02394396E-06 0.01761855E-09 0.08574173E+05 0.01147449E+03                   4
-ALME2              62987AL  1C   2H   6     G  0300.00   1500.00  0600.00      1
- 0.06481282E+02 0.01474605E+00 0.05816529E-05-0.04621347E-07 0.01396041E-10    2
- 0.03745072E+05-0.02603326E+02 0.09494573E+01 0.03206354E+00 0.06134021E-04    3
--0.06500042E-06 0.04911485E-09 0.04761408E+05 0.02419465E+03                   4
-ALME3              62987AL  1C   3H   9     G  0300.00   1500.00  0600.00      1
- 0.06654948E+02 0.02455144E+00 0.01176575E-04-0.07815023E-07 0.02255622E-10    2
--0.01340952E+06-0.03454481E+02-0.07027567E+01 0.04682764E+00 0.01149903E-03    3
--0.09160441E-06 0.06687294E-09-0.01203799E+06 0.03232771E+03                   4
-AR                120186AR  1               G  0300.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.07453750E+04 0.04366001E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.07453750E+04 0.04366001E+02                   4
-AR+               121286AR  1E  -1          G  0300.00   5000.00  1000.00      1
- 0.02864864E+02-0.01203573E-02-0.01065199E-06 0.09074839E-10-0.09623876E-14    2
- 0.01827230E+07 0.03543585E+02 0.02301341E+02 0.08035529E-02-0.01758806E-05    3
--0.01781093E-08-0.08937268E-13 0.01829281E+07 0.06659358E+02                   4
-AS                 62987AS  1               G  0300.00   1500.00  0600.00      1
- 0.02617011E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.03720455E+06 0.06995524E+02 0.02617011E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.03720455E+06 0.06995524E+02                   4
-AS2                62987AS  2               G  0300.00   1500.00  0600.00      1
- 0.04394201E+02 0.05389968E-02-0.02379401E-05-0.06541924E-09 0.05184186E-12    2
- 0.02235094E+06 0.04897919E+02 0.03682892E+02 0.03121811E-01-0.01074052E-04    3
--0.05629472E-07 0.05178811E-10 0.02247356E+06 0.08283423E+02                   4
-AS3                62987AS  3               G  0300.00   1500.00  0600.00      1
- 0.07404036E+02 0.07818426E-02-0.03918297E-05-0.05203629E-09 0.06291907E-12    2
- 0.03063825E+06-0.03417324E+02 0.06403142E+02 0.04477099E-01-0.01866642E-04    3
--0.07394750E-07 0.07012753E-10 0.03080965E+06 0.01337136E+02                   4
-AS4                62987AS  4               G  0300.00   1500.00  0600.00      1
- 0.09695766E+02 0.01306258E-01-0.05519564E-05-0.02150874E-08 0.01457935E-11    2
- 0.01571732E+06-0.01618870E+03 0.07853761E+02 0.07916509E-01-0.02329820E-04    3
--0.01526312E-06 0.01377435E-09 0.01603629E+06-0.07409755E+02                   4
-ASALME             62987AS  1AL  1C   1H   3G  0300.00   1500.00  0600.00      1
- 0.07127107E+02 0.07357864E-01 0.02300796E-06-0.02226399E-07 0.06927227E-11    2
- 0.03273438E+06-0.01847179E+02 0.04053423E+02 0.01726125E+00 0.01833498E-04    3
--0.03386953E-06 0.02626981E-09 0.03329309E+06 0.01299665E+03                   4
-ASALME2            62987AS  1AL  1C   2H   6G  0300.00   1500.00  0600.00      1
- 0.09909938E+02 0.01463850E+00 0.04118731E-05-0.04444658E-07 0.01329501E-10    2
- 0.02815111E+06-0.01523531E+03 0.04808530E+02 0.03067687E+00 0.05048001E-04    3
--0.05908099E-06 0.04462290E-09 0.02908817E+06 0.09471621E+02                   4
-ASGAET             62987AS  1GA  1C   2H   5G  0300.00   1500.00  0600.00      1
- 0.09081073E+02 0.01674632E+00 0.01283130E-05-0.05590436E-07 0.01781315E-10    2
- 0.03807443E+06-0.09142782E+02 0.06364698E+01 0.04382467E+00 0.06144686E-04    3
--0.09491641E-06 0.07374198E-09 0.03960893E+06 0.03164673E+03                   4
-ASGAET2            62987AS  1GA  1C   4H  10G  0300.00   1500.00  0600.00      1
- 0.01032429E+03 0.03073571E+00 0.01086335E-04-0.09971949E-07 0.02945979E-10    2
- 0.03039490E+06-0.01316402E+03-0.03539248E+01 0.06369772E+00 0.01359742E-03    3
--0.01286142E-05 0.09572181E-09 0.03236903E+06 0.03865086E+03                   4
-ASGAME             62987AS  1GA  1C   1H   3G  0300.00   1500.00  0600.00      1
- 0.07322183E+02 0.06995479E-01 0.01069351E-05-0.01995283E-07 0.06040446E-11    2
- 0.03949449E+06-0.07416680E+01 0.04877266E+02 0.01482559E+00 0.01652124E-04    3
--0.02712058E-06 0.02080196E-09 0.03994071E+06 0.01107670E+03                   4
-ASGAME2            62987AS  1GA  1C   2H   6G  0300.00   1500.00  0600.00      1
- 0.09352436E+02 0.01504820E+00 0.05157975E-05-0.04553518E-07 0.01348763E-10    2
- 0.03735856E+06-0.01218114E+03 0.04382076E+02 0.03056345E+00 0.05477067E-04    3
--0.05834108E-06 0.04373509E-09 0.03827434E+06 0.01191111E+03                   4
-ASGAMEH            62987AS  1GA  1C   1H   4G  0300.00   1500.00  0600.00      1
- 0.07842794E+02 0.09682097E-01 0.01060306E-05-0.02991402E-07 0.09382673E-11    2
- 0.04435297E+06-0.05093455E+02 0.03585119E+02 0.02336317E+00 0.02873356E-04    3
--0.04737895E-06 0.03674461E-09 0.04512703E+06 0.01547160E+03                   4
-ASH                62987AS  1H   1          G  0300.00   1500.00  0600.00      1
- 0.03219848E+02 0.01001250E-01-0.04874997E-08-0.01107653E-08-0.09254321E-13    2
- 0.03008176E+06 0.06647311E+02 0.03865843E+02-0.01157571E-01-0.03494372E-05    3
- 0.07079686E-07-0.06014028E-10 0.02996829E+06 0.03549869E+02                   4
-ASH2               62987AS  1H   2          G  0300.00   1500.00  0600.00      1
- 0.03428307E+02 0.03181140E-01 0.01460484E-05-0.07937145E-08 0.01694414E-11    2
- 0.02010282E+06 0.02904703E+02 0.03778945E+02 0.01759233E-01 0.08070807E-05    3
- 0.02358763E-07-0.03043521E-10 0.02004862E+06 0.01272974E+02                   4
-ASH3               62987AS  1H   3          G  0300.00   1500.00  0600.00      1
- 0.04172022E+02 0.04371323E-01 0.02177574E-05-0.01183264E-07 0.04536374E-11    2
- 0.06882916E+05 0.02803477E+02 0.09446356E+01 0.01508469E+00 0.01201696E-04    3
--0.03397465E-06 0.02767656E-09 0.07459168E+05 0.01832268E+03                   4
-ASME               62987AS  1C   1H   3     G  0300.00   1500.00  0600.00      1
- 0.04657260E+02 0.06976298E-01 0.02147557E-05-0.02101159E-07 0.06082150E-11    2
- 0.02806423E+06 0.03409835E+02 0.02625270E+02 0.01325242E+00 0.02441628E-04    3
--0.02419567E-06 0.01786944E-09 0.02844080E+06 0.01327336E+03                   4
-ASME2              62987AS  1C   2H   6     G  0300.00   1500.00  0600.00      1
- 0.05981395E+02 0.01521284E+00 0.06993355E-05-0.04721619E-07 0.01369912E-10    2
- 0.01467985E+06 0.01192741E+02 0.01390400E+02 0.02923331E+00 0.06598871E-04    3
--0.05620560E-06 0.04130368E-09 0.01553302E+06 0.02349981E+03                   4
-ASME3              62987AS  1C   3H   9     G  0300.00   1500.00  0600.00      1
- 0.06347764E+02 0.02466454E+00 0.01154629E-04-0.07877436E-07 0.02202225E-10    2
--0.01617323E+05-0.06316786E+01 0.02667388E+01 0.04253171E+00 0.01165106E-03    3
--0.07914706E-06 0.05603127E-09-0.04685540E+04 0.02904591E+03                   4
-BE                 81392BE  1               G  0300.00   5000.00  1000.00      1
- 0.02380618E+02 0.02339856E-02-0.01453949E-05 0.03111727E-09-0.01072959E-13    2
- 0.03868083E+06 0.02787792E+02 0.02403493E+02 0.06166087E-02-0.01321925E-04    3
- 0.01144806E-07-0.03437304E-11 0.03864894E+06 0.02549853E+02                   4
-BE(S)              81392BE  1               S  0300.00   3000.00  1000.00      1
- 0.01898768E+02 0.01629382E-01-0.03547406E-05 0.01247349E-08-0.01578507E-12    2
--0.06527011E+04-0.01020412E+03-0.09092963E+01 0.01585668E+00-0.02624182E-03    3
- 0.02044924E-06-0.05872448E-10-0.02390556E+04 0.02598871E+02                   4
-BE2SIO4(S)         81392BE  2O   4SI  1     S  0300.00   3000.00  1000.00      1
- 0.01695617E+03 0.06266472E-01-0.02841325E-04 0.06379149E-08-0.04780890E-12    2
--0.02614324E+07-0.09398438E+03-0.06380159E+02 0.09333352E+00-0.01415477E-02    3
- 0.01101948E-05-0.03462902E-09-0.02558671E+07 0.02162977E+03                   4
-BE3B2O6(S)         81392B   2BE  3O   6     S  0300.00   3000.00  1000.00      1
- 0.02640267E+03 0.01142674E+00-0.03773479E-04 0.04332047E-08 0.02356543E-12    2
--0.03849576E+07-0.01487137E+04-0.05230657E+02 0.01105769E+01-0.01614054E-02    3
- 0.01447797E-05-0.05420786E-09-0.03755957E+07 0.01490974E+03                   4
-BE3N2(A)           81392BE  3N   2          S  0300.00   3000.00  1000.00      1
- 0.01097008E+03 0.06416846E-01-0.02938928E-04 0.04564651E-08-0.05509703E-13    2
--0.07519767E+06-0.06231286E+03-0.08167547E+02 0.08515091E+00-0.01355569E-02    3
- 0.01060406E-05-0.03256815E-09-0.07110460E+06 0.03040606E+03                   4
-BE3N2(L)           81392BE  3N   2          L  0300.00   4000.00  1000.00      1
- 0.01610468E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.06338252E+06-0.08701469E+03 0.01610468E+03 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.06338252E+06-0.08701468E+03                   4
-BEAL2O4(S)         81392AL  2BE  1O   4     S  0300.00   2400.00  1000.00      1
- 0.01118219E+03 0.01677777E+00-0.06692989E-04-0.01497360E-07 0.01203700E-10    2
--0.02810337E+07-0.06116527E+03-0.07257604E+02 0.01074554E+01-0.01713422E-02    3
- 0.01295274E-05-0.03740965E-09-0.02780832E+07 0.02383770E+03                   4
-BEB2O4             81392B   2BE  1O   4     G  0300.00   5000.00  1000.00      1
- 0.01266018E+03 0.06883210E-01-0.02963169E-04 0.05694789E-08-0.04050458E-12    2
--0.01672990E+07-0.03636876E+03 0.04012008E+02 0.03052847E+00-0.02571938E-03    3
- 0.09738810E-07-0.01450712E-10-0.01648983E+07 0.08399628E+02                   4
-BEBO2              81392B   1BE  1O   2     G  0300.00   5000.00  1000.00      1
- 0.06831273E+02 0.03424464E-01-0.01471236E-04 0.02825118E-08-0.02008790E-12    2
--0.06047559E+06-0.08730609E+02 0.02426203E+02 0.01572415E+00-0.01309160E-03    3
- 0.04244447E-07-0.02562806E-11-0.05929016E+06 0.01394744E+03                   4
-BEBR               81392BE  1BR  1          G  0300.00   5000.00  1000.00      1
- 0.04166357E+02 0.04424462E-02-0.01713095E-05 0.03185381E-09-0.01964221E-13    2
- 0.01313080E+06 0.03473875E+02 0.03178756E+02 0.03144181E-01-0.01989189E-04    3
--0.04871910E-08 0.06208255E-11 0.01337870E+06 0.08520506E+02                   4
-BEBR2              81392BE  1BR  2          G  0300.00   5000.00  1000.00      1
- 0.06814040E+02 0.07848450E-02-0.03497501E-05 0.06885841E-09-0.04984129E-13    2
--0.02974764E+06-0.06362110E+02 0.05216331E+02 0.05128972E-01-0.03678726E-04    3
- 0.08525872E-09 0.05611721E-11-0.02932967E+06 0.01847829E+02                   4
-BEBR2(S)           81392BE  1BR  2          S  0300.00   1500.00  1000.00      1
- 0.07680161E+02 0.03193456E-01-0.02439097E-05-0.09487536E-08 0.03902210E-11    2
--0.04528092E+06-0.03282152E+03 0.05659917E+02 0.08805599E-01-0.02790316E-04    3
--0.04611400E-07 0.03007373E-10-0.04482571E+06-0.02263852E+03                   4
-BECL               81392BE  1CL  1          G  0300.00   5000.00  1000.00      1
- 0.04072243E+02 0.05328307E-02-0.02146892E-05 0.04097687E-09-0.02774848E-13    2
- 0.05990792E+05 0.02639872E+02 0.03006275E+02 0.03385550E-01-0.02274674E-04    3
--0.01333438E-08 0.04447782E-11 0.06271131E+05 0.08126810E+02                   4
-BECL2              81392BE  1CL  2          G  0300.00   5000.00  1000.00      1
- 0.06656109E+02 0.09583935E-02-0.04248637E-05 0.08333911E-09-0.06016211E-13    2
--0.04547842E+06-0.08159565E+02 0.04835084E+02 0.05899051E-01-0.04307799E-04    3
- 0.03113267E-08 0.05292957E-11-0.04499748E+06 0.01210616E+02                   4
-BECL2(A)           81392BE  1CL  2          S  0300.00   1500.00  1000.00      1
- 0.08380054E+02 0.02572312E-01-0.07554892E-05-0.02368242E-08 0.01042547E-11    2
--0.06177281E+06-0.03886076E+03 0.08074927E+01 0.03830225E+00-0.06255340E-03    3
- 0.04645940E-06-0.01295143E-09-0.06052883E+06-0.03683825E+02                   4
-BECL2(B)           81392BE  1CL  2          S  0300.00   1500.00  1000.00      1
- 0.07791771E+02 0.02945389E-01-0.04237093E-05-0.05339604E-08 0.01505044E-11    2
--0.06231958E+06-0.03656698E+03 0.03004424E+02 0.02353211E+00-0.03553037E-03    3
- 0.02706855E-06-0.08144728E-10-0.06136495E+06-0.01365758E+03                   4
-BECLF              81392BE  1CL  1F   1     G  0300.00   5000.00  1000.00      1
- 0.06393787E+02 0.01234948E-01-0.05412476E-05 0.01053150E-08-0.07557553E-13    2
--0.07104831E+06-0.07478512E+02 0.04405415E+02 0.06642228E-01-0.05154354E-04    3
- 0.01063175E-07 0.02287810E-11-0.07051262E+06 0.02777586E+02                   4
-BEF                81392BE  1F   1          G  0300.00   5000.00  1000.00      1
- 0.03741370E+02 0.08524818E-02-0.03436428E-05 0.06466099E-09-0.04475089E-13    2
--0.02167667E+06 0.02968223E+02 0.02905108E+02 0.02952099E-01-0.02747617E-04    3
- 0.01918800E-07-0.07179964E-11-0.02140972E+06 0.07407617E+02                   4
-BEF2               81392BE  1F   2          G  0300.00   5000.00  1000.00      1
- 0.06008875E+02 0.01636431E-01-0.07094651E-05 0.01370220E-08-0.09780462E-13    2
--0.09777056E+06-0.07723693E+02 0.03801759E+02 0.07737988E-01-0.06427724E-04    3
- 0.02097328E-07-0.01462695E-11-0.09717092E+06 0.03660784E+02                   4
-BEF2(L)            81392BE  1F   2          L  0300.00   2000.00  1000.00      1
- 0.05976585E+02 0.04777009E-01-0.05064131E-05 0.05012404E-09 0.08570416E-13    2
--0.01251277E+07-0.02873833E+03-0.05587355E+01 0.03423905E+00-0.05210078E-03    3
- 0.04099400E-06-0.01226767E-09-0.01239060E+07 0.02162308E+02                   4
-BEH                81392BE  1H   1          G  0300.00   5000.00  1000.00      1
- 0.03103757E+02 0.01443026E-01-0.05486383E-05 0.09992518E-09-0.06823073E-13    2
- 0.03762032E+06 0.03113887E+02 0.03220220E+02 0.01660638E-01-0.03759811E-04    3
- 0.05403578E-07-0.02433378E-10 0.03762484E+06 0.02536116E+02                   4
-BEH+               81392BE  1H   1E  -1     G  0300.00   5000.00  1000.00      1
- 0.02935026E+02 0.01642881E-01-0.06606950E-05 0.01253854E-08-0.08322438E-13    2
- 0.01381605E+07 0.03342443E+02 0.03203174E+02 0.01918095E-01-0.04743515E-04    3
- 0.06392785E-07-0.02736265E-10 0.01380944E+07 0.01849186E+02                   4
-BEH2               81392BE  1H   2          G  0300.00   5000.00  1000.00      1
- 0.03274395E+02 0.04312822E-01-0.01774785E-04 0.03298131E-08-0.02286391E-12    2
- 0.01367913E+06 0.03758700E+01 0.01761472E+02 0.08827701E-01-0.01241923E-03    3
- 0.01412574E-06-0.06176309E-10 0.01426447E+06 0.08573833E+02                   4
-BEH2O2             81392BE  1H   2O   2     G  0300.00   5000.00  1000.00      1
- 0.07694718E+02 0.04893975E-01-0.01780895E-04 0.03055611E-08-0.02009121E-12    2
--0.08403520E+06-0.01751820E+03 0.03118833E+02 0.01997183E+00-0.01673101E-03    3
- 0.03275766E-07 0.01457848E-10-0.08305301E+06 0.05128545E+02                   4
-BEH2O2(A)          81392BE  1H   2O   2     S  0300.00   1000.00  1000.00      1
- 0.01357669E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01138925E+07-0.07369071E+03-0.07121292E+02 0.08378375E+00-0.01435144E-02    3
- 0.01164084E-05-0.03597983E-09-0.01091544E+07 0.02745148E+03                   4
-BEH2O2(B)          81392BE  1H   2O   2     S  0300.00   1000.00  1000.00      1
- 0.01357669E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01142447E+07-0.07409333E+03-0.07121292E+02 0.08378375E+00-0.01435144E-02    3
- 0.01164084E-05-0.03597983E-09-0.01095066E+07 0.02704887E+03                   4
-BEI                81392BE  1I   1          G  0300.00   5000.00  1000.00      1
- 0.04226574E+02 0.03948427E-02-0.01549696E-05 0.03023851E-09-0.01932301E-13    2
- 0.01912832E+06 0.04229493E+02 0.03358791E+02 0.02864276E-01-0.01889889E-04    3
--0.04370942E-08 0.05986692E-11 0.01933641E+06 0.08627578E+02                   4
-BEI2               81392BE  1I   2          G  0300.00   5000.00  1000.00      1
- 0.06974217E+02 0.06094573E-02-0.02739783E-05 0.05428767E-09-0.03948833E-13    2
--0.09890086E+05-0.05063732E+02 0.05564008E+02 0.04472664E-01-0.03090745E-04    3
--0.02609722E-08 0.06750777E-11-0.09529549E+05 0.02158152E+02                   4
-BEI2(S)            81392BE  1I   2          S  0300.00   1500.00  1000.00      1
- 0.08868316E+02 0.02591978E-01-0.07796846E-05-0.02236952E-08 0.01016032E-11    2
--0.02556556E+06-0.03709859E+03 0.01301872E+02 0.03830115E+00-0.06255080E-03    3
- 0.04645675E-06-0.01295046E-09-0.02432303E+06-0.01952190E+02                   4
-BEN                81392BE  1N   1          G  0300.00   5000.00  1000.00      1
- 0.03799137E+02 0.08135072E-02-0.03271826E-05 0.06267597E-09-0.04443547E-13    2
- 0.05006582E+06 0.03013958E+02 0.02880282E+02 0.03157848E-01-0.02749300E-04    3
- 0.01549304E-07-0.04944407E-11 0.05034622E+06 0.07854857E+02                   4
-BEO(A)             81392BE  1O   1          S  0300.00   3500.00  1000.00      1
- 0.04606101E+02 0.01465013E-01-0.09316989E-06-0.08839902E-09 0.01840163E-12    2
--0.07492927E+06-0.02579358E+03-0.01187545E+01 0.01231168E+00-0.02298405E-04    3
--0.09318502E-07 0.05331928E-10-0.07364786E+06-0.01151163E+02                   4
-BEO(B)             81392BE  1O   1          S  0300.00   3500.00  1000.00      1
- 0.04606101E+02 0.01465013E-01-0.09316989E-06-0.08839902E-09 0.01840163E-12    2
--0.07412403E+06-0.02545418E+03-0.01187545E+01 0.01231168E+00-0.02298405E-04    3
--0.09318502E-07 0.05331928E-10-0.07284262E+06-0.08117651E+01                   4
-BEOH               81392BE  1H   1O   1     G  0300.00   5000.00  1000.00      1
- 0.04580703E+02 0.02444079E-01-0.08794693E-05 0.01484750E-08-0.09530468E-13    2
--0.01534682E+06-0.01819725E+02 0.02577868E+02 0.08977628E-01-0.07867956E-04    3
- 0.02536139E-07 0.06057864E-12-0.01489220E+06 0.08162645E+02                   4
-BES(S)             81392BE  1S   1          S  0300.00   3000.00  1000.00      1
- 0.04944107E+02 0.03098929E-01-0.01308985E-04 0.02564670E-08-0.01377673E-12    2
--0.03004408E+06-0.02521191E+03-0.03045166E+02 0.03934537E+00-0.06572406E-03    3
- 0.05230436E-06-0.01590377E-09-0.02854032E+06 0.01256033E+03                   4
-BESO4(A)           81392BE  1O   4S   1     S  0300.00   2300.00  1000.00      1
- 0.02081235E+01 0.03035540E+00-0.07769396E-04-0.02942517E-07 0.01112249E-10    2
--0.01455278E+07 0.02609183E+01-0.08960041E+02 0.01179726E+01-0.02438390E-02    3
- 0.02430177E-05-0.08722741E-09-0.01453005E+07 0.03410812E+03                   4
-BESO4(B)           81392BE  1O   4S   1     S  0300.00   2300.00  1000.00      1
- 0.02081235E+01 0.03035540E+00-0.07769396E-04-0.02942517E-07 0.01112249E-10    2
--0.01453939E+07 0.04157230E+01-0.08960041E+02 0.01179726E+01-0.02438390E-02    3
- 0.02430177E-05-0.08722741E-09-0.01451667E+07 0.03426292E+03                   4
-BESO4(GAM)         81392BE  1O   4S   1     S  0300.00   2300.00  1000.00      1
- 0.02081235E+01 0.03035540E+00-0.07769396E-04-0.02942517E-07 0.01112249E-10    2
--0.01430422E+07 0.03005051E+02-0.08960041E+02 0.01179726E+01-0.02438390E-02    3
- 0.02430177E-05-0.08722741E-09-0.01428148E+07 0.03685225E+03                   4
-C                 121086C   1               G  0300.00   5000.00  1000.00      1
- 0.02602087E+02-0.01787081E-02 0.09087041E-06-0.01149933E-09 0.03310844E-14    2
- 0.08542154E+06 0.04195177E+02 0.02498585E+02 0.08085777E-03-0.02697697E-05    3
- 0.03040729E-08-0.01106652E-11 0.08545878E+06 0.04753459E+02                   4
-C(S)              121286C   1               S  0300.00   5000.00  1000.00      1
- 0.01490166E+02 0.01662126E-01-0.06687204E-05 0.01290880E-08-0.09205334E-13    2
--0.07074019E+04-0.08717785E+02-0.06705661E+01 0.07181500E-01-0.05632921E-04    3
- 0.02142299E-07-0.04168562E-11-0.07339498E+03 0.02601596E+02                   4
-C+                120186C   1E  -1          G  0300.00   5000.00  1000.00      1
- 0.02511827E+02-0.01735978E-03 0.09504268E-07-0.02218852E-10 0.01862189E-14    2
- 0.02166772E+07 0.04286130E+02 0.02595384E+02-0.04068665E-02 0.06892367E-05    3
--0.05266488E-08 0.01508338E-11 0.02166628E+07 0.03895730E+02                   4
-C-                121686C   1E   1          G  0300.00   5000.00  1000.00      1
- 0.02990221E+02-0.09184596E-02 0.05055560E-05-0.07703410E-09 0.03163271E-13    2
- 0.06983931E+06 0.01259453E+02 0.02783903E+02-0.01774288E-01 0.03696761E-04    3
--0.03066693E-07 0.08637622E-11 0.06998511E+06 0.02726281E+02                   4
-C2                121286C   2               G  0300.00   5000.00  1000.00      1
- 0.04135979E+02 0.06531618E-03 0.01837099E-05-0.05295085E-09 0.04712137E-13    2
- 0.09967272E+06 0.07472923E+01 0.06996045E+02-0.07400602E-01 0.03234704E-04    3
- 0.04802535E-07-0.03295918E-10 0.09897487E+06-0.01386227E+03                   4
-C2-               121286C   2E   1          G  0300.00   5000.00  1000.00      1
- 0.03796891E+02 0.02530050E-02 0.09709118E-06-0.01614804E-09-0.03212893E-15    2
- 0.05207981E+06 0.01658147E+02 0.03468012E+02-0.02352875E-02 0.01243912E-04    3
- 0.04705961E-08-0.08164274E-11 0.05231215E+06 0.03886699E+02                   4
-C2CL3              40992C   2CL  3          G  0300.00   4000.00  1500.00      1
- 0.01183853E+03 0.09460851E-02-0.02920870E-05 0.03847024E-09-0.01539560E-13    2
- 0.02313143E+06-0.02891445E+03 0.04808647E+02 0.02212948E+00-0.02548847E-03    3
- 0.01372083E-06-0.02812663E-10 0.02514353E+06 0.07232629E+02                   4
-C2CL5              40992C   2CL  5          G  0300.00   4000.00  1500.00      1
- 0.01775107E+03 0.09220800E-02-0.04852694E-05 0.01190373E-08-0.01100446E-12    2
--0.02402768E+05-0.05545676E+03 0.06414346E+02 0.03867367E+00-0.04857935E-03    3
- 0.02734513E-06-0.05732891E-10 0.04697039E+04 0.01542036E+02                   4
-C2CL6              40992C   2CL  6          G  0300.00   4000.00  1500.00      1
- 0.02021422E+03 0.01757648E-01-0.05881040E-05 0.08029739E-09-0.03958238E-13    2
--0.02340156E+06-0.07096011E+03 0.07492710E+02 0.04318468E+00-0.05275048E-03    3
- 0.02947143E-06-0.06176554E-10-0.02006555E+06-0.06635582E+02                   4
-C2F6               82489C   2F   6          G  0300.00   5000.00  1000.00      1
- 0.01602057E+03 0.06273007E-01-0.02797778E-04 0.05517547E-08-0.04004651E-12    2
--0.01675654E+07-0.05519459E+03 0.03577448E+02 0.03913670E+00-0.02714862E-03    3
- 0.04348459E-08 0.04007135E-10-0.01642174E+07 0.09098384E+02                   4
-C2H                81193C   2H   1          G  0300.00   4000.00  1000.00      1
- 0.03986367E+02 0.03143123E-01-0.01267243E-04 0.02924363E-08-0.02716320E-12    2
- 0.06655884E+06 0.01191063E+02 0.02737704E+02 0.08048446E-01-0.09244310E-04    3
- 0.06525259E-07-0.01939580E-10 0.06683813E+06 0.07300220E+02                   4
-C2H2              121386C   2H   2          G  0300.00   5000.00  1000.00      1
- 0.04436770E+02 0.05376039E-01-0.01912817E-04 0.03286379E-08-0.02156710E-12    2
- 0.02566766E+06-0.02800338E+02 0.02013562E+02 0.01519045E+00-0.01616319E-03    3
- 0.09078992E-07-0.01912746E-10 0.02612444E+06 0.08805378E+02                   4
-C2H3               12787C   2H   3          G  0300.00   5000.00  1000.00      1
- 0.05933468E+02 0.04017746E-01-0.03966740E-05-0.01441267E-08 0.02378644E-12    2
- 0.03185435E+06-0.08530313E+02 0.02459276E+02 0.07371476E-01 0.02109873E-04    3
--0.01321642E-07-0.01184784E-10 0.03335225E+06 0.01155620E+03                   4
-C2H4              121286C   2H   4          G  0300.00   5000.00  1000.00      1
- 0.03528419E+02 0.01148518E+00-0.04418385E-04 0.07844601E-08-0.05266848E-12    2
- 0.04428289E+05 0.02230389E+02-0.08614880E+01 0.02796163E+00-0.03388677E-03    3
- 0.02785152E-06-0.09737879E-10 0.05573046E+05 0.02421149E+03                   4
-C2H5               12387C   2H   5          G  0300.00   5000.00  1000.00      1
- 0.07190480E+02 0.06484077E-01-0.06428065E-05-0.02347879E-08 0.03880877E-12    2
- 0.01067455E+06-0.01478089E+03 0.02690702E+02 0.08719133E-01 0.04419839E-04    3
- 0.09338703E-08-0.03927773E-10 0.01287040E+06 0.01213820E+03                   4
-C2H6              121686C   2H   6          G  0300.00   4000.00  1000.00      1
- 0.04825938E+02 0.01384043E+00-0.04557259E-04 0.06724967E-08-0.03598161E-12    2
--0.01271779E+06-0.05239507E+02 0.01462539E+02 0.01549467E+00 0.05780507E-04    3
--0.01257832E-06 0.04586267E-10-0.01123918E+06 0.01443229E+03                   4
-C2HCL             112989C   2H   1CL  1     G  0300.00   5000.00  1000.00      1
- 0.06295372E+02 0.03883113E-01-0.01506049E-04 0.02700003E-08-0.01830213E-12    2
- 0.02357279E+06-0.08137063E+02 0.03618443E+02 0.01331979E+00-0.01321822E-03    3
- 0.06092024E-07-0.08879026E-11 0.02415385E+06 0.05050645E+02                   4
-C2HCL5             40992H   1C   2CL  5     G  0300.00   4000.00  1500.00      1
- 0.01897802E+03 0.02244275E-01-0.05864788E-05 0.02733950E-09 0.04934135E-13    2
--0.02494887E+06-0.06578714E+03 0.05356044E+02 0.04176390E+00-0.04710787E-03    3
- 0.02550758E-06-0.05324478E-10-0.02079330E+06 0.04970258E+02                   4
-C2N               121286C   2N   1          G  0300.00   5000.00  1000.00      1
- 0.06151561E+02 0.01511650E-01-0.06629362E-05 0.01286148E-08-0.09160830E-13    2
- 0.06484318E+06-0.08177850E+02 0.03498544E+02 0.08554433E-01-0.06288697E-04    3
- 0.08638478E-08 0.04915996E-11 0.06556611E+06 0.05548374E+02                   4
-C2N2              121286C   2N   2          G  0300.00   5000.00  1000.00      1
- 0.06548003E+02 0.03984707E-01-0.01634216E-04 0.03038597E-08-0.02111069E-12    2
- 0.03490716E+06-0.09735790E+02 0.04265459E+02 0.01192257E+00-0.01342014E-03    3
- 0.09192297E-07-0.02778942E-10 0.03547888E+06 0.01713212E+02                   4
-C2O               121286C   2O   1          G  0300.00   5000.00  1000.00      1
- 0.04849809E+02 0.02947585E-01-0.01090729E-04 0.01792562E-08-0.01115758E-12    2
- 0.03282055E+06-0.06453226E+01 0.03368851E+02 0.08241803E-01-0.08765145E-04    3
- 0.05569262E-07-0.01540009E-10 0.03317081E+06 0.06713314E+02                   4
-C3                121286C   3               G  0300.00   5000.00  1000.00      1
- 0.03803710E+02 0.02253567E-01-0.07704535E-05 0.01316294E-08-0.08694264E-13    2
- 0.09736135E+06 0.06128063E+02 0.04345528E+02 0.01264466E-01-0.04652557E-04    3
- 0.08695856E-07-0.04243536E-10 0.09731403E+06 0.03519437E+02                   4
-C3H2              102193H   2C   3          G  0150.00   4000.00  1000.00      1
- 0.07670981E+02 0.02748749E-01-0.04370943E-05-0.06455599E-09 0.01663887E-12    2
- 0.06259722E+06-0.01236890E+03 0.03166714E+02 0.02482572E+00-0.04591637E-03    3
- 0.04268019E-06-0.01482152E-09 0.06350421E+06 0.08869446E+02                   4
-C3H2(S)           101993H   2C   3          G  0300.00   4000.00  1400.00      1
- 0.08351312E+02 0.02672278E-01-0.02129404E-05-0.01478218E-08 0.02583689E-12    2
- 0.06800690E+06-0.01950884E+03 0.04749475E+02 0.08520229E-01-0.01160268E-04    3
--0.02494954E-07 0.09921004E-11 0.06939979E+06 0.05437792E+01                   4
-C3H4              101993H   4C   3          G  0300.00   4000.00  1400.00      1
- 0.09776256E+02 0.05302138E-01-0.03701118E-05-0.03026386E-08 0.05089581E-12    2
- 0.01954972E+06-0.03077061E+03 0.02539831E+02 0.01633437E+00-0.01764950E-04    3
--0.04647365E-07 0.01729131E-10 0.02251243E+06 0.09935702E+02                   4
-C3H4C             101993H   4C   3          G  0300.00   4000.00  1400.00      1
- 0.09708652E+02 0.05344939E-01-0.03953553E-05-0.03111764E-08 0.05369406E-12    2
- 0.02967722E+06-0.03073273E+03 0.01056162E+02 0.01905236E+00-0.02317048E-04    3
--0.05933690E-07 0.02307128E-10 0.03309110E+06 0.01761927E+03                   4
-C3H4P             101993H   4C   3          G  0300.00   4000.00  1400.00      1
- 0.09768102E+02 0.05219151E-01-0.03753140E-05-0.02992191E-08 0.05107878E-12    2
- 0.01860277E+06-0.03020678E+03 0.03029730E+02 0.01498961E+00-0.01398500E-04    3
--0.03969619E-07 0.01388217E-10 0.02148408E+06 0.08004594E+02                   4
-C3H6              120186C   3H   6          G  0300.00   5000.00  1000.00      1
- 0.06732257E+02 0.01490834E+00-0.04949899E-04 0.07212022E-08-0.03766204E-12    2
--0.09235703E+04-0.01331335E+03 0.01493307E+02 0.02092518E+00 0.04486794E-04    3
--0.01668912E-06 0.07158146E-10 0.01074826E+05 0.01614534E+03                   4
-C3H8              120186C   3H   8          G  0300.00   5000.00  1000.00      1
- 0.07525217E+02 0.01889034E+00-0.06283924E-04 0.09179373E-08-0.04812410E-12    2
--0.01646455E+06-0.01784390E+03 0.08969208E+01 0.02668986E+00 0.05431425E-04    3
--0.02126001E-06 0.09243330E-10-0.01395492E+06 0.01935533E+03                   4
-C3O2              121286C   3O   2          G  0300.00   5000.00  1000.00      1
- 0.08098897E+02 0.05560040E-01-0.02312265E-04 0.04340709E-08-0.03036387E-12    2
--0.01421435E+06-0.01521974E+03 0.04018127E+02 0.01836661E+00-0.01907148E-03    3
- 0.01185587E-06-0.03418748E-10-0.01312824E+06 0.05582084E+02                   4
-C4                121286C   4               G  0300.00   5000.00  1000.00      1
- 0.06500180E+02 0.04228632E-01-0.01790718E-04 0.03404813E-08-0.02403978E-12    2
- 0.01143401E+07-0.01148889E+03 0.02343028E+02 0.01642981E+00-0.01527986E-03    3
- 0.07343826E-07-0.01582274E-10 0.01154538E+07 0.09826204E+02                   4
-C4H               121686C   4H   1          G  0300.00   5000.00  1000.00      1
- 0.06242882E+02 0.06193683E-01-0.02085932E-04 0.03082203E-08-0.01636483E-12    2
- 0.07568019E+06-0.07210806E+02 0.05023247E+02 0.07092375E-01-0.06073762E-07    3
--0.02275752E-07 0.08086994E-11 0.07623813E+06-0.06942594E+00                   4
-C4H10              62090C   4H  10          G  0300.00   4000.00  1500.00      1
- 0.01998785E+03 0.01037281E+00-0.09610818E-05-0.04623018E-08 0.08202828E-12    2
--0.02625571E+06-0.08837907E+03-0.02256618E+02 0.05881732E+00-0.04525783E-03    3
- 0.02037115E-06-0.04079458E-10-0.01760233E+06 0.03329595E+03                   4
-C4H2              121686C   4H   2          G  0300.00   5000.00  1000.00      1
- 0.09031407E+02 0.06047253E-01-0.01948789E-04 0.02754863E-08-0.01385608E-12    2
- 0.05294736E+06-0.02385068E+03 0.04005192E+02 0.01981000E+00-0.09865877E-04    3
--0.06635158E-07 0.06077413E-10 0.05424065E+06 0.01845737E+02                   4
-C4H6              120186C   4H   6          G  0300.00   5000.00  1000.00      1
- 0.08046583E+02 0.01648525E+00-0.05522227E-04 0.08123593E-08-0.04295078E-12    2
- 0.01370130E+06-0.01800458E+03 0.03197108E+02 0.02025592E+00 0.06510192E-04    3
--0.01658442E-06 0.06400282E-10 0.01571520E+06 0.09895660E+02                   4
-C4H8              120386C   4H   8          G  0300.00   5000.00  1000.00      1
- 0.02053584E+02 0.03435051E+00-0.01588320E-03 0.03308966E-07-0.02536104E-11    2
--0.02139723E+05 0.01554320E+03 0.01181138E+02 0.03085338E+00 0.05086525E-04    3
--0.02465489E-06 0.01111019E-09-0.01790400E+05 0.02106247E+03                   4
-C5                121286C   5               G  0300.00   5000.00  1000.00      1
- 0.08078081E+02 0.05743464E-01-0.02436405E-04 0.04638916E-08-0.03278910E-12    2
- 0.01147022E+07-0.01953024E+03 0.02115274E+02 0.02326332E+00-0.02109499E-03    3
- 0.09072734E-07-0.01540093E-10 0.01162738E+07 0.01097603E+03                   4
-C5H                20387C   5H   1          G  0300.00   5000.00  1000.00      1
- 0.08695749E+02 0.06054301E-01-0.02016011E-04 0.02892893E-08-0.01470100E-12    2
- 0.09031069E+06-0.02101595E+03 0.01634825E+02 0.02509538E+00-0.01206636E-03    3
--0.01046511E-06 0.08809988E-10 0.09212488E+06 0.01512194E+03                   4
-C5H12              20387C   5H  12          G  0300.00   4000.00  1000.00      1
- 0.01667798E+03 0.02114483E+00-0.03533321E-04-0.05742202E-08 0.01515948E-11    2
--0.02553670E+06-0.06372940E+03 0.01877908E+02 0.04121646E+00 0.01253234E-03    3
--0.03701537E-06 0.01525569E-09-0.02003816E+06 0.01877257E+03                   4
-C5H2               20587C   5H   2          G  0300.00   5000.00  1000.00      1
- 0.01132917E+03 0.07424057E-01-0.02628189E-04 0.04082541E-08-0.02301333E-12    2
- 0.07878706E+06-0.03617117E+03 0.03062322E+02 0.02709998E+00-0.01009170E-03    3
--0.01272745E-06 0.09167219E-10 0.08114969E+06 0.07071078E+02                   4
-C5H5              101993H   5C   5          G  0300.00   4000.00  1400.00      1
- 0.01531094E+03 0.07473806E-01-0.05837458E-05-0.04386651E-08 0.07696839E-12    2
- 0.02525890E+06-0.05951593E+03 0.01007316E+02 0.03189880E+00-0.04748189E-04    3
--0.01102390E-06 0.04584681E-10 0.03047390E+06 0.01934168E+03                   4
-C5H6               20387C   5H   6          G  0300.00   5000.00  1000.00      1
- 0.09689815E+02 0.01838262E+00-0.06264884E-04 0.09393377E-08-0.05087708E-12    2
- 0.01102124E+06-0.03122908E+03-0.03196739E+02 0.04081361E+00 0.06816505E-05    3
--0.03137459E-06 0.01577223E-09 0.01529068E+06 0.03869939E+03                   4
-C6H               121686C   6H   1          G  0300.00   5000.00  1000.00      1
- 0.01158735E+03 0.07295363E-01-0.02466008E-04 0.03407046E-08-0.01498185E-12    2
- 0.01031448E+07-0.03172578E+03 0.04769848E+02 0.02457279E+00-0.07561252E-04    3
--0.01480691E-06 0.09768054E-10 0.01048523E+07 0.03241530E+02                   4
-C6H10              20387C   6H  10          G  0300.00   5000.00  1000.00      1
- 0.01592777E+03 0.02374413E+00-0.06908672E-04 0.08109777E-08-0.02683123E-12    2
--0.08642656E+05-0.06525186E+03-0.01394228E+02 0.04720693E+00 0.01196042E-03    3
--0.04162896E-06 0.01740336E-09-0.02217790E+05 0.03129604E+03                   4
-C6H14              20387C   6H  14          G  0300.00   4000.00  1000.00      1
- 0.02280472E+03 0.02097989E+00-0.03530674E-04-0.05466245E-08 0.01478950E-11    2
--0.03073757E+06-0.09583162E+03 0.01836174E+02 0.05098461E+00 0.01259586E-03    3
--0.04428362E-06 0.01872237E-09-0.02292750E+06 0.02088145E+03                   4
-C6H2              121686C   6H   2          G  0300.00   5000.00  1000.00      1
- 0.01275652E+03 0.08034381E-01-0.02618215E-04 0.03725060E-08-0.01878851E-12    2
- 0.08075469E+06-0.04041263E+03 0.05751085E+02 0.02636720E+00-0.01166760E-03    3
--0.01071450E-06 0.08790297E-10 0.08262013E+06-0.04335532E+02                   4
-C6H3               20387C   6H   3          G  0300.00   5000.00  1000.00      1
- 0.01276118E+03 0.01038557E+00-0.03479193E-04 0.05109733E-08-0.02690965E-12    2
- 0.07477706E+06-0.03891745E+03 0.05007090E+02 0.02692852E+00-0.05919866E-04    3
--0.01527233E-06 0.09408310E-10 0.07713200E+06 0.02225621E+02                   4
-C6H4              111293H   4C   6          G  0300.00   4000.00  1000.00      1
- 0.01401625E+03 0.08242769E-01-0.08099664E-05-0.04654132E-08 0.08748122E-12    2
- 0.04410396E+06-0.05139376E+03 0.01520024E+02 0.02876611E+00 0.01417725E-04    3
--0.01650589E-06 0.05873157E-10 0.04844894E+06 0.01719034E+03                   4
-C6H5               82489C   6H   5          G  0300.00   4000.00  1000.00      1
- 0.01577589E+03 0.09651109E-01-0.09429416E-05-0.05469111E-08 0.01026522E-11    2
- 0.03302698E+06-0.06176280E+03 0.01143557E+01 0.03627325E+00 0.01158286E-04    3
--0.02196965E-06 0.08463556E-10 0.03836054E+06 0.02380117E+03                   4
-C6H5(L)            82489C   6H   5          G  0300.00   4000.00  1000.00      1
- 0.01721540E+03 0.08621068E-01-0.08221340E-05-0.04752164E-08 0.08844086E-12    2
- 0.06385819E+06-0.06139128E+03 0.04854269E+02 0.03031659E+00 0.01742893E-05    3
--0.01811010E-06 0.07392511E-10 0.06798734E+06 0.05854935E+02                   4
-C6H5O              82489C   6H   5O   1     G  0300.00   4000.00  1000.00      1
- 0.01822639E+03 0.01003985E+00-0.09915668E-05-0.05672804E-08 0.01068372E-11    2
--0.02620846E+05-0.07361391E+03 0.01107497E+02 0.03956946E+00 0.08497295E-05    3
--0.02436311E-06 0.09650660E-10 0.03159672E+05 0.01973496E+03                   4
-C6H5OH             82489C   6H   6O   1     G  0300.00   4000.00  1000.00      1
- 0.01821633E+03 0.01142427E+00-0.01096684E-04-0.06427442E-08 0.01198893E-11    2
--0.02053664E+06-0.07304234E+03 0.01391456E+02 0.03931958E+00 0.01777096E-04    3
--0.02277673E-06 0.08309659E-10-0.01472181E+06 0.01917813E+03                   4
-C6H6               20387C   6H   6          G  0300.00   5000.00  1000.00      1
- 0.01291074E+03 0.01723297E+00-0.05024211E-04 0.05893497E-08-0.01947521E-12    2
- 0.03664512E+05-0.05002699E+03-0.03138012E+02 0.04723103E+00-0.02962208E-04    3
--0.03262819E-06 0.01718692E-09 0.08890031E+05 0.03657573E+03                   4
-C6H7               82489C   6H   7          G  0300.00   4000.00  1000.00      1
- 0.01755221E+03 0.01227080E+00-0.01185742E-04-0.06959661E-08 0.01301326E-11    2
- 0.01624581E+06-0.07166589E+03 0.04639166E+01 0.03975928E+00 0.02529095E-04    3
--0.02223792E-06 0.07557053E-10 0.02225169E+06 0.02235387E+03                   4
-C8H               121686C   8H   1          G  0300.00   5000.00  1000.00      1
- 0.01474991E+03 0.09931501E-01-0.03374841E-04 0.04687593E-08-0.02073536E-12    2
- 0.01399448E+07-0.04892690E+03 0.04489508E+02 0.03521521E+00-0.01019390E-03    3
--0.02197025E-06 0.01421416E-09 0.01425992E+07 0.03996225E+02                   4
-C8H2              121686C   8H   2          G  0300.00   5000.00  1000.00      1
- 0.01568021E+03 0.01115461E+00-0.03724373E-04 0.05197891E-08-0.02375550E-12    2
- 0.01081123E+07-0.05571437E+03 0.04630427E+02 0.03937080E+00-0.01148035E-03    3
--0.02562214E-06 0.01670791E-09 0.01108285E+07 0.08077425E+01                   4
-CA                 80792CA  1               G  0300.00   5000.00  1000.00      1
- 0.01636990E+02 0.01938281E-01-0.01464011E-04 0.04278257E-08-0.03581686E-12    2
- 0.02109799E+06 0.08990615E+02 0.01563120E+02 0.06228361E-01-0.01415732E-03    3
- 0.01323968E-06-0.04370569E-10 0.02092191E+06 0.08370537E+02                   4
-CA(A)              81092CA  1               S  0300.00   1500.00  1000.00      1
- 0.03344424E+02-0.06129555E-04-0.02048549E-05 0.02199575E-08-0.06498067E-12    2
--0.01020624E+05-0.01410880E+03 0.02492826E+02 0.03921280E-01-0.07242436E-04    3
- 0.05919276E-07-0.01802531E-10-0.08641901E+04-0.01010018E+03                   4
-CA(B)              81092CA  1               S  0300.00   2000.00  1000.00      1
- 0.02149662E+02 0.02293734E-01 0.03948384E-05-0.01813978E-08 0.03060995E-12    2
--0.06970589E+04-0.07862350E+02 0.02013343E+02 0.02718935E-01-0.01374494E-05    3
- 0.01528553E-08-0.06023681E-12-0.06613041E+04-0.07168449E+02                   4
-CA(L)              81092CA  1               L  0300.00   3000.00  1000.00      1
- 0.03623553E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.02310016E+04-0.01455354E+03 0.03623553E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.02310016E+04-0.01455354E+03                   4
-CA+                80792CA  1E  -1          G  0300.00   5000.00  1000.00      1
- 0.02415423E+02 0.03140053E-02-0.03458031E-05 0.01350163E-08-0.01342160E-12    2
- 0.09252434E+06 0.05468189E+02 0.02276338E+02 0.01581988E-01-0.03878953E-04    3
- 0.03953701E-07-0.01427856E-10 0.09253536E+06 0.06008258E+02                   4
-CA2                80792CA  2               G  0300.00   5000.00  1000.00      1
- 0.04174798E+02-0.07401838E-02 0.03131196E-05-0.05885577E-09 0.04296578E-13    2
- 0.04052221E+06 0.07582380E+02 0.05604867E+02-0.04044408E-01 0.02454638E-04    3
--0.01495064E-08-0.01724184E-11 0.04008842E+06 0.01167234E+00                   4
-CABR               80792BR  1CA  1          G  0300.00   5000.00  1000.00      1
- 0.04312008E+02 0.04246804E-02-0.02536360E-05 0.07082421E-09-0.05508239E-13    2
--0.07242509E+05 0.05721414E+02 0.04004020E+02 0.01927770E-01-0.02749388E-04    3
- 0.01785012E-07-0.04190442E-11-0.07199987E+05 0.07125700E+02                   4
-CABR2              80792BR  2CA  1          G  0300.00   5000.00  1000.00      1
- 0.07388434E+02 0.01393017E-02-0.06561619E-06 0.01342748E-09-0.09993272E-14    2
--0.04852787E+06-0.04337760E+02 0.06902053E+02 0.01599316E-01-0.01154723E-04    3
--0.02428795E-08 0.03707822E-11-0.04841873E+06-0.01900929E+02                   4
-CABR2(S)           81292BR  2CA  1          S  0300.00   1500.00  1000.00      1
- 0.01076200E+03-0.02979247E-01 0.06950511E-05 0.03569778E-07-0.01382224E-10    2
--0.08542235E+06-0.04524895E+03 0.05478536E+02 0.02209325E+00-0.04544460E-03    3
- 0.04176543E-06-0.01322726E-09-0.08447516E+06-0.02052538E+03                   4
-CACL               80792CA  1CL  1          G  0300.00   5000.00  1000.00      1
- 0.04272197E+02 0.04612770E-02-0.02684554E-05 0.07233022E-09-0.05565813E-13    2
--0.01387933E+06 0.04556153E+02 0.03810549E+02 0.02372144E-01-0.02939380E-04    3
- 0.01528166E-07-0.02396962E-11-0.01379994E+06 0.06742955E+02                   4
-CACL2              80792CA  1CL  2          G  0300.00   5000.00  1000.00      1
- 0.07322969E+02 0.02201546E-02-0.01035664E-05 0.02117574E-09-0.01575201E-13    2
--0.05893953E+06-0.06959426E+02 0.06595983E+02 0.02364235E-01-0.01611807E-04    3
--0.04866457E-08 0.05973912E-11-0.05877467E+06-0.03308009E+02                   4
-CACL2(S)           81092CA  1CL  2          S  0300.00   2000.00  1000.00      1
- 0.06749013E+02 0.03694542E-01-0.02199980E-05 0.01165549E-08-0.02193898E-12    2
--0.09759255E+06-0.02629777E+03 0.05722155E+02 0.01836100E+00-0.03597296E-03    3
- 0.03173054E-06-0.09522563E-10-0.09798464E+06-0.02415730E+03                   4
-CAF                80792CA  1F   1          G  0300.00   5000.00  1000.00      1
- 0.04150489E+02 0.05746086E-02-0.03081448E-05 0.07585468E-09-0.05641270E-13    2
--0.03400290E+06 0.03725193E+02 0.03309446E+02 0.03419155E-01-0.03357208E-04    3
- 0.01004510E-07 0.01112627E-11-0.03382332E+06 0.07876121E+02                   4
-CAF2               80792CA  1F   2          G  0300.00   5000.00  1000.00      1
- 0.06575083E+02 0.05172194E-02-0.02403804E-05 0.04876347E-09-0.03608526E-13    2
--0.09641588E+06-0.04868362E+02 0.05023320E+02 0.04921285E-01-0.03129418E-04    3
--0.01178313E-07 0.01260201E-10-0.09604913E+06 0.02984363E+02                   4
-CAH2O2             81292CA  1H   2O   2     G  0300.00   5000.00  1000.00      1
- 0.08627170E+02 0.03353668E-01-0.01123553E-04 0.01801642E-08-0.01122696E-12    2
--0.07617877E+06-0.01582838E+03 0.05634984E+02 0.01431225E+00-0.01160774E-03    3
- 0.02415328E-08 0.02445194E-10-0.07567777E+06-0.01510141E+02                   4
-CAH2O2(S)          81292CA  1H   2O   2     S  0300.00   1000.00  1000.00      1
- 0.01418556E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01237066E+07-0.07268995E+03-0.07906910E+01 0.06795647E+00-0.01329918E-02    3
- 0.01211862E-05-0.04117456E-09-0.01204396E+07-0.07999789E+01                   4
-CAI                80792CA  1I   1          G  0300.00   5000.00  1000.00      1
- 0.04316128E+02 0.04138589E-02-0.02776385E-05 0.08074141E-09-0.06592826E-13    2
--0.01903879E+05 0.06725163E+02 0.04078205E+02 0.01812968E-01-0.02972846E-04    3
- 0.02225520E-07-0.06173497E-11-0.01881151E+05 0.07754936E+02                   4
-CAI2               80792CA  1I   2          G  0300.00   5000.00  1000.00      1
- 0.07403366E+02 0.01208762E-02-0.05698306E-06 0.01167152E-09-0.08696049E-14    2
--0.03328039E+06-0.02870204E+02 0.06975307E+02 0.01413683E-01-0.01046359E-04    3
--0.01757655E-08 0.03111958E-11-0.03318450E+06-0.07269292E+01                   4
-CAO                80792CA  1O   1          G  0300.00   5000.00  1000.00      1
- 0.08665723E+02-0.09857255E-01 0.07277137E-04-0.01813874E-07 0.01477538E-11    2
- 0.02566423E+05-0.02151985E+03 0.07277069E+02-0.02477194E+00 0.06313166E-03    3
--0.06322423E-06 0.02200693E-09 0.03774998E+05-0.09934620E+02                   4
-CAO(S)             81092CA  1O   1          S  0300.00   3600.00  1000.00      1
- 0.05184497E+02 0.01938337E-01-0.08932525E-05 0.02410689E-08-0.02389613E-12    2
--0.07806390E+06-0.02562669E+03 0.02964466E+02 0.09464719E-01-0.07948131E-04    3
- 0.06517958E-08 0.01313902E-10-0.07762567E+06-0.01476156E+03                   4
-CAOH               80792CA  1H   1O   1     G  0300.00   5000.00  1000.00      1
- 0.05164977E+02 0.01974644E-01-0.07757403E-05 0.01507385E-08-0.01048831E-12    2
--0.02493597E+06-0.01690344E+02 0.03596803E+02 0.08182874E-01-0.07863515E-04    3
- 0.01974293E-07 0.06136755E-11-0.02469004E+06 0.05713983E+02                   4
-CAOH+              80792CA  1H   1O   1E  -1G  0300.00   5000.00  1000.00      1
- 0.05293390E+02 0.01697953E-01-0.05704847E-05 0.09169199E-09-0.05724155E-13    2
- 0.04274157E+06-0.03041255E+02 0.03766022E+02 0.07251869E-01-0.05903957E-04    3
- 0.02063514E-08 0.01186538E-10 0.04300269E+06 0.04285959E+02                   4
-CAS                80792CA  1S   1          G  0300.00   5000.00  1000.00      1
- 0.04077726E+02-0.02148896E-01 0.03595164E-04-0.01167272E-07 0.01101218E-11    2
- 0.01401038E+06 0.05797750E+02 0.05045918E+02-0.09248234E-01 0.03176027E-03    3
--0.04007223E-06 0.01698112E-09 0.01355553E+06 0.08770679E+01                   4
-CCL                40992C   1CL  1          G  0300.00   4000.00  1500.00      1
- 0.04306010E+02 0.01816861E-02-0.07184326E-06 0.01354479E-09-0.01002479E-13    2
- 0.05198808E+06 0.01558593E+02 0.02871441E+02 0.04709268E-01-0.05629052E-04    3
- 0.03086609E-07-0.06379756E-11 0.05237631E+06 0.08859373E+02                   4
-CCL2               40992C   1CL  2          G  0300.00   4000.00  1500.00      1
- 0.06632435E+02 0.03558831E-02-0.01507592E-05 0.03116243E-09-0.02546496E-13    2
- 0.02443636E+06-0.06590137E+02 0.03329579E+02 0.01112853E+00-0.01375891E-03    3
- 0.07726329E-07-0.01624070E-10 0.02530408E+06 0.01010975E+03                   4
-CCL2CCLO           40992C   2 O  1CL  3     G  0300.00   4000.00  1500.00      1
- 0.01497380E+03 0.09004180E-02-0.03714287E-05 0.05602716E-09-0.02392170E-13    2
--0.01781718E+06-0.04510704E+03 0.05066114E+02 0.02846673E+00-0.03113001E-03    3
- 0.01605483E-06-0.03208502E-10-0.01474354E+06 0.06663101E+02                   4
-CCL2CCLOH          53090C   2H   1O   1CL  3G  0300.00   5000.00  1500.00      1
- 0.01567259E+03 0.02218766E-01-0.04425239E-05 0.06261725E-10 0.03673507E-13    2
--0.02855361E+06-0.05085224E+03 0.04602117E+02 0.03408842E+00-0.03836909E-03    3
- 0.02120271E-06-0.04527143E-10-0.02507945E+06 0.06859776E+02                   4
-CCL2CH             40992H   1C   2CL  2     G  0300.00   4000.00  1500.00      1
- 0.01101223E+03 0.01364477E-01-0.03497001E-05 0.01107466E-09 0.03844298E-13    2
- 0.02706218E+06-0.02886258E+03 0.02961736E+02 0.02429423E+00-0.02731403E-03    3
- 0.01493184E-06-0.03162966E-10 0.02960233E+06 0.01317486E+03                   4
-CCL2HOO            53090C   1H   1O   2CL  2G  0300.00   5000.00  1500.00      1
- 0.01273967E+03 0.01671789E-01-0.03280073E-05 0.09239024E-10 0.02183938E-13    2
--0.05665041E+05-0.03552584E+03 0.03425417E+02 0.02745544E+00-0.02973832E-03    3
- 0.01588391E-06-0.03309428E-10-0.02675529E+05 0.01333474E+03                   4
-CCL2OHCH2          53090C   2H   3O   1CL  2G  0300.00   5000.00  1500.00      1
- 0.01606355E+03 0.02856412E-01-0.05564238E-05 0.02056416E-09 0.02871365E-13    2
--0.01756115E+06-0.05438455E+03 0.02870959E+02 0.04462273E+00-0.05377946E-03    3
- 0.03093185E-06-0.06719238E-10-0.01379636E+06 0.01305466E+03                   4
-CCL2OHCHCL         53090C   2H   2O   1CL  3G  0300.00   5000.00  1500.00      1
- 0.01681474E+03 0.02433421E-01-0.04717311E-05 0.01595327E-09 0.02647197E-13    2
--0.02217115E+06-0.05406904E+03 0.05487264E+02 0.03719540E+00-0.04391386E-03    3
- 0.02501465E-06-0.05417859E-10-0.01882134E+06 0.04237537E+02                   4
-CCL3               40992C   1CL  3          G  0300.00   4000.00  1500.00      1
- 0.09375859E+02 0.05723237E-02-0.02242398E-05 0.04238666E-09-0.03174834E-13    2
- 0.05113147E+05-0.01813304E+03 0.04292822E+02 0.01682379E+00-0.02044420E-03    3
- 0.01135805E-06-0.02371493E-10 0.06477756E+05 0.07677874E+02                   4
-CCL3CCLH2          53090C   2H   2CL  4     G  0300.00   5000.00  1500.00      1
- 0.01788619E+03 0.02281235E-01-0.04746598E-05 0.01962667E-09 0.02451768E-13    2
--0.02496335E+06-0.06312883E+03 0.03463508E+02 0.04144805E+00-0.04421053E-03    3
- 0.02320525E-06-0.04772525E-10-0.02028144E+06 0.01275956E+03                   4
-CCL3CCLO           40992C   2 O  1CL  4     G  0300.00   4000.00  1500.00      1
- 0.01687401E+03 0.01341876E-01-0.04555006E-05 0.07178333E-09-0.04348641E-13    2
--0.03442278E+06-0.05295025E+03 0.06334167E+02 0.03461171E+00-0.04173791E-03    3
- 0.02324686E-06-0.04882451E-10-0.03152121E+06 0.07697654E+01                   4
-CCL3CH2            53090C   2H   2CL  3     G  0300.00   5000.00  1500.00      1
- 0.01468243E+03 0.02202649E-01-0.03960690E-05 0.02319280E-10 0.03655521E-13    2
- 0.03875531E+05-0.04495230E+03 0.05008132E+02 0.03031103E+00-0.03453620E-03    3
- 0.01951049E-06-0.04245840E-10 0.06936588E+05 0.05474640E+02                   4
-CCL3CHCL           53090C   2H   1CL  4     G  0300.00   5000.00  1500.00      1
- 0.01610198E+03 0.01597223E-01-0.04069892E-05 0.04158083E-09-0.01105635E-13    2
--0.02318814E+04-0.04936573E+03 0.05761929E+02 0.03433482E+00-0.04163980E-03    3
- 0.02362341E-06-0.05054182E-10 0.02663920E+05 0.03399588E+02                   4
-CCL3CHO            53090C   2H   1O   1CL  3G  0300.00   5000.00  1500.00      1
- 0.01532135E+03 0.01914228E-01-0.03622777E-05 0.05526564E-10 0.03016202E-13    2
--0.02886499E+06-0.04774516E+03 0.05016867E+02 0.02961902E+00-0.03140321E-03    3
- 0.01666643E-06-0.03481662E-10-0.02544921E+06 0.06644422E+02                   4
-CCL3OO             53090C   1O   2CL  3     G  0300.00   5000.00  1500.00      1
- 0.01473249E+03 0.08345102E-02-0.03627944E-05 0.07101159E-09-0.05165897E-13    2
--0.05526644E+05-0.04381961E+03 0.04317420E+02 0.03486414E+00-0.04287094E-03    3
- 0.02371950E-06-0.04903871E-10-0.02855912E+05 0.08720693E+02                   4
-CCL4               40992C   1CL  4          G  0300.00   4000.00  1500.00      1
- 0.01222570E+03 0.07440275E-02-0.03141658E-05 0.06499383E-09-0.05330319E-13    2
--0.01439931E+06-0.03133566E+03 0.05107111E+02 0.02402469E+00-0.02980593E-03    3
- 0.01678331E-06-0.03535253E-10-0.01253198E+06 0.04640845E+02                   4
-CCLH2OO            53090C   1H   2O   2CL  1G  0300.00   5000.00  1500.00      1
- 0.01131351E+03 0.02330645E-01-0.03546376E-05-0.02064087E-09 0.06154082E-13    2
--0.04225590E+05-0.03183829E+03 0.01583541E+02 0.02745395E+00-0.02803155E-03    3
- 0.01491598E-06-0.03172720E-10-0.08340802E+04 0.01999023E+03                   4
-CH                121286C   1H   1          G  0300.00   5000.00  1000.00      1
- 0.02196223E+02 0.02340381E-01-0.07058201E-05 0.09007582E-09-0.03855040E-13    2
- 0.07086723E+06 0.09178373E+02 0.03200202E+02 0.02072876E-01-0.05134431E-04    3
- 0.05733890E-07-0.01955533E-10 0.07045259E+06 0.03331588E+02                   4
-CH+               121286C   1H   1E  -1     G  0300.00   5000.00  1000.00      1
- 0.02753358E+02 0.01552900E-01-0.05368453E-05 0.08921772E-09-0.05416801E-13    2
- 0.01948467E+07 0.04654892E+02 0.03327207E+02 0.01347051E-01-0.03895861E-04    3
- 0.05129390E-07-0.02054576E-10 0.01946452E+07 0.01408474E+02                   4
-CH2               120186C   1H   2          G  0250.00   4000.00  1000.00      1
- 0.03636408E+02 0.01933057E-01-0.01687016E-05-0.01009899E-08 0.01808256E-12    2
- 0.04534134E+06 0.02156561E+02 0.03762237E+02 0.01159819E-01 0.02489585E-05    3
- 0.08800836E-08-0.07332435E-11 0.04536791E+06 0.01712578E+02                   4
-CH2(S)             31287C   1H   2          G  0300.00   4000.00  1000.00      1
- 0.03552889E+02 0.02066788E-01-0.01914116E-05-0.01104673E-08 0.02021350E-12    2
- 0.04984975E+06 0.01686570E+02 0.03971265E+02-0.01699089E-02 0.01025369E-04    3
- 0.02492551E-07-0.01981266E-10 0.04989368E+06 0.05753207E+00                   4
-CH2CCL             53090C   2H   2CL  1     G  0300.00   5000.00  1500.00      1
- 0.09117805E+02 0.02336015E-01-0.03466390E-05-0.03584809E-09 0.08154328E-13    2
- 0.02697366E+06-0.02251742E+03 0.01553177E+02 0.02243159E+00-0.02366950E-03    3
- 0.01323270E-06-0.02931823E-10 0.02962339E+06 0.01769303E+03                   4
-CH2CCL2            53090C   2H   2CL  2     G  0300.00   5000.00  1500.00      1
- 0.01169451E+03 0.02435982E-01-0.03733045E-05-0.01419412E-09 0.05199337E-13    2
--0.04601975E+05-0.03547415E+03 0.01527166E+02 0.02983780E+00-0.03171097E-03    3
- 0.01728380E-06-0.03709638E-10-0.01173986E+05 0.01827540E+03                   4
-CH2CCLOH           53090C   2H   3O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.01267601E+03 0.03201392E-01-0.04788878E-05-0.02136104E-09 0.07030796E-13    2
--0.02402379E+06-0.04128498E+03 0.06647840E+01 0.03723168E+00-0.04115206E-03    3
- 0.02307135E-06-0.05021609E-10-0.02012318E+06 0.02165270E+03                   4
-CH2CHCCH           82489C   4H   4          G  0300.00   4000.00  1000.00      1
- 0.01069777E+03 0.06982014E-01-0.06567747E-05-0.03884517E-08 0.07200946E-12    2
- 0.03034803E+06-0.03128430E+03 0.03233893E+02 0.01865634E+00 0.01270320E-04    3
--0.09410096E-07 0.02956111E-10 0.03301097E+06 0.09922676E+02                   4
-CH2CHCCH2          82489C   4H   5          G  0300.00   4000.00  1000.00      1
- 0.01199776E+03 0.07990580E-01-0.08098173E-05-0.04568733E-08 0.08636910E-12    2
- 0.03228493E+06-0.03528495E+03 0.03879443E+02 0.01997664E+00 0.01872777E-04    3
--0.09306953E-07 0.02386116E-10 0.03526859E+06 0.09842152E+02                   4
-CH2CHCH2           82489C   3H   5          G  0300.00   4000.00  1000.00      1
- 0.09651539E+02 0.08075596E-01-0.07965424E-05-0.04650696E-08 0.08603280E-12    2
- 0.01530096E+06-0.02686774E+03 0.02276486E+02 0.01985564E+00 0.01123842E-04    3
--0.01014576E-06 0.03441342E-10 0.01789497E+06 0.01372515E+03                   4
-CH2CHCHCH          82489C   4H   5          G  0300.00   4000.00  1000.00      1
- 0.01286597E+03 0.07943369E-01-0.08626466E-05-0.04655635E-08 0.08951131E-12    2
- 0.03783552E+06-0.04182502E+03 0.02995240E+02 0.02288456E+00 0.01975471E-04    3
--0.01148245E-06 0.03197824E-10 0.04142218E+06 0.01289454E+03                   4
-CH2CHCHCH2        120189C   4H   6          G  0300.00   4000.00  1000.00      1
- 0.01254437E+03 0.09596525E-01-0.09187012E-05-0.05429640E-08 0.01005364E-11    2
- 0.08597330E+05-0.04217451E+03 0.01931624E+02 0.02479030E+00 0.03018071E-04    3
--0.01154686E-06 0.02586623E-10 0.01255468E+06 0.01701999E+03                   4
-CH2CHCL            53090C   2H   3CL  1     G  0300.00   5000.00  1500.00      1
- 0.01029820E+03 0.03042926E-01-0.03881390E-05-0.04925565E-09 0.01005072E-12    2
--0.02492899E+05-0.03108614E+03 0.01118026E+01 0.02796358E+00-0.02726559E-03    3
- 0.01463257E-06-0.03204075E-10 0.01287844E+05 0.02381617E+03                   4
-CH2CL              53090C   1H   2CL  1     G  0300.00   5000.00  1500.00      1
- 0.06822515E+02 0.01659744E-01-0.02075515E-05-0.02793518E-09 0.05509087E-13    2
- 0.01080454E+06-0.01090504E+03 0.02419924E+02 0.01303317E+00-0.01356559E-03    3
- 0.07836108E-07-0.01800535E-10 0.01243112E+06 0.01269845E+03                   4
-CH2CL2            112989C   1H   2CL  2     G  0300.00   5000.00  1000.00      1
- 0.05917327E+02 0.06762395E-01-0.02676163E-04 0.04856687E-08-0.03316974E-12    2
--0.01385926E+06-0.03877739E+02 0.01423284E+02 0.02116658E+00-0.02178088E-03    3
- 0.01345873E-06-0.03811649E-10-0.01268664E+06 0.01893445E+03                   4
-CH2CLCCL2          53090C   2H   2CL  3     G  0300.00   5000.00  1500.00      1
- 0.01438156E+03 0.02379635E-01-0.04167426E-05-0.02445116E-10 0.04499574E-13    2
--0.02746720E+05-0.04351762E+03 0.03351194E+02 0.03297633E+00-0.03604139E-03    3
- 0.01977453E-06-0.04233823E-10 0.08620011E+04 0.01444760E+03                   4
-CH2CLCCLO          53090C   2H   2O   1CL  2G  0300.00   5000.00  1500.00      1
- 0.01392027E+03 0.02589602E-01-0.04141892E-05-0.01643169E-09 0.06237174E-13    2
--0.03517257E+06-0.04389503E+03 0.02705995E+02 0.03210128E+00-0.03357727E-03    3
- 0.01814310E-06-0.03890009E-10-0.03130905E+06 0.01566013E+03                   4
-CH2CLCH2           53090C   2H   4CL  1     G  0300.00   5000.00  1500.00      1
- 0.01167011E+03 0.03554722E-01-0.04124241E-05-0.07276110E-09 0.01316756E-12    2
- 0.06201629E+05-0.03604549E+03 0.01635864E+02 0.02680201E+00-0.02491421E-03    3
- 0.01349235E-06-0.03046571E-10 0.01014294E+06 0.01864248E+03                   4
-CH2CLCH2CL         53090C   2H   4CL  2     G  0300.00   5000.00  1500.00      1
- 0.01443143E+03 0.03836770E-01-0.05299122E-05-0.05165412E-09 0.01177636E-12    2
--0.02296285E+06-0.05130124E+03-0.02436500E+01 0.04032574E+00-0.03956993E-03    3
- 0.02074245E-06-0.04412604E-10-0.01767830E+06 0.02741366E+03                   4
-CH2CLCHCL          53090C   2H   3CL  2     G  0300.00   5000.00  1500.00      1
- 0.01295593E+03 0.03001689E-01-0.04165162E-05-0.03909055E-09 0.09041090E-13    2
- 0.09932077E+04-0.03925387E+03 0.02276185E+02 0.03011401E+00-0.03047664E-03    3
- 0.01654880E-06-0.03613198E-10 0.04836340E+05 0.01792166E+03                   4
-CH2CLCHCL2         53090C   2H   3CL  3     G  0300.00   5000.00  1500.00      1
- 0.01618739E+03 0.03047681E-01-0.05011496E-05-0.01596701E-09 0.07107547E-13    2
--0.02474417E+06-0.05695454E+03 0.01239011E+02 0.04148444E+00-0.04188654E-03    3
- 0.02163214E-06-0.04467364E-10-0.01960717E+06 0.02257856E+03                   4
-CH2CLCHO           53090C   2H   3O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.01227955E+03 0.03320979E-01-0.04106710E-05-0.06199826E-09 0.01190594E-12    2
--0.02678416E+06-0.03762356E+03 0.06553003E+01 0.02959046E+00-0.02635056E-03    3
- 0.01327545E-06-0.02838288E-10-0.02227005E+06 0.02576797E+03                   4
-CH2CO             121686C   2H   2O   1     G  0300.00   5000.00  1000.00      1
- 0.06038817E+02 0.05804840E-01-0.01920954E-04 0.02794485E-08-0.01458868E-12    2
--0.08583402E+05-0.07657581E+02 0.02974971E+02 0.01211871E+00-0.02345046E-04    3
--0.06466685E-07 0.03905649E-10-0.07632637E+05 0.08673553E+02                   4
-CH2F2              82489C   1H   2F   2     G  0300.00   5000.00  1000.00      1
- 0.04730052E+02 0.07997300E-01-0.03186045E-04 0.05801160E-08-0.03967925E-12    2
--0.05637288E+06-0.04954843E+01 0.03669434E+01 0.02168917E+00-0.02441913E-03    3
- 0.01942310E-06-0.06978343E-10-0.05510103E+06 0.02202215E+03                   4
-CH2HCO            110393O   1H   3C   2     G  0300.00   5000.00  1000.00      1
- 0.05975670E+02 0.08130591E-01-0.02743624E-04 0.04070304E-08-0.02176017E-12    2
- 0.04903218E+04-0.05045251E+02 0.03409062E+02 0.01073857E+00 0.01891492E-04    3
--0.07158583E-07 0.02867385E-10 0.01521477E+05 0.09558290E+02                   4
-CH2O              121286C   1H   2O   1     G  0300.00   5000.00  1000.00      1
- 0.02995606E+02 0.06681321E-01-0.02628955E-04 0.04737153E-08-0.03212517E-12    2
--0.01532037E+06 0.06912572E+02 0.01652731E+02 0.01263144E+00-0.01888168E-03    3
- 0.02050031E-06-0.08413237E-10-0.01486540E+06 0.01378482E+03                   4
-CH2OH             120186H   3C   1O   1     G  0250.00   4000.00  1000.00      1
- 0.06327520E+02 0.03608271E-01-0.03201547E-05-0.01938750E-08 0.03509705E-12    2
--0.04474509E+05-0.08329366E+02 0.02862628E+02 0.01001527E+00-0.05285436E-05    3
--0.05138540E-07 0.02246041E-10-0.03349679E+05 0.01039794E+03                   4
-CH2OHCCL2          53090C   2H   3O   1CL  2G  0300.00   5000.00  1500.00      1
- 0.01602181E+03 0.02846352E-01-0.04974218E-05-0.02167450E-10 0.05246046E-13    2
--0.01829579E+06-0.05402134E+03 0.01922940E+02 0.04158207E+00-0.04427505E-03    3
- 0.02343015E-06-0.04851868E-10-0.01375512E+06 0.02001902E+03                   4
-CH2OHCHCL          53090C   2H   4O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.01446298E+03 0.03569514E-01-0.05419118E-05-0.02862176E-09 0.08920560E-13    2
--0.01475559E+06-0.04942815E+03 0.03505696E+01 0.04212749E+00-0.04493839E-03    3
- 0.02448187E-06-0.05236589E-10-0.01007314E+06 0.02495261E+03                   4
-CH2SICL            40992H   2C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.09915966E+02 0.01896319E-01-0.03304238E-05-0.03882353E-09 0.01089169E-12    2
- 0.01906587E+06-0.02389137E+03 0.03514077E+02 0.01959495E+00-0.02147274E-03    3
- 0.01214017E-06-0.02691323E-10 0.02123280E+06 0.09882836E+02                   4
-CH2SICL3           40992H   2C   1SI  1CL  3G  0300.00   4000.00  1500.00      1
- 0.01476240E+03 0.02289499E-01-0.04148337E-05-0.01526182E-09 0.07724698E-13    2
--0.04947703E+06-0.04020475E+03 0.06718170E+02 0.02712662E+00-0.03168529E-03    3
- 0.01809641E-06-0.03938906E-10-0.04710183E+06 0.01167360E+02                   4
-CH2SIH2CL          40992H   4C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01260561E+03 0.03468476E-01-0.04606434E-05-0.09748147E-09 0.02077681E-12    2
--0.05748538E+05-0.03743183E+03 0.02426229E+02 0.03028056E+00-0.03039200E-03    3
- 0.01612599E-06-0.03425629E-10-0.02268891E+05 0.01657736E+03                   4
-CH2SIHCL2          40992H   3C   1SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01365092E+03 0.02909029E-01-0.04521180E-05-0.05274788E-09 0.01389320E-12    2
--0.02781262E+06-0.03810353E+03 0.04180967E+02 0.03005761E+00-0.03288772E-03    3
- 0.01822025E-06-0.03925700E-10-0.02480330E+06 0.01134845E+03                   4
-CH3               121286C   1H   3          G  0300.00   5000.00  1000.00      1
- 0.02844052E+02 0.06137974E-01-0.02230345E-04 0.03785161E-08-0.02452159E-12    2
- 0.01643781E+06 0.05452697E+02 0.02430443E+02 0.01112410E+00-0.01680220E-03    3
- 0.01621829E-06-0.05864953E-10 0.01642378E+06 0.06789794E+02                   4
-CH3C(O)CL          53090C   2H   3O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.01240568E+03 0.03210496E-01-0.03737157E-05-0.06739592E-09 0.01219122E-12    2
--0.03432420E+06-0.03909195E+03 0.02275117E+02 0.02518533E+00-0.02152420E-03    3
- 0.01084005E-06-0.02369191E-10-0.03024376E+06 0.01657016E+03                   4
-CH3CC              82489C   3H   3          G  0300.00   4000.00  1000.00      1
- 0.07640221E+02 0.05233556E-01-0.05053635E-05-0.02919772E-08 0.05445700E-12    2
- 0.05909763E+06-0.01629573E+03 0.03798751E+02 0.08749062E-01 0.02523014E-04    3
--0.01529373E-07-0.01410562E-10 0.06077425E+06 0.05989223E+02                   4
-CH3CCCH2           82489C   4H   5          G  0300.00   4000.00  1000.00      1
- 0.01156506E+03 0.08030297E-01-0.07649450E-05-0.04476534E-08 0.08313260E-12    2
- 0.03256813E+06-0.03014066E+03 0.05068450E+02 0.01571747E+00 0.02968975E-04    3
--0.04990587E-07-0.02984224E-11 0.03518855E+06 0.06791893E+02                   4
-CH3CCCH3          120189C   4H   6          G  0300.00   4000.00  1000.00      1
- 0.01133658E+03 0.01005764E+00-0.09511323E-05-0.05660497E-08 0.01049451E-11    2
- 0.01547659E+06-0.03350867E+03 0.04077105E+02 0.01703159E+00 0.04707490E-04    3
--0.03767240E-07-0.02066963E-10 0.01859757E+06 0.08444801E+02                   4
-CH3CCH2            82489C   3H   5          G  0300.00   4000.00  1000.00      1
- 0.09101018E+02 0.07964168E-01-0.07884945E-05-0.04562036E-08 0.08529212E-12    2
- 0.02670680E+06-0.02150559E+03 0.03385811E+02 0.01404534E+00 0.03204127E-04    3
--0.03824120E-07-0.09053742E-11 0.02909066E+06 0.01126649E+03                   4
-CH3CCL             53090C   2H   3CL  1     G  0300.00   5000.00  1500.00      1
- 0.01023962E+03 0.02767116E-01-0.03228853E-05-0.05752548E-09 0.01043430E-12    2
- 0.02633607E+06-0.02806184E+03 0.01687397E+02 0.02164347E+00-0.01891466E-03    3
- 0.09699015E-07-0.02134580E-10 0.02975387E+06 0.01882236E+03                   4
-CH3CCL2            53090C   2H   3CL  2     G  0300.00   5000.00  1500.00      1
- 0.01300035E+03 0.02940485E-01-0.03746456E-05-0.05040644E-09 0.01006332E-12    2
--0.04228816E+04-0.03979863E+03 0.03213473E+02 0.02587378E+00-0.02419993E-03    3
- 0.01273817E-06-0.02788481E-10 0.03325663E+05 0.01333320E+03                   4
-CH3CCL3            53090C   2H   3CL  3     G  0300.00   5000.00  1500.00      1
- 0.01637160E+03 0.02935021E-01-0.04836108E-05-0.01454723E-09 0.06731691E-13    2
--0.02378095E+06-0.05941864E+03 0.02484363E+02 0.03909474E+00-0.04013637E-03    3
- 0.02110179E-06-0.04418213E-10-0.01902540E+06 0.01435603E+03                   4
-CH3CCLO            53090C   2H   3O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.01240595E+03 0.03210266E-01-0.03736397E-05-0.06740236E-09 0.01219081E-12    2
--0.03432283E+06-0.03909605E+03 0.02277402E+02 0.02517912E+00-0.02151632E-03    3
- 0.01083524E-06-0.02368079E-10-0.03024308E+06 0.01655556E+03                   4
-CH3CH2CCH         120189C   4H   6          G  0300.00   4000.00  1000.00      1
- 0.01200695E+03 0.09576069E-01-0.08995018E-05-0.05369808E-08 0.09934174E-12    2
- 0.01729420E+06-0.03802692E+03 0.03726043E+02 0.02053493E+00 0.03021439E-04    3
--0.08131813E-07 0.01095280E-10 0.02048821E+06 0.08538826E+02                   4
-CH3CH2CH2C         62090C   4H  10          G  0300.00   4000.00  1500.00      1
- 0.02032597E+03 0.01025189E+00-0.09348665E-05-0.04706743E-08 0.08327283E-12    2
--0.02590868E+06-0.08998431E+03-0.02544545E+02 0.05770712E+00-0.04104933E-03    3
- 0.01684742E-06-0.03176653E-10-0.01682847E+06 0.03586176E+03                   4
-CH3CH2CL           53090C   2H   5CL  1     G  0300.00   5000.00  1500.00      1
- 0.01301118E+03 0.04448941E-01-0.05200473E-05-0.09119710E-09 0.01658842E-12    2
--0.02013503E+06-0.04677847E+03-0.06981899E+01 0.03567705E+00-0.03230260E-03    3
- 0.01689622E-06-0.03727523E-10-0.01476054E+06 0.02802219E+03                   4
-CH3CH2O           103190C   2H   5O   1     G  0300.00   4000.00  1500.00      1
- 0.01187115E+03 0.05390415E-01-0.04990159E-05-0.02399585E-08 0.04255456E-12    2
--0.05950457E+05-0.03996585E+03 0.06904570E+01 0.02951398E+00-0.02245116E-03    3
- 0.01011600E-06-0.02044101E-10-0.01559918E+05 0.02130230E+03                   4
-CH3CHCH            82489C   3H   5          G  0300.00   4000.00  1000.00      1
- 0.09209764E+02 0.07871413E-01-0.07724523E-05-0.04497357E-08 0.08377272E-12    2
- 0.02853967E+06-0.02232370E+03 0.03161863E+02 0.01518100E+00 0.02722659E-04    3
--0.05177112E-07 0.05435286E-12 0.03095548E+06 0.01197973E+03                   4
-CH3CHCL            53090C   2H   4CL  1     G  0300.00   5000.00  1500.00      1
- 0.01166291E+03 0.03539284E-01-0.03858423E-05-0.08186871E-09 0.01407549E-12    2
- 0.03696642E+05-0.03616108E+03 0.01903574E+02 0.02438193E+00-0.02062779E-03    3
- 0.01068382E-06-0.02414461E-10 0.07722870E+05 0.01768152E+03                   4
-CH3CHCL2           53090C   2H   4CL  2     G  0300.00   5000.00  1500.00      1
- 0.01454311E+03 0.03772378E-01-0.05189301E-05-0.05141063E-09 0.01163076E-12    2
--0.02277045E+06-0.05147426E+03 0.04510764E+01 0.03884901E+00-0.03832912E-03    3
- 0.02029502E-06-0.04357591E-10-0.01767234E+06 0.02414546E+03                   4
-CH3CHOH           103190C   2H   5O   1     G  0300.00   4000.00  1500.00      1
- 0.01161148E+03 0.05173117E-01-0.04856685E-05-0.02202895E-08 0.03913721E-12    2
--0.01248811E+06-0.03688213E+03 0.01415940E+02 0.02870648E+00-0.02373820E-03    3
- 0.01148886E-06-0.02391420E-10-0.08638718E+05 0.01844256E+03                   4
-CH3CL             112989C   1H   3CL  1     G  0300.00   5000.00  1000.00      1
- 0.03633876E+02 0.08664625E-01-0.03343871E-04 0.05950130E-08-0.04001401E-12    2
--0.01177659E+06 0.04430651E+02 0.04621901E+01 0.02068247E+00-0.02553133E-03    3
- 0.02160311E-06-0.07706816E-10-0.01093667E+06 0.02032977E+03                   4
-CH3CO             120186C   2H   3O   1     G  0300.00   5000.00  1000.00      1
- 0.05612279E+02 0.08449886E-01-0.02854147E-04 0.04238376E-08-0.02268404E-12    2
--0.05187863E+05-0.03274949E+02 0.03125278E+02 0.09778220E-01 0.04521448E-04    3
--0.09009462E-07 0.03193718E-10-0.04108508E+05 0.01122885E+03                   4
-CH3F               82489C   1H   3F   1     G  0300.00   5000.00  1000.00      1
- 0.03014978E+02 0.09314397E-01-0.03611697E-04 0.06443728E-08-0.04339594E-12    2
--0.02977838E+06 0.06323815E+02 0.02600911E+01 0.02000788E+00-0.02662585E-03    3
- 0.02561177E-06-0.09935237E-10-0.02896233E+06 0.02031799E+03                   4
-CH3HCO            120186C   2O   1H   4     G  0300.00   5000.00  1000.00      1
- 0.05868650E+02 0.01079424E+00-0.03645530E-04 0.05412912E-08-0.02896844E-12    2
--0.02264569E+06-0.06012946E+02 0.02505695E+02 0.01336991E+00 0.04671953E-04    3
--0.01128140E-06 0.04263566E-10-0.02124589E+06 0.01335089E+03                   4
-CH3NO             103190C   1H   3N   1O   1G  0300.00   4000.00  1500.00      1
- 0.08820547E+02 0.03706233E-01-0.02894741E-05-0.01897910E-08 0.03237544E-12    2
- 0.05362862E+05-0.02213220E+03 0.02109955E+02 0.01517822E+00-0.07071789E-04    3
- 0.01510611E-07-0.01604204E-11 0.08293612E+05 0.01569702E+03                   4
-CH3NO2            103190C   1H   3N   1O   2G  0300.00   4000.00  1500.00      1
- 0.01090158E+03 0.04326381E-01-0.04203548E-05-0.01893071E-08 0.03417444E-12    2
--0.01370862E+06-0.03073183E+03 0.03224717E+01 0.02665147E+00-0.01930574E-03    3
- 0.07762620E-07-0.01398746E-10-0.09597527E+05 0.02726156E+03                   4
-CH3O              121686C   1H   3O   1     G  0300.00   3000.00  1000.00      1
- 0.03770800E+02 0.07871497E-01-0.02656384E-04 0.03944431E-08-0.02112616E-12    2
- 0.01278325E+04 0.02929575E+02 0.02106204E+02 0.07216595E-01 0.05338472E-04    3
--0.07377636E-07 0.02075611E-10 0.09786011E+04 0.01315218E+03                   4
-CH3OCH3           103190C   2H   6O   1     G  0300.00   4000.00  1500.00      1
- 0.01228100E+03 0.06711031E-01-0.04726871E-05-0.03636409E-08 0.06084545E-12    2
--0.02839743E+06-0.04434692E+03 0.01245246E+02 0.02381198E+00-0.08266949E-04    3
- 0.03068452E-08 0.01909248E-11-0.02335996E+06 0.01855817E+03                   4
-CH3OCL             53090C   1H   3O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.01022518E+03 0.02780047E-01-0.03331582E-05-0.05437858E-09 0.01012799E-12    2
--0.01172886E+06-0.02912014E+03 0.01575392E+02 0.02255642E+00-0.02052644E-03    3
- 0.01075312E-06-0.02371140E-10-0.08346834E+05 0.01804593E+03                   4
-CH3OH             121686C   1H   4O   1     G  0300.00   5000.00  1000.00      1
- 0.04029061E+02 0.09376593E-01-0.03050254E-04 0.04358793E-08-0.02224723E-12    2
--0.02615791E+06 0.02378196E+02 0.02660115E+02 0.07341508E-01 0.07170051E-04    3
--0.08793194E-07 0.02390570E-10-0.02535348E+06 0.01123263E+03                   4
-CH3ONO            103190C   1H   3N   1O   2G  0300.00   4000.00  1500.00      1
- 0.01136129E+03 0.04159349E-01-0.04145670E-05-0.01695140E-08 0.03028732E-12    2
--0.01281482E+06-0.03545435E+03 0.01490345E+02 0.02645433E+00-0.02112332E-03    3
- 0.09414399E-07-0.01811205E-10-0.09125782E+05 0.01813766E+03                   4
-CH3ONO2           103190C   1H   3N   1O   3G  0300.00   4000.00  1500.00      1
- 0.01436189E+03 0.04112243E-01-0.05113052E-05-0.01496436E-08 0.03012156E-12    2
--0.01972440E+06-0.05131842E+03 0.07803354E+01 0.03454204E+00-0.02822328E-03    3
- 0.01232324E-06-0.02302164E-10-0.01465346E+06 0.02245752E+03                   4
-CH3SICL            10891C   1H   3CL  1SI  1G  0300.00   4000.00  1500.00      1
- 0.01001981E+03 0.03098227E-01-0.03223524E-05-0.01222654E-08 0.02254960E-12    2
--0.05427416E+05-0.02357211E+03 0.03485139E+02 0.01833182E+00-0.01573128E-03    3
- 0.07856310E-07-0.01670946E-10-0.02954042E+05 0.01186948E+03                   4
-CH3SIH2SIH         10891C   2H  10SI  2     G  0300.00   4000.00  1500.00      1
- 0.02302241E+03 0.08819047E-01-0.08859755E-05-0.03700889E-08 0.06746256E-12    2
--0.01577058E+06-0.09458104E+03 0.02492915E+02 0.05396367E+00-0.04281663E-03    3
- 0.01967585E-06-0.03981630E-10-0.07813141E+05 0.01758364E+03                   4
-CH3SIH2SIH2CH3     61991H  10C   2SI  2     G  0300.00   2500.00  1500.00      1
- 0.01948332E+03 0.01195163E+00-0.02653155E-05-0.01489522E-07 0.03049901E-11    2
--0.01405639E+06-0.07368209E+03 0.03129493E+02 0.05016930E+00-0.03522061E-03    3
- 0.01354295E-06-0.02274339E-10-0.08303932E+05 0.01426819E+03                   4
-CH3SIHCL2          10891C   1CL  2H   4SI  1G  0300.00   4000.00  1500.00      1
- 0.01459367E+03 0.04005638E-01-0.04816391E-05-0.01336359E-08 0.02648177E-12    2
--0.05325682E+06-0.04689839E+03 0.04156949E+02 0.02994072E+00-0.02797859E-03    3
- 0.01431829E-06-0.03010165E-10-0.04952345E+06 0.09043929E+02                   4
-CH4               121286C   1H   4          G  0300.00   5000.00  1000.00      1
- 0.01683479E+02 0.01023724E+00-0.03875129E-04 0.06785585E-08-0.04503423E-12    2
--0.01008079E+06 0.09623395E+02 0.07787415E+01 0.01747668E+00-0.02783409E-03    3
- 0.03049708E-06-0.01223931E-09-0.09825229E+05 0.01372219E+03                   4
-CHCL              112989C   1H   1CL  1     G  0300.00   5000.00  1200.00      1
- 0.03216518E+02 0.05976969E-01-0.02918238E-04 0.05912801E-08-0.04297945E-12    2
- 0.03879839E+06 0.07793842E+02 0.02781263E+02 0.07805384E-01-0.01063711E-03    3
- 0.01065441E-06-0.03916797E-10 0.03916144E+06 0.01045515E+03                   4
-CHCL2              40992H   1C   1CL  2     G  0300.00   4000.00  1500.00      1
- 0.06912875E+02 0.01251733E-01-0.01973086E-05-0.02153722E-09 0.05853635E-13    2
- 0.07229632E+05-0.07968135E+02 0.02809820E+02 0.01295936E+00-0.01392392E-03    3
- 0.07533319E-07-0.01588448E-10 0.08515305E+05 0.01343798E+03                   4
-CHCL2CCL2          40992H   1C   2CL  4     G  0300.00   4000.00  1500.00      1
- 0.01530640E+03 0.02140772E-01-0.04619954E-05 0.08299157E-10 0.05236928E-13    2
--0.01524306E+05-0.04358303E+03 0.04207169E+02 0.03437580E+00-0.03802411E-03    3
- 0.02026572E-06-0.04164115E-10 0.01811422E+05 0.01398021E+03                   4
-CHCL2CCLO          40992H   1C   2 O  1CL  3G  0300.00   4000.00  1500.00      1
- 0.01488775E+03 0.02323698E-01-0.04365744E-05-0.01680889E-09 0.08613253E-13    2
--0.03483792E+06-0.04504932E+03 0.04593886E+02 0.03118954E+00-0.03338775E-03    3
- 0.01763042E-06-0.03630728E-10-0.03160866E+06 0.08756166E+02                   4
-CHCL2CH2           53090C   2H   3CL  2     G  0300.00   5000.00  1500.00      1
- 0.01306632E+03 0.02964322E-01-0.04303601E-05-0.03173131E-09 0.08244908E-13    2
- 0.04594697E+05-0.03814765E+03 0.02234889E+02 0.03152885E+00-0.03307990E-03    3
- 0.01825221E-06-0.03994163E-10 0.08375531E+05 0.01944506E+03                   4
-CHCL2CHCL          53090C   2H   2CL  3     G  0300.00   5000.00  1500.00      1
- 0.01445051E+03 0.02336553E-01-0.04132107E-05-0.05243785E-11 0.04204775E-13    2
--0.05183250E+04-0.04362699E+03 0.03789098E+02 0.03243338E+00-0.03598339E-03    3
- 0.01993302E-06-0.04287482E-10 0.02920910E+05 0.01221991E+03                   4
-CHCL2CHCL2         53090C   2H   2CL  4     G  0300.00   5000.00  1500.00      1
- 0.01745859E+03 0.02484178E-01-0.05127803E-05 0.02266909E-09 0.02371932E-13    2
--0.02510699E+06-0.06065213E+03 0.02711746E+02 0.04441279E+00-0.04905962E-03    3
- 0.02632472E-06-0.05466293E-10-0.02052421E+06 0.01624857E+03                   4
-CHCL3              40992H   1C   1CL  3     G  0300.00   4000.00  1500.00      1
- 0.01034980E+03 0.01690302E-01-0.03209168E-05-0.09502160E-10 0.05845725E-13    2
--0.01567029E+06-0.02558805E+03 0.02905633E+02 0.02315061E+00-0.02534675E-03    3
- 0.01356724E-06-0.02810882E-10-0.01339798E+06 0.01310749E+03                   4
-CHCLCCL            40992H   1C   2CL  2     G  0300.00   4000.00  1500.00      1
- 0.01027647E+03 0.01733039E-01-0.03161161E-05-0.08153494E-10 0.05443014E-13    2
- 0.02418877E+06-0.02436862E+03 0.02625129E+02 0.02366908E+00-0.02583240E-03    3
- 0.01383374E-06-0.02870111E-10 0.02654214E+06 0.01545629E+03                   4
-CHCLCCLOH          53090C   2H   2O   1CL  2G  0300.00   5000.00  1500.00      1
- 0.01412206E+03 0.02583764E-01-0.04576900E-05 0.05215675E-10 0.03521300E-13    2
--0.02752482E+06-0.04544297E+03 0.02020547E+02 0.03810981E+00-0.04280147E-03    3
- 0.02343806E-06-0.04934735E-10-0.02385982E+06 0.01729375E+03                   4
-CHCLCH             53090C   2H   2CL  1     G  0300.00   5000.00  1500.00      1
- 0.09924881E+02 0.01618108E-01-0.02995768E-05-0.09718417E-11 0.03296695E-13    2
- 0.02834312E+06-0.02704593E+03 0.01190122E+02 0.02432800E+00-0.02555965E-03    3
- 0.01375158E-06-0.02941848E-10 0.03138157E+06 0.01944186E+03                   4
-CHCLCHCL           53090C   2H   2CL  2     G  0300.00   5000.00  1500.00      1
- 0.01163648E+03 0.02461981E-01-0.03900520E-05-0.01521677E-09 0.05853766E-13    2
--0.05593248E+05-0.03507354E+03 0.01054340E+02 0.03076645E+00-0.03252549E-03    3
- 0.01763454E-06-0.03774444E-10-0.02006846E+05 0.02094011E+03                   4
-CHCLCHOH           53090C   2H   3O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.01285464E+03 0.03107712E-01-0.04837735E-05-0.02088657E-09 0.07393125E-13    2
--0.02505588E+06-0.04274804E+03-0.02073397E+01 0.03868022E+00-0.04104567E-03    3
- 0.02211252E-06-0.04680556E-10-0.02074261E+06 0.02608356E+03                   4
-CHCLOH             53090C   1H   2O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.09427376E+02 0.01722643E-01-0.02912707E-05-0.03765845E-10 0.03354461E-13    2
--0.01224575E+06-0.02330123E+03 0.01319372E+02 0.02406119E+00-0.02560105E-03    3
- 0.01356738E-06-0.02812530E-10-0.09640457E+05 0.01925640E+03                   4
-CHCLOHCH2          53090C   2H   4O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.01438435E+03 0.03552541E-01-0.05033147E-05-0.04051247E-09 0.01001172E-12    2
--0.01383899E+06-0.04819745E+03 0.01473757E+02 0.03764188E+00-0.03898776E-03    3
- 0.02112109E-06-0.04543830E-10-0.09395106E+05 0.02033823E+03                   4
-CHCLOHCHCL         53090C   2H   3O   1CL  2G  0300.00   5000.00  1500.00      1
- 0.01567240E+03 0.02970040E-01-0.04827588E-05-0.01366600E-09 0.06500296E-13    2
--0.01896002E+06-0.05132923E+03 0.02626025E+02 0.03856175E+00-0.04091474E-03    3
- 0.02190241E-06-0.04603080E-10-0.01468188E+06 0.01735864E+03                   4
-CHF                82489C   1H   1F   1     G  0300.00   5000.00  1000.00      1
- 0.04242812E+02 0.02066316E-01-0.06527951E-05 0.01388700E-08-0.01213336E-12    2
- 0.01355982E+06 0.01680197E+02 0.03029061E+02 0.04850873E-01-0.04971679E-04    3
- 0.05277968E-07-0.02403154E-10 0.01401435E+06 0.08324101E+02                   4
-CHF3               82489C   1H   1F   3     G  0300.00   5000.00  1000.00      1
- 0.06834333E+02 0.06248731E-01-0.02575750E-04 0.04809112E-08-0.03352074E-12    2
--0.08663771E+06-0.01062741E+03 0.08725142E+01 0.02308432E+00-0.02123718E-03    3
- 0.01114428E-06-0.02909229E-10-0.08496391E+06 0.02021499E+03                   4
-CHOHCLCCL2         53090C   2H   2O   1CL  3G  0300.00   5000.00  1500.00      1
- 0.01681824E+03 0.02450153E-01-0.04706624E-05 0.01313263E-09 0.03046283E-13    2
--0.02253368E+06-0.05396958E+03 0.04216444E+02 0.03898554E+00-0.04360467E-03    3
- 0.02374677E-06-0.04984764E-10-0.01867017E+06 0.01152520E+03                   4
-CHSICL             40992H   1C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.08205361E+02 0.01092172E-01-0.02021812E-05-0.04611367E-10 0.03306854E-13    2
- 0.04201323E+06-0.01240589E+03 0.04575767E+02 0.01266147E+00-0.01507699E-03    3
- 0.08704482E-07-0.01902710E-10 0.04304864E+06 0.06132926E+02                   4
-CHSICL2            40992H   1C   1SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01071823E+03 0.01148355E-01-0.02625783E-05 0.01567972E-09 0.01085455E-13    2
- 0.01124882E+06-0.02053734E+03 0.05945817E+02 0.01709681E+00-0.02135360E-03    3
- 0.01252863E-06-0.02749860E-10 0.01253413E+06 0.03573691E+02                   4
-CHSICL3            40992H   1C   1SI  1CL  3G  0300.00   4000.00  1500.00      1
- 0.01359698E+03 0.01283679E-01-0.03320724E-05 0.03292615E-09-0.05463635E-14    2
--0.02236189E+06-0.03349768E+03 0.07368467E+02 0.02227384E+00-0.02809218E-03    3
- 0.01644147E-06-0.03590729E-10-0.02071740E+06-0.02118077E+02                   4
-CHSIH2CL           40992H   3C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01142815E+03 0.02475732E-01-0.03864817E-05-0.04667547E-09 0.01222497E-12    2
- 0.02085332E+06-0.03033129E+03 0.02869509E+02 0.02622702E+00-0.02794178E-03    3
- 0.01516891E-06-0.03231519E-10 0.02364000E+06 0.01462055E+03                   4
-CHSIHCL            40992H   2C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.09716450E+02 0.01691882E-01-0.02846288E-05-0.02130090E-09 0.06948758E-13    2
- 0.03056780E+06-0.02079822E+03 0.04045980E+02 0.01850072E+00-0.02095734E-03    3
- 0.01185107E-06-0.02580401E-10 0.03232392E+06 0.08632908E+02                   4
-CHSIHCL2           40992H   2C   1SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01246646E+03 0.01911555E-01-0.03687550E-05-0.05466318E-10 0.05749803E-13    2
--0.09679288E+04-0.03163481E+03 0.04853917E+02 0.02509790E+00-0.02916486E-03    3
- 0.01649649E-06-0.03563598E-10 0.01297543E+05 0.07606296E+02                   4
-CL                 42189CL  1               G  0300.00   5000.00  1000.00      1
- 0.02920237E+02-0.03597985E-02 0.01294294E-05-0.02162776E-09 0.01376517E-13    2
- 0.01371338E+06 0.03262690E+02 0.02381577E+02 0.08891079E-02 0.04070476E-05    3
--0.02168943E-07 0.01160827E-10 0.01383999E+06 0.06021818E+02                   4
-CL(CH3)SICH2       40992H   5C   2SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01496923E+03 0.05605854E-01-0.06191278E-05-0.02134591E-08 0.03977673E-12    2
--0.01304066E+06-0.05036296E+03 0.02980753E+02 0.03627511E+00-0.03428566E-03    3
- 0.01799146E-06-0.03853029E-10-0.08814405E+05 0.01362870E+03                   4
-CL2                42189CL  2               G  0300.00   5000.00  1000.00      1
- 0.04274587E+02 0.03717337E-02-0.01893490E-05 0.05337465E-09-0.05057602E-13    2
--0.01331149E+05 0.02256947E+02 0.03439587E+02 0.02870774E-01-0.02385871E-04    3
- 0.02892918E-08 0.02915057E-11-0.01131787E+05 0.06471359E+02                   4
-CL2CCCL2           40992C   2CL  4          G  0300.00   4000.00  1500.00      1
- 0.01440000E+03 0.01269397E-01-0.03525286E-05 0.04493620E-09-0.02348053E-13    2
--0.08039017E+05-0.04321878E+03 0.05557831E+02 0.02778255E+00-0.03176769E-03    3
- 0.01706054E-06-0.03492940E-10-0.05495042E+05 0.02293508E+02                   4
-CL2CCHCL           40992H   1C   2CL  3     G  0300.00   4000.00  1500.00      1
- 0.01278204E+03 0.02068630E-01-0.03764411E-05-0.09077792E-10 0.06116574E-13    2
--0.06934337E+05-0.03655991E+03 0.03457684E+02 0.02848717E+00-0.03070062E-03    3
- 0.01624951E-06-0.03341401E-10-0.04047205E+05 0.01206381E+03                   4
-CL2CCHO            40992H   1C   2 O  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01294627E+03 0.02168144E-01-0.04244587E-05-0.03590986E-09 0.01220303E-12    2
--0.01144361E+06-0.03783814E+03 0.03400952E+02 0.02760695E+00-0.02843245E-03    3
- 0.01470263E-06-0.03017427E-10-0.08287517E+05 0.01257321E+03                   4
-CL2CHOH            53090C   1H   2O   1CL  2G  0300.00   5000.00  1500.00      1
- 0.01129114E+03 0.02286704E-01-0.03461513E-05-0.01814480E-09 0.05661342E-13    2
--0.03803060E+06-0.03079831E+03 0.02619078E+02 0.02601286E+00-0.02784252E-03    3
- 0.01528682E-06-0.03294008E-10-0.03513998E+06 0.01492462E+03                   4
-CL2CO              40992C   1 O  1CL  2     G  0300.00   4000.00  1500.00      1
- 0.08764773E+02 0.08919938E-02-0.02237590E-05 0.01486621E-09 0.09630870E-14    2
--0.02973390E+06-0.01732025E+03 0.03460242E+02 0.01632331E+00-0.01828304E-03    3
- 0.09805656E-07-0.02024319E-10-0.02813622E+06 0.01019127E+03                   4
-CL2COH             53090C   1O   1H   1CL  2G  0300.00   5000.00  1500.00      1
- 0.01026215E+03 0.01316796E-01-0.02754008E-05 0.01630771E-09 0.06472563E-14    2
--0.01511655E+06-0.02298315E+03 0.03800719E+02 0.02204678E+00-0.02673857E-03    3
- 0.01531854E-06-0.03305323E-10-0.01332053E+06 0.09915879E+02                   4
-CL2HCO             53090C   1H   1O   1CL  2G  0300.00   5000.00  1500.00      1
- 0.01051838E+03 0.01499316E-01-0.02927670E-05 0.07898750E-10 0.01988433E-13    2
--0.06272394E+05-0.02634097E+03 0.02241202E+02 0.02456990E+00-0.02682371E-03    3
- 0.01443170E-06-0.03023080E-10-0.03624526E+05 0.01703508E+03                   4
-CL2SI(CH3)2        40992H   6C   2SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01890988E+03 0.06245385E-01-0.06370532E-05-0.02508388E-08 0.04589637E-12    2
--0.06523166E+06-0.06829627E+03 0.05958770E+02 0.03632045E+00-0.03098078E-03    3
- 0.01545683E-06-0.03292671E-10-0.06031232E+06 0.01996401E+02                   4
-CL2SI(CH3)CH2      40992H   5C   2SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01795078E+03 0.05155757E-01-0.06049094E-05-0.01717793E-08 0.03355529E-12    2
--0.03961749E+06-0.05949218E+03 0.05993815E+02 0.03621806E+00-0.03546358E-03    3
- 0.01906128E-06-0.04137511E-10-0.03541814E+06 0.04216162E+02                   4
-CL2SICH2           40992H   2C   1SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01186709E+03 0.02689241E-01-0.04231139E-05-0.05555102E-09 0.01367174E-12    2
--0.02169965E+06-0.03225026E+03 0.04111900E+02 0.02637445E+00-0.02985130E-03    3
- 0.01679309E-06-0.03625511E-10-0.01940307E+06 0.07695176E+02                   4
-CL2SICH3           40992H   3C   1SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01285090E+03 0.03239360E-01-0.03774509E-05-0.01111777E-08 0.02163712E-12    2
--0.03164727E+06-0.03531424E+03 0.05273286E+02 0.02205797E+00-0.02049425E-03    3
- 0.01060061E-06-0.02257829E-10-0.02891555E+06 0.05340218E+02                   4
-CL2SISI            40992SI  2CL  2          G  0300.00   4000.00  1500.00      1
- 0.09706403E+02 0.03323652E-02-0.01679851E-05 0.04061274E-09-0.03746093E-13    2
- 0.01334060E+06-0.01565614E+03 0.06576632E+02 0.01105568E+00-0.01422816E-03    3
- 0.08199114E-07-0.01752833E-10 0.01412004E+06 0.06538601E-02                   4
-CL2SISICL          40992SI  2CL  3          G  0300.00   4000.00  1500.00      1
- 0.01304318E+03-0.01847658E-03-0.02187635E-05 0.08817012E-09-0.01004063E-12    2
--0.01640770E+06-0.02832289E+03 0.08389457E+02 0.01629172E+00-0.02138192E-03    3
- 0.01207431E-06-0.02508349E-10-0.01534318E+06-0.05268396E+02                   4
-CL2SISICL2         40992SI  2CL  4          G  0300.00   4000.00  1500.00      1
- 0.01620538E+03 0.08400587E-04-0.02457560E-05 0.08992196E-09-0.09639101E-13    2
--0.05343016E+06-0.04193027E+03 0.01077595E+03 0.01717615E+00-0.02131386E-03    3
- 0.01172528E-06-0.02417202E-10-0.05196762E+06-0.01431634E+03                   4
-CL3CCO             81092C   2O   1CL  3     G  0300.00   5000.00  1400.00      1
- 0.01383246E+03 0.01240141E-01-0.03510210E-05 0.04103960E-09-0.01475220E-13    2
- 0.07499342E+07-0.03691505E+03 0.05016825E+02 0.02899350E+00-0.03563990E-03    3
- 0.02082488E-06-0.04661957E-10 0.07524076E+07 0.08141487E+02                   4
-CL3CO              53090C   1O   1CL  3     G  0300.00   5000.00  1500.00      1
- 0.01208526E+03 0.07759038E-02-0.02700075E-05 0.04346263E-09-0.02671642E-13    2
--0.06464079E+05-0.03099432E+03 0.04548646E+02 0.02463303E+00-0.02974898E-03    3
- 0.01647154E-06-0.03433021E-10-0.04416522E+05 0.07360693E+02                   4
-CL3COH             53090C   1O   1H   1CL  3G  0300.00   5000.00  1500.00      1
- 0.01285985E+03 0.01588083E-01-0.03377500E-05 0.02031362E-09 0.08017922E-14    2
--0.03807818E+06-0.03561945E+03 0.04269172E+02 0.02791723E+00-0.03272753E-03    3
- 0.01828272E-06-0.03882978E-10-0.03558880E+06 0.08521096E+02                   4
-CL3SICH3           40992H   3C   1SI  1CL  3G  0300.00   4000.00  1500.00      1
- 0.01572988E+03 0.03373817E-01-0.04472970E-05-0.09359551E-09 0.01995442E-12    2
--0.07539927E+06-0.05017697E+03 0.06708039E+02 0.02724465E+00-0.02730290E-03    3
- 0.01457864E-06-0.03116460E-10-0.07231476E+06-0.02328694E+02                   4
-CL3SISI            40992SI  2CL  3          G  0300.00   4000.00  1500.00      1
- 0.01263015E+03 0.04310339E-02-0.02248369E-05 0.05573034E-09-0.05229996E-13    2
--0.01723335E+06-0.02767933E+03 0.08429942E+02 0.01496243E+00-0.01942087E-03    3
- 0.01125326E-06-0.02414611E-10-0.01619796E+06-0.06711706E+02                   4
-CL3SISICL          40992SI  2CL  4          G  0300.00   4000.00  1500.00      1
- 0.01503498E+03 0.05376136E-02-0.02788507E-05 0.06889626E-09-0.06454867E-13    2
--0.05496076E+06-0.03460735E+03 0.09721335E+02 0.01889709E+00-0.02451039E-03    3
- 0.01419597E-06-0.03045164E-10-0.05364875E+06-0.08073287E+02                   4
-CLCCCL             40992C   2CL  2          G  0300.00   4000.00  1500.00      1
- 0.09105373E+02 0.09281996E-02-0.01948371E-05 0.01590377E-10 0.02472937E-13    2
- 0.02507216E+06-0.02072870E+03 0.05118707E+02 0.01243668E+00-0.01386540E-03    3
- 0.07609302E-07-0.01615959E-10 0.02631398E+06 0.03298777E+00                   4
-CLCCO              53090C   2O   1CL  1     G  0300.00   5000.00  1500.00      1
- 0.09368609E+02 0.03733935E-02-0.01286981E-05 0.01206469E-09 0.09220283E-15    2
- 0.01762808E+06-0.02046752E+03 0.04417443E+02 0.01129365E+00-0.01013488E-03    3
- 0.04661357E-07-0.09098661E-11 0.01952423E+06 0.06539246E+02                   4
-CLCH2OH            53090C   1H   3O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.09750194E+02 0.02974385E-01-0.03450482E-05-0.06010047E-09 0.01089784E-12    2
--0.03248678E+06-0.02345467E+03 0.08330910E+01 0.02358999E+00-0.02137297E-03    3
- 0.01105808E-06-0.02402402E-10-0.02905351E+06 0.02503745E+03                   4
-CLCO               40992C   1 O  1CL  1     G  0300.00   4000.00  1500.00      1
- 0.06134827E+02 0.05369294E-02-0.07583742E-06-0.01514557E-09 0.03376080E-13    2
--0.05363338E+05-0.03198172E+02 0.04790425E+02 0.03165209E-01-0.02098201E-04    3
- 0.07703306E-08-0.01346351E-11-0.04812905E+05 0.04257480E+02                   4
-CLCOH              53090C   1H   1O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.07642908E+02 0.01507814E-01-0.02651581E-05-0.01466785E-09 0.04797316E-13    2
--0.02511908E+05-0.01405046E+03 0.02037663E+02 0.01733328E+00-0.01936443E-03    3
- 0.01099366E-06-0.02427341E-10-0.06596141E+04 0.01538422E+03                   4
-CLH2CO             53090C   1H   2O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.09104530E+02 0.02130629E-01-0.02994563E-05-0.02733652E-09 0.06437597E-13    2
--0.05255641E+05-0.02258799E+03 0.08437505E+01 0.02258903E+00-0.02217447E-03    3
- 0.01165204E-06-0.02487574E-10-0.02264707E+05 0.02176388E+03                   4
-CLHCO              40992H   1C   1 O  1CL  1G  0300.00   4000.00  1500.00      1
- 0.07132409E+02 0.01686027E-01-0.02034320E-05-0.05804520E-09 0.01152902E-12    2
--0.02522232E+06-0.01150137E+03 0.02378612E+02 0.01278870E+00-0.01094130E-03    3
- 0.05089666E-07-0.09985544E-11-0.02348305E+06 0.01417749E+03                   4
-CLO                40992 O  1CL  1          G  0300.00   4000.00  1500.00      1
- 0.04320627E+02 0.01730970E-02-0.07157875E-06 0.01424639E-09-0.01115543E-13    2
- 0.01328601E+06 0.01764362E+02 0.02918696E+02 0.04664857E-01-0.05654826E-04    3
- 0.03131108E-07-0.06515478E-11 0.01365989E+06 0.08877238E+02                   4
-CLOCL              53090O   1CL  2          G  0300.00   5000.00  1500.00      1
- 0.06635186E+02 0.03284434E-02-0.01225328E-05 0.02123621E-09-0.01404377E-13    2
- 0.07672352E+05-0.06410996E+02 0.03397880E+02 0.01080127E+00-0.01324655E-03    3
- 0.07392960E-07-0.01546583E-10 0.08527797E+05 0.09981834E+02                   4
-CLOO               40992 O  2CL  1          G  0300.00   4000.00  1500.00      1
- 0.06500858E+02 0.04259430E-02-0.01471496E-05 0.02312042E-09-0.01357033E-13    2
- 0.01465068E+06-0.05831007E+02 0.03097113E+02 0.01088530E+00-0.01274586E-03    3
- 0.06909658E-07-0.01419679E-10 0.01560137E+06 0.01159355E+03                   4
-CLSI(CH3)2         40992H   6C   2SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01602072E+03 0.06121766E-01-0.05697358E-05-0.02685516E-08 0.04764446E-12    2
--0.02023771E+06-0.05448286E+03 0.04366292E+02 0.03146501E+00-0.02442313E-03    3
- 0.01155763E-06-0.02441972E-10-0.01561856E+06 0.09415220E+02                   4
-CLSI(CH3)2CH2      40992H   8C   3SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.02115100E+03 0.08018265E-01-0.07924248E-05-0.03295050E-08 0.05955233E-12    2
--0.02795355E+06-0.07954995E+03 0.05283182E+02 0.04510586E+00-0.03881938E-03    3
- 0.01972924E-06-0.04266615E-10-0.02191153E+06 0.06553031E+02                   4
-CLSI(CH3)3         40992H   9C   3SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.02209311E+03 0.09120019E-01-0.08258094E-05-0.04093090E-08 0.07203542E-12    2
--0.05338834E+06-0.08746922E+03 0.05151450E+02 0.04536455E+00-0.03440035E-03    3
- 0.01610968E-06-0.03411234E-10-0.04659624E+06 0.05658041E+02                   4
-CLSICH3            40992H   3C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01002062E+03 0.03097435E-01-0.03221687E-05-0.01222123E-08 0.02253457E-12    2
--0.05623578E+05-0.02357626E+03 0.03485850E+02 0.01832800E+00-0.01572477E-03    3
- 0.07852071E-07-0.01669997E-10-0.03149803E+05 0.01186709E+03                   4
-CLSISI             40992SI  2CL  1          G  0300.00   4000.00  1500.00      1
- 0.06847303E+02 0.01844250E-02-0.09793979E-06 0.02440659E-09-0.02287823E-13    2
- 0.04772443E+06-0.03339368E+02 0.05234557E+02 0.05788035E-01-0.07516996E-04    3
- 0.04356402E-07-0.09346885E-11 0.04811932E+06 0.04702599E+02                   4
-CLSISICL           40992SI  2CL  2          G  0300.00   4000.00  1500.00      1
- 0.01008343E+03-0.01216815E-02-0.01555866E-05 0.07247150E-09-0.08633006E-13    2
- 0.01376083E+06-0.01644862E+03 0.07022588E+02 0.01136420E+00-0.01558778E-03    3
- 0.08961882E-07-0.01874769E-10 0.01437523E+06-0.01570360E+02                   4
-CN                121286C   1N   1          G  0300.00   5000.00  1000.00      1
- 0.03720120E+02 0.01518351E-02 0.01987381E-05-0.03798371E-09 0.01328230E-13    2
- 0.05111626E+06 0.02888597E+02 0.03663204E+02-0.01156529E-01 0.02163409E-04    3
- 0.01854208E-08-0.08214695E-11 0.05128118E+06 0.03739016E+02                   4
-CN+               121286C   1N   1E  -1     G  0300.00   5000.00  1000.00      1
- 0.03701463E+02 0.07482931E-02-0.01790173E-05 0.02366368E-09-0.01437037E-13    2
- 0.02155966E+07 0.04108678E+02 0.03118657E+02 0.01553258E-01-0.09487764E-05    3
- 0.01479501E-07-0.09096763E-11 0.02158512E+07 0.07456254E+02                   4
-CN-               121286C   1N   1E   1     G  0300.00   5000.00  1000.00      1
- 0.02981277E+02 0.01464773E-01-0.05672737E-05 0.01017623E-08-0.06870931E-13    2
- 0.06346098E+05 0.06171693E+02 0.03278995E+02 0.01464192E-01-0.03925899E-04    3
- 0.05629875E-07-0.02473497E-10 0.06279509E+05 0.04568972E+02                   4
-CN2               121686C   1N   2          G  0300.00   5000.00  1000.00      1
- 0.05567064E+02 0.02100501E-01-0.09010517E-05 0.01718572E-08-0.01206255E-12    2
- 0.05489968E+06-0.05630054E+02 0.03039964E+02 0.08812105E-01-0.07605508E-04    3
- 0.03554357E-07-0.08746100E-11 0.05563268E+06 0.07555298E+02                   4
-CNN               121286C   1N   2          G  0300.00   5000.00  1000.00      1
- 0.04785930E+02 0.02559554E-01-0.01003133E-04 0.01807149E-08-0.01227383E-12    2
- 0.06870411E+06-0.02953957E+01 0.03524436E+02 0.07271923E-01-0.08272698E-04    3
- 0.05628705E-07-0.01641576E-10 0.06899647E+06 0.05932445E+02                   4
-CNO               103190C   1N   1O   1     G  0300.00   4000.00  1500.00      1
- 0.06328598E+02 0.07390401E-02-0.01110761E-05-0.01846498E-09 0.04400816E-13    2
- 0.04683387E+06-0.09091839E+02 0.03819863E+02 0.06416255E-01-0.05303312E-04    3
- 0.02308211E-07-0.04256414E-11 0.04775979E+06 0.04507300E+02                   4
-CO                121286C   1O   1          G  0300.00   5000.00  1000.00      1
- 0.03025078E+02 0.01442689E-01-0.05630828E-05 0.01018581E-08-0.06910952E-13    2
--0.01426835E+06 0.06108218E+02 0.03262452E+02 0.01511941E-01-0.03881755E-04    3
- 0.05581944E-07-0.02474951E-10-0.01431054E+06 0.04848897E+02                   4
-CO2               121286C   1O   2          G  0300.00   5000.00  1000.00      1
- 0.04453623E+02 0.03140169E-01-0.01278411E-04 0.02393997E-08-0.01669033E-12    2
--0.04896696E+06-0.09553959E+01 0.02275725E+02 0.09922072E-01-0.01040911E-03    3
- 0.06866687E-07-0.02117280E-10-0.04837314E+06 0.01018849E+03                   4
-CO2-              121286C   1O   2E   1     G  0300.00   5000.00  1000.00      1
- 0.04610574E+02 0.02532962E-01-0.01070165E-04 0.02026771E-08-0.01424958E-12    2
--0.05479882E+06 0.01449630E+02 0.02637077E+02 0.07803230E-01-0.08196187E-04    3
- 0.06537897E-07-0.02520220E-10-0.05416773E+06 0.01188955E+03                   4
-COS               121286C   1O   1S   1     G  0300.00   5000.00  1000.00      1
- 0.05191925E+02 0.02506123E-01-0.01024396E-04 0.01943914E-08-0.01370800E-12    2
--0.01846210E+06-0.02825755E+02 0.02858531E+02 0.09515458E-01-0.08884915E-04    3
- 0.04220994E-07-0.08557340E-11-0.01785145E+06 0.09081989E+02                   4
-CS                121686C   1S   1          G  0300.00   5000.00  1000.00      1
- 0.03737431E+02 0.08180451E-02-0.03178918E-05 0.05356801E-09-0.02886195E-13    2
- 0.03247725E+06 0.03576557E+02 0.02938623E+02 0.02724352E-01-0.02397707E-04    3
- 0.01689501E-07-0.06665050E-11 0.03273992E+06 0.07848720E+02                   4
-CS2               121286C   1S   2          G  0300.00   5000.00  1000.00      1
- 0.05930515E+02 0.01813645E-01-0.07492172E-05 0.01445892E-08-0.01032638E-12    2
- 0.01205117E+06-0.06093910E+02 0.03566139E+02 0.08374928E-01-0.06835704E-04    3
- 0.02091214E-07-0.06737193E-12 0.01268848E+06 0.06085967E+02                   4
-CSICL              40992C   1SI  1CL  1     G  0300.00   4000.00  1500.00      1
- 0.06817655E+02 0.02139344E-02-0.01117811E-05 0.02768133E-09-0.02593011E-13    2
- 0.07133105E+06-0.04934821E+02 0.04809756E+02 0.07155653E-01-0.09274105E-04    3
- 0.05368218E-07-0.01150991E-10 0.07182609E+06 0.05089754E+02                   4
-CSICL2             40992C   1SI  1CL  2     G  0300.00   4000.00  1500.00      1
- 0.09603536E+02 0.04212005E-02-0.02008617E-05 0.04653654E-09-0.04174779E-13    2
- 0.04167197E+06-0.01686119E+03 0.05482765E+02 0.01432904E+00-0.01824531E-03    3
- 0.01044588E-06-0.02224179E-10 0.04271677E+06 0.03823593E+02                   4
-CSICL3             40992C   1SI  1CL  3     G  0300.00   4000.00  1500.00      1
- 0.01250544E+03 0.05339218E-02-0.02588613E-05 0.06075307E-09-0.05497769E-13    2
- 0.04346089E+04-0.02851950E+03 0.07246579E+02 0.01837148E+00-0.02348583E-03    3
- 0.01347935E-06-0.02874547E-10 0.01760441E+05-0.02151092E+02                   4
-CSIH2CL            40992H   2C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01027485E+03 0.01774759E-01-0.03308189E-05-0.01554251E-09 0.07008815E-13    2
- 0.04915449E+06-0.02589174E+03 0.02180376E+02 0.02405210E+00-0.02551666E-03    3
- 0.01345591E-06-0.02782039E-10 0.05175432E+06 0.01659754E+03                   4
-CSIHCL             40992H   1C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.08584251E+02 0.09503299E-02-0.01990512E-05 0.07276089E-11 0.02697011E-13    2
- 0.05701632E+06-0.01616263E+03 0.04195792E+02 0.01336658E+00-0.01458110E-03    3
- 0.07822924E-07-0.01632113E-10 0.05839343E+06 0.06755654E+02                   4
-CSIHCL2            40992H   1C   1SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01133022E+03 0.01200867E-01-0.03112842E-05 0.02565133E-09 0.05146234E-14    2
- 0.02764986E+06-0.02737920E+03 0.04205701E+02 0.02278870E+00-0.02653546E-03    3
- 0.01465130E-06-0.03083816E-10 0.02972624E+06 0.09294144E+02                   4
-DIOXANE           103190C   4H   8O   2     G  0300.00   4000.00  1500.00      1
- 0.02168170E+03 0.01049644E+00-0.01053878E-04-0.04473945E-08 0.08168288E-12    2
--0.04922005E+06-0.09955139E+03-0.05862900E+02 0.07081444E+00-0.05458695E-03    3
- 0.02315148E-06-0.04289514E-10-0.03876477E+06 0.05061959E+03                   4
-E                 120186E   1               G  0300.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.07453749E+04-0.01173403E+03 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.07453750E+04-0.01173403E+03                   4
-F                 121286F   1               G  0300.00   5000.00  1000.00      1
- 0.02687459E+02-0.02010358E-02 0.08597957E-06-0.01644974E-09 0.01166160E-13    2
- 0.08722883E+05 0.03882212E+02 0.02913905E+02-0.07336339E-02 0.05571015E-05    3
--0.02666871E-08 0.08643255E-12 0.08651201E+05 0.02677115E+02                   4
-F2                121286F   2               G  0300.00   5000.00  1000.00      1
- 0.04018308E+02 0.06221479E-02-0.02420845E-05 0.04742076E-09-0.03418141E-13    2
--0.01300713E+05 0.01126327E+02 0.02940287E+02 0.03491492E-01-0.02458208E-04    3
- 0.01837073E-08 0.02850917E-11-0.01010430E+05 0.06694194E+02                   4
-F2SINH             42489SI  1N   1F   2H   1G  0300.00   3000.00  1000.00      1
- 0.01004830E+03 0.01983144E-01-0.02703169E-05-0.01767853E-08 0.04444368E-12    2
--0.07739741E+06-0.02303889E+03 0.04951547E+02 0.01329636E+00-0.02098648E-04    3
--0.01007276E-06 0.05552286E-10-0.07597541E+06 0.03690891E+02                   4
-F3SIN              22790F   3SI  1N   1     G  0300.00   4000.00  1000.00      1
- 0.01151242E+03 0.01115029E-01-0.01605465E-05-0.05271933E-09 0.01160900E-12    2
--0.01045919E+07-0.02981224E+03 0.06028419E+02 0.01278681E+00-0.01878856E-04    3
--0.09695426E-07 0.05184848E-10-0.01029950E+07-0.08217831E+01                   4
-FNNF               42489F   2N   2          G  0300.00   3000.00  1000.00      1
- 0.07255211E+02 0.02274410E-01-0.02793346E-05-0.02203844E-08 0.05359234E-12    2
- 0.06360353E+05-0.01094248E+03 0.03127143E+02 0.01057134E+00-0.09746112E-05    3
--0.07208357E-07 0.03567978E-10 0.07615831E+05 0.01107465E+03                   4
-FNO3              121286F   1N   1O   3     G  0300.00   5000.00  1000.00      1
- 0.09176275E+02 0.04219072E-01-0.01835576E-04 0.03553718E-08-0.02541078E-12    2
--0.02118639E+05-0.01934397E+03 0.02985786E+02 0.02094642E+00-0.01652733E-03    3
- 0.04318770E-07 0.01660784E-11-0.04237215E+04 0.01266793E+03                   4
-FO                121286F   1O   1          G  0300.00   5000.00  1000.00      1
- 0.03913735E+02 0.07210714E-02-0.02796614E-05 0.05337821E-09-0.03720184E-13    2
- 0.01180141E+06 0.03346368E+02 0.02879578E+02 0.03399121E-01-0.02572855E-04    3
- 0.07422381E-08-0.04328053E-12 0.01209663E+06 0.08738887E+02                   4
-FO2               121286F   1O   2          G  0300.00   5000.00  1000.00      1
- 0.05678971E+02 0.01442455E-01-0.06229546E-05 0.01199612E-08-0.08543416E-13    2
--0.03861836E+04-0.01941812E+02 0.03872542E+02 0.06409974E-01-0.05517785E-04    3
- 0.02232771E-07-0.03876157E-11 0.01157076E+04 0.07406950E+02                   4
-FSIN               42489SI  1N   1F   1     G  0300.00   3000.00  1000.00      1
- 0.06269572E+02 0.06747867E-02-0.01241976E-05-0.04970158E-09 0.01424452E-12    2
- 0.02533350E+06-0.04201141E+02 0.04269969E+02 0.05298358E-01-0.01103802E-04    3
--0.03962805E-07 0.02282982E-10 0.02587238E+06 0.06215038E+02                   4
-GA                 62987GA  1               G  0300.00   1500.00  0600.00      1
- 0.02679919E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.03368804E+06 0.06788109E+02 0.02679919E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.03368804E+06 0.06788109E+02                   4
-GA2H6              62987GA  2H   6          G  0300.00   1500.00  0600.00      1
- 0.06016247E+02 0.01788370E+00-0.01204229E-05-0.06487881E-07 0.02075367E-10    2
- 0.01312548E+06-0.05228030E+02-0.03914561E+02 0.04965434E+00 0.07401904E-04    3
--0.01124137E-05 0.08726339E-09 0.01493079E+06 0.04274883E+03                   4
-GAAS               62987GA  1AS  1          G  0300.00   1500.00  0600.00      1
- 0.04471149E+02 0.04238449E-02-0.02279405E-05-0.04441172E-10 0.02618952E-12    2
- 0.04313359E+06 0.06212471E+02 0.03967474E+02 0.02318966E-01-0.01145452E-04    3
--0.03411431E-07 0.03365821E-10 0.04321919E+06 0.08599628E+02                   4
-GAAS(3,C)          62987GA  3AS  3          G  0300.00   1500.00  0600.00      1
- 0.01485247E+03 0.02959435E-01-0.07124246E-05-0.05316048E-08 0.01287321E-11    2
- 0.01191262E+07-0.03514144E+03 0.01470189E+03 0.03827728E-01-0.02945747E-04    3
- 0.02465370E-07-0.01520598E-10 0.01191496E+07-0.03445955E+03                   4
-GAAS(3,L)          62987GA  3AS  3          G  0300.00   1500.00  0600.00      1
- 0.01356850E+03 0.02802435E-01-0.07969918E-05-0.06437098E-08 0.01560255E-11    2
- 0.01248005E+07-0.01381063E+03 0.01341276E+03 0.03617689E-01-0.02726209E-04    3
- 0.01877183E-07-0.01259178E-10 0.01248265E+07-0.01309195E+03                   4
-GAAS(5,C)          62987GA  5AS  5          G  0300.00   1500.00  0600.00      1
- 0.02573672E+03 0.05523956E-01-0.01203468E-04-0.01043743E-07 0.02528931E-11    2
- 0.01721381E+07-0.08254488E+03 0.02546512E+03 0.07014337E-01-0.04881356E-04    3
- 0.03825484E-07-0.02450420E-10 0.01721819E+07-0.08130267E+03                   4
-GAAS(5,L)          62987GA  5AS  5          G  0300.00   1500.00  0600.00      1
- 0.03045793E+03 0.05403152E-01-0.01649477E-04-0.09968842E-08 0.02413154E-11    2
- 0.02020691E+07-0.07768010E+03 0.03015255E+03 0.07234394E-01-0.06497994E-04    3
- 0.05559585E-07-0.03339653E-10 0.02021151E+07-0.07630866E+03                   4
-GAET               62987GA  1C   2H   5     G  0300.00   1500.00  0600.00      1
- 0.05932970E+02 0.01342454E+00 0.04110518E-05-0.04286069E-07 0.01238710E-10    2
- 0.06504863E+05 0.03090838E+02 0.01846399E+02 0.02592050E+00 0.05522394E-04    3
--0.04977960E-06 0.03654362E-09 0.07264445E+05 0.02294639E+03                   4
-GAET2              62987GA  1C   4H  10     G  0300.00   1500.00  0600.00      1
- 0.07213832E+02 0.03055228E+00 0.01249451E-04-0.09990274E-07 0.02881966E-10    2
--0.01392119E+05-0.07795098E+00-0.02162930E+02 0.05892512E+00 0.01447145E-03    3
--0.01168602E-05 0.08526654E-09 0.03561841E+04 0.04552626E+03                   4
-GAET3              62987GA  1C   6H  15     G  0300.00   1500.00  0600.00      1
- 0.08436453E+02 0.04804950E+00 0.02119157E-04-0.01581685E-06 0.04571178E-10    2
--0.01346996E+06-0.06196490E+02-0.06544289E+02 0.09332246E+00 0.02364121E-03    3
--0.01874104E-05 0.01367721E-08-0.01067659E+06 0.06666796E+03                   4
-GAH                62987GA  1H   1          G  0300.00   1500.00  0600.00      1
- 0.03232142E+02 0.01343247E-01-0.04325499E-06-0.02791841E-08 0.04973590E-12    2
- 0.02656060E+06 0.05947896E+02 0.03524579E+02 0.03386213E-02-0.02064014E-05    3
- 0.03220999E-07-0.02936132E-10 0.02651074E+06 0.04554067E+02                   4
-GAH2               62987GA  1H   2          G  0300.00   1500.00  0600.00      1
- 0.03762385E+02 0.03210792E-01 0.02180096E-06-0.08908393E-08 0.02219063E-11    2
- 0.01936647E+06 0.05783398E+02 0.03559710E+02 0.03676742E-01 0.06484499E-05    3
--0.03109349E-07 0.01585414E-10 0.01940976E+06 0.06803082E+02                   4
-GAH3               62987GA  1H   3          G  0300.00   1500.00  0600.00      1
- 0.03345476E+02 0.06399313E-01 0.01122996E-05-0.02065900E-07 0.05780202E-11    2
- 0.01228185E+06 0.06394842E+02 0.01726154E+02 0.01124739E+00 0.02447527E-04    3
--0.02026314E-06 0.01447000E-09 0.01258620E+06 0.01428445E+03                   4
-GAME               62987GA  1C   1H   3     G  0300.00   1500.00  0600.00      1
- 0.04809857E+02 0.06824207E-01 0.02258235E-05-0.02018341E-07 0.05736453E-11    2
- 0.07558677E+05 0.02595904E+02 0.03054537E+02 0.01218640E+00 0.02332213E-04    3
--0.02121866E-06 0.01544226E-09 0.07885869E+05 0.01112878E+03                   4
-GAME2              62987GA  1C   2H   6     G  0300.00   1500.00  0600.00      1
- 0.07068373E+02 0.01421602E+00 0.05120694E-05-0.04421986E-07 0.01309641E-10    2
- 0.05453790E+05-0.04173960E+02 0.02257655E+02 0.02916446E+00 0.05669861E-04    3
--0.05709755E-06 0.04268905E-09 0.06341297E+05 0.01915435E+03                   4
-GAME3              62987GA  1C   3H   9     G  0300.00   1500.00  0600.00      1
- 0.08410636E+02 0.02262803E+00 0.01043019E-04-0.07049611E-07 0.02015308E-10    2
--0.09087271E+05-0.01072250E+03 0.02120239E+02 0.04161029E+00 0.09959505E-04    3
--0.07846792E-06 0.05693396E-09-0.07911968E+05 0.01988516E+03                   4
-H                 120186H   1               G  0300.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.02547163E+06-0.04601176E+01 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.02547163E+06-0.04601176E+01                   4
-H(CH3)SICH2        61991H   6C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.01254527E+03 0.07143719E-01-0.01146987E-05-0.08100963E-08 0.01568740E-11    2
- 0.07723628E+05-0.04075435E+03 0.01206249E+02 0.03587271E+00-0.02971970E-03    3
- 0.01379675E-06-0.02695736E-10 0.01156328E+06 0.01956017E+03                   4
-H+                120186H   1E  -1          G  0300.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.01840334E+07-0.01153862E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.01840334E+07-0.01153862E+02                   4
-H-                120186H   1E   1          G  0300.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.01596104E+06-0.01152449E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.01596104E+06-0.01152449E+02                   4
-H2                121286H   2               G  0300.00   5000.00  1000.00      1
- 0.02991423E+02 0.07000644E-02-0.05633829E-06-0.09231578E-10 0.01582752E-13    2
--0.08350340E+04-0.01355110E+02 0.03298124E+02 0.08249442E-02-0.08143015E-05    3
--0.09475434E-09 0.04134872E-11-0.01012521E+05-0.03294094E+02                   4
-H2ALME             62987AL  1C   1H   5     G  0300.00   1500.00  0600.00      1
- 0.04898410E+02 0.01358223E+00 0.02611459E-05-0.04575170E-07 0.01384802E-10    2
- 0.08743072E+04-0.01113117E+02-0.06283259E+01 0.03089531E+00 0.05774090E-04    3
--0.06488033E-06 0.04907111E-09 0.01889334E+05 0.02565779E+03                   4
-H2ASME             62987AS  1C   1H   5     G  0300.00   1500.00  0600.00      1
- 0.05686213E+02 0.02154422E+00 0.08185248E-05-0.07069951E-07 0.02101522E-10    2
- 0.09331084E+05-0.06513957E+02-0.02113506E+02 0.04564229E+00 0.09983227E-04    3
--0.09399697E-06 0.07014021E-09 0.01077170E+06 0.03132611E+03                   4
-H2C4O             120189H   2C   4O   1     G  0300.00   4000.00  1000.00      1
- 0.01026888E+03 0.04896164E-01-0.04885081E-05-0.02708566E-08 0.05107013E-12    2
- 0.02346903E+06-0.02815985E+03 0.04810971E+02 0.01313999E+00 0.09865073E-05    3
--0.06120720E-07 0.01640003E-10 0.02545803E+06 0.02113424E+02                   4
-H2CCC             102093H   2C   3          G  0300.00   4000.00  1400.00      1
- 0.08266525E+02 0.02728619E-01-0.02160829E-05-0.01515161E-08 0.02641695E-12    2
- 0.07757192E+06-0.01864937E+03 0.04212193E+02 0.08954521E-01-0.01050721E-04    3
--0.02578513E-07 0.09722836E-11 0.07922349E+06 0.04134299E+02                   4
-H2CCC(S)          102093H   2C   3          G  0300.00   4000.00  1400.00      1
- 0.07904213E+02 0.02907464E-01-0.02219731E-05-0.01620844E-08 0.02796013E-12    2
- 0.06385167E+06-0.01810882E+03 0.03794178E+02 0.08761049E-01-0.07975878E-05    3
--0.02308045E-07 0.07911151E-11 0.06563580E+06 0.05264196E+02                   4
-H2CCCCCH          101993H   3C   5          G  0300.00   4000.00  1400.00      1
- 0.01440736E+03 0.04424058E-01-0.03618245E-05-0.02456408E-08 0.04327859E-12    2
- 0.05896103E+06-0.04775145E+03 0.07441421E+02 0.01585165E+00-0.02219895E-04    3
--0.04928038E-07 0.01984559E-10 0.06162266E+06-0.09047891E+02                   4
-H2CCCCH            82489C   4H   3          G  0300.00   4000.00  1000.00      1
- 0.01131409E+03 0.05014414E-01-0.05350445E-05-0.02825309E-08 0.05403279E-12    2
- 0.05181211E+06-0.03062434E+03 0.06545799E+02 0.01242477E+00 0.05603226E-05    3
--0.05631141E-07 0.01665218E-10 0.05352503E+06-0.04264082E+02                   4
-H2CCCCH2           82489C   4H   4          G  0300.00   4000.00  1000.00      1
- 0.01062083E+03 0.07199370E-01-0.06806234E-05-0.04021185E-08 0.07378498E-12    2
- 0.03358798E+06-0.03193583E+03 0.03849007E+02 0.01713169E+00 0.01644270E-04    3
--0.07761590E-07 0.01947860E-10 0.03608372E+06 0.05732121E+02                   4
-H2CCCH             82489C   3H   3          G  0300.00   4000.00  1000.00      1
- 0.08831047E+02 0.04357195E-01-0.04109067E-05-0.02368723E-08 0.04376520E-12    2
- 0.03847420E+06-0.02177919E+03 0.04754200E+02 0.01108028E+00 0.02793323E-05    3
--0.05479212E-07 0.01949629E-10 0.03988883E+06 0.05854549E+01                   4
-H2CCCLO            53090C   2H   2O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.01240462E+03 0.02067658E-01-0.03889952E-05-0.03138121E-10 0.04625008E-13    2
--0.01114503E+06-0.03928723E+03 0.01680422E+02 0.03020642E+00-0.03234256E-03    3
- 0.01779343E-06-0.03877221E-10-0.07395297E+05 0.01777265E+03                   4
-H2CCH(SICL2H)      40992H   4C   2SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01680247E+03 0.04516342E-01-0.05794312E-05-0.01367868E-08 0.02833862E-12    2
--0.04037858E+06-0.05763375E+03 0.03640801E+02 0.03803764E+00-0.03641732E-03    3
- 0.01855101E-06-0.03834642E-10-0.03581475E+06 0.01252145E+03                   4
-H2CCH2OH          103190C   2H   5O   1     G  0300.00   4000.00  1500.00      1
- 0.01144956E+03 0.05249185E-01-0.04887850E-05-0.02243250E-08 0.03973360E-12    2
--0.07554972E+05-0.03426083E+03 0.01304406E+02 0.02873214E+00-0.02387448E-03    3
- 0.01166988E-06-0.02450027E-10-0.03718933E+05 0.02078756E+03                   4
-H2CCHO            103190C   2H   3O   1     G  0300.00   4000.00  1500.00      1
- 0.09710060E+02 0.03854966E-01-0.04677825E-05-0.01505179E-08 0.02941428E-12    2
--0.02692492E+05-0.02810566E+03 0.02802205E+01 0.02740311E+00-0.02554683E-03    3
- 0.01306679E-06-0.02750425E-10 0.06682648E+04 0.02239731E+03                   4
-H2CCHSI            61991H   3C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.09386889E+02 0.03941784E-01-0.01316150E-05-0.04081553E-08 0.07971026E-12    2
- 0.04528924E+06-0.02340680E+03 0.01645904E+02 0.02461474E+00-0.02252401E-03    3
- 0.01105892E-06-0.02209069E-10 0.04779814E+06 0.01738303E+03                   4
-H2CCHSIH           61991H   4C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.01039415E+03 0.04987864E-01-0.01480904E-05-0.05650110E-08 0.01139073E-11    2
- 0.03263919E+06-0.02930385E+03 0.01989225E+02 0.02637566E+00-0.02197547E-03    3
- 0.09982490E-07-0.01893595E-10 0.03544082E+06 0.01531216E+03                   4
-H2CCHSIH2          61991H   5C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.01289871E+03 0.05366252E-01-0.02345064E-05-0.05622057E-08 0.01143224E-11    2
- 0.02373919E+06-0.04346106E+03 0.04606628E+01 0.03824847E+00-0.03490747E-03    3
- 0.01656684E-06-0.03180820E-10 0.02773639E+06 0.02208512E+03                   4
-H2CCHSIH3          61991H   6C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.01249653E+03 0.07666553E-01-0.02075339E-05-0.09569749E-08 0.01987112E-11    2
- 0.04799029E+05-0.04174850E+03 0.07686183E+01 0.03576322E+00-0.02634364E-03    3
- 0.01032868E-06-0.01717329E-10 0.08811836E+05 0.02100703E+03                   4
-H2CLSICH3          40992H   5C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01354344E+03 0.04577293E-01-0.04988032E-05-0.01758807E-08 0.03311232E-12    2
--0.03126783E+06-0.04541432E+03 0.02142669E+02 0.03103477E+00-0.02660368E-03    3
- 0.01286599E-06-0.02646554E-10-0.02699973E+06 0.01636317E+03                   4
-H2CLSISICL3        40992H   2SI  2CL  4     G  0300.00   4000.00  1500.00      1
- 0.01871701E+03 0.01924360E-01-0.04472779E-05 0.02003132E-09 0.03268818E-13    2
--0.08047111E+06-0.05817685E+03 0.08945602E+02 0.03068227E+00-0.03483212E-03    3
- 0.01910354E-06-0.04027623E-10-0.07751434E+06-0.07537633E+02                   4
-H2CN               41687H   2C   1N   1     G  0300.00   4000.00  1000.00      1
- 0.05209703E+02 0.02969291E-01-0.02855589E-05-0.01635550E-08 0.03043259E-12    2
- 0.02767711E+06-0.04444478E+02 0.02851661E+02 0.05695233E-01 0.01071140E-04    3
--0.01622612E-07-0.02351108E-11 0.02863782E+06 0.08992751E+02                   4
-H2CNCH2           103190C   2H   4N   1     G  0300.00   4000.00  1500.00      1
- 0.01065385E+03 0.05191287E-01-0.05816522E-05-0.02206912E-08 0.04101341E-12    2
- 0.02345063E+06-0.03469895E+03-0.01203076E+01 0.03225369E+00-0.02968723E-03    3
- 0.01527290E-06-0.03242500E-10 0.02728820E+06 0.02297042E+03                   4
-H2CNCH2O          103190C   2H   4N   1O   1G  0300.00   4000.00  1500.00      1
- 0.01327652E+03 0.04830938E-01-0.04858949E-05-0.02009495E-08 0.03640181E-12    2
- 0.01624962E+06-0.04713094E+03-0.01978522E+01 0.03341279E+00-0.02432022E-03    3
- 0.09438643E-07-0.01604050E-10 0.02141154E+06 0.02658265E+03                   4
-H2CNCHO           103190C   2H   3N   1O   1G  0300.00   4000.00  1500.00      1
- 0.01196792E+03 0.03915428E-01-0.03860933E-05-0.01696877E-08 0.03041050E-12    2
--0.05902236E+05-0.03958545E+03 0.01096066E+02 0.02577215E+00-0.01711630E-03    3
- 0.05880104E-07-0.08956774E-11-0.01612063E+05 0.02032528E+03                   4
-H2CNH              41687C   1H   3N   1     G  0300.00   4000.00  1000.00      1
- 0.05221589E+02 0.04748526E-01-0.04179159E-05-0.02606612E-08 0.04703140E-12    2
- 0.08657219E+05-0.04500776E+02 0.02365879E+02 0.06780570E-01 0.02423000E-04    3
--0.06157824E-08-0.01615097E-10 0.09971141E+05 0.01230718E+03                   4
-H2CNNHO           103190C   1H   3N   2O   1G  0300.00   4000.00  1500.00      1
- 0.01157754E+03 0.04489180E-01-0.05033233E-05-0.01651066E-08 0.03069139E-12    2
- 0.01986783E+06-0.03656958E+03 0.05954945E+01 0.03239559E+00-0.02993966E-03    3
- 0.01489054E-06-0.03022863E-10 0.02364485E+06 0.02192790E+03                   4
-H2CNNO            103190C   1H   2N   2O   1G  0300.00   4000.00  1500.00      1
- 0.01016234E+03 0.03065936E-01-0.03082820E-05-0.01194424E-08 0.02169867E-12    2
- 0.02494088E+06-0.02762275E+03 0.02498334E+02 0.01993009E+00-0.01557879E-03    3
- 0.06838956E-07-0.01313250E-10 0.02786476E+06 0.01417025E+03                   4
-H2CNNO2            41687H   2C   1N   2O   2G  0300.00   4000.00  1000.00      1
- 0.01140794E+03 0.04564542E-01-0.04600304E-05-0.02513539E-08 0.04782211E-12    2
- 0.01242142E+06-0.03165238E+03 0.03534317E+02 0.01811272E+00 0.02394018E-05    3
--0.01080024E-06 0.04222725E-10 0.01509006E+06 0.01131138E+03                   4
-H2CNO             103190C   1H   2N   1O   1G  0300.00   4000.00  1500.00      1
- 0.08485639E+02 0.02633277E-01-0.03017498E-05-0.08341916E-09 0.01593977E-12    2
- 0.01716434E+06-0.02052156E+03 0.01045856E+02 0.02126494E+00-0.01962754E-03    3
- 0.09659592E-07-0.01941069E-10 0.01974611E+06 0.01919718E+03                   4
-H2CNO2            103190C   1H   2N   1O   2G  0300.00   4000.00  1500.00      1
- 0.01127481E+03 0.02584711E-01-0.03934331E-05-0.05614969E-09 0.01392400E-12    2
- 0.01360470E+06-0.03461951E+03 0.01165696E+02 0.02890490E+00-0.02817663E-03    3
- 0.01387569E-06-0.02727595E-10 0.01694546E+06 0.01888293E+03                   4
-H2CONO            103190C   1H   2N   1O   2G  0300.00   4000.00  1500.00      1
- 0.01075754E+03 0.02983288E-01-0.04123564E-05-0.08096724E-09 0.01720195E-12    2
- 0.01230253E+06-0.02976009E+03 0.02120026E+02 0.02709056E+00-0.02799616E-03    3
- 0.01479145E-06-0.03074997E-10 0.01504327E+06 0.01546092E+03                   4
-H2GAET             62987GA  1C   2H   7     G  0300.00   1500.00  0600.00      1
- 0.07187273E+02 0.01867211E+00 0.06156157E-05-0.06027764E-07 0.01797524E-10    2
--0.04232757E+05-0.04686699E+02 0.04124020E+01 0.03972972E+00 0.07979140E-04    3
--0.08059234E-06 0.06040387E-09-0.02983932E+05 0.02816148E+03                   4
-H2GAME             62987GA  1C   1H   5     G  0300.00   1500.00  0600.00      1
- 0.05831604E+02 0.01222872E+00 0.03033669E-05-0.03956941E-07 0.01225452E-10    2
- 0.05189255E+05-0.04446614E+02 0.05251130E+01 0.02904695E+00 0.04844148E-04    3
--0.06097646E-06 0.04672763E-09 0.06158712E+05 0.02122149E+03                   4
-H2NF               42489H   2N   1F   1     G  0300.00   3000.00  1000.00      1
- 0.04143658E+02 0.03805135E-01-0.02771153E-05-0.03589717E-08 0.07589549E-12    2
--0.04891486E+05 0.02309362E+02 0.02597863E+02 0.05882104E-01 0.04938351E-05    3
--0.01948600E-07 0.03634003E-11-0.04301253E+05 0.01098289E+03                   4
-H2NNO             103190H   2N   2O   1     G  0300.00   4000.00  1500.00      1
- 0.07759737E+02 0.03025701E-01-0.02888916E-05-0.01262990E-08 0.02195026E-12    2
- 0.05894193E+05-0.01647713E+03 0.02088916E+02 0.01684997E+00-0.01428977E-03    3
- 0.06830147E-07-0.01368985E-10 0.07907340E+05 0.01394381E+03                   4
-H2NO              102290H   2N   1O   1     G  0300.00   4000.00  1500.00      1
- 0.05673346E+02 0.02298837E-01-0.01774446E-05-0.01103482E-08 0.01859762E-12    2
- 0.05569325E+05-0.06153540E+02 0.02530590E+02 0.08596035E-01-0.05471030E-04    3
- 0.02276249E-07-0.04648073E-11 0.06868030E+05 0.01126651E+03                   4
-H2NOH             103190H   3N   1O   1     G  0300.00   4000.00  1500.00      1
- 0.06764633E+02 0.03047036E-01-0.02777798E-05-0.01250487E-08 0.02191094E-12    2
--0.09026701E+05-0.01269845E+03 0.01407003E+02 0.01658498E+00-0.01463594E-03    3
- 0.07318354E-07-0.01511897E-10-0.07158596E+05 0.01589649E+03                   4
-H2O                20387H   2O   1          G  0300.00   5000.00  1000.00      1
- 0.02672146E+02 0.03056293E-01-0.08730260E-05 0.01200996E-08-0.06391618E-13    2
--0.02989921E+06 0.06862817E+02 0.03386842E+02 0.03474982E-01-0.06354696E-04    3
- 0.06968581E-07-0.02506588E-10-0.03020811E+06 0.02590233E+02                   4
-H2O(L)            120186H   2O   1          L  0273.15   1000.00  1000.00      1
- 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.00000000E+00 0.00000000E+00 0.01271278E+03-0.01766279E+00-0.02255666E-03    3
- 0.02082091E-05-0.02407861E-08-0.03748320E+06-0.05911535E+03                   4
-H2O(S)            120186H   2O   1          S  0200.00   0273.15  0273.15      1
- 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.00000000E+00 0.00000000E+00-0.03926933E+00 0.01692042E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.03594958E+06 0.05693378E+01                   4
-H2O2              120186H   2O   2          G  0300.00   5000.00  1000.00      1
- 0.04573167E+02 0.04336136E-01-0.01474689E-04 0.02348904E-08-0.01431654E-12    2
--0.01800696E+06 0.05011370E+01 0.03388754E+02 0.06569226E-01-0.01485013E-05    3
--0.04625806E-07 0.02471515E-10-0.01766315E+06 0.06785363E+02                   4
-H2S               121286H   2S   1          G  0300.00   5000.00  1000.00      1
- 0.02883147E+02 0.03827835E-01-0.01423398E-04 0.02497999E-08-0.01660273E-12    2
--0.03480743E+05 0.07258162E+02 0.03071029E+02 0.05578261E-01-0.01030967E-03    3
- 0.01201953E-06-0.04838370E-10-0.03559826E+05 0.05935226E+02                   4
-H2SI(CH3)2         61991H   8C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.01362000E+03 0.01024457E+00-0.01528107E-05-0.01329179E-07 0.02717974E-11    2
--0.01781386E+06-0.04695844E+03 0.02005893E+02 0.03638380E+00-0.02273374E-03    3
- 0.07691266E-07-0.01156681E-10-0.01364280E+06 0.01583265E+03                   4
-H2SI(CH3)CH2       61991H   7C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.01388829E+03 0.07937538E-01-0.01559644E-05-0.09324826E-08 0.01847251E-11    2
- 0.06767195E+05-0.04464997E+03 0.01980449E+02 0.03727036E+00-0.02944759E-03    3
- 0.01312558E-06-0.02507859E-10 0.01087973E+06 0.01898102E+03                   4
-H2SI(NH2)2         22790SI  1H   6N   2     G  0300.00   4000.00  1000.00      1
- 0.01302179E+03 0.06465444E-01-0.05816746E-05-0.03484493E-08 0.06340675E-12    2
--0.02357071E+06-0.04132570E+03 0.05615307E+02 0.02079854E+00-0.09999530E-05    3
--0.01288525E-06 0.06091866E-10-0.02126283E+06-0.01615658E+02                   4
-H2SIC              61991H   2C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.07319671E+02 0.01729952E-01-0.01346466E-05-0.01450487E-08 0.03000643E-12    2
- 0.08125478E+06-0.01320432E+03 0.02408167E+02 0.01437372E+00-0.01331203E-03    3
- 0.06387472E-07-0.01244523E-10 0.08289031E+06 0.01283748E+03                   4
-H2SICCH            61991H   3C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.01091422E+03 0.03001577E-01-0.01622344E-05-0.02466767E-08 0.04595260E-12    2
- 0.04137118E+06-0.03153165E+03 0.02952641E+02 0.02407857E+00-0.02313898E-03    3
- 0.01172227E-06-0.02393835E-10 0.04400800E+06 0.01054929E+03                   4
-H2SICH             61991H   3C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.08489276E+02 0.02348812E-01-0.01091163E-05-0.02027972E-08 0.03759264E-12    2
- 0.04973382E+06-0.01845097E+03 0.03442743E+02 0.01542521E+00-0.01429096E-03    3
- 0.07252204E-07-0.01507009E-10 0.05145786E+06 0.08363421E+02                   4
-H2SICH2            61991H   4C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.09303939E+02 0.04006038E-01-0.09702324E-06-0.03997739E-08 0.07350215E-12    2
- 0.01649066E+06-0.02623845E+03 0.01049782E+02 0.02562277E+00-0.02324392E-03    3
- 0.01142315E-06-0.02295441E-10 0.01922778E+06 0.01743860E+03                   4
-H2SICH3            61991H   5C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.08991115E+02 0.06006339E-01-0.01118591E-05-0.07745983E-08 0.01594429E-11    2
- 0.01270233E+06-0.02218700E+03 0.02094419E+02 0.02127010E+00-0.01294390E-03    3
- 0.04156964E-07-0.05854213E-11 0.01520143E+06 0.01518517E+03                   4
-H2SIN              22790H   2SI  1N   1     G  0300.00   4000.00  1000.00      1
- 0.06826533E+02 0.02125460E-01-0.02343132E-05-0.01166339E-08 0.02277273E-12    2
- 0.07253673E+06-0.01052162E+03 0.03549344E+02 0.07311005E-01 0.03249026E-05    3
--0.03682945E-07 0.01121511E-10 0.07370656E+06 0.07565329E+02                   4
-H2SINH             42489SI  1N   1H   3     G  0300.00   3000.00  1000.00      1
- 0.06588295E+02 0.04903194E-01-0.04944720E-05-0.05014630E-08 0.01139470E-11    2
- 0.01809794E+06-0.09522970E+02 0.02822196E+02 0.01245518E+00-0.08350819E-05    3
--0.07411814E-07 0.03579019E-10 0.01923616E+06 0.01054783E+03                   4
-H2SINH2            42489SI  1N   1H   4     G  0300.00   3000.00  1000.00      1
- 0.07392047E+02 0.05476841E-01-0.04453276E-05-0.05236661E-08 0.01138390E-11    2
- 0.01136858E+06-0.01138050E+03 0.04053223E+02 0.01182231E+00-0.04348128E-05    3
--0.06225818E-07 0.02798829E-10 0.01241971E+06 0.06562033E+02                   4
-H2SINH3           121386SI  1H   5N   1     G  0300.00   4000.00  1000.00      1
- 0.08711392E+02 0.05909106E-01-0.05436615E-05-0.03248350E-08 0.05960257E-12    2
- 0.08441694E+05-0.01933470E+03 0.04269730E+02 0.01125224E+00 0.01951722E-04    3
--0.03578373E-07-0.08372202E-12 0.01022204E+06 0.05876736E+02                   4
-H2SISIH2           42489SI  2H   4          G  0300.00   3000.00  1000.00      1
- 0.08986817E+02 0.05405047E-01-0.05214022E-05-0.05313742E-08 0.01188727E-11    2
- 0.02832748E+06-0.02004478E+03 0.05133186E+02 0.01252855E+00-0.04620421E-05    3
--0.06606075E-07 0.02864345E-10 0.02956915E+06 0.07605133E+01                   4
-H3ASGAET3          62987AS  1GA  1C   6H  18G  0300.00   1500.00  0600.00      1
- 0.08508501E+02 0.05632369E+00 0.02524140E-04-0.01861451E-06 0.05372403E-10    2
--0.01085517E+06-0.03399858E+02-0.08974745E+02 0.01090516E+01 0.02811457E-03    3
--0.02195513E-05 0.01599734E-08-0.07592761E+05 0.08165459E+03                   4
-H3ASGAME3          62987AS  1GA  1C   3H  12G  0300.00   1500.00  0600.00      1
- 0.01125499E+03 0.03159753E+00 0.01177904E-04-0.01013352E-06 0.02947356E-10    2
--0.07280344E+05-0.02238730E+03 0.01267161E+02 0.06214586E+00 0.01385631E-03    3
--0.01220044E-05 0.08982019E-09-0.05425619E+05 0.02613306E+03                   4
-H3CONHO           103190C   1H   4N   1O   2G  0300.00   4000.00  1500.00      1
- 0.01249270E+03 0.04773900E-01-0.04717255E-05-0.01987935E-08 0.03599460E-12    2
--0.02354754E+05-0.03945442E+03 0.01930733E+02 0.02865910E+00-0.02313063E-03    3
- 0.01068402E-06-0.02139376E-10 0.01638891E+05 0.01796108E+03                   4
-H3SIC              61991H   3C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.08536022E+02 0.02944748E-01-0.01752614E-05-0.03061316E-08 0.06463710E-12    2
- 0.07066730E+06-0.02041360E+03 0.01037017E+02 0.02192253E+00-0.01926062E-03    3
- 0.08725014E-07-0.01615505E-10 0.07315849E+06 0.01939904E+03                   4
-H3SICCH            61991H   4C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.01193845E+03 0.04298239E-01-0.01882154E-05-0.04212272E-08 0.08245783E-12    2
- 0.02161639E+06-0.03978125E+03 0.01692389E+02 0.03078862E+00-0.02808630E-03    3
- 0.01359918E-06-0.02690423E-10 0.02503587E+06 0.01453670E+03                   4
-H3SICH             61991H   4C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.09747808E+02 0.03532863E-01-0.01540271E-05-0.03539077E-08 0.06992248E-12    2
- 0.04253036E+06-0.02504347E+03 0.01710027E+02 0.02413212E+00-0.02164005E-03    3
- 0.01035470E-06-0.02035579E-10 0.04522928E+06 0.01762908E+03                   4
-H3SICH2            61991H   5C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.01050164E+03 0.04907525E-01-0.01523178E-05-0.05436598E-08 0.01082455E-11    2
- 0.01632252E+06-0.02911264E+03 0.01199673E+02 0.02828259E+00-0.02394311E-03    3
- 0.01103518E-06-0.02125819E-10 0.01948167E+06 0.02041804E+03                   4
-H3SICH3            61991H   6C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.01022214E+03 0.07221275E-01-0.01482544E-05-0.09419140E-08 0.01956175E-11    2
--0.08301660E+05-0.03163487E+03 0.01240228E+02 0.02729962E+00-0.01707597E-03    3
- 0.05502474E-07-0.07521465E-11-0.05090007E+05 0.01692759E+03                   4
-H3SIN              22790H   3SI  1N   1     G  0300.00   4000.00  1000.00      1
- 0.07964213E+02 0.03355633E-01-0.03579695E-05-0.01889818E-08 0.03650912E-12    2
- 0.01148697E+07-0.01924110E+03 0.02790629E+02 0.01134566E+00 0.08321879E-05    3
--0.05845045E-07 0.01685969E-10 0.01167357E+07 0.09384630E+02                   4
-H3SINH             42489SI  1N   1H   4     G  0300.00   3000.00  1000.00      1
- 0.07697340E+02 0.05657943E-01-0.05209306E-05-0.05617966E-08 0.01263502E-11    2
- 0.02282005E+06-0.01330379E+03 0.02778390E+02 0.01510711E+00-0.06734261E-05    3
--0.08928515E-07 0.04115347E-10 0.02435913E+06 0.01309386E+03                   4
-H3SISIH           111191H   4SI  2          G  0300.00   4000.00  1500.00      1
- 0.01127202E+03 0.02538145E-01-0.02998472E-05-0.09465367E-09 0.01855053E-12    2
- 0.03297169E+06-0.03264598E+03 0.03698707E+02 0.01870180E+00-0.01430704E-03    3
- 0.06005836E-07-0.01116293E-10 0.03590825E+06 0.08825191E+02                   4
-H3SISIH3           42489SI  2H   6          G  0300.00   3000.00  1000.00      1
- 0.01068273E+03 0.08221416E-01-0.08096035E-05-0.08337975E-08 0.01908205E-11    2
- 0.05316920E+05-0.03082188E+03 0.03898290E+02 0.01977415E+00 0.01791014E-05    3
--0.01033168E-06 0.03931699E-10 0.07621719E+05 0.06227022E+02                   4
-HALME              62987AL  1C   1H   4     G  0300.00   1500.00  0600.00      1
- 0.04812273E+02 0.01029645E+00 0.02582808E-05-0.03323597E-07 0.09884584E-11    2
- 0.01176673E+06 0.09557062E+01 0.01118789E+02 0.02180038E+00 0.04120785E-04    3
--0.04366690E-06 0.03273825E-09 0.01244736E+06 0.01886107E+03                   4
-HALME2             62987AL  1C   2H   7     G  0300.00   1500.00  0600.00      1
- 0.05705172E+02 0.01924317E+00 0.06377855E-05-0.06346800E-07 0.01896800E-10    2
--0.06049865E+05-0.06331378E+01-0.01494261E+02 0.04158568E+00 0.08686772E-04    3
--0.08604142E-06 0.06447653E-09-0.04722517E+05 0.03427725E+03                   4
-HASALME            62987AS  1AL  1C   1H   4G  0300.00   1500.00  0600.00      1
- 0.06956539E+02 0.01061278E+00 0.02440154E-05-0.03297737E-07 0.01020004E-10    2
- 0.02582506E+06-0.08625792E+01 0.02544859E+02 0.02465795E+00 0.03677808E-04    3
--0.05008894E-06 0.03848384E-09 0.02663010E+06 0.02046859E+03                   4
-HASGAET            62987AS  1GA  1C   2H   6G  0300.00   1500.00  0600.00      1
- 0.06336445E+02 0.02340603E+00 0.09066638E-05-0.07519059E-07 0.01828115E-10    2
- 0.03184605E+06 0.05812180E+02 0.05642724E+02 0.02296739E+00 0.01094867E-03    3
--0.02449038E-06 0.09602701E-10 0.03204718E+06 0.09675533E+02                   4
-HASGAME            62987AS  1GA  1C   1H   4G  0300.00   1500.00  0600.00      1
- 0.07507970E+02 0.09277900E-01 0.01891932E-05-0.02769887E-07 0.07996070E-11    2
- 0.03253908E+06-0.01422608E+02 0.04859127E+02 0.01750423E+00 0.02831996E-04    3
--0.03107937E-06 0.02299468E-09 0.03302941E+06 0.01142952E+03                   4
-HASME              62987AS  1C   1H   4     G  0300.00   1500.00  0600.00      1
- 0.05753261E+02 0.01841813E+00 0.07493313E-05-0.05919917E-07 0.01726247E-10    2
- 0.01880057E+06-0.05360325E+02-0.01575095E+01 0.03649094E+00 0.08332940E-04    3
--0.07234666E-06 0.05330928E-09 0.01989792E+06 0.02335316E+03                   4
-HASME2             62987AS  1C   2H   7     G  0300.00   1500.00  0600.00      1
- 0.05850437E+02 0.01841766E+00 0.08066845E-05-0.05868715E-07 0.01726428E-10    2
- 0.06450535E+05 0.03909152E+01-0.02908405E+01 0.03729577E+00 0.08335855E-04    3
--0.07455611E-06 0.05527881E-09 0.07587766E+05 0.03020451E+03                   4
-HCCCHCCH          101993H   3C   5          G  0300.00   4000.00  1400.00      1
- 0.01412247E+03 0.04593411E-01-0.03738175E-05-0.02574329E-08 0.04539160E-12    2
- 0.06249257E+06-0.04722335E+03 0.06854796E+02 0.01699404E+00-0.02582284E-04    3
--0.05488765E-07 0.02281481E-10 0.06515364E+06-0.07133854E+02                   4
-HCCCL              40992H   1C   2CL  1     G  0300.00   4000.00  1500.00      1
- 0.07743241E+02 0.01618655E-01-0.02465935E-05-0.02909336E-09 0.07522752E-13    2
- 0.02472494E+06-0.01686593E+03 0.02969338E+02 0.01583152E+00-0.01787078E-03    3
- 0.01017728E-06-0.02231985E-10 0.02620733E+06 0.07906791E+02                   4
-HCCHCCH            82489C   4H   3          G  0300.00   4000.00  1000.00      1
- 0.01075274E+03 0.05381153E-01-0.05549638E-05-0.03052266E-08 0.05761740E-12    2
- 0.06121419E+06-0.02973025E+03 0.04153882E+02 0.01726287E+00-0.02389374E-05    3
--0.01018700E-06 0.04340505E-10 0.06338071E+06 0.06036507E+02                   4
-HCCO               32387H   1C   2O   1     G  0300.00   4000.00  1000.00      1
- 0.06758073E+02 0.02000400E-01-0.02027607E-05-0.01041132E-08 0.01965165E-12    2
- 0.01901513E+06-0.09071262E+02 0.05047965E+02 0.04453478E-01 0.02268283E-05    3
--0.01482095E-07 0.02250742E-11 0.01965892E+06 0.04818439E+01                   4
-HCCOH              32387H   2C   2O   1     G  0300.00   4000.00  1000.00      1
- 0.07328324E+02 0.03336416E-01-0.03024705E-05-0.01781106E-08 0.03245168E-12    2
- 0.07598258E+05-0.01401214E+03 0.03899465E+02 0.09701075E-01-0.03119309E-05    3
--0.05537732E-07 0.02465732E-10 0.08701190E+05 0.04491875E+02                   4
-HCCSICL2H          40992H   2C   2SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01480501E+03 0.02600965E-01-0.04631204E-05-0.02401379E-09 0.09812397E-13    2
--0.02163059E+06-0.04610236E+03 0.04846840E+02 0.03181717E+00-0.03572068E-03    3
- 0.01983339E-06-0.04248036E-10-0.01856223E+06 0.05613645E+02                   4
-HCL                42189CL  1H   1          G  0300.00   5000.00  1000.00      1
- 0.02755335E+02 0.01473581E-01-0.04971254E-05 0.08108658E-09-0.05072063E-13    2
--0.01191806E+06 0.06515116E+02 0.03338534E+02 0.01268207E-01-0.03666917E-04    3
- 0.04703992E-07-0.01836011E-10-0.01213151E+06 0.03193555E+02                   4
-HCL2SICH3          40992H   4C   1SI  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01459366E+03 0.04006211E-01-0.04818700E-05-0.01336338E-08 0.02648821E-12    2
--0.05346984E+06-0.04689795E+03 0.04155299E+02 0.02995026E+00-0.02799546E-03    3
- 0.01433046E-06-0.03013208E-10-0.04973616E+06 0.09051815E+02                   4
-HCL2SISICL2H       40992H   2SI  2CL  4     G  0300.00   4000.00  1500.00      1
- 0.01863092E+03 0.01991871E-01-0.04703153E-05 0.02393378E-09 0.02997096E-13    2
--0.07983306E+06-0.05812192E+03 0.08215700E+02 0.03290751E+00-0.03764294E-03    3
- 0.02071053E-06-0.04369767E-10-0.07671145E+06-0.04245506E+02                   4
-HCLCCCLO           40992H   1C   2 O  1CL  2G  0300.00   4000.00  1500.00      1
- 0.01282877E+03 0.02295631E-01-0.04601887E-05-0.02941710E-09 0.01148412E-12    2
--0.01481358E+06-0.03708152E+03 0.03082763E+02 0.03013466E+00-0.03298082E-03    3
- 0.01776354E-06-0.03720337E-10-0.01177928E+06 0.01372635E+03                   4
-HCLCCHO            53090C   2H   2O   1CL  1G  0300.00   5000.00  1500.00      1
- 0.01228193E+03 0.02136310E-01-0.03756942E-05-0.01347374E-09 0.05834907E-13    2
--0.08447210E+05-0.03860056E+03 0.01544662E+02 0.02882431E+00-0.02921314E-03    3
- 0.01557811E-06-0.03358528E-10-0.04546644E+05 0.01905110E+03                   4
-HCLSI(CH3)2        40992H   7C   2SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01779932E+03 0.06864497E-01-0.06677913E-05-0.02916791E-08 0.05251096E-12    2
--0.04235416E+06-0.06627844E+03 0.03428693E+02 0.03880542E+00-0.03118298E-03    3
- 0.01483918E-06-0.03097758E-10-0.03676770E+06 0.01220014E+03                   4
-HCLSI(CH3)CH2      40992H   6C   2SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01684996E+03 0.05769153E-01-0.06362653E-05-0.02117805E-08 0.04004912E-12    2
--0.01692029E+06-0.05821970E+03 0.03518672E+02 0.03868692E+00-0.03578989E-03    3
- 0.01856940E-06-0.03976975E-10-0.01207708E+06 0.01340137E+03                   4
-HCLSICH2           40992H   3C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01094639E+03 0.03063482E-01-0.04057563E-05-0.07933510E-09 0.01649546E-12    2
--0.03161099E+05-0.03101113E+03 0.02331473E+02 0.02712338E+00-0.02843577E-03    3
- 0.01542443E-06-0.03288710E-10-0.03745104E+04 0.01417701E+03                   4
-HCLSICH3           40992H   4C   1SI  1CL  1G  0300.00   4000.00  1500.00      1
- 0.01183446E+03 0.03802168E-01-0.04054360E-05-0.01478932E-08 0.02756845E-12    2
--0.09669808E+05-0.03413556E+03 0.03061496E+02 0.02418432E+00-0.02072566E-03    3
- 0.01016711E-06-0.02124115E-10-0.06367089E+05 0.01342892E+03                   4
-HCLSISI            40992H   1SI  2CL  1     G  0300.00   4000.00  1500.00      1
- 0.08766356E+02 0.08352699E-02-0.01828719E-05 0.04227080E-10 0.01924493E-13    2
- 0.03066829E+06-0.01515527E+03 0.05006777E+02 0.01170423E+00-0.01308663E-03    3
- 0.07173085E-07-0.01520111E-10 0.03183531E+06 0.04414009E+02                   4
-HCN               110193H   1C   1N   1     G  0300.00   4000.00  1000.00      1
- 0.03426457E+02 0.03924190E-01-0.01601138E-04 0.03161966E-08-0.02432850E-12    2
- 0.01485552E+06 0.03607795E+02 0.02417787E+02 0.09031856E-01-0.01107727E-03    3
- 0.07980141E-07-0.02311141E-10 0.01501044E+06 0.08222891E+02                   4
-HCNH               41687C   1H   2N   1     G  0300.00   4000.00  1000.00      1
- 0.04923293E+02 0.03332897E-01-0.03370897E-05-0.01901619E-08 0.03531825E-12    2
- 0.03132669E+06-0.01632509E+02 0.02759456E+02 0.06103387E-01 0.07713149E-05    3
--0.02063094E-07 0.01931920E-11 0.03217247E+06 0.01057489E+03                   4
-HCNO              120186H   1C   1N   1O   1G  0250.00   4000.00  1000.00      1
- 0.06692412E+02 0.02368360E-01-0.02371510E-05-0.01275503E-08 0.02407137E-12    2
- 0.01694737E+06-0.01245434E+03 0.03184859E+02 0.09752316E-01-0.01280203E-04    3
--0.06163104E-07 0.03226275E-10 0.01797907E+06 0.06123844E+02                   4
-HCO               121286H   1C   1O   1     G  0300.00   5000.00  1000.00      1
- 0.03557271E+02 0.03345573E-01-0.01335006E-04 0.02470573E-08-0.01713851E-12    2
- 0.03916324E+05 0.05552299E+02 0.02898330E+02 0.06199147E-01-0.09623084E-04    3
- 0.01089825E-06-0.04574885E-10 0.04159922E+05 0.08983614E+02                   4
-HCO+              121286H   1C   1O   1E  -1G  0300.00   5000.00  1000.00      1
- 0.03692074E+02 0.03454732E-01-0.01316524E-04 0.02323551E-08-0.01554132E-12    2
- 0.09890941E+06 0.02330722E+02 0.02496483E+02 0.08690658E-01-0.01060445E-03    3
- 0.07882791E-07-0.02418385E-10 0.09915097E+06 0.08048178E+02                   4
-HCOOH             103190C   1H   2O   2     G  0300.00   4000.00  1500.00      1
- 0.07959698E+02 0.03024532E-01-0.03434242E-05-0.01326767E-08 0.02520240E-12    2
--0.05027445E+06-0.01872208E+03 0.09326031E+01 0.01891002E+00-0.01554964E-03    3
- 0.07290031E-07-0.01483695E-10-0.04760071E+06 0.01950653E+03                   4
-HE                120186HE  1               G  0300.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.07453750E+04 0.09153489E+01 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.07453750E+04 0.09153488E+01                   4
-HE+               120186HE  1E  -1          G  0300.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.02853427E+07 0.01608405E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.02853427E+07 0.01608405E+02                   4
-HF                121286H   1F   1          G  0300.00   5000.00  1000.00      1
- 0.02956767E+02 0.07721015E-02-0.09899833E-06-0.04993521E-10 0.01429331E-13    2
--0.03361061E+06 0.04011673E+02 0.03431841E+02 0.04404166E-02-0.08828452E-05    3
- 0.06574516E-08-0.02055910E-12-0.03381977E+06 0.01238270E+02                   4
-HG2BR2(S)          81292BR  2HG  2          S  0300.00   1500.00  1000.00      1
- 0.01131527E+03 0.05176237E-01-0.09149018E-05-0.01774353E-07 0.08208311E-11    2
--0.02812664E+06-0.03960847E+03 0.09176256E+02 0.01716637E+00-0.02379101E-03    3
- 0.01656353E-06-0.04492058E-10-0.02787921E+06-0.03016915E+03                   4
-HG2CL2(S)          81292CL  2HG  2          S  0300.00   1500.00  1000.00      1
- 0.01170237E+03 0.03242224E-01-0.01018772E-05-0.03745899E-08 0.04682208E-12    2
--0.03555571E+06-0.04461773E+03 0.01002375E+03 0.01031694E+00-0.01160577E-03    3
- 0.08123549E-07-0.02343515E-10-0.03522627E+06-0.03658009E+03                   4
-HG2F2(S)           81292F   2HG  2          S  0300.00   1500.00  1000.00      1
- 0.01156086E+03 0.03513290E-01-0.04228193E-06-0.06265655E-08 0.01191005E-11    2
--0.06207291E+06-0.04780613E+03 0.01035013E+03 0.06139501E-01-0.03674693E-05    3
--0.03011902E-07 0.01414143E-10-0.06172955E+06-0.04143495E+03                   4
-HG2I2(S)           81292HG  2I   2          S  0300.00   1500.00  1000.00      1
- 0.01104021E+03 0.05724188E-01-0.09515335E-05-0.02149612E-07 0.09793057E-11    2
--0.01777374E+06-0.03535439E+03 0.09788829E+02 0.01440390E+00-0.01844748E-03    3
- 0.01180869E-06-0.02911372E-10-0.01774167E+06-0.03032197E+03                   4
-HGAET              62987GA  1C   2H   6     G  0300.00   1500.00  0600.00      1
- 0.06580152E+02 0.01610132E+00 0.05009546E-05-0.05185148E-07 0.01524085E-10    2
- 0.08765131E+05-0.04046067E+01 0.01163284E+02 0.03282213E+00 0.06765717E-04    3
--0.06509541E-06 0.04835807E-09 0.09767174E+05 0.02588269E+03                   4
-HGAET2             62987GA  1C   4H  11     G  0300.00   1500.00  0600.00      1
- 0.06511306E+02 0.02819754E+00 0.01418751E-04-0.09000947E-07 0.02572894E-10    2
--0.04482180E+05 0.04709022E+02-0.01486576E+02 0.05217640E+00 0.01356342E-03    3
--0.01011982E-05 0.07319854E-09-0.02985242E+05 0.04364749E+03                   4
-HGAME              62987GA  1C   1H   4     G  0300.00   1500.00  0600.00      1
- 0.05318279E+02 0.09490931E-01 0.02277164E-05-0.03005070E-07 0.09037830E-11    2
- 0.01253534E+06-0.01065710E+01 0.01784750E+02 0.02058861E+00 0.03548509E-04    3
--0.04111927E-06 0.03108978E-09 0.01318422E+06 0.01700702E+03                   4
-HGAME2             62987GA  1C   2H   7     G  0300.00   1500.00  0600.00      1
- 0.06759398E+02 0.01426103E+00-0.01174024E-05-0.05001401E-07 0.01502785E-10    2
--0.01473265E+05-0.02967135E+02 0.09039155E+01 0.03264779E+00 0.05389244E-04    3
--0.06814504E-06 0.05150323E-09-0.03978242E+04 0.02539305E+03                   4
-HGBR               81292BR  1HG  1          G  0300.00   5000.00  1000.00      1
- 0.04470182E+02 0.01740022E-02-0.01782286E-06 0.03639776E-10-0.02699461E-14    2
- 0.01118634E+06 0.07116504E+02 0.04325519E+02 0.06429246E-02-0.04527797E-05    3
- 0.04543436E-09 0.06863204E-12 0.01121730E+06 0.07833202E+02                   4
-HGCL2              81292CL  2HG  1          G  0300.00   5000.00  1000.00      1
- 0.07251462E+02 0.03082143E-02-0.01447555E-05 0.02958294E-09-0.02201214E-13    2
--0.01981231E+06-0.06061846E+02 0.06249130E+02 0.03221573E-01-0.02109668E-04    3
--0.07713536E-08 0.08526178E-11-0.01958242E+06-0.01015613E+02                   4
-HGCL2(S)           81292CL  2HG  1          S  0300.00   1500.00  1000.00      1
- 0.07750329E+02 0.03529253E-01 0.03886646E-06-0.08307839E-08 0.02781535E-11    2
--0.03009787E+06-0.02772331E+03 0.07611778E+02 0.05084911E-01-0.02887606E-04    3
- 0.09093899E-08 0.04734468E-12-0.03015054E+06-0.02738100E+03                   4
-HGF2               81292F   2HG  1          G  0300.00   5000.00  1000.00      1
- 0.06970407E+02 0.06373497E-02-0.02938029E-05 0.05925826E-09-0.04366956E-13    2
--0.03751535E+06-0.08137829E+02 0.05155538E+02 0.05733727E-01-0.03667157E-04    3
--0.01223692E-07 0.01370429E-10-0.03707844E+06 0.01073098E+02                   4
-HGF2(S)            81292F   2HG  1          S  0300.00   2000.00  1000.00      1
- 0.08322627E+02 0.02317361E-01 0.02103511E-05-0.09665973E-09 0.01631405E-12    2
--0.05342179E+06-0.03414006E+03 0.08250103E+02 0.02543387E-01-0.07218619E-06    3
- 0.08044224E-09-0.03175138E-12-0.05340276E+06-0.03377085E+03                   4
-HGH                81292H   1HG  1          G  0300.00   5000.00  1000.00      1
- 0.03674353E+02 0.01116618E-01-0.03728888E-05 0.07077644E-09-0.04984356E-13    2
- 0.02745200E+06 0.04954799E+02 0.02859969E+02 0.03217363E-01-0.02993410E-04    3
- 0.02267118E-07-0.08671660E-11 0.02771287E+06 0.09273314E+02                   4
-HGI                81292HG  1I   1          G  0300.00   5000.00  1000.00      1
- 0.04487935E+02 0.03041356E-02-0.07219846E-07 0.01468881E-10-0.01089820E-14    2
- 0.01470042E+06 0.08086309E+02 0.04411734E+02 0.05799910E-02-0.03475217E-05    3
- 0.01593090E-08-0.01730073E-12 0.01471610E+06 0.08458668E+02                   4
-HGO                81292HG  1O   1          G  0300.00   5000.00  1000.00      1
- 0.04192036E+02 0.04176084E-02-0.01658976E-05 0.03318185E-09-0.02429647E-13    2
- 0.03713110E+05 0.04621457E+02 0.03235991E+02 0.03067171E-01-0.01992628E-04    3
--0.04378690E-08 0.06018341E-11 0.03950193E+05 0.09495331E+02                   4
-HGO(S)             81292HG  1O   1          S  0300.00   1000.00  1000.00      1
- 0.07146808E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01350616E+06-0.03327734E+03 0.02854835E+02 0.01115052E+00-0.01160794E-03    3
- 0.06126729E-07-0.01377341E-10-0.01217635E+06-0.01067390E+03                   4
-HMEGAET            62987GA  1C   3H   9     G  0300.00   1500.00  0600.00      1
- 0.07025463E+02 0.02564787E+00 0.09619100E-05-0.08403699E-07 0.02488960E-10    2
--0.01361377E+05-0.03319484E+02-0.02079143E+02 0.05373076E+00 0.01181036E-03    3
--0.01099855E-05 0.08189554E-09 0.03216961E+04 0.04086070E+03                   4
-HN(OH)2           103190H   3N   1O   2     G  0300.00   4000.00  1500.00      1
- 0.09963640E+02 0.02864737E-01-0.03812930E-05-0.07443356E-09 0.01610124E-12    2
--0.01662184E+06-0.02871770E+03 0.03244199E+01 0.02850544E+00-0.02753934E-03    3
- 0.01337294E-06-0.02571777E-10-0.01354499E+06 0.02201480E+03                   4
-HN3                82687H   1N   3          G  0300.00   4000.00  1000.00      1
- 0.06023015E+02 0.02454362E-01-0.02404279E-05-0.01322973E-08 0.02474146E-12    2
- 0.03394051E+06-0.07015537E+02 0.03621003E+02 0.06030785E-01 0.04054460E-05    3
--0.02545271E-07 0.06174280E-11 0.03482373E+06 0.06333769E+02                   4
-HNC                92392H   1C   1N   1     G  0300.00   5000.00  1500.00      1
- 0.05283464E+02 0.01092476E-01-0.01170865E-05-0.02308672E-09 0.03950673E-13    2
- 0.02012958E+06-0.06388218E+02 0.03592377E+02 0.05561340E-01-0.05936823E-04    3
- 0.03782329E-07-0.09365092E-11 0.02079803E+06 0.02732160E+02                   4
-HNCN               62790C   1H   1N   2     G  0300.00   4000.00  1500.00      1
- 0.07251951E+02 0.01587363E-01-0.01995579E-05-0.04841944E-09 0.09908280E-13    2
- 0.03563666E+06-0.01312080E+03 0.02951908E+02 0.01245028E+00-0.01161611E-03    3
- 0.05786108E-07-0.01175004E-10 0.03712483E+06 0.09811426E+02                   4
-HNCNH              62790C   1H   2N   2     G  0300.00   4000.00  1500.00      1
- 0.08374143E+02 0.02366143E-01-0.03502324E-05-0.04391102E-09 0.01096859E-12    2
- 0.01461088E+06-0.02107393E+03 0.01001985E+02 0.02464016E+00-0.02759770E-03    3
- 0.01532472E-06-0.03268280E-10 0.01679368E+06 0.01694325E+03                   4
-HNCO              110193H   1C   1N   1O   1G  0300.00   4000.00  1400.00      1
- 0.06545307E+02 0.01965760E-01-0.01562664E-05-0.01074318E-08 0.01874680E-12    2
--0.01664773E+06-0.01003880E+03 0.03858467E+02 0.06390342E-01-0.09016628E-05    3
--0.01898224E-07 0.07651380E-11-0.01562343E+06 0.04882493E+02                   4
-HNF                42489H   1N   1F   1     G  0300.00   3000.00  1000.00      1
- 0.04133219E+02 0.01912057E-01-0.01625330E-05-0.01726461E-08 0.03743691E-12    2
- 0.01467052E+06 0.03292122E+02 0.03249761E+02 0.03261818E-01 0.04355642E-06    3
--0.01100277E-07 0.02926757E-11 0.01499126E+06 0.08187434E+02                   4
-HNF2               42489H   1N   1F   2     G  0300.00   3000.00  1000.00      1
- 0.05704866E+02 0.03049897E-01-0.02826803E-05-0.02923185E-08 0.06551055E-12    2
--0.09107488E+05-0.03941332E+02 0.02572812E+02 0.08762144E-01-0.02326921E-05    3
--0.05000826E-07 0.02143838E-10-0.08086760E+05 0.01300681E+03                   4
-HNNHO             103190H   2N   2O   1     G  0300.00   4000.00  1500.00      1
- 0.07462348E+02 0.03113521E-01-0.02614534E-05-0.01394601E-08 0.02363352E-12    2
- 0.07517607E+05-0.01619293E+03 0.07974964E+01 0.01693171E+00-0.01141086E-03    3
- 0.04201242E-07-0.06926417E-11 0.01010665E+06 0.02038765E+03                   4
-HNNO              103190H   1N   2O   1     G  0300.00   4000.00  1500.00      1
- 0.06991217E+02 0.01875970E-01-0.02124584E-05-0.06710472E-09 0.01230508E-12    2
- 0.02497566E+06-0.01123523E+03 0.02238298E+02 0.01359200E+00-0.01179873E-03    3
- 0.05392971E-07-0.01010859E-10 0.02660259E+06 0.01413679E+03                   4
-HNNONO             10891H   1N   3O   2     G  0300.00   4000.00  1500.00      1
- 0.01246747E+03 0.02018438E-01-0.03674474E-05-0.03459117E-09 0.01090810E-12    2
- 0.02452278E+06-0.03868309E+03 0.02642670E+02 0.02625418E+00-0.02477878E-03    3
- 0.01184374E-06-0.02298757E-10 0.02793182E+06 0.01383705E+03                   4
-HNO               121286H   1N   1O   1     G  0300.00   5000.00  1000.00      1
- 0.03615144E+02 0.03212486E-01-0.01260337E-04 0.02267298E-08-0.01536236E-12    2
- 0.01066191E+06 0.04810264E+02 0.02784403E+02 0.06609646E-01-0.09300223E-04    3
- 0.09437980E-07-0.03753146E-10 0.01091878E+06 0.09035629E+02                   4
-HNO2              103190H   1N   1O   2     G  0300.00   4000.00  1500.00      1
- 0.06479630E+02 0.01995274E-01-0.01740387E-05-0.09695872E-09 0.01701480E-12    2
--0.09999271E+05-0.01067286E+03 0.01934838E+02 0.01010036E+00-0.04964616E-04    3
- 0.08701120E-08-0.02324135E-13-0.08105484E+05 0.01473250E+03                   4
-HNO3              121286H   1N   1O   3     G  0300.00   5000.00  1000.00      1
- 0.07003845E+02 0.05811493E-01-0.02333789E-04 0.04288814E-08-0.02959385E-12    2
--0.01889952E+06-0.01047863E+03 0.01353185E+02 0.02220025E+00-0.01978812E-03    3
- 0.08773908E-07-0.01658384E-10-0.01738563E+06 0.01851868E+03                   4
-HNOH              102290H   2N   1O   1     G  0300.00   4000.00  1500.00      1
- 0.06396134E+02 0.01821067E-01-0.01870892E-05-0.07844472E-09 0.01444855E-12    2
- 0.07859615E+05-0.01040479E+03 0.02125274E+02 0.01066282E+00-0.07602589E-04    3
- 0.03081642E-07-0.05726498E-11 0.09553544E+05 0.01309672E+03                   4
-HO2                20387H   1O   2          G  0300.00   5000.00  1000.00      1
- 0.04072191E+02 0.02131296E-01-0.05308145E-05 0.06112269E-09-0.02841165E-13    2
--0.01579727E+04 0.03476029E+02 0.02979963E+02 0.04996697E-01-0.03790997E-04    3
- 0.02354192E-07-0.08089024E-11 0.01762274E+04 0.09222724E+02                   4
-HOCH2OH           103190C   1H   4O   2     G  0300.00   4000.00  1500.00      1
- 0.01089048E+03 0.04000443E-01-0.04729597E-05-0.01295970E-08 0.02552658E-12    2
--0.05347440E+06-0.03540623E+03-0.06548874E+01 0.03377715E+00-0.03157595E-03    3
- 0.01532216E-06-0.02994259E-10-0.04963411E+06 0.02579207E+03                   4
-HOCL               40992H   1 O  1CL  1     G  0300.00   4000.00  1500.00      1
- 0.04953150E+02 0.01100053E-01-0.01256296E-05-0.03349951E-09 0.06464506E-13    2
--0.01114737E+06-0.06838384E+01 0.02861399E+02 0.07134484E-01-0.07311028E-04    3
- 0.03980236E-07-0.08506421E-11-0.01049306E+06 0.01021485E+03                   4
-HOCN              110193H   1C   1N   1O   1G  0300.00   4000.00  1400.00      1
- 0.06022112E+02 0.01929530E-01-0.01455029E-05-0.01045811E-08 0.01794814E-12    2
--0.04040321E+05-0.05866433E+02 0.03789424E+02 0.05387981E-01-0.06518270E-05    3
--0.01420164E-07 0.05367969E-11-0.03135335E+05 0.06667052E+02                   4
-HOCO              103190C   1H   1O   2     G  0300.00   4000.00  1500.00      1
- 0.07517634E+02 0.01259029E-01-0.01910901E-05-0.03136391E-09 0.07547673E-13    2
--0.02634121E+06-0.01448392E+03 0.02285122E+02 0.01351435E+00-0.01160407E-03    3
- 0.05047011E-07-0.09032231E-11-0.02448416E+06 0.01367874E+03                   4
-HONO               31787H   1N   1O   2     G  0300.00   5000.00  1000.00      1
- 0.05486893E+02 0.04218065E-01-0.01649143E-04 0.02971877E-08-0.02021148E-12    2
--0.01126865E+06-0.02997002E+02 0.02290413E+02 0.01409922E+00-0.01367872E-03    3
- 0.07498780E-07-0.01876905E-10-0.01043195E+06 0.01328077E+03                   4
-HONO2             103190H   1N   1O   3     G  0300.00   4000.00  1500.00      1
- 0.09756148E+02 0.01900948E-01-0.03240020E-05-0.03976639E-09 0.01100334E-12    2
--0.01942244E+06-0.02690023E+03 0.07877668E+01 0.02382329E+00-0.02205964E-03    3
- 0.01034048E-06-0.01972857E-10-0.01630442E+06 0.02108964E+03                   4
-HSI(CH3)2          61991H   7C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.01220942E+03 0.09173338E-01-0.01186653E-05-0.01188590E-07 0.02418110E-11    2
- 0.03781464E+05-0.03668250E+03 0.02568267E+02 0.03071446E+00-0.01863911E-03    3
- 0.06210373E-07-0.09376544E-11 0.07271919E+05 0.01551808E+03                   4
-HSI(CH3)2CH2       61991H   9C   3SI  1     G  0300.00   2500.00  1500.00      1
- 0.01723999E+03 0.01101475E+00-0.01546410E-05-0.01338650E-07 0.02653453E-11    2
--0.02842083E+05-0.06077749E+03 0.03367732E+02 0.04430759E+00-0.03246598E-03    3
- 0.01379387E-06-0.02586752E-10 0.02041653E+05 0.01367000E+03                   4
-HSI(CH3)3          61991H  10C   3SI  1     G  0300.00   2500.00  1500.00      1
- 0.01689903E+03 0.01338224E+00-0.01538243E-05-0.01746233E-07 0.03550375E-11    2
--0.02740327E+06-0.06121112E+03 0.03224459E+02 0.04373614E+00-0.02597404E-03    3
- 0.08415742E-07-0.01236561E-10-0.02243583E+06 0.01289306E+03                   4
-HSI(NH2)2          22790SI  1H   5N   2     G  0300.00   4000.00  1000.00      1
- 0.01171677E+03 0.05339021E-01-0.04667824E-05-0.02824087E-08 0.05080916E-12    2
--0.01264169E+05-0.03245118E+03 0.06289699E+02 0.01675060E+00-0.01520878E-04    3
--0.01070065E-06 0.05538641E-10 0.03154771E+04-0.03746008E+02                   4
-HSI(NH2)3          22790SI  1H   7N   3     G  0300.00   4000.00  1000.00      1
- 0.01661406E+03 0.07395874E-01-0.06440010E-05-0.03918887E-08 0.07045959E-12    2
--0.03859547E+06-0.05865318E+03 0.07070983E+02 0.02754435E+00-0.02603669E-04    3
--0.01874567E-06 0.09778511E-10-0.03582658E+06-0.08209675E+02                   4
-HSIC               61991H   1C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.05849544E+02 0.07628346E-02-0.09974130E-06-0.03811586E-09 0.08581471E-13    2
- 0.09097438E+06-0.04862062E+02 0.03761288E+02 0.06108070E-01-0.05721172E-04    3
- 0.02805116E-07-0.05597709E-11 0.09168219E+06 0.06236756E+02                   4
-HSICCH             61991H   2C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.09098096E+02 0.02292999E-01-0.01278589E-05-0.01869017E-08 0.03514532E-12    2
- 0.04933532E+06-0.02153271E+03 0.03799881E+02 0.01633703E+00-0.01551299E-03    3
- 0.07880591E-07-0.01619982E-10 0.05109468E+06 0.06475363E+02                   4
-HSICH2             61991H   3C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.08641686E+02 0.02535259E-01-0.01532829E-05-0.02418416E-08 0.04870000E-12    2
- 0.03962671E+06-0.02128790E+03 0.02376883E+02 0.01822864E+00-0.01641260E-03    3
- 0.07937691E-07-0.01590356E-10 0.04179768E+06 0.01215211E+03                   4
-HSICH3             61991H   4C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.07578257E+02 0.05000398E-01-0.08706991E-06-0.06516750E-08 0.01344446E-11    2
- 0.02138075E+06-0.01438961E+03 0.02658293E+02 0.01547950E+00-0.08319889E-04    3
- 0.02184355E-07-0.02302844E-11 0.02319822E+06 0.01240552E+03                   4
-HSICL             121986SI  1H   1CL  1     G  0300.00   2000.00  1000.00      1
- 0.04900628E+02 0.01981752E-01-0.03634647E-05-0.02285211E-08 0.07633527E-12    2
- 0.06914634E+05 0.01377004E+02 0.03072748E+02 0.09057843E-01-0.01159134E-03    3
- 0.08310477E-07-0.02483000E-10 0.07324210E+05 0.01033490E+03                   4
-HSIN               22790H   1SI  1N   1     G  0300.00   4000.00  1000.00      1
- 0.05746590E+02 0.01167119E-01-0.01360742E-05-0.05908617E-09 0.01174696E-12    2
- 0.04484671E+06-0.05931788E+02 0.04865176E+02 0.01775119E-01 0.04890870E-05    3
- 0.03922383E-08-0.07913276E-11 0.04526353E+06-0.07134509E+01                   4
-HSINH              42489SI  1H   2N   1     G  0300.00   3000.00  1000.00      1
- 0.06493435E+02 0.02567980E-01-0.03126526E-05-0.02577467E-08 0.06216479E-12    2
- 0.04035934E+06-0.07830112E+02 0.03566343E+02 0.08446736E-01-0.07699952E-05    3
--0.05270970E-07 0.02581065E-10 0.04124904E+06 0.07780791E+02                   4
-HSINH2             42489SI  1N   1H   3     G  0300.00   3000.00  1000.00      1
- 0.06177894E+02 0.04689964E-01-0.03583294E-05-0.04457980E-08 0.09379187E-12    2
- 0.01091277E+06-0.07006672E+02 0.02716144E+02 0.01204278E+00-0.09827195E-05    3
--0.07408477E-07 0.03789792E-10 0.01190771E+06 0.01126252E+03                   4
-HSISICL            40992H   1SI  2CL  1     G  0300.00   4000.00  1500.00      1
- 0.09242357E+02 0.07265211E-02-0.02039730E-05-0.03559737E-10 0.04236577E-13    2
- 0.03651789E+06-0.01714597E+03 0.05753464E+02 0.01000321E+00-0.01097056E-03    3
- 0.06117942E-07-0.01351102E-10 0.03773825E+06 0.01395110E+02                   4
-I*C3H7            120186C   3H   7          G  0300.00   5000.00  1000.00      1
- 0.08063369E+02 0.01574488E+00-0.05182392E-04 0.07477245E-08-0.03854422E-12    2
- 0.05313871E+05-0.02192647E+03 0.01713300E+02 0.02542616E+00 0.01580808E-04    3
--0.01821286E-06 0.08827710E-10 0.07535809E+05 0.01297901E+03                   4
-K                  81092K   1               G  0300.00   5000.00  1000.00      1
- 0.02563720E+02-0.01453656E-02 0.01223794E-05-0.05337797E-09 0.01196251E-12    2
- 0.09958933E+05 0.04689090E+02 0.02599395E+02-0.06665192E-02 0.01537419E-04    3
--0.01462701E-07 0.04917226E-11 0.09968534E+05 0.04606125E+02                   4
-K(L)               81092K   1               L  0300.00   2000.00  1000.00      1
- 0.03274152E+02-0.08858241E-03 0.03862458E-05 0.01524701E-08-0.07158116E-12    2
--0.05365253E+04-0.09686786E+02 0.04883188E+02-0.05109876E-01 0.08368289E-04    3
--0.07183867E-07 0.02694974E-10-0.01014822E+05-0.01801753E+03                   4
-K+                 81092K   1E  -1          G  0300.00   5000.00  1000.00      1
- 0.02500252E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.06110476E+06 0.04335097E+02 0.02500252E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.06110476E+06 0.04335097E+02                   4
-K2                 81092K   2               G  0300.00   5000.00  1000.00      1
- 0.04493744E+02 0.02561175E-02-0.03738461E-07 0.07392168E-11-0.05314252E-15    2
- 0.01393386E+06 0.04344696E+02 0.04445378E+02 0.04507960E-02-0.02923572E-05    3
- 0.01874060E-08-0.04441270E-12 0.01394330E+06 0.04577300E+02                   4
-K2B4O7(S)          81292B   4K   2O   7     S  0300.00   2000.00  1000.00      1
- 0.02241821E+03 0.01632758E+00-0.03423961E-04-0.01996427E-07 0.07329643E-11    2
--0.04092750E+07-0.01095459E+04-0.02998519E+02 0.01131803E+01-0.01363625E-02    3
- 0.07498933E-06-0.01475027E-09-0.04041216E+07 0.01385206E+03                   4
-K2B6O10(S)         81292B   6K   2O  10     S  0300.00   2000.00  1000.00      1
- 0.03118760E+03 0.02605101E+00-0.07109914E-04-0.01524101E-07 0.08605891E-11    2
--0.05702715E+07-0.01601394E+04 0.08964822E+02 0.01355307E+01-0.02844741E-02    3
- 0.03136564E-05-0.01242126E-08-0.05641143E+07-0.05121922E+03                   4
-K2B8O13(S)         81292B   8K   2O  13     S  0300.00   2000.00  1000.00      1
- 0.04112535E+03 0.02714051E+00 0.01343626E-04-0.04965544E-07 0.09664300E-11    2
--0.07315279E+07-0.02135898E+04 0.02800687E+03 0.02363518E+00 0.05436592E-03    3
--0.04802017E-06 0.07622581E-10-0.07248984E+07-0.01332889E+04                   4
-K2CO3(S)           81292C   1K   2O   3     S  0300.00   2000.00  1000.00      1
- 0.01170935E+03 0.01041619E+00 0.01020812E-04-0.05155670E-08 0.09388472E-12    2
--0.01424670E+07-0.05154899E+03 0.06680495E+02 0.03154875E+00-0.03258348E-03    3
- 0.02341080E-06-0.06331882E-10-0.01414994E+07-0.02751031E+03                   4
-K2H2O2             81292H   2K   2O   2     G  0300.00   5000.00  1000.00      1
- 0.09476007E+02 0.05520012E-01-0.02003512E-04 0.03416984E-08-0.02230089E-12    2
--0.08204786E+06-0.01665546E+03 0.06069657E+02 0.01657159E+00-0.01641134E-03    3
- 0.09628012E-07-0.02546013E-10-0.08118152E+06 0.05625929E+01                   4
-K2O(S)             81092K   2O   1          S  0300.00   2000.00  1000.00      1
- 0.09200109E+02 0.04813529E-01-0.01018656E-04 0.08972973E-08-0.02121417E-11    2
--0.04671154E+06-0.04264142E+03 0.02640315E+02 0.04577225E+00-0.09349357E-03    3
- 0.08921012E-06-0.03044898E-09-0.04583697E+06-0.01392763E+03                   4
-K2O2(S)            81092K   2O   2          S  0300.00   2000.00  1000.00      1
- 0.01094138E+03 0.06102309E-01 0.08639951E-05-0.02383978E-08 0.01021959E-12    2
--0.06335114E+06-0.05099447E+03 0.08940024E+02 0.01225014E+00-0.08065365E-04    3
- 0.07182271E-07-0.02627561E-10-0.06277485E+06-0.04066683E+03                   4
-K2SO4              81092K   2O   4S   1     G  0300.00   5000.00  1000.00      1
- 0.01526056E+03 0.04272701E-01-0.01902870E-04 0.03745009E-08-0.02710228E-12    2
--0.01368994E+07-0.04548655E+03 0.06620770E+02 0.02753542E+00-0.01909671E-03    3
--0.04668391E-08 0.03385142E-10-0.01346318E+07-0.01043411E+02                   4
-K2SO4(A)           81092K   2O   4S   1     S  0300.00   1200.00  1000.00      1
- 0.01112054E+03 0.01688473E+00 0.02694884E-04-0.06810694E-07 0.03326950E-10    2
--0.01771853E+07-0.04766545E+03 0.05610137E+02 0.05334319E+00-0.08680538E-03    3
- 0.08485600E-06-0.02978756E-09-0.01763645E+07-0.02358624E+03                   4
-K2SO4(B)           81092K   2O   4S   1     S  0300.00   1500.00  1000.00      1
- 0.01400625E+03 0.08639256E-01 0.01734839E-04-0.01101018E-07 0.02493181E-11    2
--0.01758863E+07-0.05931899E+03 0.01384030E+03 0.09154258E-01 0.01580722E-04    3
--0.01673984E-07 0.06273504E-11-0.01758589E+07-0.05851410E+03                   4
-K3CL6AL(S)         81292AL  1CL  6K   3     S  0300.00   2000.00  1000.00      1
- 0.02692199E+03 0.01202448E+00 0.05058586E-06-0.02459252E-07 0.06112274E-11    2
--0.02602720E+07-0.01118533E+04 0.02756025E+03 0.01980910E-01 0.02914285E-03    3
--0.03306608E-06 0.01153111E-09-0.02601182E+07-0.01132925E+04                   4
-K3CL9AL2(S)        81292AL  2CL  9K   3     S  0300.00   1500.00  1000.00      1
- 0.04789960E+03-0.03698524E-01 0.01208277E-04 0.06439299E-07-0.01714364E-10    2
--0.03594776E+07-0.02186357E+04 0.03685728E+03 0.02754220E-01 0.05087779E-03    3
--0.06808868E-06 0.02773367E-09-0.03554758E+07-0.01561649E+04                   4
-K3F6AL(S)          81292AL  1F   6K   3     S  0300.00   2000.00  1000.00      1
- 0.02557611E+03 0.01452585E+00-0.02005301E-04-0.01843642E-07 0.05259736E-11    2
--0.04090259E+07-0.01172057E+04 0.01633462E+03 0.05150368E+00-0.07128115E-03    3
- 0.06274052E-06-0.02251868E-09-0.04067185E+07-0.07147460E+03                   4
-KBF4               81292B   1F   4K   1     G  0300.00   5000.00  1000.00      1
- 0.01230182E+03 0.04142506E-01-0.01820830E-04 0.03550730E-08-0.02552394E-12    2
--0.01910389E+07-0.03449073E+03 0.05358002E+02 0.02295803E+00-0.01721231E-03    3
- 0.02466718E-07 0.01382599E-10-0.01891819E+07 0.01299769E+02                   4
-KBO2               81292B   1K   1O   2     G  0300.00   5000.00  1000.00      1
- 0.07506115E+02 0.02663024E-01-0.01134505E-04 0.02165299E-08-0.01532624E-12    2
--0.08364206E+06-0.08262075E+02 0.04636629E+02 0.01088843E+00-0.09865937E-04    3
- 0.04481115E-07-0.09043993E-11-0.08286314E+06 0.06500684E+02                   4
-KBO2(S)            81292B   1K   1O   2     S  0300.00   2000.00  1000.00      1
- 0.07971486E+02 0.06730890E-01-0.01544574E-04-0.09972352E-08 0.04052630E-11    2
--0.01227148E+07-0.03858371E+03 0.01603821E+02 0.03275175E+00-0.04757948E-03    3
- 0.03848067E-06-0.01269093E-09-0.01212629E+07-0.07486101E+02                   4
-KBR                81292BR  1K   1          G  0300.00   5000.00  1000.00      1
- 0.04458711E+02 0.01473836E-02-0.02499466E-06 0.05161851E-10-0.03875234E-14    2
--0.02300303E+06 0.04657488E+02 0.04270624E+02 0.07398923E-02-0.05320569E-05    3
--0.05894879E-10 0.01133094E-11-0.02296215E+06 0.05593031E+02                   4
-KBR(L)             81292BR  1K   1          L  0300.00   2500.00  1000.00      1
- 0.08404630E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.04779214E+06-0.03519115E+03 0.08404630E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.04779214E+06-0.03519115E+03                   4
-KBR(S)             81292BR  1K   1          S  0300.00   1500.00  1000.00      1
--0.05170830E+02 0.01746852E+00 0.01013392E-04-0.07494241E-07 0.02378879E-10    2
--0.04495981E+06 0.03946532E+03 0.05431605E+02 0.03845234E-01-0.03455247E-04    3
--0.09685064E-09 0.02470977E-10-0.04912882E+06-0.02040493E+03                   4
-KCL                81092CL  1K   1          G  0300.00   5000.00  1000.00      1
- 0.04434967E+02 0.01726721E-02-0.03865868E-06 0.07943251E-10-0.05932801E-14    2
--0.02716306E+06 0.03398542E+02 0.04149517E+02 0.01039142E-01-0.07034589E-05    3
--0.01200715E-08 0.02112008E-11-0.02709960E+06 0.04826011E+02                   4
-KCL(L)             81092CL  1K   1          L  0300.00   2000.00  1000.00      1
- 0.08852542E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.05337392E+06-0.04001344E+03 0.08852542E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.05337392E+06-0.04001344E+03                   4
-KCL(S)             81092CL  1K   1          S  0300.00   1500.00  1000.00      1
- 0.01391136E+01 0.07749002E-01 0.02100056E-04-0.01960861E-07 0.03813962E-12    2
--0.05188544E+06 0.09020889E+02 0.05818812E+02-0.05778791E-02 0.09593293E-04    3
--0.01468548E-06 0.07916702E-10-0.05429399E+06-0.02336092E+03                   4
-KCL4AL(S)          81292AL  1CL  4K   1     S  0300.00   2000.00  1000.00      1
- 0.02311946E+03 0.01525936E-01-0.06380630E-06-0.04176163E-08 0.01306884E-11    2
--0.01521618E+07-0.01113391E+04 0.01753111E+03-0.03647218E-01 0.03673018E-03    3
--0.03613268E-06 0.09813280E-10-0.01492592E+07-0.07647553E+03                   4
-KCLO4(S)           81092CL  1K   1O   4     S  0300.00   1500.00  1000.00      1
- 0.01704025E+03 0.06660737E-01-0.06016704E-05 0.09785776E-08-0.05059647E-11    2
--0.05676480E+06-0.08085843E+03-0.08468085E+02 0.01228758E+01-0.02129487E-02    3
- 0.01790606E-05-0.05694776E-09-0.05181381E+06 0.04005509E+03                   4
-KCN                81092C   1K   1N   1     G  0300.00   5000.00  1000.00      1
- 0.05842749E+02 0.01653475E-01-0.06722096E-05 0.01241081E-08-0.08573718E-13    2
- 0.07711161E+05-0.03406482E+02 0.05315387E+02 0.03936776E-01-0.05387426E-04    3
- 0.04814072E-07-0.01739264E-10 0.07842257E+05-0.08199391E+01                   4
-KCN(L)             81092C   1K   1N   1     L  0300.00   3000.00  1000.00      1
- 0.09058883E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01522798E+06-0.03545687E+03 0.09058883E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.01522798E+06-0.03545687E+03                   4
-KCN(S)             81092C   1K   1N   1     S  0300.00   2000.00  1000.00      1
- 0.07894013E+02 0.02150449E-02-0.01621315E-05 0.06831993E-09-0.01060712E-12    2
--0.01600422E+06-0.02964975E+03 0.08115453E+02-0.08847082E-02 0.01981085E-04    3
--0.01804607E-07 0.05974163E-11-0.01604356E+06-0.03067895E+03                   4
-KF                 81292F   1K   1          G  0300.00   5000.00  1000.00      1
- 0.04357120E+02 0.02586241E-02-0.08236973E-06 0.01676907E-09-0.01243132E-13    2
--0.04063861E+06 0.02285054E+02 0.03798984E+02 0.01885430E-01-0.01210870E-04    3
--0.03741075E-08 0.04494632E-11-0.04051013E+06 0.05095577E+02                   4
-KF(L)              81292F   1K   1          L  0300.00   3000.00  1000.00      1
- 0.08656265E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.06927377E+06-0.04118344E+03 0.08656265E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.06927377E+06-0.04118343E+03                   4
-KF(S)              81292F   1K   1          S  0300.00   2000.00  1000.00      1
- 0.03272299E+01 0.08993195E-01-0.03094381E-06-0.02624963E-07 0.07101532E-11    2
--0.06804909E+06 0.05309298E+02 0.06190467E+02-0.05622034E-01 0.02294401E-03    3
--0.02818213E-06 0.01204436E-09-0.07014057E+06-0.02637925E+03                   4
-KH                 81092H   1K   1          G  0300.00   5000.00  1000.00      1
- 0.03968138E+02 0.07086924E-02-0.02618517E-05 0.05096044E-09-0.03655452E-13    2
- 0.01350120E+06 0.08027413E+01 0.02900121E+02 0.03518317E-01-0.02544774E-04    3
- 0.04599961E-08 0.01286229E-11 0.01379667E+06 0.06342766E+02                   4
-KH(S)              81092H   1K   1          S  0300.00   1500.00  1000.00      1
- 0.05864564E+02 0.01204909E-01 0.02825877E-06 0.03559937E-08-0.02515747E-11    2
--0.09079129E+05-0.02848776E+03 0.05248775E+01 0.02016870E+00-0.02768125E-03    3
- 0.02024240E-06-0.06052568E-10-0.07796234E+05-0.01890097E+02                   4
-KI                 81092I   1K   1          G  0300.00   5000.00  1000.00      1
- 0.04470767E+02 0.01359027E-02-0.01768799E-06 0.03648327E-10-0.02733674E-14    2
--0.01644198E+06 0.05528315E+02 0.04327901E+02 0.05945793E-02-0.04409470E-05    3
- 0.04559572E-09 0.06522621E-12-0.01641095E+06 0.06237795E+02                   4
-KI(L)              81092I   1K   1          L  0300.00   2500.00  1000.00      1
- 0.08706593E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.04022598E+06-0.03588112E+03 0.08706593E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.04022598E+06-0.03588112E+03                   4
-KI(S)              81092I   1K   1          S  0300.00   2000.00  1000.00      1
- 0.01442913E+02 0.09802845E-01-0.01380615E-04-0.02325573E-07 0.07600708E-11    2
--0.03988335E+06 0.02717618E+02 0.05114120E+02 0.08508960E-01-0.02212545E-03    3
- 0.02836093E-06-0.01155892E-09-0.04120049E+06-0.01812497E+03                   4
-KO                 81092K   1O   1          G  0300.00   5000.00  1000.00      1
- 0.04400291E+02 0.02386787E-02-0.05880047E-06 0.01206713E-09-0.09006961E-14    2
- 0.07217110E+05 0.03434775E+02 0.03985333E+02 0.01469353E-01-0.09479054E-05    3
--0.02419141E-08 0.03264700E-11 0.07311120E+05 0.05517902E+02                   4
-KO-                81092K   1O   1E   1     G  0300.00   5000.00  1000.00      1
- 0.04394805E+02 0.02418371E-02-0.06146423E-06 0.01255348E-09-0.09326869E-14    2
--0.01794565E+06 0.02053687E+02 0.03961007E+02 0.01526099E-01-0.09806386E-05    3
--0.02666917E-08 0.03470232E-11-0.01784737E+06 0.04231682E+02                   4
-KO2(S)             81092K   1O   2          S  0300.00   1500.00  1000.00      1
- 0.01049310E+03 0.01397618E-01-0.06976643E-05 0.03477427E-08-0.01222708E-11    2
--0.03767516E+06-0.04607321E+03 0.04023244E+02 0.02903561E+00-0.04812416E-03    3
- 0.03816613E-06-0.01168231E-09-0.03635805E+06-0.01502191E+03                   4
-KOH                81092H   1K   1O   1     G  0300.00   2000.00  1000.00      1
- 0.09996477E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.05262511E+06-0.04533806E+03 0.09996477E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.05262511E+06-0.04533805E+03                   4
-KOH+               81092H   1K   1O   1E  -1G  0300.00   5000.00  1000.00      1
- 0.05583889E+02 0.01372118E-01-0.04239710E-05 0.06231942E-09-0.03548772E-13    2
- 0.05821436E+06-0.02017959E+02 0.05036081E+02 0.04278173E-01-0.04213406E-04    3
- 0.01114253E-07 0.03757057E-11 0.05823345E+06 0.03093667E+01                   4
-ME2GAET            62987GA  1C   4H  11     G  0300.00   1500.00  0600.00      1
- 0.07174541E+02 0.03235532E+00 0.01495199E-04-0.01048226E-06 0.03053962E-10    2
--0.06383914E+05-0.02026765E+02-0.03218207E+02 0.06398884E+00 0.01554552E-03    3
--0.01284710E-05 0.09441259E-09-0.04451897E+05 0.04848091E+03                   4
-MEGAET             62987GA  1C   3H   8     G  0300.00   1500.00  0600.00      1
- 0.06600990E+02 0.02284791E+00 0.01013375E-04-0.07318046E-07 0.02140197E-10    2
- 0.04071593E+05 0.05239052E+01-0.08169937E+01 0.04554296E+00 0.01053133E-03    3
--0.09079987E-06 0.06700564E-09 0.05448005E+05 0.03655502E+03                   4
-MEGAET2            62987GA  1C   5H  13     G  0300.00   1500.00  0600.00      1
- 0.08123156E+02 0.03978908E+00 0.01690979E-04-0.01308415E-06 0.03852599E-10    2
--0.08091057E+05-0.05039992E+02-0.05607499E+02 0.08187357E+00 0.01920530E-03    3
--0.01678979E-05 0.01243354E-08-0.05546688E+05 0.06163371E+03                   4
-MG                 81292MG  1               G  0300.00   5000.00  1000.00      1
- 0.02392633E+02 0.02085925E-02-0.01269898E-05 0.02553204E-09-0.04502495E-14    2
- 0.01704914E+06 0.04211876E+02 0.02416375E+02 0.05325518E-02-0.01135514E-04    3
- 0.09757325E-08-0.02898280E-11 0.01701992E+06 0.03983786E+02                   4
-MG(L)              81292MG  1               L  0300.00   2500.00  1000.00      1
- 0.02664314E+02 0.01304526E-01-0.07547418E-07 0.06776047E-10-0.01436523E-13    2
- 0.02234430E+04-0.01047801E+03 0.02161491E+02 0.04242991E-01-0.06464607E-04    3
- 0.06116790E-07-0.02090033E-10 0.02996028E+04-0.08229090E+02                   4
-MG(S)              81292MG  1               S  0300.00   2000.00  1000.00      1
- 0.02318547E+02 0.01929427E-01-0.01682130E-05 0.04131403E-09-0.01669293E-13    2
--0.07634172E+04-0.09802473E+02 0.01505637E+02 0.09217769E-01-0.01955590E-03    3
- 0.02020331E-06-0.07251403E-10-0.07226661E+04-0.06689818E+02                   4
-MG+                81292MG  1E  -1          G  0300.00   5000.00  1000.00      1
- 0.02504405E+02-0.08920014E-04 0.06671727E-07-0.02081615E-10 0.02311490E-14    2
- 0.01064936E+07 0.04292208E+02 0.02498282E+02 0.01465863E-03-0.03808341E-06    3
- 0.04118195E-09-0.01573362E-12 0.01064953E+07 0.04322873E+02                   4
-MG2                81292MG  2               G  0300.00   5000.00  1000.00      1
- 0.03671278E+02-0.02125120E-02 0.01013096E-05-0.02144628E-09 0.01719351E-13    2
- 0.03362331E+06 0.08548934E+02 0.04345606E+02-0.02080614E-01 0.01110301E-04    3
- 0.08675645E-08-0.07025087E-11 0.03346530E+06 0.05134171E+02                   4
-MG2BR4             81292BR  4MG  2          G  0300.00   5000.00  1000.00      1
- 0.01577579E+03 0.02832096E-02-0.01343784E-05 0.02764443E-09-0.02066139E-13    2
--0.09710095E+06-0.03457961E+03 0.01476089E+03 0.03361559E-01-0.02433120E-04    3
--0.05502974E-08 0.08111758E-11-0.09687714E+06-0.02950851E+03                   4
-MG2C3(S)           81292C   3MG  2          S  0300.00   2500.00  1000.00      1
- 0.01239169E+03 0.04624400E-01-0.02484800E-04 0.08656213E-08-0.01151950E-11    2
- 0.05393315E+05-0.06051988E+03-0.01026610E+02 0.07016433E+00-0.01240220E-02    3
- 0.01009934E-05-0.03082738E-09 0.07664551E+05 0.01701243E+02                   4
-MG2F4              81292F   4MG  2          G  0300.00   5000.00  1000.00      1
- 0.01441927E+03 0.01917749E-01-0.08894670E-05 0.01801607E-08-0.01331627E-12    2
--0.02113316E+07-0.04283410E+03 0.08770948E+02 0.01784847E+00-0.01109718E-03    3
--0.04603306E-07 0.04695460E-10-0.02099919E+07-0.01422645E+03                   4
-MGAL2O4(S)         81292AL  2MG  1O   4     S  0300.00   2800.00  1000.00      1
- 0.01495895E+03 0.08818509E-01-0.03160711E-04 0.01013391E-07-0.01228526E-11    2
--0.02817956E+07-0.07811436E+03-0.04868005E+02 0.01055641E+01-0.01821902E-02    3
- 0.01481432E-05-0.04514191E-09-0.02784436E+07 0.01382603E+03                   4
-MGB2(S)            81292B   2MG  1          S  0300.00   2000.00  1000.00      1
- 0.06619755E+02 0.01322195E-01 0.04697857E-05 0.03681802E-08-0.01739753E-11    2
--0.01346401E+06-0.03460640E+03 0.04176086E+02 0.06396544E-01-0.05616456E-04    3
- 0.07092297E-07-0.03442529E-10-0.01255609E+06-0.02118159E+03                   4
-MGBR               81292BR  1MG  1          G  0300.00   5000.00  1000.00      1
- 0.04385933E+02 0.01975075E-02-0.06117347E-06 0.01027103E-09-0.03876260E-14    2
--0.05584836E+05 0.04357095E+02 0.03932960E+02 0.01518559E-01-0.09413456E-05    3
--0.03806534E-08 0.04026288E-11-0.05481871E+05 0.06634707E+02                   4
-MGBR2              81292BR  2MG  1          G  0300.00   5000.00  1000.00      1
- 0.07282371E+02 0.02671005E-02-0.01246470E-05 0.02534839E-09-0.01878437E-13    2
--0.03865522E+06-0.05463838E+02 0.06436183E+02 0.02723204E-01-0.01828290E-04    3
--0.05509276E-08 0.06681264E-11-0.03845914E+06-0.01198273E+02                   4
-MGBR2+             81292BR  2MG  1E  -1     G  0300.00   5000.00  1000.00      1
- 0.07317323E+02 0.02252288E-02-0.01039562E-05 0.02025280E-09-0.01333602E-13    2
- 0.08575141E+06-0.03144653E+02 0.06600891E+02 0.02322271E-01-0.01575443E-04    3
--0.04621806E-08 0.05719750E-11 0.08591576E+06 0.04604670E+01                   4
-MGC2(S)            81292C   2MG  1          S  0300.00   2500.00  1000.00      1
- 0.07427011E+02 0.02786444E-01-0.01500518E-04 0.05235992E-08-0.06981197E-12    2
- 0.08069270E+05-0.03697419E+03-0.06510206E+01 0.04230993E+00-0.07491559E-03    3
- 0.06109534E-06-0.01867195E-09 0.09434739E+05 0.04708862E+01                   4
-MGCL               81292CL  1MG  1          G  0300.00   5000.00  1000.00      1
- 0.04335941E+02 0.02574531E-02-0.09346352E-06 0.01898185E-09-0.01405830E-13    2
--0.06564693E+05 0.03214818E+02 0.03708081E+02 0.02069048E-01-0.01328293E-04    3
--0.04347061E-08 0.05033764E-11-0.06418555E+05 0.06382778E+02                   4
-MGCL2              81292CL  2MG  1          G  0300.00   5000.00  1000.00      1
- 0.07176871E+02 0.03917414E-02-0.01814155E-05 0.03670114E-09-0.02710187E-13    2
--0.04941693E+06-0.07830507E+02 0.06000831E+02 0.03745347E-01-0.02447708E-04    3
--0.07873749E-08 0.09100925E-11-0.04913880E+06-0.01880677E+02                   4
-MGCL2(S)           81292CL  2MG  1          S  0300.00   2000.00  1000.00      1
- 0.08460549E+02 0.02204761E-01-0.06316590E-05 0.02617815E-08-0.05082748E-12    2
--0.07983216E+06-0.03816537E+03 0.04852236E+02 0.02102714E+00-0.03667994E-03    3
- 0.03032449E-06-0.09279303E-10-0.07928891E+06-0.02175204E+03                   4
-MGCO3(S)           81292C   1MG  1O   3     S  0300.00   1000.00  1000.00      1
- 0.01585340E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01402924E+07-0.08639698E+03 0.01344667E+02 0.03695912E+00-0.04452165E-03    3
- 0.03181716E-06-0.09745892E-10-0.01354278E+07-0.09041713E+02                   4
-MGF                81292F   1MG  1          G  0300.00   5000.00  1000.00      1
- 0.04166004E+02 0.04434929E-02-0.01720072E-05 0.03280565E-09-0.02190876E-13    2
--0.02980270E+06 0.02577443E+02 0.03172942E+02 0.03157075E-01-0.02008009E-04    3
--0.04636928E-08 0.06097890E-11-0.02955269E+06 0.07654193E+02                   4
-MGF2               81292F   2MG  1          G  0300.00   5000.00  1000.00      1
- 0.06314408E+02 0.08013760E-02-0.03622602E-05 0.07202929E-09-0.05250556E-13    2
--0.08944590E+06-0.05637362E+02 0.04365511E+02 0.06150098E-01-0.04077014E-04    3
--0.07490467E-08 0.01130754E-10-0.08895505E+06 0.04323487E+02                   4
-MGF2(S)            81292F   2MG  1          S  0300.00   2000.00  1000.00      1
- 0.08170168E+02 0.02353222E-01-0.01060785E-04 0.02392788E-08-0.01594861E-12    2
--0.01379692E+07-0.04083052E+03 0.01762995E+02 0.03056669E+00-0.04933989E-03    3
- 0.03778577E-06-0.01108964E-09-0.01367476E+07-0.01039233E+03                   4
-MGF2+              81292F   2MG  1E  -1     G  0300.00   5000.00  1000.00      1
- 0.06819974E+02 0.08267521E-02-0.03871799E-05 0.07864547E-09-0.05589085E-13    2
- 0.06903427E+06-0.08313943E+02 0.04782002E+02 0.06580736E-01-0.04470059E-04    3
--0.08656625E-08 0.01305586E-10 0.06953005E+06 0.02038302E+02                   4
-MGH                81292H   1MG  1          G  0300.00   5000.00  1000.00      1
- 0.03501857E+02 0.01196289E-01-0.04870483E-05 0.09616032E-09-0.06566165E-13    2
- 0.01915847E+06 0.02762077E+02 0.02929127E+02 0.02881565E-01-0.03702138E-04    3
- 0.03761425E-07-0.01569289E-10 0.01935649E+06 0.05809553E+02                   4
-MGH2(S)            81292H   2MG  1          S  0300.00   2000.00  1000.00      1
- 0.04503751E+02 0.05009365E-01-0.07076169E-05-0.09321345E-08 0.03016174E-11    2
--0.01106837E+06-0.02418625E+03-0.09052193E+00 0.01938007E+00-0.01936573E-03    3
- 0.01164904E-06-0.03397887E-10-0.09845471E+05-0.07606392E+01                   4
-MGH2O2             81292H   2MG  1O   2     G  0300.00   5000.00  1000.00      1
- 0.08302454E+02 0.03712996E-01-0.01279645E-04 0.02102831E-08-0.01337217E-12    2
--0.07153173E+06-0.01640682E+03 0.04724303E+02 0.01611746E+00-0.01291007E-03    3
- 0.05703660E-08 0.02430663E-10-0.07085783E+06 0.09898885E+01                   4
-MGH2O2(S)          81292H   2MG  1O   2     S  0300.00   1000.00  1000.00      1
- 0.01381001E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01162998E+07-0.07323205E+03-0.04220693E+02 0.07726916E+00-0.01383568E-02    3
- 0.01155986E-05-0.03648025E-09-0.01123883E+07 0.01381610E+03                   4
-MGN                81292MG  1N   1          G  0300.00   5000.00  1000.00      1
- 0.04177825E+02 0.04387980E-02-0.01726040E-05 0.03444124E-09-0.02516521E-13    2
- 0.03340716E+06 0.02969357E+02 0.03200092E+02 0.03139739E-01-0.02045035E-04    3
--0.04125930E-08 0.05937391E-11 0.03365107E+06 0.07958522E+02                   4
-MGO(S)             81292MG  1O   1          S  0300.00   4000.00  1000.00      1
- 0.04857470E+02 0.01952289E-01-0.08605956E-05 0.02101340E-08-0.01886027E-12    2
--0.07394488E+06-0.02524503E+03 0.01971740E+02 0.01095483E+00-0.08169910E-04    3
--0.06359402E-08 0.02019714E-10-0.07332016E+06-0.01088662E+03                   4
-MGOH               81292H   1MG  1O   1     G  0300.00   5000.00  1000.00      1
- 0.05156858E+02 0.01849251E-01-0.06339213E-05 0.01026031E-08-0.06282974E-13    2
--0.02145938E+06-0.02774689E+02 0.03347871E+02 0.08101305E-01-0.06443066E-04    3
- 0.02006805E-08 0.01261718E-10-0.02111816E+06 0.06024177E+02                   4
-MGOH+              81292H   1MG  1O   1E  -1G  0300.00   5000.00  1000.00      1
- 0.05171484E+02 0.01835998E-01-0.06314934E-05 0.01036229E-08-0.06583402E-13    2
- 0.06865354E+06-0.03526109E+02 0.03383351E+02 0.08055572E-01-0.06452790E-04    3
- 0.02400212E-08 0.01246873E-10 0.06898753E+06 0.05158118E+02                   4
-MGS                81292MG  1S   1          G  0300.00   5000.00  1000.00      1
- 0.01071331E+03-0.06086042E-01 0.02390833E-04-0.04174042E-08 0.02737530E-12    2
- 0.01317442E+06-0.03521998E+03 0.03789723E+02-0.03985028E-01 0.02217192E-03    3
--0.01858825E-06 0.03239714E-10 0.01635406E+06 0.05868810E+02                   4
-MGS(S)             81292MG  1S   1          S  0300.00   3000.00  1000.00      1
- 0.05581918E+02 0.08031267E-02-0.01812239E-05 0.04113088E-09-0.02798069E-13    2
--0.04331716E+06-0.02607368E+03 0.04076152E+02 0.07088011E-01-0.09604458E-04    3
- 0.06056009E-07-0.01373560E-10-0.04304232E+06-0.01890776E+03                   4
-MGSO4(S)           81292MG  1O   4S   1     S  0300.00   2500.00  1000.00      1
- 0.08845820E+02 0.01221900E+00-0.02141897E-04-0.09580988E-08 0.02954552E-11    2
--0.01549512E+07-0.04302983E+03 0.02258418E+02 0.04788929E+00-0.07110586E-03    3
- 0.05630850E-06-0.01709008E-09-0.01540505E+07-0.01345647E+03                   4
-N                 120186N   1               G  0300.00   5000.00  1000.00      1
- 0.02450268E+02 0.01066146E-02-0.07465337E-06 0.01879652E-09-0.01025984E-13    2
- 0.05611604E+06 0.04448758E+02 0.02503071E+02-0.02180018E-03 0.05420529E-06    3
--0.05647560E-09 0.02099904E-12 0.05609890E+06 0.04167566E+02                   4
-N*C3H7            120186C   3H   7          G  0300.00   5000.00  1000.00      1
- 0.07978291E+02 0.01576113E+00-0.05173243E-04 0.07443892E-08-0.03824978E-12    2
- 0.07579402E+05-0.01935611E+03 0.01922537E+02 0.02478927E+00 0.01810249E-04    3
--0.01783266E-06 0.08582996E-10 0.09713281E+05 0.01399271E+03                   4
-N2                121286N   2               G  0300.00   5000.00  1000.00      1
- 0.02926640E+02 0.01487977E-01-0.05684761E-05 0.01009704E-08-0.06753351E-13    2
--0.09227977E+04 0.05980528E+02 0.03298677E+02 0.01408240E-01-0.03963222E-04    3
- 0.05641515E-07-0.02444855E-10-0.01020900E+05 0.03950372E+02                   4
-N2H2              121286N   2H   2          G  0300.00   5000.00  1000.00      1
- 0.03371185E+02 0.06039968E-01-0.02303854E-04 0.04062789E-08-0.02713144E-12    2
- 0.02418172E+06 0.04980585E+02 0.01617999E+02 0.01306312E+00-0.01715712E-03    3
- 0.01605608E-06-0.06093639E-10 0.02467526E+06 0.01379467E+03                   4
-N2H3              120186N   2H   3          G  0300.00   5000.00  1000.00      1
- 0.04441846E+02 0.07214271E-01-0.02495684E-04 0.03920565E-08-0.02298950E-12    2
- 0.01664221E+06-0.04275205E+01 0.03174204E+02 0.04715907E-01 0.01334867E-03    3
--0.01919685E-06 0.07487564E-10 0.01727270E+06 0.07557224E+02                   4
-N2H4              121286N   2H   4          G  0300.00   5000.00  1000.00      1
- 0.04977317E+02 0.09595519E-01-0.03547639E-04 0.06124299E-08-0.04029795E-12    2
- 0.09341219E+05-0.02962990E+02 0.06442606E+00 0.02749730E+00-0.02899451E-03    3
- 0.01745240E-06-0.04422282E-10 0.01045192E+06 0.02127789E+03                   4
-N2H4(L)            90589H   4N   2          L  0300.00   0600.00  0450.00      1
- 0.08890683E+02 0.08330343E-01 0.04945549E-04-0.04909251E-08-0.03355824E-10    2
- 0.03032250E+05-0.03871433E+03 0.09047444E+02 0.09241592E-01 0.02263547E-04    3
--0.08952247E-07 0.01486863E-09 0.02970393E+05-0.03974034E+03                   4
-N2O               121286N   2O   1          G  0300.00   5000.00  1000.00      1
- 0.04718977E+02 0.02873714E-01-0.01197496E-04 0.02250552E-08-0.01575337E-12    2
- 0.08165811E+05-0.01657250E+02 0.02543058E+02 0.09492193E-01-0.09792775E-04    3
- 0.06263845E-07-0.01901826E-10 0.08765100E+05 0.09511222E+02                   4
-N2O+              121286N   2O   1E  -1     G  0300.00   5000.00  1000.00      1
- 0.05398516E+02 0.02249478E-01-0.09577057E-05 0.01823193E-08-0.01284422E-12    2
- 0.01584851E+07-0.03733146E+02 0.03187228E+02 0.08350714E-01-0.07894549E-04    3
- 0.04597445E-07-0.01381075E-10 0.01591279E+07 0.07779426E+02                   4
-N2O4              121286N   2O   4          G  0300.00   5000.00  1000.00      1
- 0.01048220E+03 0.05972272E-01-0.02564044E-04 0.04916885E-08-0.03490969E-12    2
--0.02849989E+05-0.02612289E+03 0.03624593E+02 0.02474708E+00-0.02172875E-03    3
- 0.09927104E-07-0.02222817E-10-0.09128241E+04 0.09457174E+02                   4
-N3                121286N   3               G  0300.00   5000.00  1000.00      1
- 0.05208505E+02 0.02444507E-01-0.01038941E-04 0.01977417E-08-0.01395644E-12    2
- 0.04796178E+06-0.03612756E+02 0.02882219E+02 0.08930338E-01-0.08539038E-04    3
- 0.05045585E-07-0.01521248E-10 0.04863468E+06 0.08481757E+02                   4
-NA                 80792NA  1               G  0300.00   5000.00  1000.00      1
- 0.02574480E+02-0.01605880E-02 0.01250641E-05-0.04516576E-09 0.06941745E-13    2
- 0.01219129E+06 0.03830900E+02 0.02591348E+02-0.05961520E-02 0.01327651E-04    3
--0.01211123E-07 0.03890067E-11 0.01220642E+06 0.03841789E+02                   4
-NA(L)              81092NA  1               L  0300.00   2000.00  1000.00      1
- 0.04030581E+02-0.01320419E-01 0.04136604E-05 0.05486936E-08-0.01916626E-11    2
--0.07899189E+04-0.01548589E+03 0.04682137E+02-0.03624112E-01 0.04776195E-04    3
--0.03871514E-07 0.01518150E-10-0.09807172E+04-0.01881830E+03                   4
-NA+                80792NA  1E  -1          G  0300.00   5000.00  1000.00      1
- 0.02500252E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.07260903E+06 0.03538490E+02 0.02500252E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.07260904E+06 0.03538490E+02                   4
-NA2                80792NA  2               G  0300.00   5000.00  1000.00      1
- 0.04480669E+02 0.02178011E-02-0.01102830E-06 0.02208498E-10-0.01614866E-14    2
- 0.01519313E+06 0.02073203E+02 0.04369675E+02 0.05850265E-02-0.03825359E-05    3
- 0.08752245E-09 0.02980178E-12 0.01521703E+06 0.02622521E+02                   4
-NA2B4O7(S)         81292B   4NA  2O   7     S  0300.00   2000.00  1000.00      1
- 0.02061542E+03 0.01728323E+00-0.04016503E-04-0.07600982E-08 0.05580242E-11    2
--0.04014288E+07-0.01006093E+04 0.01430907E+02 0.01167214E+01-0.02000861E-02    3
- 0.01698028E-05-0.05418888E-09-0.03982982E+07-0.01265829E+03                   4
-NA2B6O10(S)        81292B   6NA  2O  10     S  0300.00   2000.00  1000.00      1
- 0.02989617E+03 0.03053411E+00-0.02146684E-04-0.04458443E-07 0.09406424E-11    2
--0.05638429E+07-0.01571271E+04 0.09347958E+02 0.08948274E+00-0.01024848E-02    3
- 0.01015647E-05-0.04314482E-09-0.05570116E+07-0.04828430E+03                   4
-NA2C2N2            81292C   2N   2NA  2     G  0300.00   5000.00  1000.00      1
- 0.01253426E+03 0.03485206E-01-0.01426483E-04 0.02648455E-08-0.01838071E-12    2
--0.05033986E+05-0.03087649E+03 0.01092445E+03 0.09724206E-01-0.01190420E-03    3
- 0.08942515E-07-0.02847524E-10-0.04654688E+05-0.02294170E+03                   4
-NA2F2              80792F   2NA  2          G  0300.00   5000.00  1000.00      1
- 0.09265403E+02 0.09044011E-02-0.04233919E-05 0.08630666E-09-0.06408558E-13    2
--0.01047310E+07-0.01880290E+03 0.06422050E+02 0.09031559E-01-0.05593408E-04    3
--0.02581729E-07 0.02547837E-10-0.01040718E+07-0.04453081E+02                   4
-NA2H2O2            80792H   2NA  2O   2     G  0300.00   5000.00  1000.00      1
- 0.09347846E+02 0.05678318E-01-0.02077824E-04 0.03568716E-08-0.02342868E-12    2
--0.07634945E+06-0.01850110E+03 0.05441492E+02 0.01814821E+00-0.01733029E-03    3
- 0.09077551E-07-0.02055174E-10-0.07536770E+06 0.01240430E+02                   4
-NA2O(L)            81092NA  2O   1          L  0300.00   3000.00  1000.00      1
- 0.01258178E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.04859891E+06-0.06066678E+03 0.01258178E+03 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.04859891E+06-0.06066677E+03                   4
-NA2O(S)            81092NA  2O   1          S  0300.00   2000.00  1000.00      1
- 0.08804423E+02 0.03253428E-01-0.03530522E-05-0.04324117E-08 0.01394574E-11    2
--0.05257507E+06-0.04209654E+03 0.04776964E+02 0.01483269E+00-0.01052247E-03    3
- 0.01278469E-07 0.01046187E-10-0.05155651E+06-0.02156737E+03                   4
-NA2O2              81092NA  2O   2          S  0300.00   2500.00  1000.00      1
- 0.01382402E+03-0.03556455E-02 0.02837263E-05-0.09701692E-09 0.01205762E-12    2
--0.06583802E+06-0.06789536E+03 0.08035418E+02 0.05983777E-01 0.01935571E-03    3
--0.03410482E-06 0.01439706E-09-0.06395152E+06-0.03604480E+03                   4
-NA2SO4             80792NA  2O   4S   1     G  0300.00   5000.00  1000.00      1
- 0.01506456E+03 0.04508233E-01-0.02011474E-04 0.03963989E-08-0.02871466E-12    2
--0.01296053E+07-0.04683857E+03 0.05752581E+02 0.02964118E+00-0.02035211E-03    3
--0.01073243E-07 0.03960597E-10-0.01271767E+07 0.01016246E+02                   4
-NA2SO4(D)          81092NA  2O   4S   1     S  0300.00   1500.00  1000.00      1
- 0.01062092E+03 0.01179912E+00 0.03608537E-04-0.03424054E-09-0.09650399E-11    2
--0.01684493E+07-0.04191208E+03 0.01187237E+03 0.04287018E+00-0.09072926E-03    3
- 0.09042235E-06-0.02940634E-09-0.01707163E+07-0.05750085E+03                   4
-NA2SO4(i)          81092NA  2O   4S   1     S  0300.00   1500.00  1000.00      1
- 0.01711668E+03 0.05878399E-01 0.01196697E-04 0.01676018E-08-0.02640822E-11    2
--0.01714447E+07-0.07997372E+03 0.01674756E+03 0.01133662E+00-0.01526634E-03    3
- 0.01819548E-06-0.06918027E-10-0.01714932E+07-0.07899648E+03                   4
-NA2SO4(iii)        81092NA  2O   4S   1     S  0300.00   1000.00  1000.00      1
- 0.03701786E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01854858E+07-0.02084472E+04 0.01413394E+03-0.01694491E+00 0.09403022E-03    3
--0.07815722E-06 0.02395583E-09-0.01707247E+07-0.06037737E+03                   4
-NA2SO4(iv)         81092NA  2O   4S   1     S  0300.00   1000.00  1000.00      1
- 0.02590382E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01779857E+07-0.01365608E+04 0.05917499E+02 0.04507074E+00-0.05672574E-03    3
- 0.04596655E-06-0.01432523E-09-0.01702527E+07-0.02694892E+03                   4
-NA2SO4(v)          81092NA  2O   4S   1     S  0300.00   1000.00  1000.00      1
- 0.02590382E+03 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.01780169E+07-0.01366284E+04 0.05917499E+02 0.04507074E+00-0.05672574E-03    3
- 0.04596655E-06-0.01432523E-09-0.01702840E+07-0.02701654E+03                   4
-NA3CL6AL(S)        81292AL  1CL  6NA  3     S  0300.00   2000.00  1000.00      1
- 0.02863182E+03 0.08169580E-01 0.01787040E-05-0.09984084E-08 0.01787581E-11    2
--0.02473307E+07-0.01246570E+04 0.02610594E+03 0.09148861E-01 0.09743193E-04    3
--0.01296166E-06 0.04124132E-10-0.02462808E+07-0.01099689E+04                   4
-NA3F6AL(S)         81292AL  1F   6NA  3     S  0300.00   1200.00  1000.00      1
- 0.01867366E+03 0.02426805E+00 0.01311169E-04-0.01223061E-06 0.06326451E-10    2
--0.04056682E+07-0.08492075E+03 0.01182130E+03 0.07831376E+00-0.01387551E-02    3
- 0.01331742E-05-0.04620547E-09-0.04049948E+07-0.05693419E+03                   4
-NABH4(S)           81292B   1H   4NA  1     S  0300.00   2000.00  1000.00      1
- 0.08204329E+02 0.01008304E+00-0.01032261E-04-0.02815504E-07 0.09005147E-11    2
--0.02614390E+06-0.03790153E+03 0.08076391E+02 0.05407829E-01 0.01208139E-03    3
--0.01450540E-06 0.04279918E-10-0.02580298E+06-0.03584760E+03                   4
-NABO2              81092B   1NA  1O   2     G  0300.00   5000.00  1000.00      1
- 0.07449052E+02 0.02730088E-01-0.01165145E-04 0.02226924E-08-0.01578063E-12    2
--0.08056425E+06-0.09194809E+02 0.04413702E+02 0.01144045E+00-0.01021892E-03    3
- 0.04340556E-07-0.07548787E-11-0.07974780E+06 0.06401325E+02                   4
-NABO2(S)           81292B   1NA  1O   2     S  0300.00   2000.00  1000.00      1
- 0.07820448E+02 0.06702746E-01-0.01488126E-04-0.01033983E-07 0.04130615E-11    2
--0.01203511E+07-0.03848530E+03 0.01695994E+02 0.03131723E+00-0.04453876E-03    3
- 0.03572163E-06-0.01178195E-09-0.01189335E+07-0.08471359E+02                   4
-NABR               81092BR  1NA  1          G  0300.00   5000.00  1000.00      1
- 0.04424304E+02 0.01887477E-02-0.04500799E-06 0.09226701E-10-0.06871650E-14    2
--0.01865205E+06 0.03707466E+02 0.04097639E+02 0.01170972E-01-0.07798224E-05    3
--0.01611608E-08 0.02489549E-11-0.01857889E+06 0.05343556E+02                   4
-NABR(L)            81292BR  1NA  1          L  0300.00   2500.00  1000.00      1
- 0.07498742E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.04305332E+06-0.03017306E+03 0.07498742E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.04305333E+06-0.03017306E+03                   4
-NABR(S)            81292BR  1NA  1          S  0300.00   2000.00  1000.00      1
- 0.05741811E+02 0.01766697E-01-0.01899553E-05 0.01473021E-09 0.01715605E-12    2
--0.04526151E+06-0.02279248E+03 0.04706446E+02 0.08010188E-01-0.01346175E-03    3
- 0.01196933E-06-0.03873765E-10-0.04513442E+06-0.01826015E+03                   4
-NACH               80792C   1N   1NA  1     G  0300.00   5000.00  1000.00      1
- 0.05791865E+02 0.01708993E-01-0.06965832E-05 0.01288980E-08-0.08921502E-13    2
- 0.09496355E+05-0.04320624E+02 0.05123989E+02 0.04411283E-01-0.05682223E-04    3
- 0.04664804E-07-0.01593603E-10 0.09657925E+05-0.01032367E+02                   4
-NACL               81092CL  1NA  1          G  0300.00   5000.00  1000.00      1
- 0.04393820E+02 0.02153336E-02-0.06198756E-06 0.01266879E-09-0.09427806E-14    2
--0.02315864E+06 0.02486064E+02 0.03953003E+02 0.01514187E-01-0.09819465E-05    3
--0.02807090E-08 0.03543574E-11-0.02305831E+06 0.04701214E+02                   4
-NACL(S)            81092CL  1NA  1          S  0300.00   1500.00  1000.00      1
- 0.07639640E+02-0.03933726E-01 0.02071020E-04 0.04233998E-07-0.02204761E-10    2
--0.05163684E+06-0.03397957E+03 0.04982695E+02 0.05432908E-01-0.07698454E-04    3
- 0.06300821E-07-0.01211800E-10-0.05112201E+06-0.02104512E+03                   4
-NACL4AL(S)         81292AL  1CL  4NA  1     S  0300.00   2000.00  1000.00      1
- 0.02138498E+03 0.03252454E-01-0.01769716E-05-0.07072990E-08 0.01928080E-11    2
--0.01447874E+07-0.01021539E+04 0.01588411E+03 0.04527768E-01 0.02409928E-03    3
--0.03108224E-06 0.01051706E-09-0.01424874E+07-0.07002475E+03                   4
-NACN               81092C   1N   1NA  1     G  0300.00   5000.00  1000.00      1
- 0.05791865E+02 0.01708993E-01-0.06965832E-05 0.01288980E-08-0.08921502E-13    2
- 0.09496355E+05-0.04320624E+02 0.05123989E+02 0.04411283E-01-0.05682223E-04    3
- 0.04664804E-07-0.01593603E-10 0.09657925E+05-0.01032367E+02                   4
-NACN(S)            81292C   1N   1NA  1     S  0300.00   2000.00  1000.00      1
- 0.08137501E+02 0.03044670E-02-0.01811052E-05 0.08281245E-09-0.01435891E-12    2
--0.01334049E+06-0.03217693E+03 0.08239171E+02-0.05281579E-03 0.03829305E-05    3
--0.03800801E-08 0.01401136E-11-0.01336670E+06-0.03268830E+03                   4
-NAF                80792F   1NA  1          G  0300.00   5000.00  1000.00      1
- 0.04289078E+02 0.03377828E-02-0.01184403E-05 0.02398348E-09-0.01772778E-13    2
--0.03626513E+06 0.01538309E+02 0.03532346E+02 0.02495132E-01-0.01587195E-04    3
--0.04836335E-08 0.05739804E-11-0.03608573E+06 0.05367920E+02                   4
-NAF2-              81092F   2NA  1E   1     G  0300.00   5000.00  1000.00      1
- 0.07032279E+02 0.05655084E-02-0.02615340E-05 0.05285863E-09-0.03900402E-13    2
--0.08272088E+06-0.01028459E+03 0.05382830E+02 0.05231638E-01-0.03350411E-04    3
--0.01169983E-07 0.01291137E-10-0.08232816E+06-0.01928436E+02                   4
-NAF4AL             81092AL  1F   4NA  1     G  0300.00   5000.00  1000.00      1
- 0.01407161E+03 0.02285303E-01-0.01043457E-04 0.02090484E-08-0.01532874E-12    2
--0.02260449E+07-0.04013149E+03 0.08103421E+02 0.01881143E+00-0.01205279E-03    3
--0.03477927E-07 0.04123038E-10-0.02245760E+07-0.09731781E+02                   4
-NAH                80792H   1NA  1          G  0300.00   5000.00  1000.00      1
- 0.03818649E+02 0.08597439E-02-0.03202059E-05 0.06146711E-09-0.04364567E-13    2
- 0.01368120E+06 0.04367959E+01 0.02864363E+02 0.03308582E-01-0.02753919E-04    3
- 0.01399522E-07-0.04032581E-11 0.01396756E+06 0.05450493E+02                   4
-NAI(S)             81292I   1NA  1          S  0300.00   2000.00  1000.00      1
- 0.05987605E+02 0.01342139E-01-0.03807255E-06 0.01660138E-09-0.06066889E-13    2
--0.03648630E+06-0.02270427E+03 0.05407032E+02 0.04235908E-01-0.05679955E-04    3
- 0.04941357E-07-0.01602135E-10-0.03638396E+06-0.02000921E+03                   4
-NAO                80792NA  1O   1          G  0300.00   5000.00  1000.00      1
- 0.04349803E+02 0.02849959E-02-0.08615992E-06 0.01754054E-09-0.01301677E-13    2
- 0.08731694E+05 0.02618339E+02 0.03765728E+02 0.01980031E-01-0.01256303E-04    3
--0.03909831E-08 0.04664039E-11 0.08866889E+05 0.05562273E+02                   4
-NAO-               80792NA  1O   1E   1     G  0300.00   5000.00  1000.00      1
- 0.04343846E+02 0.02955424E-02-0.08923111E-06 0.01813572E-09-0.01343290E-13    2
--0.01592823E+06 0.01245911E+02 0.03740064E+02 0.02044313E-01-0.01291719E-04    3
--0.04080754E-08 0.04823669E-11-0.01578820E+06 0.04290303E+02                   4
-NAO2(S)            81092NA  1O   2          S  0300.00   2000.00  1000.00      1
- 0.07379480E+02 0.04377048E-01 0.06355202E-05-0.03238946E-08 0.06014399E-12    2
--0.03376432E+06-0.02946090E+03 0.07236605E+02 0.04751740E-01 0.03458707E-05    3
--0.02971627E-08 0.09124652E-12-0.03372514E+06-0.02872050E+03                   4
-NAO2AL(S)          81292AL  1NA  1O   2     S  0300.00   3000.00  1000.00      1
- 0.09963634E+02 0.02329677E-01-0.08188510E-07 0.02070425E-09-0.02306699E-12    2
--0.01394255E+07-0.04932653E+03 0.03669741E+02 0.02226343E+00-0.01558734E-03    3
--0.03446683E-07 0.05383614E-10-0.01381199E+07-0.01818990E+03                   4
-NAOH               80792H   1NA  1O   1     G  0300.00   5000.00  1000.00      1
- 0.05527852E+02 0.01420623E-01-0.04439615E-05 0.06635639E-09-0.03866820E-13    2
--0.02545869E+06-0.04374785E+02 0.04727895E+02 0.05001262E-01-0.04534391E-04    3
- 0.07051240E-08 0.06671123E-11-0.02537947E+06-0.07649678E+01                   4
-NAOH(L)            81092H   1NA  1O   1     L  0300.00   2500.00  1000.00      1
- 0.01061400E+03-0.03116447E-02-0.02964198E-05 0.05475463E-09 0.01021178E-12    2
--0.05327943E+06-0.05120959E+03 0.01079389E+03-0.08545728E-02 0.03780039E-05    3
--0.03848777E-08 0.01384542E-11-0.05332840E+06-0.05213201E+03                   4
-NAOH+              80792H   1NA  1O   1E  -1G  0300.00   5000.00  1000.00      1
- 0.05570452E+02 0.01387979E-01-0.04311444E-05 0.06372652E-09-0.03648954E-13    2
- 0.07985595E+06-0.02878876E+02 0.04974624E+02 0.04424591E-01-0.04296418E-04    3
- 0.01067747E-07 0.04168198E-11 0.07988680E+06-0.03068088E+01                   4
-NCN               103190C   1N   2          G  0300.00   4000.00  1500.00      1
- 0.06652121E+02 0.06108034E-02-0.01389727E-05 0.02695549E-10 0.01669944E-13    2
- 0.05172403E+06-0.01138517E+03 0.03101270E+02 0.09981674E-01-0.09920701E-04    3
- 0.04758919E-07-0.08968626E-11 0.05285757E+06 0.07317579E+02                   4
-NCO               110193C   1N   1O   1     G  0300.00   4000.00  1400.00      1
- 0.06072346E+02 0.09227829E-02-0.09845574E-06-0.04764123E-09 0.09090445E-13    2
- 0.01359820E+06-0.08507293E+02 0.03359593E+02 0.05393239E-01-0.08144585E-05    3
--0.01912868E-07 0.07836794E-11 0.01462809E+06 0.06549694E+02                   4
-NF                121286N   1F   1          G  0300.00   5000.00  1000.00      1
- 0.03862177E+02 0.07551806E-02-0.03044943E-05 0.05874447E-09-0.04187479E-13    2
- 0.02867243E+06 0.03457233E+02 0.02871947E+02 0.03312193E-01-0.02691159E-04    3
- 0.01121951E-07-0.02475131E-11 0.02896257E+06 0.08640247E+02                   4
-NFO               121286N   1F   1O   1     G  0300.00   5000.00  1000.00      1
- 0.05174520E+02 0.01938472E-01-0.08222701E-05 0.01564291E-08-0.01104497E-12    2
--0.09670935E+05-0.05352461E+01 0.03352307E+02 0.07229966E-01-0.06951137E-04    3
- 0.03828526E-07-0.01023558E-10-0.09167035E+05 0.08854189E+02                   4
-NFO2              121286N   1F   1O   2     G  0300.00   5000.00  1000.00      1
- 0.06816857E+02 0.03462640E-01-0.01492216E-04 0.02869665E-08-0.02041857E-12    2
--0.01560262E+06-0.09320129E+02 0.02447529E+02 0.01544110E+00-0.01300595E-03    3
- 0.04856383E-07-0.06852266E-11-0.01439400E+06 0.01328360E+03                   4
-NH                 31387H   1N   1          G  0300.00   5000.00  1000.00      1
- 0.02760249E+02 0.01375346E-01-0.04451914E-05 0.07692792E-09-0.05017592E-13    2
- 0.04207828E+06 0.05857199E+02 0.03339758E+02 0.01253009E-01-0.03491646E-04    3
- 0.04218812E-07-0.01557618E-10 0.04185047E+06 0.02507181E+02                   4
-NH2               121686N   1H   2          G  0300.00   5000.00  1000.00      1
- 0.02961311E+02 0.02932699E-01-0.09063600E-05 0.01617257E-08-0.01204200E-12    2
- 0.02191977E+06 0.05777878E+02 0.03432493E+02 0.03299540E-01-0.06613600E-04    3
- 0.08590947E-07-0.03572047E-10 0.02177228E+06 0.03090111E+02                   4
-NH3               121386N   1H   3          G  0300.00   5000.00  1000.00      1
- 0.02461904E+02 0.06059166E-01-0.02004977E-04 0.03136003E-08-0.01938317E-12    2
--0.06493270E+05 0.07472097E+02 0.02204352E+02 0.01011476E+00-0.01465265E-03    3
- 0.01447235E-06-0.05328509E-10-0.06525488E+05 0.08127138E+02                   4
-NNH               120186N   2H   1          G  0250.00   4000.00  1000.00      1
- 0.04415342E+02 0.01614388E-01-0.01632894E-05-0.08559846E-09 0.01614791E-12    2
- 0.02788029E+06 0.09042888E+01 0.03501344E+02 0.02053587E-01 0.07170410E-05    3
- 0.04921348E-08-0.09671170E-11 0.02833347E+06 0.06391837E+02                   4
-NO                121286N   1O   1          G  0300.00   5000.00  1000.00      1
- 0.03245435E+02 0.01269138E-01-0.05015890E-05 0.09169283E-09-0.06275419E-13    2
- 0.09800840E+05 0.06417294E+02 0.03376542E+02 0.01253063E-01-0.03302751E-04    3
- 0.05217810E-07-0.02446263E-10 0.09817961E+05 0.05829590E+02                   4
-NO+               121286N   1O   1E  -1     G  0300.00   5000.00  1000.00      1
- 0.02914889E+02 0.01499335E-01-0.05727972E-05 0.01017777E-08-0.06825390E-13    2
- 0.01181869E+07 0.06844346E+02 0.03297349E+02 0.01422890E-01-0.04007441E-04    3
- 0.05670551E-07-0.02446972E-10 0.01180834E+07 0.04749948E+02                   4
-NO2               121286N   1O   2          G  0300.00   5000.00  1000.00      1
- 0.04682859E+02 0.02462429E-01-0.01042259E-04 0.01976902E-08-0.01391717E-12    2
- 0.02261292E+05 0.09885985E+01 0.02670600E+02 0.07838501E-01-0.08063865E-04    3
- 0.06161715E-07-0.02320150E-10 0.02896291E+05 0.01161207E+03                   4
-NO2-              121286N   1O   2E   1     G  0300.00   5000.00  1000.00      1
- 0.05043114E+02 0.02166428E-01-0.09455454E-05 0.01816314E-08-0.01238394E-12    2
--0.02621554E+06-0.01445905E+02 0.02448586E+02 0.08982507E-01-0.07853431E-04    3
- 0.03927277E-07-0.01071694E-10-0.02545097E+06 0.01213060E+03                   4
-NO3               121286N   1O   3          G  0300.00   5000.00  1000.00      1
- 0.07120307E+02 0.03246228E-01-0.01431613E-04 0.02797053E-08-0.02013008E-12    2
- 0.05864479E+05-0.01213730E+03 0.01221076E+02 0.01878797E+00-0.01344321E-03    3
- 0.01274601E-07 0.01354060E-10 0.07473144E+05 0.01840203E+03                   4
-O                 120186O   1               G  0300.00   5000.00  1000.00      1
- 0.02542060E+02-0.02755062E-03-0.03102803E-07 0.04551067E-10-0.04368052E-14    2
- 0.02923080E+06 0.04920308E+02 0.02946429E+02-0.01638166E-01 0.02421032E-04    3
--0.01602843E-07 0.03890696E-11 0.02914764E+06 0.02963995E+02                   4
-O+                121286O   1E  -1          G  0300.00   5000.00  1000.00      1
- 0.02501869E+02-0.06107262E-04 0.07324307E-07-0.03438353E-10 0.05506408E-14    2
- 0.01879553E+07 0.04372827E+02 0.02499273E+02 0.05820598E-04-0.01120922E-06    3
- 0.08232109E-10-0.01916378E-13 0.01879557E+07 0.04384826E+02                   4
-O-                 90589O   1E   1          G  0300.00   5000.00  1000.00      1
- 0.02559581E+02-0.07147888E-03 0.03301804E-06-0.06660944E-10 0.04900727E-14    2
- 0.01148935E+06 0.04426187E+02 0.02747263E+02-0.05724860E-02 0.02712548E-05    3
- 0.02691512E-08-0.02002357E-11 0.01144395E+06 0.03469852E+02                   4
-O2                121386O   2               G  0300.00   5000.00  1000.00      1
- 0.03697578E+02 0.06135197E-02-0.01258842E-05 0.01775281E-09-0.01136435E-13    2
--0.01233930E+05 0.03189166E+02 0.03212936E+02 0.01127486E-01-0.05756150E-05    3
- 0.01313877E-07-0.08768554E-11-0.01005249E+05 0.06034738E+02                   4
-O2-               121286O   2E   1          G  0300.00   5000.00  1000.00      1
- 0.03883013E+02 0.07407872E-02-0.02961776E-05 0.05724305E-09-0.04086548E-13    2
--0.07121644E+05 0.02658212E+02 0.02872292E+02 0.03359716E-01-0.02664886E-04    3
- 0.09807524E-08-0.01670957E-11-0.06829094E+05 0.07938373E+02                   4
-O3                121286O   3               G  0300.00   5000.00  1000.00      1
- 0.05429371E+02 0.01820380E-01-0.07705607E-05 0.01499293E-08-0.01075563E-12    2
- 0.01523527E+06-0.03266387E+02 0.02462609E+02 0.09582781E-01-0.07087359E-04    3
- 0.01363368E-07 0.02969647E-11 0.01606152E+06 0.01214187E+03                   4
-OC(OH)2           103190C   1H   2O   3     G  0300.00   4000.00  1500.00      1
- 0.01143196E+03 0.02555103E-01-0.04326538E-05-0.05781341E-09 0.01545461E-12    2
--0.07904865E+06-0.03657201E+03 0.03540332E+01 0.03042528E+00-0.02939616E-03    3
- 0.01452934E-06-0.02906245E-10-0.07522630E+06 0.02250923E+03                   4
-OCHCHO            103190C   2H   2O   2     G  0300.00   4000.00  1500.00      1
- 0.01056843E+03 0.02907353E-01-0.03452401E-05-0.01037593E-08 0.02042135E-12    2
--0.02952623E+06-0.03104084E+03 0.01863564E+02 0.02298297E+00-0.01917997E-03    3
- 0.08558604E-07-0.01612346E-10-0.02634847E+06 0.01601674E+03                   4
-OCHNNHO           103190C   1H   2N   2O   2G  0300.00   4000.00  1500.00      1
- 0.01241397E+03 0.04091551E-01-0.04547841E-05-0.01752324E-08 0.03271472E-12    2
--0.06754774E+05-0.04078722E+03 0.01405275E+02 0.02776281E+00-0.02088466E-03    3
- 0.08550259E-07-0.01543486E-10-0.02537631E+05 0.01937723E+03                   4
-OH                121286O   1H   1          G  0300.00   5000.00  1000.00      1
- 0.02882730E+02 0.01013974E-01-0.02276877E-05 0.02174684E-09-0.05126305E-14    2
- 0.03886888E+05 0.05595712E+02 0.03637266E+02 0.01850910E-02-0.01676165E-04    3
- 0.02387203E-07-0.08431442E-11 0.03606782E+05 0.01358860E+02                   4
-OH+               121286O   1H   1E  -1     G  0300.00   5000.00  1000.00      1
- 0.02719059E+02 0.01508571E-01-0.05029369E-05 0.08261952E-09-0.04947453E-13    2
- 0.01576341E+07 0.06234536E+02 0.03326979E+02 0.01345786E-01-0.03777168E-04    3
- 0.04687750E-07-0.01780982E-10 0.01574029E+07 0.02744042E+02                   4
-OH-               121286O   1H   1E   1     G  0300.00   5000.00  1000.00      1
- 0.02846205E+02 0.01041835E-01-0.02416851E-05 0.02483215E-09-0.07775605E-14    2
--0.01807280E+06 0.04422712E+02 0.03390038E+02 0.07922381E-02-0.01943430E-04    3
- 0.02001770E-07-0.05702087E-11-0.01830494E+06 0.01249892E+02                   4
-ONHNHO            103190H   2N   2O   2     G  0300.00   4000.00  1500.00      1
- 0.01005510E+03 0.03525461E-01-0.03868362E-05-0.01298654E-08 0.02398500E-12    2
- 0.07381692E+05-0.02950581E+03 0.07815142E+01 0.02605711E+00-0.02264714E-03    3
- 0.01049925E-06-0.02012847E-10 0.01062778E+06 0.02017946E+03                   4
-ONHNOH            103190H   2N   2O   2     G  0300.00   4000.00  1500.00      1
- 0.01120874E+03 0.02650303E-01-0.03760644E-05-0.06355768E-09 0.01466251E-12    2
--0.05721250E+05-0.03476475E+03 0.01053271E+02 0.02809676E+00-0.02637380E-03    3
- 0.01270757E-06-0.02478550E-10-0.02244769E+05 0.01937011E+03                   4
-S                 121286S   1               G  0300.00   5000.00  1000.00      1
- 0.02902148E+02-0.05484546E-02 0.02764576E-05-0.05017115E-09 0.03150685E-13    2
- 0.03249423E+06 0.03838471E+02 0.03187329E+02-0.01595776E-01 0.02005531E-04    3
--0.01507081E-07 0.04931282E-11 0.03242259E+06 0.02414441E+02                   4
-S(L)              120186S   1               L  0388.36   2000.00  1000.00      1
- 0.03603667E+02 0.09903341E-02-0.01011441E-04 0.04053633E-08-0.05667914E-12    2
--0.08453839E+04-0.01634471E+03-0.01270631E+03 0.09072521E+00-0.01695179E-02    3
- 0.01307064E-05-0.03527615E-09 0.01234607E+05 0.05621016E+03                   4
-S(S)              120186S   1               S  0300.00   0388.36  0388.36      1
- 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.00000000E+00 0.00000000E+00-0.05063703E+02 0.02881935E-01-0.02133020E-03    3
- 0.08478786E-05-0.01734497E-07 0.07148263E+04 0.02871407E+03                   4
-S+                121286S   1E  -1          G  0300.00   5000.00  1000.00      1
- 0.02404600E+02 0.02410909E-02-0.02041780E-05 0.06592945E-09-0.05756939E-13    2
- 0.01535223E+07 0.05924256E+02 0.02366101E+02 0.09130767E-02-0.02140284E-04    3
- 0.02076178E-07-0.07133859E-11 0.01535091E+07 0.05993094E+02                   4
-S-TRIAZINE         41687C   3N   3H   3     G  0300.00   4000.00  1000.00      1
- 0.01303617E+03 0.07711820E-01-0.07724374E-05-0.04385191E-08 0.08298992E-12    2
- 0.02251663E+06-0.04777676E+03 0.04493492E+01 0.02728306E+00 0.02309305E-04    3
--0.01496844E-06 0.04546753E-10 0.02703032E+06 0.02178518E+03                   4
-S2                121386S   2               G  0300.00   5000.00  1000.00      1
- 0.03904443E+02 0.06925733E-02-0.01233097E-05 0.08783809E-11 0.01374662E-13    2
- 0.01425693E+06 0.04956834E+02 0.03157673E+02 0.03099480E-01-0.01560746E-04    3
--0.01357891E-07 0.01137444E-10 0.01439187E+06 0.08596062E+02                   4
-SH                121286S   1H   1          G  0300.00   5000.00  1000.00      1
- 0.03053810E+02 0.01258884E-01-0.04249169E-05 0.06929591E-09-0.04281691E-13    2
- 0.01588225E+06 0.05973551E+02 0.04133327E+02-0.03787893E-02-0.02777854E-04    3
- 0.05370112E-07-0.02394006E-10 0.01555862E+06 0.01611535E+01                   4
-SI                 32989SI  1               G  0300.00   4000.00  1000.00      1
- 0.02775846E+02-0.06213257E-02 0.04843696E-05-0.01275615E-08 0.01134482E-12    2
- 0.05339791E+06 0.04543298E+02 0.03113515E+02-0.02330991E-01 0.03518531E-04    3
--0.02417573E-07 0.06391902E-11 0.05335062E+06 0.03009719E+02                   4
-SI(CH3)2           61991H   6C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.01092572E+03 0.07986807E-01-0.09096208E-06-0.01014552E-07 0.02037989E-11    2
- 0.01132561E+06-0.02834187E+03 0.02308663E+02 0.02773810E+00-0.01799333E-03    3
- 0.06733023E-07-0.01154743E-10 0.01442892E+06 0.01819319E+03                   4
-SI(CH3)3           61991H   9C   3SI  1     G  0300.00   2500.00  1500.00      1
- 0.01536389E+03 0.01242119E+00-0.01189769E-05-0.01630302E-07 0.03308576E-11    2
--0.05218398E+05-0.05088962E+03 0.03907073E+02 0.03734813E+00-0.02072025E-03    3
- 0.06180575E-07-0.08429605E-11-0.01002462E+05 0.01138100E+03                   4
-SI(CH3)3CH2        61991H  11C   4SI  1     G  0300.00   2500.00  1500.00      1
- 0.02061565E+03 0.01408136E+00-0.01497876E-05-0.01748111E-07 0.03468780E-11    2
--0.01240235E+06-0.07596671E+03 0.05258771E+02 0.04995369E+00-0.03393958E-03    3
- 0.01367592E-06-0.02513506E-10-0.06886708E+05 0.06814728E+02                   4
-SI(CH3)4           61991H  12C   4SI  1     G  0300.00   2500.00  1500.00      1
- 0.02023461E+03 0.01648004E+00-0.01486572E-05-0.02161245E-07 0.04377236E-11    2
--0.03702410E+06-0.07661021E+03 0.05009315E+02 0.04952953E+00-0.02745875E-03    3
- 0.08231031E-07-0.01137614E-10-0.03140314E+06 0.06187860E+02                   4
-SI(L)              90589SI  1               L  0300.00   4500.00  1000.00      1
- 0.03271263E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
- 0.04855058E+05-0.01329054E+03 0.03271263E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00 0.04855059E+05-0.01329054E+03                   4
-SI(NH2)3           42489SI  1N   3H   6     G  0300.00   3000.00  1000.00      1
- 0.01406550E+03 0.07581744E-01-0.05168510E-05-0.06743626E-08 0.01397926E-11    2
--0.01414403E+06-0.04063874E+03 0.07598413E+02 0.02435266E+00-0.04296202E-04    3
--0.01756007E-06 0.01050102E-09-0.01265343E+06-0.07808647E+02                   4
-SI(NH2)4           22790SI  1N   4H   8     G  0300.00   4000.00  1000.00      1
- 0.02032107E+03 0.08289798E-01-0.07077612E-05-0.04340724E-08 0.07747068E-12    2
--0.05389855E+06-0.07730464E+03 0.08454529E+02 0.03465772E+00-0.04266782E-04    3
--0.02495363E-06 0.01365466E-09-0.05061518E+06-0.01514301E+03                   4
-SI(S)              90589SI  1               S  0300.00   2500.00  1000.00      1
- 0.02530275E+02 0.08522433E-02-0.03223469E-05 0.01280821E-08-0.01850849E-12    2
--0.08395197E+04-0.01251478E+03 0.05746418E+01 0.01026485E+00-0.01775346E-03    3
- 0.01457500E-06-0.04491292E-10-0.04969951E+04-0.03400243E+02                   4
-SI2               111191SI  2               G  0300.00   4000.00  1500.00      1
- 0.04402888E+02 0.01154530E-02-0.06005177E-06 0.01469072E-09-0.01357408E-13    2
- 0.07199220E+06 0.02340066E+02 0.03439839E+02 0.03440171E-01-0.04437681E-04    3
- 0.02559961E-07-0.05474618E-11 0.07222934E+06 0.07148545E+02                   4
-SI2C              112989C   1SI  2          G  0300.00   5000.00  1000.00      1
- 0.06334110E+02 0.01210252E-01-0.06798289E-05 0.02244433E-08-0.02280178E-12    2
- 0.06227189E+06-0.07770097E+02 0.04157246E+02 0.07031825E-01-0.07263033E-04    3
- 0.04633583E-07-0.01493448E-10 0.06292421E+06 0.03635126E+02                   4
-SI2CL5             40992SI  2CL  5          G  0300.00   4000.00  1500.00      1
- 0.01800427E+03 0.05920529E-02-0.03159743E-05 0.07962538E-09-0.07553642E-13    2
--0.08208587E+06-0.04815622E+03 0.01218195E+03 0.02086930E+00-0.02723261E-03    3
- 0.01583266E-06-0.03404617E-10-0.08066122E+06-0.01913372E+03                   4
-SI2CL5H            40992H   1SI  2CL  5     G  0300.00   4000.00  1500.00      1
- 0.01977366E+03 0.01346980E-01-0.04241463E-05 0.05994784E-09-0.03079337E-13    2
--0.01018307E+07-0.05982624E+03 0.01104810E+03 0.02909474E+00-0.03536307E-03    3
- 0.01998957E-06-0.04259074E-10-0.09941194E+06-0.01536396E+03                   4
-SI2CL6             40992SI  2CL  6          G  0300.00   4000.00  1500.00      1
- 0.02095456E+03 0.06904584E-02-0.03881968E-05 0.01014163E-08-0.09844696E-13    2
--0.01238540E+07-0.06426893E+03 0.01372380E+03 0.02622361E+00-0.03460508E-03    3
- 0.02024950E-06-0.04371480E-10-0.01221143E+07-0.02834094E+03                   4
-SI2F6              42489SI  2F   6          G  0300.00   3000.00  1000.00      1
- 0.01830048E+03 0.02868753E-01-0.04545577E-05-0.02497900E-08 0.06630658E-12    2
--0.02928185E+07-0.05760425E+03 0.09998134E+02 0.02170314E+00-0.03875092E-04    3
--0.01670252E-06 0.09407529E-10-0.02905483E+07-0.01422886E+03                   4
-SI2H2             111191H   2SI  2          G  0300.00   4000.00  1500.00      1
- 0.08099063E+02 0.01294220E-01-0.02447198E-05-0.01449512E-09 0.05867240E-13    2
- 0.04476428E+06-0.01877323E+03 0.09668390E+01 0.01932959E+00-0.01825422E-03    3
- 0.08404012E-07-0.01537228E-10 0.04712241E+06 0.01907609E+03                   4
-SI2H3              90589SI  2H   3          G  0300.00   2000.00  1000.00      1
- 0.07257627E+02 0.05123860E-01-0.07633465E-05-0.06662471E-08 0.02053053E-11    2
- 0.05062055E+06-0.01031413E+03 0.03335404E+02 0.02155615E+00-0.02933937E-03    3
- 0.02287785E-06-0.07272827E-10 0.05146157E+06 0.08656853E+02                   4
-SI2H5              90589SI  2H   5          G  0300.00   2000.00  1000.00      1
- 0.08451010E+02 0.09286371E-01-0.01091183E-04-0.01442367E-07 0.04250825E-11    2
- 0.02472719E+06-0.01710331E+03 0.01578848E+02 0.03549383E+00-0.04267511E-03    3
- 0.03059177E-06-0.09360425E-10 0.02630550E+06 0.01672073E+03                   4
-SI2H6              90589SI  2H   6          G  0300.00   2000.00  1000.00      1
- 0.08882090E+02 0.01151395E+00-0.01216216E-04-0.01905086E-07 0.05542379E-11    2
- 0.05967242E+05-0.02265611E+03 0.05301921E+01 0.04184056E+00-0.04685249E-03    3
- 0.03179525E-06-0.09484526E-10 0.07950598E+05 0.01880453E+03                   4
-SI3                32989SI  3               G  0300.00   4000.00  1000.00      1
- 0.07021585E+02 0.06981538E-02-0.04818729E-05 0.01720754E-08-0.01927025E-12    2
- 0.07429956E+06-0.08179233E+02 0.05312161E+02 0.05920181E-01-0.05075225E-04    3
- 0.05303866E-08 0.07031630E-11 0.07469502E+06 0.04036452E+01                   4
-SI3H8              90589SI  3H   8          G  0300.00   2000.00  1000.00      1
- 0.01342277E+03 0.01563632E+00-0.01936565E-04-0.02388330E-07 0.07120030E-11    2
- 0.09165887E+05-0.04163000E+03 0.06319791E+01 0.06412995E+00-0.07772444E-03    3
- 0.05486969E-06-0.01646097E-09 0.01209258E+06 0.02133318E+03                   4
-SI3N4(A)           42589N   4SI  3          S  0300.00   3000.00  1000.00      1
- 0.09667453E+02 0.01192721E+00-0.01709282E-04-0.01084607E-07 0.02713018E-11    2
--0.09324734E+06-0.04556492E+03 0.06631384E+02 0.02293929E+00-0.02152876E-03    3
- 0.01766237E-06-0.06632215E-10-0.09241684E+06-0.03021795E+03                   4
-SIC               112989C   1SI  1          G  0300.00   5000.00  1000.00      1
- 0.05024270E+02-0.04920894E-02 0.03109315E-05-0.06901344E-09 0.05215735E-13    2
- 0.08531026E+06-0.02478798E+02 0.02427812E+02 0.09551934E-01-0.02796633E-04    3
--0.01360012E-06 0.09196323E-10 0.08546512E+06 0.09179253E+02                   4
-SIC(B)            112989C   1SI  1          S  0300.00   4000.00  1000.00      1
- 0.03548057E+02 0.03636817E-01-0.01734873E-04 0.03912869E-08-0.03337953E-12    2
--0.01018858E+06-0.01967253E+03-0.03551396E+01 0.01599881E+00-0.01393327E-03    3
- 0.03314914E-07 0.07825957E-11-0.09294352E+05-0.01515388E+01                   4
-SIC2              112989C   2SI  1          G  0300.00   5000.00  1000.00      1
- 0.05753726E+02 0.02067546E-01-0.01132535E-04 0.03106456E-08-0.02799937E-12    2
- 0.07200461E+06-0.05294927E+02 0.03647725E+02 0.08765100E-01-0.01079869E-03    3
- 0.07974287E-07-0.02617042E-10 0.07258578E+06 0.05481050E+02                   4
-SICCH              61991H   1C   2SI  1     G  0300.00   2500.00  1500.00      1
- 0.08229114E+02 0.01220783E-01-0.01179375E-05-0.03293923E-09 0.02957217E-13    2
- 0.06029046E+06-0.01793033E+03 0.03946147E+02 0.01353938E+00-0.01476061E-03    3
- 0.08141935E-07-0.01743041E-10 0.06163490E+06 0.04400106E+02                   4
-SICH               61991H   1C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.06212049E+02 0.05590981E-02-0.07015929E-06 0.03497540E-09-0.01203199E-12    2
- 0.06044180E+06-0.08520574E+02 0.03822068E+02 0.07938745E-01-0.09707239E-04    3
- 0.05877454E-07-0.01338338E-10 0.06118631E+06 0.03835953E+02                   4
-SICH2              61991H   2C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.06246250E+02 0.02147775E-01-0.06406396E-06-0.02067218E-08 0.03841890E-12    2
- 0.03490992E+06-0.08995611E+02 0.02794283E+02 0.01138805E+00-0.01041700E-03    3
- 0.05368052E-07-0.01132779E-10 0.03606279E+06 0.09246714E+02                   4
-SICH3              61991H   3C   1SI  1     G  0300.00   2500.00  1500.00      1
- 0.06681751E+02 0.03837387E-01-0.06162348E-06-0.04678285E-08 0.09346313E-12    2
- 0.03472013E+06-0.01022379E+03 0.02444652E+02 0.01367883E+00-0.09266249E-04    3
- 0.03704818E-07-0.06763833E-11 0.03624755E+06 0.01263619E+03                   4
-SICL              121986SI  1CL  1          G  0300.00   2000.00  1000.00      1
- 0.04258460E+02 0.04020317E-02-0.02888145E-05 0.01009777E-08-0.01411012E-12    2
- 0.01775614E+06 0.04134521E+02 0.03096406E+02 0.05738623E-01-0.09740903E-04    3
- 0.07643597E-07-0.02279179E-10 0.01796795E+06 0.09603212E+02                   4
-SICL2             121986SI  1CL  2          G  0300.00   2000.00  1000.00      1
- 0.06491205E+02 0.08242384E-02-0.05767737E-05 0.01972405E-08-0.02713757E-12    2
--0.02232408E+06-0.03570531E+02 0.03826666E+02 0.01308296E+00-0.02234087E-03    3
- 0.01760742E-06-0.05267404E-10-0.02183869E+06 0.08965448E+02                   4
-SICL2H2           121986SI  1H   2CL  2     G  0300.00   2000.00  1000.00      1
- 0.07727079E+02 0.05034189E-01-0.01095746E-04-0.04419587E-08 0.01631124E-11    2
--0.04028605E+06-0.01170816E+03 0.01100209E+02 0.03262362E+00-0.04691995E-03    3
- 0.03494565E-06-0.01036285E-09-0.03892087E+06 0.02022693E+03                   4
-SICL3             121986SI  1CL  3          G  0300.00   2000.00  1000.00      1
- 0.09098097E+02 0.01405353E-01-0.09317005E-05 0.02982296E-08-0.03822011E-12    2
--0.04140193E+06-0.01455012E+03 0.04485691E+02 0.02241754E+00-0.03794196E-03    3
- 0.02973183E-06-0.08861335E-10-0.04055264E+06 0.07198771E+02                   4
-SICL3CH2CH         10891C   2CL  3H   5SI  1G  0300.00   4000.00  1500.00      1
- 0.02087242E+03 0.05492755E-01-0.06829558E-05-0.01876697E-08 0.03787112E-12    2
--0.07972510E+06-0.07741949E+03 0.04624781E+02 0.04378379E+00-0.03850522E-03    3
- 0.01844376E-06-0.03709272E-10-0.07377043E+06 0.01029869E+03                   4
-SICL3H            121986SI  1H   1CL  3     G  0300.00   2000.00  1000.00      1
- 0.09663121E+02 0.03563368E-01-0.01214911E-04-0.01609009E-09 0.05641710E-12    2
--0.06295557E+06-0.01894777E+03 0.02883770E+02 0.03308241E+00-0.05169241E-03    3
- 0.03949918E-06-0.01172104E-09-0.06163323E+06 0.01337466E+03                   4
-SICL4             121986SI  1CL  4          G  0300.00   2000.00  1000.00      1
- 0.01170938E+03 0.01972092E-01-0.01269077E-04 0.03900188E-08-0.04756468E-12    2
--0.08347808E+06-0.02791153E+03 0.05252110E+02 0.03122067E+00-0.05254593E-03    3
- 0.04102707E-06-0.01219907E-09-0.08228177E+06 0.02575727E+02                   4
-SICLH3            121986SI  1H   3CL  1     G  0300.00   2000.00  1000.00      1
- 0.05964238E+02 0.06278087E-01-0.08205635E-05-0.09280558E-08 0.02796643E-11    2
--0.01854309E+06-0.06395305E+02 0.05057173E+01 0.02703378E+00-0.03301474E-03    3
- 0.02302732E-06-0.06778703E-10-0.01730819E+06 0.02043167E+03                   4
-SIF                42489SI  1F   1          G  0300.00   3000.00  1000.00      1
- 0.04120067E+02 0.03548821E-02-0.07200222E-06-0.02190434E-09 0.06764591E-13    2
--0.07561378E+05 0.02784246E+02 0.03144948E+02 0.02588557E-01-0.05795912E-05    3
--0.01807279E-07 0.01041172E-10-0.07294439E+05 0.07876774E+02                   4
-SIF(NH2)2          22790SI  1F   1N   2H   4G  0300.00   4000.00  1000.00      1
- 0.01287944E+03 0.04598535E-01-0.04004441E-05-0.02374189E-08 0.04255211E-12    2
--0.05238279E+06-0.03653418E+03 0.07210094E+02 0.01764698E+00-0.02542060E-04    3
--0.01242214E-06 0.06989787E-10-0.05086706E+06-0.07024622E+02                   4
-SIF(NH2)3          42489SI  1N   3H   6F   1G  0300.00   3000.00  1000.00      1
- 0.01611180E+03 0.08329222E-01-0.06023787E-05-0.07470125E-08 0.01570731E-11    2
--0.09137007E+06-0.05098123E+03 0.08388268E+02 0.02746622E+00-0.04455675E-04    3
--0.01955733E-06 0.01140721E-09-0.08947806E+06-0.01138178E+03                   4
-SIF2               42489SI  1F   2          G  0300.00   3000.00  1000.00      1
- 0.06142470E+02 0.07807974E-02-0.01339312E-05-0.06264839E-09 0.01725138E-12    2
--0.07744042E+06-0.04712327E+02 0.03845345E+02 0.06038465E-01-0.01167732E-04    3
--0.04579554E-07 0.02607414E-10-0.07681634E+06 0.07272984E+02                   4
-SIF2(NH2)2         42489SI  1N   2H   4F   2G  0300.00   3000.00  1000.00      1
- 0.01441477E+03 0.06110646E-01-0.04871145E-05-0.05455935E-08 0.01172714E-11    2
--0.01292757E+07-0.04308682E+03 0.07634268E+02 0.02315843E+00-0.04193827E-04    3
--0.01715351E-06 0.01016462E-09-0.01276410E+07-0.08419031E+02                   4
-SIF2N              42489SI  1N   1F   2     G  0300.00   3000.00  1000.00      1
- 0.08687337E+02 0.01193488E-01-0.01992661E-05-0.09951334E-09 0.02704383E-12    2
--0.03463832E+06-0.01494053E+03 0.05102583E+02 0.09456606E-01-0.01819383E-04    3
--0.07309616E-07 0.04178902E-10-0.03367294E+06 0.03734424E+02                   4
-SIF2NH2            42489SI  1N   1F   2H   2G  0300.00   3000.00  1000.00      1
- 0.09872415E+02 0.03722112E-01-0.03271338E-05-0.03321674E-08 0.07293692E-12    2
--0.08751628E+06-0.01899096E+03 0.05890444E+02 0.01285128E+00-0.01863556E-04    3
--0.08718963E-07 0.04848951E-10-0.08644527E+06 0.01756163E+02                   4
-SIF3               42489SI  1F   3          G  0300.00   3000.00  1000.00      1
- 0.08524790E+02 0.01323792E-01-0.02104279E-05-0.01149504E-08 0.03055301E-12    2
--0.01223522E+07-0.01550234E+03 0.04662868E+02 0.01008788E+00-0.01805544E-04    3
--0.07769299E-07 0.04377852E-10-0.01212965E+07 0.04672966E+02                   4
-SIF3NH             42489SI  1N   1F   3H   1G  0300.00   3000.00  1000.00      1
- 0.01163766E+03 0.02880769E-01-0.03357310E-05-0.02584594E-08 0.06162371E-12    2
--0.01295891E+07-0.02590718E+03 0.06013822E+02 0.01597729E+00-0.02791466E-04    3
--0.01214120E-06 0.06927415E-10-0.01280974E+07 0.03316771E+02                   4
-SIF3NH2            42489SI  1N   1F   3H   2G  0300.00   3000.00  1000.00      1
- 0.01210964E+03 0.04383282E-01-0.04142245E-05-0.03989090E-08 0.08958954E-12    2
--0.01641768E+07-0.03046928E+03 0.06229403E+02 0.01778015E+00-0.02612304E-04    3
--0.01267243E-06 0.07044556E-10-0.01625849E+07 0.02045441E+01                   4
-SIF3NHSIH3         42489SI  2N   1H   4F   3G  0300.00   3000.00  1000.00      1
- 0.01669941E+03 0.07789785E-01-0.08110570E-05-0.07650199E-08 0.01773956E-11    2
--0.01673412E+07-0.05080007E+03 0.06216046E+02 0.02939330E+00-0.02717745E-04    3
--0.01982878E-06 0.01002768E-09-0.01642282E+07 0.04858261E+02                   4
-SIF3NSIH3          42489SI  2N   1H   3F   3G  0300.00   3000.00  1000.00      1
- 0.01599146E+03 0.06371086E-01-0.07256824E-05-0.06292690E-08 0.01495157E-11    2
--0.01331158E+07-0.04495265E+03 0.06404372E+02 0.02601982E+00-0.02491543E-04    3
--0.01769542E-06 0.08919883E-10-0.01302520E+07 0.06002945E+02                   4
-SIF4               41389F   4SI  1          G  0300.00   2000.00  1000.00      1
- 0.09985301E+02 0.03532637E-01-0.01197378E-04-0.01036549E-08 0.08661585E-12    2
--0.01977200E+07-0.02472644E+03 0.02147416E+02 0.03402219E+00-0.04756874E-03    3
- 0.03252196E-06-0.08819304E-10-0.01960449E+07 0.01346315E+03                   4
-SIFH3              42489SI  1F   1H   3     G  0300.00   3000.00  1000.00      1
- 0.06799678E+02 0.04747086E-01-0.04767067E-05-0.04814665E-08 0.01107761E-11    2
--0.04577024E+06-0.01261433E+03 0.02032190E+02 0.01341363E+00-0.02806381E-05    3
--0.07803291E-07 0.03337474E-10-0.04421627E+06 0.01318768E+03                   4
-SIFNH              42489SI  1N   1F   1H   1G  0300.00   3000.00  1000.00      1
- 0.07163299E+02 0.01521325E-01-0.01536337E-05-0.01195933E-08 0.02684100E-12    2
--0.09065496E+05-0.06764144E+02 0.05390691E+02 0.06071319E-01-0.01359490E-04    3
--0.04267435E-07 0.02603154E-10-0.08644237E+05 0.02272065E+02                   4
-SIFNH2             22790F   1SI  1N   1H   2G  0300.00   4000.00  1000.00      1
- 0.08017582E+02 0.03209103E-01-0.03361364E-05-0.01796537E-08 0.03385552E-12    2
--0.04313426E+06-0.01487024E+03 0.04214050E+02 0.01105423E+00-0.01014725E-04    3
--0.07143728E-07 0.03634923E-10-0.04200629E+06 0.05318890E+02                   4
-SIH               121986SI  1H   1          G  0300.00   2000.00  1000.00      1
- 0.03110430E+02 0.01094946E-01 0.02898629E-06-0.02745104E-08 0.07051799E-12    2
- 0.04516898E+06 0.04193487E+02 0.03836010E+02-0.02702657E-01 0.06849070E-04    3
--0.05424184E-07 0.01472131E-10 0.04507593E+06 0.09350778E+01                   4
-SIH2               42489SI  1H   2          G  0300.00   3000.00  1000.00      1
- 0.04142390E+02 0.02150191E-01-0.02190730E-05-0.02073725E-08 0.04741018E-12    2
- 0.03110484E+06 0.02930745E+01 0.03475092E+02 0.02139338E-01 0.07672306E-05    3
- 0.05217668E-08-0.09898824E-11 0.03147397E+06 0.04436585E+02                   4
-SIH2CL            121986SI  1H   2CL  1     G  0300.00   2000.00  1000.00      1
- 0.05555902E+02 0.04046479E-01-0.06581751E-05-0.05027548E-08 0.01599110E-11    2
- 0.01912428E+05-0.01906890E+02 0.01699256E+02 0.01961407E+00-0.02622973E-03    3
- 0.01936417E-06-0.05846399E-10 0.02743662E+05 0.01683133E+03                   4
-SIH2F              42489SI  1F   1H   2     G  0300.00   3000.00  1000.00      1
- 0.06020399E+02 0.03074040E-01-0.03248887E-05-0.03052243E-08 0.07098090E-12    2
--0.02347670E+06-0.05919595E+02 0.02782566E+02 0.09148257E-01-0.04186788E-05    3
--0.05388971E-07 0.02412133E-10-0.02244201E+06 0.01152854E+03                   4
-SIH2F2             42489SI  1H   2F   2     G  0300.00   3000.00  1000.00      1
- 0.07997762E+02 0.03911538E-01-0.04222679E-05-0.03913812E-08 0.09171569E-12    2
--0.09682880E+06-0.01622400E+03 0.02701455E+02 0.01456545E+00-0.01163300E-04    3
--0.09685830E-07 0.04769591E-10-0.09522440E+06 0.01200689E+03                   4
-SIH3               42489SI  1H   3          G  0300.00   3000.00  1000.00      1
- 0.05015906E+02 0.03732750E-01-0.03609053E-05-0.03729193E-08 0.08468490E-12    2
- 0.02190233E+06-0.04291368E+02 0.02946733E+02 0.06466764E-01 0.05991653E-05    3
--0.02218413E-07 0.03052670E-11 0.02270173E+06 0.07347948E+02                   4
-SIH3NH2            42489SI  1N   1H   5     G  0300.00   3000.00  1000.00      1
- 0.08109945E+02 0.07215753E-01-0.06052251E-05-0.07086088E-08 0.01557864E-11    2
--0.08999782E+05-0.01651650E+03 0.02936348E+02 0.01674704E+00-0.03232859E-05    3
--0.09171970E-07 0.03979516E-10-0.07334716E+05 0.01141437E+03                   4
-SIH3NHSIH3         42489SI  2N   1H   7     G  0300.00   3000.00  1000.00      1
- 0.01265296E+03 0.01066748E+00-0.01007336E-04-0.01081222E-07 0.02452364E-11    2
--0.01249721E+06-0.03441428E+03 0.02468750E+02 0.02940255E+00-0.06248179E-05    3
--0.01731462E-06 0.07545261E-10-0.09209690E+05 0.02059560E+03                   4
-SIH3NSIH3          42489SI  2N   1H   6     G  0300.00   3000.00  1000.00      1
- 0.01201462E+03 0.09187517E-01-0.09159516E-05-0.09380967E-08 0.02156435E-11    2
- 0.01965066E+06-0.02978186E+03 0.02827574E+02 0.02580647E+00-0.04200478E-05    3
--0.01503859E-06 0.06388325E-10 0.02265351E+06 0.01997012E+03                   4
-SIH3SIH2CH3       111391H   8C   1SI  2     G  0300.00   4000.00  1500.00      1
- 0.01886736E+03 0.06449996E-01-0.06896411E-05-0.02584789E-08 0.04830521E-12    2
--0.06620909E+05-0.07374424E+03 0.02132164E+02 0.04348657E+00-0.03495608E-03    3
- 0.01588231E-06-0.03150773E-10-0.02040937E+04 0.01752930E+03                   4
-SIH4              121386SI  1H   4          G  0300.00   4000.00  1000.00      1
- 0.06893874E+02 0.04030501E-01-0.04183314E-05-0.02291395E-08 0.04384766E-12    2
- 0.01107037E+05-0.01749117E+03 0.02475167E+02 0.09003721E-01 0.02185394E-04    3
--0.02681423E-07-0.06621081E-11 0.02925488E+05 0.07751015E+02                   4
-SIHCL2            121986SI  1H   1CL  2     G  0300.00   2000.00  1000.00      1
- 0.07229734E+02 0.02869206E-01-0.08849876E-05-0.07495866E-09 0.05752338E-12    2
--0.01971399E+06-0.07052663E+02 0.02368353E+02 0.02401088E+00-0.03717220E-03    3
- 0.02851998E-06-0.08530494E-10-0.01875884E+06 0.01614587E+03                   4
-SIHF               42489SI  1F   1H   1     G  0300.00   3000.00  1000.00      1
- 0.05073509E+02 0.01533279E-01-0.01840659E-05-0.01440038E-08 0.03452517E-12    2
--0.01973880E+06-0.01079507E+02 0.03223728E+02 0.04981221E-01-0.03173051E-05    3
--0.02822231E-07 0.01247832E-10-0.01914168E+06 0.08906423E+02                   4
-SIHF2              42489SI  1H   1F   2     G  0300.00   3000.00  1000.00      1
- 0.07216536E+02 0.02253240E-01-0.02737472E-05-0.02173460E-08 0.05255331E-12    2
--0.07280241E+06-0.09783487E+02 0.03377237E+02 0.01036607E+00-0.01239082E-04    3
--0.07267982E-07 0.03794989E-10-0.07168358E+06 0.01052189E+03                   4
-SIHF3              42489SI  1H   1F   3     G  0300.00   3000.00  1000.00      1
- 0.09363567E+02 0.02947556E-01-0.03577633E-05-0.02858224E-08 0.06915729E-12    2
--0.01486074E+07-0.02169453E+03 0.03918053E+02 0.01463917E+00-0.01856070E-04    3
--0.01058200E-06 0.05617543E-10-0.01470439E+07 0.07024261E+02                   4
-SIN                42489SI  1N   1          G  0300.00   3000.00  1000.00      1
- 0.04122909E+02 0.03521458E-02-0.07161081E-06-0.02154956E-09 0.06667571E-13    2
- 0.05683927E+06 0.02389838E+02 0.03149182E+02 0.02584376E-01-0.05804625E-05    3
--0.01805627E-07 0.01041095E-10 0.05710564E+06 0.07474389E+02                   4
-SINH               42489SI  1N   1H   1     G  0300.00   3000.00  1000.00      1
- 0.04928801E+02 0.01628624E-01-0.01367197E-05-0.01390460E-08 0.02998969E-12    2
- 0.01767790E+06-0.02823472E+02 0.03166975E+02 0.05805823E-01-0.09524443E-05    3
--0.03991893E-07 0.02283188E-10 0.01813561E+06 0.06298440E+02                   4
-SINH2              42489SI  1N   1H   2     G  0300.00   3000.00  1000.00      1
- 0.05186436E+02 0.03016656E-01-0.02165476E-05-0.02722658E-08 0.05706182E-12    2
- 0.02270508E+06-0.01242140E+02 0.03362770E+02 0.07261176E-01-0.08721233E-05    3
--0.04400014E-07 0.02419532E-10 0.02318446E+06 0.08223867E+02                   4
-SN                121286S   1N   1          G  0300.00   5000.00  1000.00      1
- 0.03888287E+02 0.06778427E-02-0.02725309E-05 0.05135927E-09-0.03593836E-13    2
- 0.03044496E+06 0.04194291E+02 0.03407346E+02 0.01797887E-01-0.02018970E-04    3
- 0.02107857E-07-0.09527592E-11 0.03062373E+06 0.06821481E+02                   4
-SO                121286S   1O   1          G  0300.00   5000.00  1000.00      1
- 0.04021078E+02 0.02584856E-02 0.08948142E-06-0.03580145E-09 0.03228430E-13    2
--0.07119620E+04 0.03452523E+02 0.03080401E+02 0.01803106E-01 0.06705022E-05    3
--0.02069005E-07 0.08514657E-11-0.03986163E+04 0.08581028E+02                   4
-SO2               121286S   1O   2          G  0300.00   5000.00  1000.00      1
- 0.05254498E+02 0.01978545E-01-0.08204226E-05 0.01576383E-08-0.01120451E-12    2
--0.03756886E+06-0.01146056E+02 0.02911439E+02 0.08103022E-01-0.06906710E-04    3
- 0.03329016E-07-0.08777121E-11-0.03687882E+06 0.01111740E+03                   4
-SO3               121286S   1O   3          G  0300.00   5000.00  1000.00      1
- 0.07050668E+02 0.03246560E-01-0.01408897E-04 0.02721535E-08-0.01942365E-12    2
--0.05020668E+06-0.01106443E+03 0.02575283E+02 0.01515092E+00-0.01229872E-03    3
- 0.04240257E-07-0.05266812E-11-0.04894411E+06 0.01219512E+03                   4
-END
diff --git a/applications/test/readCHEMKINIII/CHEMKINdata/thermo_soot.dat b/applications/test/readCHEMKINIII/CHEMKINdata/thermo_soot.dat
deleted file mode 100644
index 7a9f2c32d..000000000
--- a/applications/test/readCHEMKINIII/CHEMKINdata/thermo_soot.dat
+++ /dev/null
@@ -1,436 +0,0 @@
-THERMO ALL
-   298.000  1000.000  5000.000
-C70               T 6/93C  70    0    0    0G   200.000  6000.000  1000.00     1
- 0.10677602E+03 0.10200334E+00-0.39562455E-04 0.67122022E-08-0.41568097E-12    2
- 0.29769320E+06-0.59941734E+03-0.31366983E+02 0.33484410E+00 0.98587783E-04    3
--0.44663983E-06 0.22008836E-09 0.34260294E+06 0.14891614E+03 0.34822593E+06    4
-C60               T 6/93C  60    0    0    0G   200.000  6000.000  1000.00     1
- 0.99843418E+02 0.78857558E-01-0.30608799E-04 0.51957690E-08-0.32188408E-12    2
- 0.26670488E+06-0.54587488E+03-0.33579084E+02 0.42844440E+00-0.31712321E-03    3
- 0.47546257E-07 0.27677699E-10 0.30465122E+06 0.14832875E+03 0.31098790E+06    4
-C(S)              P 4/83C   1    0    0    0S   200.000  5000.000  1000.00     1
- 0.14556924E+01 0.17170638E-02-0.69758410E-06 0.13528316E-09-0.96764905E-14    2
--0.69512804E+03-0.85256842E+01-0.31087207E+00 0.44035369E-02 0.19039412E-05    3
--0.63854697E-08 0.29896425E-11-0.10865079E+03 0.11138295E+01                   4
-O                 L 1/90O   1   00   00   00G   200.000  3500.000  1000.000    1
- 2.56942078E+00-8.59741137E-05 4.19484589E-08-1.00177799E-11 1.22833691E-15    2
- 2.92175791E+04 4.78433864E+00 3.16826710E+00-3.27931884E-03 6.64306396E-06    3
--6.12806624E-09 2.11265971E-12 2.91222592E+04 2.05193346E+00 6.72540300E+03    4
-O2                TPIS89O   2   00   00   00G   200.000  3500.000  1000.000    1
- 3.28253784E+00 1.48308754E-03-7.57966669E-07 2.09470555E-10-2.16717794E-14    2
--1.08845772E+03 5.45323129E+00 3.78245636E+00-2.99673416E-03 9.84730201E-06    3
--9.68129509E-09 3.24372837E-12-1.06394356E+03 3.65767573E+00 8.68010400E+03    4
-H                 L 7/88H   1   00   00   00G   200.000  3500.000   1000.00    1
- 2.50000001E+00-2.30842973E-11 1.61561948E-14-4.73515235E-18 4.98197357E-22    2
- 2.54736599E+04-4.46682914E-01 2.50000000E+00 7.05332819E-13-1.99591964E-15    3
- 2.30081632E-18-9.27732332E-22 2.54736599E+04-4.46682853E-01 6.19742800E+03    4
-H2                TPIS78H   2   00   00   00G   200.000  3500.000   1000.00    1
- 3.33727920E+00-4.94024731E-05 4.99456778E-07-1.79566394E-10 2.00255376E-14    2
--9.50158922E+02-3.20502331E+00 2.34433112E+00 7.98052075E-03-1.94781510E-05    3
- 2.01572094E-08-7.37611761E-12-9.17935173E+02 6.83010238E-01 8.46810200E+03    4
-OH                RUS 78O   1H   1   00   00G   200.000  3500.000  1000.000    1
- 3.09288767E+00 5.48429716E-04 1.26505228E-07-8.79461556E-11 1.17412376E-14    2
- 3.85865700E+03 4.47669610E+00 3.99201543E+00-2.40131752E-03 4.61793841E-06    3
--3.88113333E-09 1.36411470E-12 3.61508056E+03-1.03925458E-01 8.81310600E+03    4
-H2O               L 8/89H   2O   1   00   00G   200.000  3500.000  1000.000    1
- 3.03399249E+00 2.17691804E-03-1.64072518E-07-9.70419870E-11 1.68200992E-14    2
--3.00042971E+04 4.96677010E+00 4.19864056E+00-2.03643410E-03 6.52040211E-06    3
--5.48797062E-09 1.77197817E-12-3.02937267E+04-8.49032208E-01 9.90409200E+03    4
-HO2               L 5/89H   1O   2   00   00G   200.000  3500.000  1000.000    1
- 4.01721090E+00 2.23982013E-03-6.33658150E-07 1.14246370E-10-1.07908535E-14    2
- 1.11856713E+02 3.78510215E+00 4.30179801E+00-4.74912051E-03 2.11582891E-05    3
--2.42763894E-08 9.29225124E-12 2.94808040E+02 3.71666245E+00 1.00021620E+04    4
-H2O2              L 7/88H   2O   2   00   00G   200.000  3500.000  1000.000    1
- 4.16500285E+00 4.90831694E-03-1.90139225E-06 3.71185986E-10-2.87908305E-14    2
--1.78617877E+04 2.91615662E+00 4.27611269E+00-5.42822417E-04 1.67335701E-05    3
--2.15770813E-08 8.62454363E-12-1.77025821E+04 3.43505074E+00 1.11588350E+04    4
-C                 L11/88C   1   00   00   00G   200.000  3500.000  1000.000    1
- 2.49266888E+00 4.79889284E-05-7.24335020E-08 3.74291029E-11-4.87277893E-15    2
- 8.54512953E+04 4.80150373E+00 2.55423955E+00-3.21537724E-04 7.33792245E-07    3
--7.32234889E-10 2.66521446E-13 8.54438832E+04 4.53130848E+00 6.53589500E+03    4
-CH                TPIS79C   1H   1   00   00G   200.000  3500.000  1000.000    1
- 2.87846473E+00 9.70913681E-04 1.44445655E-07-1.30687849E-10 1.76079383E-14    2
- 7.10124364E+04 5.48497999E+00 3.48981665E+00 3.23835541E-04-1.68899065E-06    3
- 3.16217327E-09-1.40609067E-12 7.07972934E+04 2.08401108E+00 8.62500000E+03    4
-CH2               L S/93C   1H   2   00   00G   200.000  3500.000  1000.000    1
- 2.87410113E+00 3.65639292E-03-1.40894597E-06 2.60179549E-10-1.87727567E-14    2
- 4.62636040E+04 6.17119324E+00 3.76267867E+00 9.68872143E-04 2.79489841E-06    3
--3.85091153E-09 1.68741719E-12 4.60040401E+04 1.56253185E+00 1.00274170E+04    4
-CH2*              L S/93C   1H   2   00   00G   200.000  3500.000  1000.000    1
- 2.29203842E+00 4.65588637E-03-2.01191947E-06 4.17906000E-10-3.39716365E-14    2
- 5.09259997E+04 8.62650169E+00 4.19860411E+00-2.36661419E-03 8.23296220E-06    3
--6.68815981E-09 1.94314737E-12 5.04968163E+04-7.69118967E-01 9.93967200E+03    4
-CH3               L11/89C   1H   3   00   00G   200.000  3500.000  1000.000    1
- 2.28571772E+00 7.23990037E-03-2.98714348E-06 5.95684644E-10-4.67154394E-14    2
- 1.67755843E+04 8.48007179E+00 3.67359040E+00 2.01095175E-03 5.73021856E-06    3
--6.87117425E-09 2.54385734E-12 1.64449988E+04 1.60456433E+00 1.03663400E+04    4
-CH4               L 8/88C   1H   4   00   00G   200.000  3500.000  1000.000    1
- 7.48514950E-02 1.33909467E-02-5.73285809E-06 1.22292535E-09-1.01815230E-13    2
--9.46834459E+03 1.84373180E+01 5.14987613E+00-1.36709788E-02 4.91800599E-05    3
--4.84743026E-08 1.66693956E-11-1.02466476E+04-4.64130376E+00 1.00161980E+04    4
-CO                TPIS79C   1O   1   00   00G   200.000  3500.000  1000.000    1
- 2.71518561E+00 2.06252743E-03-9.98825771E-07 2.30053008E-10-2.03647716E-14    2
--1.41518724E+04 7.81868772E+00 3.57953347E+00-6.10353680E-04 1.01681433E-06    3
- 9.07005884E-10-9.04424499E-13-1.43440860E+04 3.50840928E+00 8.67100000E+03    4
-CO2               L 7/88C   1O   2   00   00G   200.000  3500.000  1000.000    1
- 3.85746029E+00 4.41437026E-03-2.21481404E-06 5.23490188E-10-4.72084164E-14    2
--4.87591660E+04 2.27163806E+00 2.35677352E+00 8.98459677E-03-7.12356269E-06    3
- 2.45919022E-09-1.43699548E-13-4.83719697E+04 9.90105222E+00 9.36546900E+03    4
-HCO               L12/89H   1C   1O   1   00G   200.000  3500.000  1000.000    1
- 2.77217438E+00 4.95695526E-03-2.48445613E-06 5.89161778E-10-5.33508711E-14    2
- 4.01191815E+03 9.79834492E+00 4.22118584E+00-3.24392532E-03 1.37799446E-05    3
--1.33144093E-08 4.33768865E-12 3.83956496E+03 3.39437243E+00 9.98945000E+03    4
-CH2O              L 8/88H   2C   1O   1   00G   200.000  3500.000  1000.000    1
- 1.76069008E+00 9.20000082E-03-4.42258813E-06 1.00641212E-09-8.83855640E-14    2
--1.39958323E+04 1.36563230E+01 4.79372315E+00-9.90833369E-03 3.73220008E-05    3
--3.79285261E-08 1.31772652E-11-1.43089567E+04 6.02812900E-01 1.00197170E+04    4
-CH2OH             GUNL93C   1H   3O   1   00G   200.000  3500.000 1000.0       1
- 3.69266569E+00 8.64576797E-03-3.75101120E-06 7.87234636E-10-6.48554201E-14    2
--3.24250627E+03 5.81043215E+00 3.86388918E+00 5.59672304E-03 5.93271791E-06    3
--1.04532012E-08 4.36967278E-12-3.19391367E+03 5.47302243E+00 1.18339080E+04    4
-CH3O              121686C   1H   3O   1     G  0300.00   3000.00  1000.00      1
- 0.03770799E+02 0.07871497E-01-0.02656384E-04 0.03944431E-08-0.02112616E-12    2
- 0.12783252E+03 0.02929575E+02 0.02106204E+02 0.07216595E-01 0.05338472E-04    3
--0.07377636E-07 0.02075610E-10 0.09786011E+04 0.13152177E+02                   4
-CH3OH             L 8/88C   1H   4O   1   00G   200.000  3500.000  1000.000    1
- 1.78970791E+00 1.40938292E-02-6.36500835E-06 1.38171085E-09-1.17060220E-13    2
--2.53748747E+04 1.45023623E+01 5.71539582E+00-1.52309129E-02 6.52441155E-05    3
--7.10806889E-08 2.61352698E-11-2.56427656E+04-1.50409823E+00 1.14352770E+04    4
-C2H               L 1/91C   2H   1   00   00G   200.000  3500.000  1000.000    1
- 3.16780652E+00 4.75221902E-03-1.83787077E-06 3.04190252E-10-1.77232770E-14    2
- 6.71210650E+04 6.63589475E+00 2.88965733E+00 1.34099611E-02-2.84769501E-05    3
- 2.94791045E-08-1.09331511E-11 6.68393932E+04 6.22296438E+00 1.04544720E+04    4
-C2H2              L 1/91C   2H   2   00   00G   200.000  3500.000  1000.000    1
- 4.14756964E+00 5.96166664E-03-2.37294852E-06 4.67412171E-10-3.61235213E-14    2
- 2.59359992E+04-1.23028121E+00 8.08681094E-01 2.33615629E-02-3.55171815E-05    3
- 2.80152437E-08-8.50072974E-12 2.64289807E+04 1.39397051E+01 1.00058390E+04    4
-C2H3              L 2/92C   2H   3   00   00G   200.000  3500.000  1000.000    1
- 3.01672400E+00 1.03302292E-02-4.68082349E-06 1.01763288E-09-8.62607041E-14    2
- 3.46128739E+04 7.78732378E+00 3.21246645E+00 1.51479162E-03 2.59209412E-05    3
--3.57657847E-08 1.47150873E-11 3.48598468E+04 8.51054025E+00 1.05750490E+04    4
-C2H4              L 1/91C   2H   4   00   00G   200.000  3500.000  1000.000    1
- 2.03611116E+00 1.46454151E-02-6.71077915E-06 1.47222923E-09-1.25706061E-13    2
- 4.93988614E+03 1.03053693E+01 3.95920148E+00-7.57052247E-03 5.70990292E-05    3
--6.91588753E-08 2.69884373E-11 5.08977593E+03 4.09733096E+00 1.05186890E+04    4
-C2H5              L12/92C   2H   5   00   00G   200.000  3500.000  1000.000    1
- 1.95465642E+00 1.73972722E-02-7.98206668E-06 1.75217689E-09-1.49641576E-13    2
- 1.28575200E+04 1.34624343E+01 4.30646568E+00-4.18658892E-03 4.97142807E-05    3
--5.99126606E-08 2.30509004E-11 1.28416265E+04 4.70720924E+00 1.21852440E+04    4
-C2H6              L 8/88C   2H   6   00   00G   200.000  3500.000  1000.000    1
- 1.07188150E+00 2.16852677E-02-1.00256067E-05 2.21412001E-09-1.90002890E-13    2
--1.14263932E+04 1.51156107E+01 4.29142492E+00-5.50154270E-03 5.99438288E-05    3
--7.08466285E-08 2.68685771E-11-1.15222055E+04 2.66682316E+00 1.18915940E+04    4
-CH2CO             L 5/90C   2H   2O   1   00G   200.000  3500.000  1000.000    1
- 4.51129732E+00 9.00359745E-03-4.16939635E-06 9.23345882E-10-7.94838201E-14    2
--7.55105311E+03 6.32247205E-01 2.13583630E+00 1.81188721E-02-1.73947474E-05    3
- 9.34397568E-09-2.01457615E-12-7.04291804E+03 1.22156480E+01 1.17977430E+04    4
-HCCO              SRIC91H   1C   2O   1     G  0300.00   4000.00  1000.00      1
- 0.56282058E+01 0.40853401E-02-0.15934547E-05 0.28626052E-09-0.19407832E-13    2
- 0.19327215E+05-0.39302595E+01 0.22517214E+01 0.17655021E-01-0.23729101E-04    3
- 0.17275759E-07-0.50664811E-11 0.20059449E+05 0.12490417E+02                   4
-HCCOH              SRI91C   2O   1H   20   0G   300.000  5000.000   1000.G     1
- 0.59238291E+01 0.67923600E-02-0.25658564E-05 0.44987841E-09-0.29940101E-13    2
- 0.72646260E+04-0.76017742E+01 0.12423733E+01 0.31072201E-01-0.50866864E-04    3
- 0.43137131E-07-0.14014594E-10 0.80316143E+04 0.13874319E+02                   4
-N2                121286N   2               G  0300.00   5000.00  1000.00      1
- 0.02926640E+02 0.14879768E-02-0.05684760E-05 0.10097038E-09-0.06753351E-13    2
--0.09227977E+04 0.05980528E+02 0.03298677E+02 0.14082404E-02-0.03963222E-04    3
- 0.05641515E-07-0.02444854E-10-0.10208999E+04 0.03950372E+02                   4
-AR                120186AR  1               G  0300.00   5000.00  1000.00      1
- 0.02500000E+02 0.00000000E+00 0.00000000E+00 0.00000000E+00 0.00000000E+00    2
--0.07453750E+04 0.04366001E+02 0.02500000E+02 0.00000000E+00 0.00000000E+00    3
- 0.00000000E+00 0.00000000E+00-0.07453750E+04 0.04366001E+02                   4
-C4H               P 1/93C   4H   1    0    0G   300.000  3000.000              1
- 0.77697593E+01 0.49829976E-02-0.17628546E-05 0.28144284E-09-0.16689869E-13    2
- 0.94345900E+05-0.14165274E+02 0.13186295E+01 0.38582956E-01-0.71385623E-04    3
- 0.65356359E-07-0.22617666E-10 0.95456106E+05 0.15567583E+02                   4
-C4H2              P 1/93C   4H   2    0    0G   300.000  3000.000              1
- 0.86637708E+01 0.67247189E-02-0.23593397E-05 0.37506380E-09-0.22230940E-13    2
- 0.53252275E+05-0.21093503E+02-0.39201030E+00 0.51937565E-01-0.91737340E-04    3
- 0.80471986E-07-0.26898218E-10 0.54845266E+05 0.20957794E+02                   4
-C6H2              P 1/93C   6H   2    0    0G   300.000  3000.000              1
- 0.13226281E+02 0.73904302E-02-0.22715381E-05 0.25875217E-09-0.55356741E-14    2
- 0.80565258E+05-0.41201176E+02-0.15932624E+01 0.80530145E-01-0.14800649E-03    3
- 0.13300031E-06-0.45332313E-10 0.83273227E+05 0.27980873E+02                   4
-C6H               P 1/93C   6H   1    0    0G   300.000  3000.000              1
- 0.12370055E+02 0.52177699E-02-0.16885009E-05 0.25807149E-09-0.15472851E-13    2
- 0.12158739E+06-0.34952797E+02-0.25630299E+00 0.63793827E-01-0.11440118E-03    3
- 0.10136744E-06-0.34361855E-10 0.12408855E+06 0.24930750E+02                   4
-C2O               121286C   2O   1          G  0300.00   5000.00  1000.00      1
- 0.04849809E+02 0.02947585E-01-0.01090729E-04 0.01792562E-08-0.01115758E-12    2
- 0.03282055E+06-0.06453226E+01 0.03368851E+02 0.08241803E-01-0.08765145E-04    3
- 0.05569262E-07-0.01540009E-10 0.03317081E+06 0.06713314E+02                   4
-C3H2              121686C   3H   2          G  0300.00   5000.00  1000.00      1
- 0.06530853E+02 0.05870316E-01-0.01720777E-04 0.02127498E-08-0.08291910E-13    2
- 0.05115214E+06-0.01122728E+03 0.02691077E+02 0.01480366E+00-0.03250551E-04    3
--0.08644363E-07 0.05284878E-10 0.05219072E+06 0.08757391E+02                   4
-C3H3               82489C   3H   3          G  0300.00   4000.00  1000.00      1
- 0.08831047E+02 0.04357195E-01-0.04109067E-05-0.02368723E-08 0.04376520E-12    2
- 0.03847420E+06-0.02177919E+03 0.04754200E+02 0.01108028E+00 0.02793323E-05    3
--0.05479212E-07 0.01949629E-10 0.03988883E+06 0.05854549E+01                   4
-AC3H4              40687C   3H   4          G  0300.00   5000.00  1000.00      1
- 0.05729144E+02 0.01236804E+00-0.04805627E-04 0.08601364E-08-0.05812802E-12    2
- 0.02012984E+06-0.09448668E+02-0.02131969E+01 0.03358714E+00-0.03804870E-03    3
- 0.02745838E-06-0.08690044E-10 0.02162048E+06 0.02029393E+03                   4
-PC3H4              40687C   3H   4          G  0300.00   5000.00  1000.00      1
- 0.05511034E+02 0.01246956E+00-0.04814165E-04 0.08573769E-08-0.05771561E-12    2
- 0.01961967E+06-0.01079475E+03 0.06271447E+01 0.03116179E+00-0.03747664E-03    3
- 0.02964118E-06-0.09987382E-10 0.02083493E+06 0.01346880E+03                   4
-H2C4O             120189H   2C   4O   1     G  0300.00   4000.00  1000.00      1
- 0.01026888E+03 0.04896164E-01-0.04885081E-05-0.02708566E-08 0.05107013E-12    2
- 0.02346903E+06-0.02815985E+03 0.04810971E+02 0.01313999E+00 0.09865073E-05    3
--0.06120720E-07 0.01640003E-10 0.02545803E+06 0.02113424E+02                   4
-C5H2               20587C   5H   2          G  0300.00   5000.00  1000.00      1
- 0.01132917E+03 0.07424057E-01-0.02628189E-04 0.04082541E-08-0.02301333E-12    2
- 0.07878706E+06-0.03617117E+03 0.03062322E+02 0.02709998E+00-0.01009170E-03    3
--0.01272745E-06 0.09167219E-10 0.08114969E+06 0.07071078E+02                   4
-C5H3               20387C   5H   3          G  0300.00   5000.00  1000.00      1
- 0.01078762E+03 0.09539619E-01-0.03206745E-04 0.04733323E-08-0.02512135E-12    2
- 0.06392904E+06-0.03005444E+03 0.04328720E+02 0.02352480E+00-0.05856723E-04    3
--0.01215449E-06 0.07726478E-10 0.06588531E+06 0.04173259E+02                   4
-C4H4              HW /94C   4H   4    0    0G   300.000  3000.000              1
- 0.66507092E+01 0.16129434E-01-0.71938875E-05 0.14981787E-08-0.11864110E-12    2
- 0.31195992E+05-0.97952118E+01-0.19152479E+01 0.52750878E-01-0.71655944E-04    3
- 0.55072423E-07-0.17286228E-10 0.32978504E+05 0.31419983E+02                   4
-n-C4H3            HW /94C   4H   3    0    0G   300.000  3000.000              1
- 0.54328279E+01 0.16860981E-01-0.94313109E-05 0.25703895E-08-0.27456309E-12    2
- 0.61600680E+05-0.15673981E+01-0.31684113E+00 0.46912100E-01-0.68093810E-04    3
- 0.53179921E-07-0.16523005E-10 0.62476199E+05 0.24622559E+02                   4
-i-C4H3            AB1/93C   4H   3    0    0G   300.000  3000.000              1
- 0.90978165E+01 0.92207119E-02-0.33878441E-05 0.49160498E-09-0.14529780E-13    2
- 0.56600574E+05-0.19802597E+02 0.20830412E+01 0.40834274E-01-0.62159685E-04    3
- 0.51679358E-07-0.17029184E-10 0.58005129E+05 0.13617462E+02                   4
-C2H3O             T04/83O   1H   3C   2    0G   300.000  5000.000              1
- 0.59756699E+01 0.81305914E-02-0.27436245E-05 0.40703041E-09-0.21760171E-13    2
- 0.49032178E+03-0.50320879E+01 0.34090624E+01 0.10738574E-01 0.18914925E-05    3
- 0.71585831E-08 0.28673851E-11 0.15214766E+04 0.95714535E+01 0.30474436E+04    4
-n-C4H5            HW /94C   4H   5    0    0G   300.000  3000.000              1
- 0.98501978E+01 0.10779008E-01-0.13672125E-05-0.77200535E-09 0.18366314E-12    2
- 0.38840301E+05-0.26001846E+02 0.16305321E+00 0.39830137E-01-0.34000128E-04    3
- 0.15147233E-07-0.24665825E-11 0.41429766E+05 0.23536163E+02                   4
-i-C4H5            HW /94C   4H   5    0    0G   300.000  3000.000              1
- 0.10229092E+02 0.94850138E-02-0.90406445E-07-0.12596100E-08 0.24781468E-12    2
- 0.34642812E+05-0.28564529E+02-0.19932900E-01 0.38005672E-01-0.27559450E-04    3
- 0.77835551E-08 0.40209383E-12 0.37496223E+05 0.24394241E+02                   4
-n-C4H7            HW /94C   4H   7    0    0G   300.000  3000.000              1
- 0.11963392E+02 0.11425305E-01 0.78948909E-06-0.19858872E-08 0.36873645E-12    2
- 0.16962977E+05-0.37542908E+02 0.28698254E+00 0.36964495E-01-0.86277441E-05    3
--0.15051821E-07 0.89891263E-11 0.20551301E+05 0.24484467E+02                   4
-C4H6              HW /94C   4H   6    0    0G   300.000  3000.000              1
- 0.88673134E+01 0.14918670E-01-0.31548716E-05-0.41841330E-09 0.15761258E-12    2
- 0.91338516E+04-0.23328171E+02 0.11284465E+00 0.34369022E-01-0.11107392E-04    3
--0.92106660E-08 0.62065179E-11 0.11802270E+05 0.23089996E+02                   4
-C4H612            A 8/83C   4H   6    0    0G   300.     3000.     1000.0      1
-  0.1781557E 02 -0.4257502E-02  0.1051185E-04 -0.4473844E-08  0.5848138E-12    2
-  0.1267342E 05 -0.6982662E 02  0.1023467E 01  0.3495919E-01 -0.2200905E-04    3
-  0.6942272E-08 -0.7879187E-12  0.1811799E 05  0.1975066E 02  0.1950807E+05    4
-l-C6H4            HW /94C   6H   4    0    0G   300.000  3000.000              1
- 0.12715182E+02 0.13839662E-01-0.43765440E-05 0.31541636E-09 0.46619026E-13    2
- 0.57031148E+05-0.39464600E+02 0.29590225E+00 0.58053318E-01-0.67766756E-04    3
- 0.43376762E-07-0.11418864E-10 0.60001371E+05 0.22318970E+02                   4
-c-C6H4            HW /94C   6H   4    0    0G   300.000  3000.000              1
- 0.13849209E+02 0.78807920E-02 0.18243836E-05-0.21169166E-08 0.37459977E-12    2
- 0.47446340E+05-0.50404953E+02-0.30991268E+01 0.54030564E-01-0.40839004E-04    3
- 0.10738837E-07 0.98078490E-12 0.52205711E+05 0.37415207E+02                   4
-c-C6H3            FAKE  C   6H   3    0    0G   300.000  3000.000              1
- 0.13849209E+02 0.78807920E-02 0.18243836E-05-0.21169166E-08 0.37459977E-12    2
- 0.47446340E+05-0.50404953E+02-0.30991268E+01 0.54030564E-01-0.40839004E-04    3
- 0.10738837E-07 0.98078490E-12 0.52205711E+05 0.37415207E+02                   4
-n-C6H5            HW /94C   6H   5    0    0G   300.000  3000.000              1
- 0.16070068E+02 0.81899539E-02 0.17325165E-05-0.20624185E-08 0.36292345E-12    2
- 0.64616867E+05-0.56163742E+02-0.61135769E+00 0.65082610E-01-0.78262397E-04    3
- 0.53030828E-07-0.14946683E-10 0.68805375E+05 0.27635468E+02                   4
-l-C6H6            HW /94C   6H   6    0    0G   300.000  3000.000              1
- 0.10874918E+02 0.23293324E-01-0.94495535E-05 0.16255329E-08-0.84771200E-13    2
- 0.36224055E+05-0.30326756E+02 0.59114441E-01 0.55723339E-01-0.43485274E-04    3
- 0.14487391E-07-0.52512541E-12 0.39042688E+05 0.24796795E+02                   4
-c-C6H7            HW /94C   6H   7    0    0G   300.000  3000.000              1
- 0.19996841E+02 0.11189543E-02 0.11649756E-04-0.62779471E-08 0.94939508E-12    2
- 0.16730059E+05-0.83746933E+02-0.30328493E+01 0.50804518E-01-0.69150292E-05    3
--0.29715974E-07 0.16296353E-10 0.23895383E+05 0.38909180E+02                   4
-n-C6H7            HW /94C   6H   7    0    0G   300.000  3000.000              1
- 0.22577469E+02-0.30737517E-02 0.14225234E-04-0.69880848E-08 0.10232874E-11    2
- 0.41228980E+05-0.91568619E+02 0.13248032E+00 0.57103366E-01-0.43712644E-04    3
- 0.15538603E-07-0.12976356E-11 0.47730512E+05 0.25339081E+02                   4
-C6H8              HW /94C   6H   8    0    0G   300.000  3000.000              1
- 0.28481979E+02-0.15702948E-01 0.26771697E-04-0.11780109E-07 0.16573427E-11    2
- 0.93346445E+04-0.12500226E+03 0.15850439E+01 0.40215142E-01 0.78439543E-05    3
--0.38761325E-07 0.18545207E-10 0.17949613E+05 0.19112625E+02                   4
-C6H3              HW /94C   6H   3    0    0G   300.000  3000.000              1
- 0.58188343E+01 0.27933408E-01-0.17825427E-04 0.53702536E-08-0.61707627E-12    2
- 0.85188250E+05-0.92147827E+00 0.11790619E+01 0.55547360E-01-0.73076168E-04    3
- 0.52076736E-07-0.15046964E-10 0.85647312E+05 0.19179199E+02                   4
-i-C6H5            HW /94C   6H   5    0    0G   300.000  3000.000              1
- 0.22501663E+02-0.81009977E-02 0.15955695E-04-0.72310371E-08 0.10310424E-11    2
- 0.58473410E+05-0.91224777E+02-0.78585434E+00 0.60221825E-01-0.62890264E-04    3
- 0.36310730E-07-0.87000259E-11 0.64942270E+05 0.28658905E+02                   4
-i-C6H7            HW /94C   6H   7    0    0G   300.000  3000.000              1
- 0.20481506E+02 0.79439697E-03 0.11450761E-04-0.60991177E-08 0.91756724E-12    2
- 0.37728426E+05-0.81812073E+02-0.17099094E+01 0.62486034E-01-0.54290707E-04    3
- 0.26959682E-07-0.58999090E-11 0.44086621E+05 0.33344772E+02                   4
-A1                HW /94C   6H   6    0    0G   300.000  3000.000              1
- 0.17246994E+02 0.38420164E-02 0.82776232E-05-0.48961120E-08 0.76064545E-12    2
- 0.26646055E+04-0.71945175E+02-0.48998680E+01 0.59806932E-01-0.36710087E-04    3
- 0.32740399E-08 0.37600886E-11 0.91824570E+04 0.44095642E+02                   4
-A1-               HW /94C   6H   5    0    0G   300.000  3000.000              1
- 0.14493439E+02 0.75712688E-02 0.37894542E-05-0.30769500E-08 0.51347820E-12    2
- 0.33189977E+05-0.54288940E+02-0.49076147E+01 0.59790771E-01-0.45639827E-04    3
- 0.14964993E-07-0.91767826E-12 0.38733410E+05 0.46567780E+02                   4
-A1C2H             HW /94C   8H   6    0    0G   300.000  3000.000              1
- 0.24090759E+02 0.78232400E-03 0.11453964E-04-0.61620504E-08 0.93346685E-12    2
- 0.27429445E+05-0.10499631E+03-0.52645016E+01 0.84511042E-01-0.76597848E-04    3
- 0.33216978E-07-0.47673063E-11 0.35566242E+05 0.46378815E+02                   4
-A1C2H*            HW /94C   8H   5    0    0G   300.000  3000.000              1
- 0.28686157E+02-0.13869863E-01 0.22721186E-04-0.99882271E-08 0.14085851E-11    2
- 0.56047309E+05-0.12750334E+03-0.29324217E+01 0.66043675E-01-0.39500475E-04    3
--0.31830381E-08 0.85300387E-11 0.65324043E+05 0.38058685E+02                   4
-A1C2H-            HW /94C   8H   5    0    0G   300.000  3000.000              1
- 0.12359501E+02 0.25453357E-01-0.10606554E-04 0.18914603E-08-0.10630622E-12    2
- 0.60930461E+05-0.40900208E+02-0.44495859E+01 0.76995067E-01-0.66617038E-04    3
- 0.25038682E-07-0.19756601E-11 0.65225926E+05 0.44427948E+02                   4
-n-A1C2H2          HW /94C   8H   7    0    0G   300.000  3000.000              1
- 0.30433151E+02-0.13965182E-01 0.25416972E-04-0.11354174E-07 0.16092050E-11    2
- 0.35738719E+05-0.13416492E+03-0.44899931E+01 0.78750789E-01-0.62376959E-04    3
- 0.21952140E-07-0.16960955E-11 0.45902949E+05 0.47980759E+02                   4
-i-A1C2H2          HW /94C   8H   7    0    0G   300.000  3000.000              1
- 0.24365524E+02 0.11262144E-02 0.12931670E-04-0.69641146E-08 0.10540145E-11    2
- 0.33549121E+05-0.10462067E+03-0.25971584E+01 0.63454390E-01-0.20852312E-04    3
--0.22604624E-07 0.15112869E-10 0.41707375E+05 0.37893417E+02                   4
-A1C2H3            HW /94C   8H   8    0    0G   300.000  3000.000              1
- 0.11303213E+02 0.33709887E-01-0.13208885E-04 0.21140962E-08-0.87311377E-13    2
- 0.11725388E+05-0.34737919E+02-0.38678493E+01 0.67947865E-01-0.25230333E-04    3
--0.18017145E-07 0.12998470E-10 0.16200269E+05 0.45271770E+02                   4
-A1C2H3*           HW /94C   8H   7    0    0G   300.000  3000.000              1
- 0.11563599E+02 0.30210810E-01-0.11545593E-04 0.17302320E-08-0.52379765E-13    2
- 0.40498492E+05-0.34882965E+02-0.38868685E+01 0.68168961E-01-0.34805875E-04    3
--0.56410254E-08 0.80714758E-11 0.44941359E+05 0.45943188E+02                   4
-A1C2HC2H2         HW /94C  10H   7    0    0G   300.000  3000.000              1
- 0.37523422E+02-0.17028838E-01 0.28777416E-04-0.12719674E-07 0.17976818E-11    2
- 0.61041488E+05-0.17188731E+03-0.63184557E+01 0.11657917E+00-0.13638573E-03    3
- 0.88823526E-07-0.24348468E-10 0.72977062E+05 0.52624207E+02                   4
-A1C2H)2           HW /94C  10H   6    0    0G   300.000  3000.000              1
- 0.39766785E+02-0.24939798E-01 0.34210185E-04-0.14473258E-07 0.20104023E-11    2
- 0.50136750E+05-0.18657632E+03-0.75570364E+01 0.12159592E+00-0.15138849E-03    3
- 0.10287488E-06-0.28950911E-10 0.62914168E+05 0.55213287E+02                   4
-A2-1              HW /94C  10H   7    0    0G   300.000  3000.000              1
- 0.38380905E+02-0.23157451E-01 0.35479272E-04-0.15395457E-07 0.21609069E-11    2
- 0.32698469E+05-0.18106512E+03-0.85287294E+01 0.10334599E+00-0.91922702E-04    3
- 0.43147448E-07-0.85738135E-11 0.46335004E+05 0.63342224E+02                   4
-A2-2              HW /94C  10H   7    0    0G   300.000  3000.000              1
- 0.37326401E+02-0.20478070E-01 0.33183067E-04-0.14576987E-07 0.20569137E-11    2
- 0.32840301E+05-0.17537704E+03-0.38448524E+01 0.70514679E-01-0.93748040E-05    3
--0.44051607E-07 0.24267865E-10 0.45627656E+05 0.43582001E+02                   4
-A2                HW /94C  10H   8    0    0G   300.000  3000.000              1
- 0.36468643E+02-0.15419513E-01 0.30160038E-04-0.13700120E-07 0.19582730E-11    2
- 0.35091445E+04-0.17329489E+03-0.94505043E+01 0.11137849E+00-0.10345667E-03    3
- 0.52800392E-07-0.11804439E-10 0.16695594E+05 0.65187668E+02                   4
-naphthyne         HW /94C  10H   6    0    0G   300.000  3000.000              1
- 0.37680222E+02-0.23843173E-01 0.34590019E-04-0.14841252E-07 0.20744023E-11    2
- 0.45771934E+05-0.17676088E+03-0.68131294E+01 0.96868336E-01-0.87982247E-04    3
- 0.41858918E-07-0.82716637E-11 0.58661090E+05 0.54849548E+02                   4
-A2C2H2            HW /94C  12H   9    0    0G   300.000  3000.000              1
- 0.38449295E+02-0.62794946E-02 0.24404828E-04-0.11968822E-07 0.17586878E-11    2
- 0.41090176E+05-0.17668623E+03-0.78516331E+01 0.12104863E+00-0.10531662E-03    3
- 0.46280483E-07-0.77963885E-11 0.54316234E+05 0.63654388E+02                   4
-A2C2HA            HW /94C  12H   8    0    0G   300.000  3000.000              1
- 0.49453674E+02-0.33857111E-01 0.46505607E-04-0.19681195E-07 0.27340769E-11    2
- 0.26851051E+05-0.23933099E+03-0.11530450E+02 0.14741433E+00-0.17302344E-03    3
- 0.11500390E-06-0.32709183E-10 0.43793129E+05 0.74391754E+02                   4
-A2C2HB            HW /94C  12H   8    0    0G   300.000  3000.000              1
- 0.18184774E+02 0.41343965E-01-0.17302822E-04 0.31004770E-08-0.17580817E-12    2
- 0.36171543E+05-0.73466003E+02-0.68233256E+01 0.11382083E+00-0.88584900E-04    3
- 0.25930856E-07 0.80712824E-12 0.42797719E+05 0.54592098E+02                   4
-A2C2HA*           HW /94C  12H   7    0    0G   300.000  3000.000              1
- 0.36614349E+02-0.60314685E-02 0.21614964E-04-0.10579910E-07 0.15563124E-11    2
- 0.60723898E+05-0.17026691E+03-0.84175968E+01 0.12391680E+00-0.12250672E-03    3
- 0.64071344E-07-0.13889583E-10 0.73248562E+05 0.61893204E+02                   4
-A2C2HB*           HW /94C  12H   7    0    0G   300.000  3000.000              1
- 0.44933517E+02-0.26026871E-01 0.38589074E-04-0.16646357E-07 0.23321310E-11    2
- 0.57926637E+05-0.21417279E+03-0.11824737E+02 0.14904183E+00-0.18618468E-03    3
- 0.13129460E-06-0.39145326E-10 0.73385375E+05 0.76273834E+02                   4
-A2C2H)2           HW /94C  14H   8    0    0G   300.000  3000.000              1
- 0.23671062E+02 0.42137049E-01-0.17596645E-04 0.31081251E-08-0.16805216E-12    2
- 0.77926273E+05-0.99615448E+02-0.63029008E+01 0.13745695E+00-0.13055481E-03    3
- 0.60730663E-07-0.10178345E-10 0.85489430E+05 0.51891548E+02                   4
-A2HR5             HW /94C  12H   9    0    0G   300.000  3000.000              1
- 0.51227890E+02-0.36250230E-01 0.50296483E-04-0.21346413E-07 0.29698119E-11    2
- 0.32111648E+05-0.25061665E+03-0.92796507E+01 0.11707741E+00-0.78334211E-04    3
- 0.10778407E-07 0.66555260E-11 0.50063973E+05 0.66712509E+02                   4
-A2R5              HW /94C  12H   8    0    0G   300.000  3000.000              1
- 0.45883698E+02-0.27226903E-01 0.41569336E-04-0.18047093E-07 0.25351396E-11    2
- 0.13394574E+05-0.22304584E+03-0.97011614E+01 0.12019449E+00-0.98907694E-04    3
- 0.37240884E-07-0.41124578E-11 0.29601926E+05 0.66970596E+02                   4
-A3-4              HW /94C  14H   9    0    0G   300.000  3000.000              1
- 0.55788879E+02-0.37930615E-01 0.53528085E-04-0.22830790E-07 0.31841231E-11    2
- 0.32605633E+05-0.27378882E+03-0.11266616E+02 0.14216852E+00-0.12632679E-03    3
- 0.58348800E-07-0.11184283E-10 0.52141961E+05 0.75774780E+02                   4
-A3-1              HW /94C  14H   9    0    0G   300.000  3000.000              1
- 0.51812469E+02-0.28380312E-01 0.45409150E-04-0.19924162E-07 0.28118107E-11    2
- 0.34357359E+05-0.25257889E+03-0.73971558E+01 0.11464679E+00-0.57456185E-04    3
--0.14070547E-07 0.16005933E-10 0.52239715E+05 0.59582397E+02                   4
-A3                HW /94C  14H  10    0    0G   300.000  3000.000              1
- 0.55916473E+02-0.35253201E-01 0.52522926E-04-0.22672634E-07 0.31770584E-11    2
- 0.32654609E+04-0.27604980E+03-0.12275226E+02 0.15032256E+00-0.13862801E-03    3
- 0.69376767E-07-0.15105445E-10 0.23030492E+05 0.78889145E+02                   4
-A3C2H2            HW /94C  16H  11    0    0G   300.000  3000.000              1
- 0.47582428E+02-0.12822752E-02 0.25647692E-04-0.13378838E-07 0.20086545E-11    2
- 0.46191215E+05-0.22653258E+03-0.95893555E+01 0.15080631E+00-0.11617327E-03    3
- 0.36814228E-07-0.12802901E-11 0.62701906E+05 0.71309311E+02                   4
-A3C2H             HW /94C  16H  10    0    0G   300.000  3000.000              1
- 0.52165146E+02-0.13197318E-01 0.34353056E-04-0.16283892E-07 0.23677362E-11    2
- 0.34235055E+05-0.25406651E+03-0.11602674E+02 0.16824394E+00-0.16432030E-03    3
- 0.86394380E-07-0.19310567E-10 0.52172836E+05 0.75515366E+02                   4
-A4H               HW /94C  16H  11    0    0G   300.000  3000.000              1
- 0.53775238E+02-0.15681151E-01 0.38488797E-04-0.18134241E-07 0.26325071E-11    2
- 0.24154484E+05-0.26532764E+03-0.12209255E+02 0.15599608E+00-0.11474930E-03    3
- 0.30214796E-07 0.18287498E-11 0.43453211E+05 0.79503540E+02                   4
-A4                HW /94C  16H  10    0    0G   300.000  3000.000              1
- 0.58017273E+02-0.29164989E-01 0.48728383E-04-0.21593682E-07 0.30609786E-11    2
- 0.43451016E+04-0.29017163E+03-0.13759249E+02 0.16772294E+00-0.15500121E-03    3
- 0.75759544E-07-0.15674045E-10 0.24996187E+05 0.82853027E+02                   4
-A4-               HW /94C  16H   9    0    0G   300.000  3000.000              1
- 0.22088816E+02 0.53355407E-01-0.22329932E-04 0.39479620E-08-0.21313176E-12    2
- 0.45200934E+05-0.96724930E+02-0.96258593E+01 0.13385314E+00-0.77600773E-04    3
--0.36330547E-08 0.13855670E-10 0.54171852E+05 0.68499725E+02                   4
-P2                HW /94C  12H  10    0    0G   300.000  3000.000              1
- 0.50761871E+02-0.34501564E-01 0.50293413E-04-0.21559579E-07 0.30097192E-11    2
- 0.21538867E+04-0.24670712E+03-0.10283234E+02 0.12428707E+00-0.95990268E-04    3
- 0.32294793E-07-0.23045229E-11 0.20165258E+05 0.72707947E+02                   4
-P2-               HW /94C  12H   9    0    0G   300.000  3000.000              1
- 0.44711853E+02-0.22851825E-01 0.39102117E-04-0.17352100E-07 0.24579375E-11    2
- 0.33714000E+05-0.21220692E+03-0.11851097E+02 0.13545156E+00-0.13310938E-03    3
- 0.73769911E-07-0.18193003E-10 0.49878781E+05 0.81107361E+02                   4
-P2-H              HW /94C  12H  11    0    0G   300.000  3000.000              1
- 0.41542511E+02-0.83502531E-02 0.29097937E-04-0.14148299E-07 0.20728341E-11    2
- 0.22772937E+05-0.19578616E+03-0.99978790E+01 0.12279570E+00-0.80112615E-04    3
- 0.11102152E-07 0.64273890E-11 0.37960410E+05 0.74195984E+02                   4
-C5H5              L 7/89C   5H   5    0    0G   200.000  6000.000              1
- 0.10844066d+02 0.15392837d-01-0.55630421d-05 0.90189371d-09-0.54156531d-13    2
- 0.26900566d+05-0.35254948d+02-0.95903718d+00 0.31396859d-01 0.26723794d-04    3
--0.68941872d-07 0.33301856d-10 0.30729120d+05 0.29072816d+02 0.31954258d+05    4
-C5H6            C-P10/85C   5H   6    0    0G   298.150  5000.000              1
- 0.10624320E 02 0.17735448E-01-0.62330446E-05 0.97308317E-09-0.55500130E-13    2
- 0.10772188E 05-0.35773422E 02-0.28978958E 01 0.43484777E-01-0.33511005E-05    3
--0.31103756E-07 0.16912444E-10 0.15084742E 05 0.36894760E 02 0.16068486E 05    4
-C6H5O             L12/84C   6H   5O   1    0G   300.000  5000.000              1
- 0.13833984E 02 0.17618403E-01-0.60696257E-05 0.91988173E-09-0.50449181E-13    2
--0.69212549E 03-0.50392990E 02-0.18219433E 01 0.48122510E-01-0.46792302E-05    3
--0.34018594E-07 0.18649637E-10 0.42429180E 04 0.33526199E 02 0.57367379E 04    4
-C6H5OH            L 4/84C   6H   6O   1    0G   300.000  5000.000              1
- 0.14912073E 02 0.18378135E-01-0.61983128E-05 0.91983221E-09-0.49209565E-13    2
--0.18375199E 05-0.55924103E 02-0.16956539E 01 0.52271299E-01-0.72024050E-05    3
--0.35859603E-07 0.20449073E-10-0.13284121E 05 0.32542160E 02-0.11594207E 05    4
-C5H4OH            L 8/89C   5H   5O   1    0G   200.000  6000.000              1
- 0.13367912d+02 0.15205785d-01-0.54592258d-05 0.88134866d-09-0.52774454d-13    2
- 0.38411506d+04-0.45920839d+02-0.12822236d+01 0.49041160d-01-0.13688997d-04    3
--0.29133858d-07 0.19006964d-10 0.80087098d+04 0.30798358d+02 0.96365992d+04    4
-C5H4O             P 1/93C   5H   4O   1    0G   300.000  3000.000              1
- 0.47927242E+01 0.29221680E-01-0.15997486E-04 0.42069049E-08-0.42815179E-12    2
- 0.22849286E+04-0.30131893E+01-0.23915355E+01 0.47363680E-01-0.30728171E-04    3
- 0.78031552E-08-0.25145729E-12 0.43740152E+04 0.34594337E+02                   4
-C5H5O             L 7/89C   5O   1H   5    0G   200.000  6000.000              1
- 0.12606422d+02 0.16747260d-01-0.61098574d-05 0.99676557d-09-0.60113201d-13    2
- 0.39313455d+04-0.42604277d+02 0.23042835d+00 0.32322691d-01 0.28900443d-04    3
--0.70679977d-07 0.33406891d-10 0.80753082d+04 0.25330974E 02                   4
-END
-
diff --git a/applications/test/readCHEMKINIII/Make/files b/applications/test/readCHEMKINIII/Make/files
deleted file mode 100644
index a65451170..000000000
--- a/applications/test/readCHEMKINIII/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-readCHEMKINIII.C
-
-EXE = $(FOAM_USER_APPBIN)/readCHEMKINIII
diff --git a/applications/test/readCHEMKINIII/Make/options b/applications/test/readCHEMKINIII/Make/options
deleted file mode 100644
index dcc48758d..000000000
--- a/applications/test/readCHEMKINIII/Make/options
+++ /dev/null
@@ -1,8 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude
-
-EXE_LIBS = \
-    -lspecie \
-    -lbasicThermophysicalModels \
-    -lcombustionThermophysicalModels
diff --git a/applications/test/readCHEMKINIII/reactions b/applications/test/readCHEMKINIII/reactions
deleted file mode 100644
index 5a61fdfd5..000000000
--- a/applications/test/readCHEMKINIII/reactions
+++ /dev/null
@@ -1,875 +0,0 @@
-
-290
-(
-reversibleArrheniusReaction
-    C7H16 + O2 = C7H15-1 + HO2
-    (2.5e+10 0 24560.8)
-reversibleArrheniusReaction
-    C7H16 + O2 = C7H15-2 + HO2
-    (2.8e+11 0 23740.6)
-reversibleArrheniusReaction
-    C7H16 + H = C7H15-1 + H2
-    (56000 2 3857.97)
-reversibleArrheniusReaction
-    C7H16 + H = C7H15-2 + H2
-    (43800 2 2390.16)
-reversibleArrheniusReaction
-    C7H16 + OH = C7H15-1 + H2O
-    (8.6e+06 1.1 913.292)
-reversibleArrheniusReaction
-    C7H16 + OH = C7H15-2 + H2O
-    (4.8e+06 1.3 347.454)
-reversibleArrheniusReaction
-    C7H16 + HO2 = C7H15-1 + H2O2
-    (8e+09 0 9711.59)
-reversibleArrheniusReaction
-    C7H16 + HO2 = C7H15-2 + H2O2
-    (1e+10 0 8529.09)
-reversibleArrheniusReaction
-    C7H16 + CH3 = C7H15-1 + CH4
-    (1.3e+09 0 5837.02)
-reversibleArrheniusReaction
-    C7H16 + CH3 = C7H15-2 + CH4
-    (8e+08 0 4780.32)
-reversibleArrheniusReaction
-    C7H16 = C7H15-1 + H
-    (3.972e+19 -0.95 51929.3)
-reversibleArrheniusReaction
-    C7H16 = C7H15-2 + H
-    (1.248e+21 -1.34 50671.4)
-reversibleArrheniusReaction
-    C7H16 = C4H9 + C3H7
-    (2e+16 0 40612.6)
-reversibleArrheniusReaction
-    C7H15-1 + O2 = C7H15O2
-    (2e+09 0 0)
-reversibleArrheniusReaction
-    C7H15-2 + O2 = C7H15O2
-    (2e+09 0 0)
-reversibleArrheniusReaction
-    C7H15O2 = C7H14O2H
-    (6e+11 0 10255)
-reversibleArrheniusReaction
-    C7H14O2H + O2 = C7H14O2HO2
-    (2.34e+08 0 0)
-reversibleArrheniusReaction
-    C7H14O2HO2 = C7KET21 + OH
-    (2.965e+13 0 13435.2)
-reversibleArrheniusReaction
-    C7KET21 = C5H11CO + CH2O + OH
-    (1e+16 0 21335.3)
-reversibleArrheniusReaction
-    C5H11CHO + O2 = C5H11CO + HO2
-    (2e+10 0.5 21234.7)
-reversibleArrheniusReaction
-    C5H11CHO + OH = C5H11CO + H2O
-    (1e+10 0 0)
-reversibleArrheniusReaction
-    C5H11CHO + H = C5H11CO + H2
-    (4e+10 0 2113.4)
-reversibleArrheniusReaction
-    C5H11CHO + O = C5H11CO + OH
-    (5e+09 0 900.712)
-reversibleArrheniusReaction
-    C5H11CHO + HO2 = C5H11CO + H2O2
-    (2.8e+09 0 6843.4)
-reversibleArrheniusReaction
-    C5H11CHO + CH3 = C5H11CO + CH4
-    (1.7e+09 0 4246.93)
-reversibleArrheniusReaction
-    C5H11CHO + CH3O2 = C5H11CO + CH4O2
-    (1e+09 0 4780.32)
-reversibleArrheniusReaction
-    C5H11CO = C5H11 + CO
-    (1e+11 0 4830.64)
-reversibleArrheniusReaction
-    C5H11 = C2H5 + C3H6
-    (3.2e+13 0 14240.3)
-reversibleArrheniusReaction
-    C7H15-1 = C2H4 + C5H11
-    (2.5e+13 0 14496.9)
-reversibleArrheniusReaction
-    C7H15-2 = CH3 + C6H12
-    (3e+13 0 14995.1)
-reversibleArrheniusReaction
-    C6H12 = C3H7 + C3H5
-    (1e+16 0 34217)
-reversibleArrheniusReaction
-    C7H15-2 = C4H9 + C3H6
-    (1.2e+13 0 14894.5)
-reversibleArrheniusReaction
-    C7H15-1 = C7H15-2
-    (2e+11 0 9107.76)
-reversibleArrheniusReaction
-    C4H9 = C3H6 + CH3
-    (2.232e+17 -1.4 15513.4)
-reversibleArrheniusReaction
-    C4H9 = C2H5 + C2H4
-    (2.5e+13 0 14496.9)
-reversibleArrheniusReaction
-    C3H7 = C2H4 + CH3
-    (9.6e+13 0 15573.8)
-reversibleArrheniusReaction
-    C3H7 = C3H6 + H
-    (1.25e+14 0 18567.8)
-reversibleArrheniusReaction
-    C3H7 + O2 = C3H6 + HO2
-    (1e+09 0 2505.89)
-reversibleArrheniusReaction
-    C3H6 = C2H3 + CH3
-    (6.15e+15 0 43022.9)
-reversibleArrheniusReaction
-    C3H6 + H = C3H5 + H2
-    (5e+09 0 754.787)
-reversibleArrheniusReaction
-    C3H6 + CH3 = C3H5 + CH4
-    (9e+09 0 4267.06)
-reversibleArrheniusReaction
-    C3H6 + O2 = C3H5 + HO2
-    (4e+09 0 20077.3)
-reversibleArrheniusReaction
-    C3H6 + OH = CH3CHO + CH3
-    (3.5e+08 0 0)
-reversibleArrheniusReaction
-    C3H5 = C3H4 + H
-    (4e+13 0 35102.6)
-reversibleArrheniusReaction
-    C3H5 + H = C3H4 + H2
-    (1e+10 0 0)
-reversibleArrheniusReaction
-    C3H5 + O2 = C3H4 + HO2
-    (6e+08 0 5031.91)
-reversibleArrheniusReaction
-    C3H4 + OH = C2H3 + CH2O
-    (1e+09 0 0)
-reversibleArrheniusReaction
-    C3H4 + OH = C2H4 + HCO
-    (1e+09 0 0)
-reversibleArrheniusReaction
-    C3H4 + O2 = C3H3 + HO2
-    (4e+10 0 19705)
-reversibleArrheniusReaction
-    C2H5 + O = CH3CHO + H
-    (5.3e+10 0 0)
-reversibleArrheniusReaction
-    C2H4 + HO2 = CH3CHO + OH
-    (2.2e+10 0 8654.89)
-reversibleArrheniusReaction
-    C2H4 + CH3O = CH3CHO + CH3
-    (3e+10 0 7296.27)
-reversibleArrheniusReaction
-    C2H4 + CH3O2 = CH3CHO + CH3O
-    (7e+10 0 7296.27)
-reversibleArrheniusReaction
-    CH3CHO = CH3 + HCO
-    (7.08e+15 0 41140.9)
-reversiblethirdBodyArrheniusReaction
-    CH3CO = CH3 + CO
-    ((1.8e+13 0 7245.95) (1))
-reversibleArrheniusReaction
-    CH3CHO + O2 = CH3CO + HO2
-    (2e+10 0.5 21234.7)
-reversibleArrheniusReaction
-    CH3CHO + H = CH3CO + H2
-    (4.1e+10 0 2113.4)
-reversibleArrheniusReaction
-    CH3CHO + OH = CH3CO + H2O
-    (1e+10 0 0)
-reversibleArrheniusReaction
-    CH3CHO + O = CH3CO + OH
-    (5.8e+09 0 900.712)
-reversibleArrheniusReaction
-    CH3CHO + CH3 = CH3CO + CH4
-    (1.7e+09 0 4246.93)
-reversibleArrheniusReaction
-    CH3CHO + CH2 = CH3CO + CH3
-    (1.66e+09 0 1766.2)
-reversibleArrheniusReaction
-    CH3CHO + HO2 = CH3CO + H2O2
-    (1.7e+09 0 5384.15)
-reversibleArrheniusReaction
-    CH3CHO + CH3O2 = CH3CO + CH4O2
-    (1.15e+08 0 5031.91)
-reversibleArrheniusReaction
-    CH3CO + O = CH3 + CO2
-    (1e+10 0 0)
-reversibleArrheniusReaction
-    CH3CO + H = CH3 + HCO
-    (1e+11 0 0)
-reversibleArrheniusReaction
-    CH3CO + OH = CH3 + CO + OH
-    (3e+10 0 0)
-reversibleArrheniusReaction
-    CH3CO + HO2 = CH3 + CO2 + OH
-    (3e+10 0 0)
-reversibleArrheniusReaction
-    CH3CO + CH3 = C2H6 + CO
-    (5e+10 0 0)
-reversibleArrheniusReaction
-    CH3O + CO = CH3 + CO2
-    (1.57e+11 0 5937.66)
-reversibleArrheniusReaction
-    CH3O + H = CH2O + H2
-    (2e+10 0 0)
-reversibleArrheniusReaction
-    CH3O + OH = CH2O + H2O
-    (1e+10 0 0)
-reversibleArrheniusReaction
-    CH3O + O = CH2O + OH
-    (1e+10 0 0)
-reversibleArrheniusReaction
-    CH3O + O2 = CH2O + HO2
-    (1.2e+08 0 1308.3)
-reversibleArrheniusLindemannFallOffReaction
-    CH3O = CH2O + H
-    ((2.344e+22 -2.7 15397.7) (2e+13 0 13797.5)  (1))
-reversibleArrheniusReaction
-    CH3 + HO2 = CH3O + OH
-    (4.3e+10 0 0)
-reversibleArrheniusReaction
-    CH3 + O2 = CH3O + O
-    (3.67e+10 0 15095.7)
-reversibleArrheniusReaction
-    CH3 + O2 = CH2O + OH
-    (4.8e+07 0 4528.72)
-reversibleArrheniusReaction
-    CH3 + O2 = CH3O2
-    (3.02e+56 -15 8656.9)
-reversibleArrheniusReaction
-    CH3O2 + HO2 = CH4O2 + O2
-    (4.63e+08 0 -1299.74)
-reversibleArrheniusReaction
-    CH3O2 + CH4 = CH4O2 + CH3
-    (1.81e+08 0 9298.97)
-reversibleArrheniusReaction
-    CH3O2 + CH3 = CH3O + CH3O
-    (2.41e+10 0 0)
-reversibleArrheniusReaction
-    CH3O2 + O = CH3O + O2
-    (3.61e+10 0 0)
-reversibleArrheniusReaction
-    CH3O2 + H = CH3O + OH
-    (9.64e+10 0 0)
-reversibleArrheniusReaction
-    CH3O2 + CH2O = CH4O2 + HCO
-    (1e+09 0 5869.73)
-reversibleArrheniusReaction
-    CH3O2 + C2H6 = CH4O2 + C2H5
-    (2.95e+08 0 7519.69)
-reversibleArrheniusReaction
-    CH3O2 + CH3O2 = CH3O + CH3O + O2
-    (2.8e+08 0 -392.489)
-reversibleArrheniusReaction
-    CH3O2 + H2O2 = CH4O2 + HO2
-    (2.4e+09 0 5031.91)
-reversibleArrheniusReaction
-    CH4O2 = CH3O + OH
-    (3e+16 0 21597)
-reversibleArrheniusReaction
-    CH3O2 + C2H4 = C2H3 + CH4O2
-    (7.1e+08 0 8609.6)
-reversibleArrheniusReaction
-    CH4O2 + OH = CH3O2 + H2O
-    (1e+10 0 -129.823)
-reversibleArrheniusReaction
-    CH4O2 + O = CH3O2 + OH
-    (2e+10 0 2390.16)
-reversibleArrheniusReaction
-    CH3 + O = CH2O + H
-    (8e+10 0 0)
-reversibleArrheniusReaction
-    CH3 + OH = CH2 + H2O
-    (7500 2 2515.96)
-reversibleArrheniusReaction
-    CH3 + OH = CH2O + H2
-    (4e+09 0 0)
-reversibleArrheniusReaction
-    CH3O + H = CH3 + OH
-    (1e+11 0 0)
-reversiblethirdBodyArrheniusReaction
-    CO + O = CO2
-    ((6.17e+08 0 1509.57) (1))
-reversibleArrheniusReaction
-    CO + OH = CO2 + H
-    (35100 1.3 -381.419)
-reversibleArrheniusReaction
-    CO + O2 = CO2 + O
-    (1.6e+10 0 20630.8)
-reversibleArrheniusReaction
-    HO2 + CO = CO2 + OH
-    (5.8e+10 0 11538.2)
-reversibleArrheniusReaction
-    H2 + O2 = OH + OH
-    (1.7e+10 0 24042.5)
-reversibleArrheniusReaction
-    H2 + OH = H2O + H
-    (1.17e+06 1.3 1824.57)
-reversibleArrheniusReaction
-    O + OH = O2 + H
-    (4e+11 -0.5 0)
-reversibleArrheniusReaction
-    O + H2 = OH + H
-    (50.6 2.67 3165.07)
-reversibleArrheniusReaction
-    H + HO2 = O + H2O
-    (3.1e+07 0 1806.46)
-reversiblethirdBodyArrheniusReaction
-    O + OH = HO2
-    ((1e+10 0 0) (1 N2 0.7 CO 2 CO2 5 H2 3.3 H2O 6))
-reversiblethirdBodyArrheniusReaction
-    H + O2 = HO2
-    ((2.8e+12 -0.86 0) (1 O2 0 N2 0 CO 0.75 CO2 1.5 H2O 0 C2H6 1.5))
-reversibleArrheniusReaction
-    H + O2 + O2 = HO2 + O2
-    (2.08e+13 -1.24 0)
-reversibleArrheniusReaction
-    H + O2 + H2O = HO2 + H2O
-    (1.126e+13 -0.76 0)
-reversibleArrheniusReaction
-    H + O2 + N2 = HO2 + N2
-    (2.6e+13 -1.24 0)
-reversibleArrheniusReaction
-    OH + HO2 = H2O + O2
-    (7.5e+09 0 0)
-reversibleArrheniusReaction
-    H + HO2 = OH + OH
-    (1.7e+11 0 440.292)
-reversibleArrheniusReaction
-    O + HO2 = O2 + OH
-    (1.4e+10 0 539.924)
-reversibleArrheniusReaction
-    OH + OH = O + H2O
-    (600000 1.3 0)
-reversiblethirdBodyArrheniusReaction
-    H + H = H2
-    ((1e+12 -1 0) (1 CO2 0 H2 0 H2O 0))
-reversibleArrheniusReaction
-    H + H + H2 = H2 + H2
-    (9.2e+10 -0.6 0)
-reversibleArrheniusReaction
-    H + H + H2O = H2 + H2O
-    (6e+13 -1.25 0)
-reversibleArrheniusReaction
-    H + H + CO2 = H2 + CO2
-    (5.49e+14 -2 0)
-reversiblethirdBodyArrheniusReaction
-    H + OH = H2O
-    ((1.6e+16 -2 0) (1))
-reversiblethirdBodyArrheniusReaction
-    H + O = OH
-    ((6.2e+10 -0.6 0) (1))
-reversiblethirdBodyArrheniusReaction
-    O + O = O2
-    ((1.89e+07 0 -899.706) (1))
-reversibleArrheniusReaction
-    H + HO2 = H2 + O2
-    (1.25e+10 0 0)
-reversibleArrheniusReaction
-    HO2 + HO2 = H2O2 + O2
-    (2e+09 0 0)
-reversibleArrheniusTroeFallOffReaction
-    OH + OH = H2O2
-    ((4.3e+12 -0.9 -855.425) (7.6e+10 -0.37 0) (0.7346 94 1756 5182) (1 N2 0.7 CO 1.5 CO2 2 H2 2 H2O 6 CH4 2 C2H6 3))
-reversibleArrheniusReaction
-    H2O2 + H = HO2 + H2
-    (1.6e+09 0 1912.13)
-reversibleArrheniusReaction
-    H2O2 + OH = H2O + HO2
-    (1e+10 0 905.744)
-reversibleArrheniusReaction
-    H2O2 + H = H2O + OH
-    (1e+10 0 1806.46)
-reversibleArrheniusReaction
-    H2O2 + O = H2O + O2
-    (8.4e+08 0 2143.59)
-reversibleArrheniusReaction
-    H2O2 + O = OH + HO2
-    (2e+10 0 2968.83)
-reversibleArrheniusReaction
-    H2 + HO2 = H2O + OH
-    (6.5e+08 0 9460)
-reversibleArrheniusReaction
-    CO2 + N = NO + CO
-    (1.9e+08 0 1710.85)
-reversibleArrheniusReaction
-    N2O + O = N2 + O2
-    (1.4e+09 0 5439.5)
-reversibleArrheniusReaction
-    N2O + O = NO + NO
-    (2.9e+10 0 11648.9)
-reversibleArrheniusReaction
-    N2O + H = N2 + OH
-    (4.4e+11 0 9500.25)
-reversibleArrheniusReaction
-    N2O + OH = N2 + HO2
-    (2e+09 0 10597.2)
-reversiblethirdBodyArrheniusReaction
-    N2O = N2 + O
-    ((1.3e+08 0 30000.3) (1))
-reversibleArrheniusReaction
-    N + NO = N2 + O
-    (3.27e+09 0.3 0)
-reversibleArrheniusReaction
-    N + O2 = NO + O
-    (6.4e+06 1 3160.04)
-reversibleArrheniusReaction
-    N + OH = NO + H
-    (7.333e+10 0 563.574)
-reversibleArrheniusReaction
-    CH2O + O2 = HCO + HO2
-    (6.2e+10 0 19624.5)
-reversibleArrheniusReaction
-    CH2O + O = HCO + OH
-    (4.1e+08 0.57 1388.81)
-reversibleArrheniusReaction
-    CH2O + H = HCO + H2
-    (219000 1.8 1509.57)
-reversibleArrheniusReaction
-    CH2O + OH = HCO + H2O
-    (2.43e+07 1.18 -224.926)
-reversibleArrheniusReaction
-    CH2O + HO2 = HCO + H2O2
-    (3e+09 0 4025.53)
-reversiblethirdBodyArrheniusReaction
-    CH2O = CO + H2
-    ((6.25e+12 0 34991.9) (1))
-reversiblethirdBodyArrheniusReaction
-    CH2O = HCO + H
-    ((3.3e+13 0 40758.5) (1))
-reversibleArrheniusReaction
-    HCO + HCO = CH2O + CO
-    (3.01e+10 0 0)
-reversibleArrheniusReaction
-    HCO + OH = H2O + CO
-    (1e+11 0 0)
-reversibleArrheniusReaction
-    HCO + H = H2 + CO
-    (1.19e+10 0.3 0)
-reversibleArrheniusReaction
-    HCO + O = OH + CO
-    (3e+10 0 0)
-reversibleArrheniusReaction
-    HCO + O = H + CO2
-    (3e+10 0 0)
-reversibleArrheniusReaction
-    HCO + O2 = HO2 + CO
-    (3.3e+10 -0.4 0)
-reversiblethirdBodyArrheniusReaction
-    HCO = H + CO
-    ((1.87e+14 -1 8554.25) (1))
-reversibleArrheniusReaction
-    HCO + HO2 = CO2 + OH + H
-    (3e+10 0 0)
-reversibleArrheniusReaction
-    CH4 + O2 = CH3 + HO2
-    (7.9e+10 0 28178.7)
-reversibleArrheniusReaction
-    CH4 + H = CH3 + H2
-    (660000 1.6 5454.59)
-reversibleArrheniusReaction
-    CH4 + OH = CH3 + H2O
-    (1600 2.1 1237.85)
-reversibleArrheniusReaction
-    CH4 + O = CH3 + OH
-    (1.02e+06 1.5 4329.46)
-reversibleArrheniusReaction
-    CH4 + HO2 = CH3 + H2O2
-    (1e+10 0 9409.68)
-reversibleArrheniusReaction
-    CH4 + CH2 = CH3 + CH3
-    (4e+09 0 -286.819)
-reversibleArrheniusReaction
-    CH3 + CH2O = CH4 + HCO
-    (5.5 2.8 3019.15)
-reversibleArrheniusReaction
-    CH3 + HCO = CH4 + CO
-    (1.2e+11 0 0)
-reversibleArrheniusReaction
-    CH3 + H = CH4
-    (1.9e+33 -7 4553.88)
-reversibleArrheniusReaction
-    CH3 + H = CH2 + H2
-    (9e+10 0 7598.19)
-reversibleArrheniusReaction
-    CH3 + CH3O = CH4 + CH2O
-    (3.3e+11 0 0)
-reversibleArrheniusTroeFallOffReaction
-    CH3 + CH3 = C2H6
-    ((1.77e+44 -9.67 3129.85) (2.12e+13 -0.97 311.979) (0.5325 151 1038 4970) (1 N2 0.7 CO 1.5 CO2 2 H2 2 H2O 6 CH4 2 C2H6 3))
-reversibleArrheniusReaction
-    CH3 + CH3 = C2H5 + H
-    (4.99e+09 0.1 5333.83)
-reversibleArrheniusReaction
-    CH2 + OH = CH2O + H
-    (2.5e+10 0 0)
-reversibleArrheniusReaction
-    CH2 + O2 = HCO + OH
-    (4.3e+07 0 -251.596)
-reversibleArrheniusReaction
-    CH2 + O2 = CO2 + H2
-    (6.9e+08 0 251.596)
-reversibleArrheniusReaction
-    CH2 + O2 = CO + H2O
-    (2e+07 0 -503.191)
-reversibleArrheniusReaction
-    CH2 + O2 = CH2O + O
-    (5e+10 0 4528.72)
-reversibleArrheniusReaction
-    CH2 + O2 = CO2 + H + H
-    (1.6e+09 0 503.191)
-reversibleArrheniusReaction
-    CH2 + O2 = CO + OH + H
-    (8.6e+07 0 -251.596)
-reversibleArrheniusReaction
-    CH2 + CH2 = C2H2 + H2
-    (1.2e+10 0 402.553)
-reversibleArrheniusReaction
-    CH2 + CH2 = C2H2 + H + H
-    (1.2e+11 0 402.553)
-reversibleArrheniusReaction
-    CH2 + CO2 = CH2O + CO
-    (1e+08 0 503.191)
-reversibleArrheniusReaction
-    CH3 + HCO = CH2O + CH2
-    (3e+10 0 0)
-reversibleArrheniusReaction
-    CH3 + C2H4 = CH4 + C2H3
-    (0.00662 3.7 4771.26)
-reversibleArrheniusReaction
-    CH3 + CH3 = C2H4 + H2
-    (1e+12 0 15598.9)
-reversibleArrheniusReaction
-    CH3 + CH2 = C2H4 + H
-    (3e+10 0 -286.819)
-reversibleArrheniusReaction
-    C2H4 + H = C2H3 + H2
-    (1.1e+11 0 4277.13)
-reversibleArrheniusReaction
-    C2H4 + O = CH3 + HCO
-    (1.6e+06 1.2 375.381)
-reversibleArrheniusReaction
-    C2H4 + O = CH2O + CH2
-    (30 1.88 90.5744)
-reversibleArrheniusReaction
-    C2H4 + O = C2H3 + OH
-    (15100 1.91 1907.09)
-reversibleArrheniusReaction
-    C2H4 + OH = CH2O + CH3
-    (6e+10 0 483.064)
-reversibleArrheniusReaction
-    C2H4 + HO2 = C2H3 + H2O2
-    (7.1e+08 0 8609.6)
-reversibleArrheniusReaction
-    C2H4 + OH = C2H3 + H2O
-    (6.02e+10 0 2996.5)
-reversiblethirdBodyArrheniusReaction
-    C2H4 = C2H2 + H2
-    ((1.5e+12 0 28078.1) (1))
-reversiblethirdBodyArrheniusReaction
-    C2H4 = C2H3 + H
-    ((2.6e+14 0 48593.2) (1))
-reversibleArrheniusReaction
-    C2H4 + H = C2H5
-    (2.6e+40 -9.25 26457.8)
-reversibleArrheniusReaction
-    C2H6 + O2 = C2H5 + HO2
-    (1e+10 0 24636.2)
-reversibleArrheniusReaction
-    C2H5 + O2 = C2H4 + HO2
-    (2e+07 0 -1107.02)
-reversibleArrheniusReaction
-    C2H4 + O2 = C2H3 + HO2
-    (4.2e+11 0 28978.8)
-reversibleArrheniusReaction
-    C2H4 + C2H4 = C2H5 + C2H3
-    (5e+11 0 32556.5)
-reversibleArrheniusReaction
-    C2H5 + HO2 = C2H4 + H2O2
-    (3e+08 0 0)
-reversibleArrheniusReaction
-    C2H2 + O2 = HCO + HCO
-    (4e+09 0 14089.4)
-reversibleArrheniusReaction
-    C2H2 + O = CH2 + CO
-    (10200 2 956.063)
-reversiblethirdBodyArrheniusReaction
-    C2H2 + H = C2H3
-    ((5.54e+06 0 1212.69) (1))
-reversibleArrheniusReaction
-    C2H3 + H = C2H2 + H2
-    (4e+10 0 0)
-reversibleArrheniusReaction
-    C2H3 + O2 = CH2O + HCO
-    (4e+09 0 -125.798)
-reversibleArrheniusReaction
-    C2H3 + OH = C2H2 + H2O
-    (3e+10 0 0)
-reversibleArrheniusReaction
-    C2H3 + CH2 = C2H2 + CH3
-    (3e+10 0 0)
-reversibleArrheniusReaction
-    C2H3 + HCO = C2H4 + CO
-    (6.034e+10 0 0)
-reversibleArrheniusReaction
-    C2H3 + C2H3 = C2H2 + C2H4
-    (1.45e+10 0 0)
-reversibleArrheniusReaction
-    C2H3 + O = C2H2 + OH
-    (1e+10 0 0)
-reversibleArrheniusReaction
-    C2H2 + OH = CH3 + CO
-    (4.83e-07 4 -1006.38)
-reversibleArrheniusReaction
-    C2H2 + CH2 = C3H3 + H
-    (1.2e+10 0 3331.13)
-reversibleArrheniusReaction
-    C3H3 + OH = C3H2 + H2O
-    (1e+10 0 0)
-reversibleArrheniusReaction
-    C3H3 + O = CH2O + C2H
-    (1e+10 0 0)
-reversibleArrheniusReaction
-    C2H3 = C2H2 + H
-    (4.6e+40 -8.8 23247.4)
-reversibleArrheniusReaction
-    C2H2 = C2H + H
-    (2.373e+32 -5.28 65761.1)
-reversibleArrheniusReaction
-    C2H + O2 = HCO + CO
-    (5e+10 0 754.787)
-reversibleArrheniusReaction
-    C2H + H2 = H + C2H2
-    (490 2.5 281.787)
-reversibleArrheniusReaction
-    C2H2 + O = C2H + OH
-    (4.6e+16 -1.41 14567.4)
-reversibleArrheniusReaction
-    C2H2 + OH = C2H + H2O
-    (33700 2 7044.68)
-reversibleArrheniusReaction
-    C2H2 + C2H = C4H2 + H
-    (9.6e+10 0 0)
-reversibleArrheniusReaction
-    C3H4 + O = C2H3 + HCO
-    (3.2e+09 0 1011.41)
-reversibleArrheniusReaction
-    C3H4 + O = C2H4 + CO
-    (3.2e+09 0 1011.41)
-reversibleArrheniusReaction
-    C3H4 + O = HCCO + CH3
-    (6.3e+09 0 1011.41)
-reversibleArrheniusReaction
-    C4H + H2 = H + C4H2
-    (490 2.5 281.787)
-reversibleArrheniusReaction
-    C4H2 + OH = C4H + H2O
-    (33700 2 7044.68)
-reversibleArrheniusReaction
-    C4H2 + O = C3H2 + CO
-    (2.7e+10 0 865.489)
-reversibleArrheniusReaction
-    C3H2 + O = C2H2 + CO
-    (6.8e+10 0 0)
-reversibleArrheniusReaction
-    C3H2 + OH = HCO + C2H2
-    (6.8e+10 0 0)
-reversibleArrheniusReaction
-    C2H2 + C2H = C4H3
-    (4.5e+34 -7.68 3572.66)
-reversibleArrheniusReaction
-    C3H2 + CH2 = C4H3 + H
-    (5e+10 0 0)
-reversibleArrheniusReaction
-    C4H2 + H = C4H3
-    (1.1e+39 -8.72 7698.83)
-reversibleArrheniusReaction
-    C4H3 + H = C2H2 + C2H2
-    (6.3e+22 -3.34 5038.96)
-reversibleArrheniusReaction
-    C4H3 + H = C4H2 + H2
-    (1.5e+10 0 0)
-reversibleArrheniusReaction
-    C4H3 + OH = C4H2 + H2O
-    (2.5e+09 0 0)
-reversibleArrheniusReaction
-    C2H2 + HCCO = C3H3 + CO
-    (1e+08 0 1509.57)
-reversibleArrheniusReaction
-    C3H2 + O2 = HCCO + CO + H
-    (5e+10 0 0)
-reversibleArrheniusReaction
-    HCCO + O = H + CO + CO
-    (1e+11 0 0)
-reversibleArrheniusReaction
-    HCCO + O2 = OH + 2CO
-    (3.2e+09 0 429.725)
-reversibleArrheniusReaction
-    HCCO + CH2 = C2H3 + CO
-    (3e+10 0 0)
-reversibleArrheniusReaction
-    HCCO + HCCO = C2H2 + CO + CO
-    (1e+10 0 0)
-reversibleArrheniusReaction
-    C2H + OH = H + HCCO
-    (2e+10 0 0)
-reversibleArrheniusTroeFallOffReaction
-    CH2 + CO = CH2CO
-    ((2.69e+27 -5.11 3570.14) (8.1e+08 0.5 2269.39) (0.5907 275 1226 5185) (1 N2 0.7 CO 1.5 CO2 2 H2 2 H2O 6 CH4 2 C2H6 3))
-reversibleArrheniusReaction
-    C2H2 + OH = CH2CO + H
-    (2.18e-07 4.5 -503.191)
-reversibleArrheniusReaction
-    CH2CO + H = HCCO + H2
-    (5e+10 0 4025.53)
-reversibleArrheniusReaction
-    CH2CO + H = CH3 + CO
-    (1.13e+10 0 1724.94)
-reversibleArrheniusReaction
-    CH2CO + O = HCCO + OH
-    (5e+10 0 4025.53)
-reversibleArrheniusReaction
-    CH2CO + O = CH2 + CO2
-    (1.75e+09 0 679.308)
-reversibleArrheniusReaction
-    CH2CO + OH = HCCO + H2O
-    (7.5e+09 0 1006.38)
-reversibleArrheniusReaction
-    C2H3 + O = CH2CO + H
-    (3e+10 0 0)
-reversibleArrheniusReaction
-    C3H3 + O2 = CH2CO + HCO
-    (3e+07 0 1448.18)
-reversibleArrheniusReaction
-    C4H3 + O2 = HCCO + CH2CO
-    (7.86e+13 -1.8 0)
-reversibleArrheniusReaction
-    O + CH2OH = OH + CH2O
-    (1e+10 0 0)
-reversibleArrheniusTroeFallOffReaction
-    H + CH2O = CH2OH
-    ((1.27e+26 -4.82 3285.84) (5.4e+08 0.454 1811.49) (0.7187 103 1291 4160) (1 N2 0.7 CO 1.5 CO2 2 H2 2 H2O 6 CH4 2 C2H6 3))
-reversibleArrheniusReaction
-    H + CH2OH = H2 + CH2O
-    (2e+10 0 0)
-reversibleArrheniusReaction
-    H + CH2OH = OH + CH3
-    (1.65e+08 0.65 -142.906)
-reversibleArrheniusReaction
-    H + CH3O = H + CH2OH
-    (41500 1.63 968.14)
-reversibleArrheniusReaction
-    C2H3 + O2 = O + CH2CHO
-    (3.03e+08 0.29 5.5351)
-reversibleArrheniusReaction
-    C2H3 + O2 = HO2 + C2H2
-    (1337 1.61 -193.225)
-reversibleArrheniusReaction
-    O + CH3CHO = OH + CH2CHO
-    (2.92e+09 0 909.77)
-irreversibleArrheniusReaction
-    O + CH3CHO = OH + CH3 + CO
-    (2.92e+09 0 909.77)
-irreversibleArrheniusReaction
-    O2 + CH3CHO = HO2 + CH3 + CO
-    (3.01e+10 0 19699.9)
-reversibleArrheniusReaction
-    H + CH3CHO = CH2CHO + H2
-    (2.05e+06 1.16 1210.17)
-irreversibleArrheniusReaction
-    H + CH3CHO = CH3 + H2 + CO
-    (2.05e+06 1.16 1210.17)
-irreversibleArrheniusReaction
-    OH + CH3CHO = CH3 + H2O + CO
-    (2.343e+07 0.73 -560.052)
-irreversibleArrheniusReaction
-    HO2 + CH3CHO = CH3 + H2O2 + CO
-    (3.01e+09 0 5999.55)
-irreversibleArrheniusReaction
-    CH3 + CH3CHO = CH3 + CH4 + CO
-    (2720 1.77 2978.89)
-reversibleArrheniusTroeFallOffReaction
-    H + CH2CO = CH2CHO
-    ((1.012e+36 -7.63 1939.3) (4.865e+08 0.422 -883.101) (0.465 201 1773 5333) (1 N2 0.7 CO 1.5 CO2 2 H2 2 H2O 6 CH4 2 C2H6 3))
-irreversibleArrheniusReaction
-    O + CH2CHO = H + CH2 + CO2
-    (1.5e+11 0 0)
-irreversibleArrheniusReaction
-    O2 + CH2CHO = OH + CO + CH2O
-    (1.81e+07 0 0)
-irreversibleArrheniusReaction
-    O2 + CH2CHO = OH + 2HCO
-    (2.35e+07 0 0)
-reversibleArrheniusReaction
-    H + CH2CHO = CH3 + HCO
-    (2.2e+10 0 0)
-reversibleArrheniusReaction
-    H + CH2CHO = CH2CO + H2
-    (1.1e+10 0 0)
-reversibleArrheniusReaction
-    OH + CH2CHO = H2O + CH2CO
-    (1.2e+10 0 0)
-reversibleArrheniusReaction
-    OH + CH2CHO = HCO + CH2OH
-    (3.01e+10 0 0)
-reversibleArrheniusTroeFallOffReaction
-    C3H8 = C2H5 + CH3
-    ((2.237e+24 -2.88 33939.2) (9.9e+22 -1.6 42483.9) (1 1e-15 1500 1e+15) (1 N2 0.7 CO 1.5 CO2 2 H2 2 H2O 6 CH4 2 C2H6 3 C3H8 4))
-reversibleArrheniusReaction
-    O + C3H8 = OH + C3H7
-    (193 2.68 1869.86)
-reversibleArrheniusReaction
-    H + C3H8 = C3H7 + H2
-    (1020 2.34 3399.56)
-reversibleArrheniusReaction
-    OH + C3H8 = C3H7 + H2O
-    (31600 1.8 469.981)
-reversibleArrheniusReaction
-    C3H7 + H2O2 = HO2 + C3H8
-    (0.378 2.72 754.787)
-reversibleArrheniusReaction
-    CH3 + C3H8 = C3H7 + CH4
-    (0.000903 3.65 3599.83)
-reversibleArrheniusReaction
-    C3H8 + C2H5 = C3H7 + C2H6
-    (0.0009 3.65 4599.17)
-reversibleArrheniusReaction
-    C3H8 + C2H3 = C3H7 + C2H4
-    (0.6 3.3 5284.51)
-reversibleArrheniusTroeFallOffReaction
-    CH3 + C2H4 = C3H7
-    ((3e+57 -14.6 9142.98) (2550 1.6 2868.19) (0.1894 277 8748 7891) (1 N2 0.7 CO 1.5 CO2 2 H2 2 H2O 6 CH4 2 C2H6 3 C3H8 4))
-reversibleArrheniusReaction
-    O + C3H7 = C2H5 + CH2O
-    (9.64e+10 0 0)
-reversibleArrheniusTroeFallOffReaction
-    H + C3H7 = C3H8
-    ((4.42e+55 -13.545 5714.74) (3.613e+10 0 0) (0.315 369 3285 6667) (1 N2 0.7 CO 1.5 CO2 2 H2 2 H2O 6 CH4 2 C2H6 3))
-reversibleArrheniusReaction
-    H + C3H7 = CH3 + C2H5
-    (4060 2.19 447.84)
-reversibleArrheniusReaction
-    CH2 + C3H8 = CH3 + C3H7
-    (0.0015 3.46 3758.84)
-reversibleArrheniusReaction
-    OH + C3H7 = C2H5 + CH2OH
-    (2.41e+10 0 0)
-reversibleArrheniusReaction
-    HO2 + C3H7 = O2 + C3H8
-    (2.55e+07 0.255 -474.509)
-irreversibleArrheniusReaction
-    HO2 + C3H7 = OH + C2H5 + CH2O
-    (2.41e+10 0 0)
-reversibleArrheniusReaction
-    CH3 + C3H7 = 2C2H5
-    (1.927e+10 -0.32 0)
-reversibleArrheniusReaction
-    C3H7 + CH3 = CH4 + C3H6
-    (1.1e+10 0 0)
-reversibleArrheniusReaction
-    C3H6 + C2H5 = C3H5 + C2H6
-    (0.00223 3.5 3341.19)
-reversibleArrheniusReaction
-    C3H6 + O = CH3 + CH3CO
-    (68 2.56 -568.606)
-)
-
diff --git a/applications/test/readCHEMKINIII/readCHEMKINIII.C b/applications/test/readCHEMKINIII/readCHEMKINIII.C
deleted file mode 100644
index 70872ff32..000000000
--- a/applications/test/readCHEMKINIII/readCHEMKINIII.C
+++ /dev/null
@@ -1,100 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "chemkinReader.H"
-#include "argList.H"
-#include "IFstream.H"
-#include "OFstream.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    argList::validArgs.clear();
-    argList::validArgs.append("CHEMKINIIIFile");
-    argList::validOptions.insert("thermo", "fileName");
-    argList args(argc, argv);
-
-    fileName thermoFileName = fileName::null;
-    if (args.options().found("thermo"))
-    {
-        thermoFileName = args.options()["thermo"];
-    }
-
-    fileName CHEMKINFileName(args.additionalArgs()[0]);
-
-    chemkinReader ck(CHEMKINFileName, thermoFileName);
-
-    //Info<< ck.isotopeAtomicWts() << endl;
-    //Info<< ck.specieNames() << endl;
-    //Info<< ck.speciePhase() << endl;
-    //Info<< ck.specieThermo() << endl;
-    //Info<< ck.reactions() << endl;
-
-    PtrList<chemkinReader::reaction> reactions = ck.reactions();
-
-    {
-        OFstream reactionStream("reactions");
-        reactionStream<< reactions << endl;
-    }
-
-    {
-        IFstream reactionStream("reactions");
-
-        label nReactions(readLabel(reactionStream));
-        reactionStream.readBeginList(args.executable().c_str());
-
-        PtrList<chemkinReader::reaction> testReactions(nReactions);
-
-        forAll (testReactions, i)
-        {
-            testReactions.set
-            (
-                i,
-                chemkinReader::reaction::New
-                (
-                    ck.species(),
-                    ck.sThermo(),
-                    reactionStream
-                )
-            );
-        }
-
-        reactionStream.readEndList(args.executable().c_str());
-
-        Info<< testReactions << endl;
-    }
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/router/Gather/Gather.C b/applications/test/router/Gather/Gather.C
deleted file mode 100644
index d415889c0..000000000
--- a/applications/test/router/Gather/Gather.C
+++ /dev/null
@@ -1,124 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "Gather.H"
-#include "IPstream.H"
-#include "OPstream.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-// Construct from component
-template <class T0>
-Gather<T0>::Gather(const T0& localData, const bool redistribute)
-:
-    List<T0>(0),
-    nProcs_(max(1, Pstream::nProcs()))
-{
-    this->setSize(nProcs_);
-
-    //
-    // Collect sizes on all processor
-    //
-
-    if (Pstream::parRun())
-    {
-        if (Pstream::master())
-        {
-            this->operator[](0) = localData;
-
-            // Receive data
-            for
-            (
-                int slave=Pstream::firstSlave(), procIndex = 1;
-                slave<=Pstream::lastSlave();
-                slave++, procIndex++
-            )
-            {
-                IPstream fromSlave(slave);
-                fromSlave >> this->operator[](procIndex);
-            }
-            // Send data
-            for
-            (
-                int slave=Pstream::firstSlave(), procIndex = 1;
-                slave<=Pstream::lastSlave();
-                slave++, procIndex++
-            )
-            {
-                OPstream toSlave(slave);
-
-                if (redistribute)
-                {
-                    toSlave << *this;
-                }
-                else
-                {
-                    // Dummy send just to balance sends/receives
-                    toSlave << 0;
-                }
-            }
-        }
-        else
-        {
-            // Slave: send my local data to master
-            {
-                OPstream toMaster(Pstream::masterNo());
-                toMaster << localData;
-            }
-            // Receive data from master
-            {
-                IPstream fromMaster(Pstream::masterNo());
-                if (redistribute)
-                {
-                    fromMaster >> *this;
-                }
-                else
-                {
-                    label dummy;
-                    fromMaster >> dummy;
-                }
-            }
-        }
-    }
-    else
-    {
-        this->operator[](0) = localData;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/applications/test/router/Gather/GatherBase.C b/applications/test/router/Gather/GatherBase.C
deleted file mode 100644
index c8a154e76..000000000
--- a/applications/test/router/Gather/GatherBase.C
+++ /dev/null
@@ -1,121 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "GatherBase.H"
-#include "IPstream.H"
-#include "OPstream.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template <class Type>
-Type GatherBase::flatten(const List<Type> lst)
-{
-    label sum = 0;
-
-    forAll(lst, lstI)
-    {
-        sum += lst[lstI].size();
-    }
-
-    Type result(sum);
-
-    label index = 0;
-
-    forAll(lst, lstI)
-    {
-        const Type& sub = lst[lstI];
-
-        forAll(sub, subI)
-        {
-            result[index++] = sub[subI];
-        }
-    }
-
-    return result;
-}
-
-
-template <class DataType, class IndexType, class AddOp>
-IndexType GatherBase::offset
-(
-    const List<DataType>& values,
-    const List<IndexType>& indices,
-    AddOp aop
-)
-{
-    if (values.size() != indices.size())
-    {
-        FatalErrorIn
-        (
-            "GatherBase::offset(const List<DataType>&, "
-            "const List<IndexType>&, AddOp)"
-        )   << "Input data and indices lists not equal size." << endl
-            << "data size:" << values.size()
-            << "  indices:" << indices.size()
-            << abort(FatalError);
-    }
-    
-
-    label sum = 0;
-
-    forAll(indices, lstI)
-    {
-        sum += indices[lstI].size();
-    }
-
-    IndexType result(sum);
-
-    label index = 0;
-
-    label offset = 0;
-
-    forAll(indices, lstI)
-    {
-        const IndexType& sub = indices[lstI];
-
-        forAll(sub, subI)
-        {
-            result[index++] = aop(sub[subI], offset);
-        }
-        offset += values[lstI].size();
-    }
-
-    return result;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/applications/test/router/Make/files b/applications/test/router/Make/files
deleted file mode 100644
index 8a484c171..000000000
--- a/applications/test/router/Make/files
+++ /dev/null
@@ -1,4 +0,0 @@
-router.C
-processorRouter.C
-
-EXE = $(FOAM_USER_APPBIN)/processorRouter
diff --git a/applications/test/router/Make/options b/applications/test/router/Make/options
deleted file mode 100644
index e43fc5035..000000000
--- a/applications/test/router/Make/options
+++ /dev/null
@@ -1,6 +0,0 @@
-EXE_INC = \
-    -IGather \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = \
-    -lfiniteVolume
diff --git a/applications/test/router/processorRouter.C b/applications/test/router/processorRouter.C
deleted file mode 100644
index 63c393f98..000000000
--- a/applications/test/router/processorRouter.C
+++ /dev/null
@@ -1,254 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "label.H"
-#include "labelList.H"
-#include "OStringStream.H"
-#include "IStringStream.H"
-#include "OFstream.H"
-#include "IFstream.H"
-#include "point.H"
-#include "Time.H"
-#include "fvMesh.H"
-#include "router.H"
-#include "processorPolyPatch.H"
-#include "typeInfo.H"
-#include "Gather.H"
-
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Get list of my processor neighbours
-labelList procNeighbours(const polyMesh& mesh)
-{
-    word procLabel = '[' + word(name(Pstream::myProcNo())) + "]-";
-
-    label nNeighbours = 0;
-
-    forAll (mesh.boundaryMesh(), patchI)
-    {
-        if (typeid(mesh.boundaryMesh()[patchI]) == typeid(processorPolyPatch))
-        {
-            nNeighbours++;
-        }
-    }
-
-    labelList neighbours(nNeighbours);
-
-    nNeighbours = 0;
-
-    forAll (mesh.boundaryMesh(), patchI)
-    {
-        if (typeid(mesh.boundaryMesh()[patchI]) == typeid(processorPolyPatch))
-        {
-            const polyPatch& patch = mesh.boundaryMesh()[patchI];
-
-            const processorPolyPatch& procPatch = 
-                refCast<const processorPolyPatch>(patch);
-
-            label procId = procPatch.neighbProcNo() - Pstream::firstSlave() + 1;
-
-            neighbours[nNeighbours++] = procId;
-        }
-    }
-
-    return neighbours;
-}
-
-
-// Calculate some average position for mesh.
-point meshCentre(const polyMesh& mesh)
-{
-    return average(mesh.points());
-}
-
-
-// Main program:
-
-
-int main(int argc, char *argv[])
-{
-#   include "setRootCase.H"    
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    word procLabel = '[' + word(name(Pstream::myProcNo())) + "]-";
-
-    if (!Pstream::parRun())
-    {
-        FatalErrorIn(args.executable())
-            << "Please run in parallel" << exit(FatalError);
-    }
-
-    // 'Gather' processor-processor topology
-    Gather<labelList> connections
-    (
-        static_cast<const labelList&>(procNeighbours(mesh))
-    );
-
-    // Collect centres of individual meshes (for visualization only)
-    Gather<point> meshCentres(meshCentre(mesh));
-
-    if (!Pstream::master())
-    {
-        return 0;
-    }
-
-
-    //
-    // At this point we have the connections between processors and the
-    // processor-mesh centres.
-    //
-
-    Info<< "connections:" << connections << endl;
-    Info<< "meshCentres:" << meshCentres << endl;
-
-
-    //
-    // Dump connections and meshCentres to OBJ file
-    //
-
-    fileName fName("decomposition.obj");
-
-    Info<< "Writing decomposition to " << fName << endl;
-
-    OFstream objFile(fName);
-
-    // Write processors as single vertex in centre of mesh
-    forAll(meshCentres, procI)
-    {
-        const point& pt = meshCentres[procI];
-
-        objFile << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << endl;
-    }
-    // Write connections as lines between processors (duplicated)
-    forAll(connections, procI)
-    {
-        const labelList& nbs = connections[procI];
-
-        forAll(nbs, nbI)
-        {
-            objFile << "l " << procI + 1 << ' ' << nbs[nbI] + 1 << endl;
-        }
-    }
-
-
-    //
-    // Read paths to route from dictionary
-    //
-
-    IFstream dictFile("routerDict");
-
-    dictionary routeDict(dictFile);
-
-    labelListList paths(routeDict.lookup("paths"));
-
-
-
-    //
-    // Iterate over routing. Route as much as possible during each iteration
-    // and stop if all paths have been routed. No special ordering to maximize
-    // routing during one iteration.
-    //
-
-    boolList routeOk(paths.size(), false);
-    label nOk = 0;
-
-    label iter = 0;
-
-    while (nOk < paths.size())
-    {
-        Info<< "Iteration:" << iter << endl;
-        Info<< "---------------" << endl;
-
-
-        // Dump to OBJ file
-
-        fileName fName("route_" + name(iter) + ".obj");
-        Info<< "Writing route to " << fName << endl;
-
-        OFstream objFile(fName);
-
-        forAll(meshCentres, procI)
-        {
-            const point& pt = meshCentres[procI];
-
-            objFile << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z()
-                    << endl;
-        }
-
-
-        // Router
-        router cellRouter(connections, meshCentres);
-
-        // Try to route as many paths possible during this iteration.
-        forAll(paths, pathI)
-        {
-            if (!routeOk[pathI])
-            {
-                const labelList& path = paths[pathI];
-
-                Info<< "Trying to route path " << pathI
-                    << " nodes " << path << endl;
-
-                routeOk[pathI] = cellRouter.route(path, -(pathI + 1));
-
-                Info<< "Result of routing:" << routeOk[pathI] << endl;
-
-                if (routeOk[pathI])
-                {
-                    nOk++;
-
-                    // Dump route as lines.
-                    labelList route(cellRouter.getRoute(-(pathI + 1)));
-
-                    for(label elemI = 1; elemI < route.size(); elemI++)
-                    {
-                        objFile
-                            << "l " << route[elemI-1]+1 << ' '
-                            << route[elemI]+1 << endl;
-                    }
-                    Info<< "route:" << route << endl;
-                }
-            }
-        }
-        Info<< endl;
-
-        iter++;
-    }
-
-    Info<< "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/router/router.C b/applications/test/router/router.C
deleted file mode 100644
index 88f07acbe..000000000
--- a/applications/test/router/router.C
+++ /dev/null
@@ -1,406 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "router.H"
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-Foam::label Foam::router::count(const label weight) const
-{
-    label cnt = 0;
-
-    forAll(weights_, nodeI)
-    {
-        cnt += weights_[nodeI];
-    }
-    
-    return cnt;
-}
-
-
-// Given connections between nodes set minimum distance from nodeI
-void Foam::router::setWeights
-(
-    const label weight,
-    const label nodeI
-)
-{
-    // Set weight at current node
-    weights_[nodeI] = weight;
-
-    const labelList& myNeighbours = connections_[nodeI];
-
-    forAll(myNeighbours, neighbourI)
-    {
-        if (weights_[myNeighbours[neighbourI]] > weight + 1)
-        {
-            // Distribute weight+1 to neighbours
-            setWeights
-            (
-                weight+1,
-                myNeighbours[neighbourI]
-            );
-        }
-    }
-}
-
-
-// Mark shortest path from endNode to startNode by setting the weights
-// to 0.
-void Foam::router::fixWeights
-(
-    const label startNodeI,
-    const label endNodeI,
-
-    const label nodeI,
-    const label prevNodeI
-)
-{
-    // Mark this node
-    weights_[nodeI] = 0;
-
-    label minNodeI = -1;
-    label minDist = labelMax;
-    label nMinNodes = 0;
-
-    const labelList& myNeighbours = connections_[nodeI];
-
-    forAll(myNeighbours, neighbourI)
-    {
-        label nbrNodeI = myNeighbours[neighbourI];
-
-        if (nbrNodeI != prevNodeI)
-        {
-            if (weights_[nbrNodeI] == 0)
-            {
-                // Reached end
-                minDist = 0;
-                break;
-            }
-            else if (weights_[nbrNodeI] > 0)
-            {
-                if (weights_[nbrNodeI] < minDist)
-                {
-                    minDist = weights_[nbrNodeI];
-                    minNodeI = nbrNodeI;
-                    nMinNodes = 1;
-                }
-                else if (weights_[nbrNodeI] == minDist)
-                {
-                    nMinNodes++;
-                }
-            }
-        }
-    }
-
-    if (minDist == 0)
-    {
-        // Reached starting point.
-        return;
-    }
-
-    if (minNodeI == -1)
-    {
-        WarningIn
-        (
-            "Foam::router::fixWeights"
-            "(const label startNodeI, const label endNodeI,"
-            "const label nodeI, const label prevNodeI)"
-        )   << "Cannot route from node " << nodeI
-            << " since all neigbours of node "
-            << "already allocated:" << endl;
-
-        forAll(myNeighbours, neighbourI)
-        {
-            label nbrNodeI = myNeighbours[neighbourI];
-
-            WarningIn
-            (
-                "Foam::router::fixWeights"
-                "(const label startNodeI, const label endNodeI,"
-                "const label nodeI, const label prevNodeI)"
-            )   << "  neighbour:" << nbrNodeI
-                << "  weight:" << weights_[nbrNodeI] << endl;
-        }
-        return;
-    }
-
-
-    if (nMinNodes > 1)
-    {
-        // Multiple paths, all with same weight. Use some heuristic
-        // to choose one. Here: smallest angle to vector end-start
-        vector n(coords_[endNodeI] - coords_[startNodeI]);
-
-        scalar maxCosAngle = -GREAT;
-
-        forAll(myNeighbours, neighbourI)
-        {
-            label nbrNodeI = myNeighbours[neighbourI];
-
-            if (weights_[nbrNodeI] == minDist)
-            {
-                vector n2(coords_[nbrNodeI] - coords_[startNodeI]);
-
-                scalar magN2 = mag(n2);
-
-                if (magN2 > SMALL)
-                {
-                    n2 /= mag(n2);
-
-                    scalar cosAngle = n & n2;
-
-                    if (cosAngle > maxCosAngle)
-                    {
-                        maxCosAngle = cosAngle;
-                        minNodeI = nbrNodeI;
-                    }
-                }
-            }
-        }
-    }
-
-
-    // Recursively go mark the path at minNode
-    fixWeights
-    (
-        startNodeI,
-        endNodeI,
-        minNodeI,
-        nodeI
-    );
-}
-
-
-Foam::label Foam::router::getValue(const label pathValue) const
-{
-    forAll(weights_, nodeI)
-    {
-        if (weights_[nodeI] == pathValue)
-        {
-            return nodeI;
-        }
-    }
-    return -1;
-}
-
-
-// Find node which has no neighbours with pathValue
-Foam::label Foam::router::findEndNode
-(
-    const label startNodeI,
-    const label prevNodeI,
-    const label pathValue
-) const
-{
-    const labelList& myNeighbours = connections_[startNodeI];
-
-    forAll(myNeighbours, neighbourI)
-    {
-        label nodeI = myNeighbours[neighbourI];
-
-        if (nodeI != prevNodeI)
-        {
-            if (weights_[nodeI] == pathValue)
-            {
-                return findEndNode(nodeI, startNodeI, pathValue);
-            }
-        }
-    }
-
-    // No neighbours with pathValue found. Return this node
-    return startNodeI;
-}
-
-
-// Append all pathValue weights to route.
-void Foam::router::storeRoute
-(
-    const label startNodeI,
-    const label prevNodeI,
-    const label pathValue,
-    DynamicList<label>& route
-) const
-{
-    const labelList& myNeighbours = connections_[startNodeI];
-
-    forAll(myNeighbours, neighbourI)
-    {
-        label nodeI = myNeighbours[neighbourI];
-
-        if (nodeI != prevNodeI)
-        {
-            if (weights_[nodeI] == pathValue)
-            {
-                route.append(nodeI);
-
-                storeRoute
-                (
-                    nodeI,
-                    startNodeI,
-                    pathValue,
-                    route
-                );
-            }
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-// Construct from connections, route later
-Foam::router::router
-(
-    const labelListList& connections,
-    const List<point>& coords
-)
-:
-    connections_(connections),
-    coords_(coords),
-    weights_(coords.size(), 0)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-bool Foam::router::route(const labelList& path, const label pathValue)
-{
-    if (pathValue >= 0)
-    {
-        FatalErrorIn("router::route(const labelList&, const label)")
-            << "Illegal pathValue " << pathValue << exit(FatalError);
-    }
-
-    // Reset all non-allocated weights to maximum distance
-    forAll(weights_, nodeI)
-    {
-        if (weights_[nodeI] >= 0)
-        {
-            weights_[nodeI] = labelMax;
-        }
-    }
-
-    if (weights_[path[0]] < 0)
-    {
-        // Already used
-        return false;
-    }
-    // Get weights according to distance to starting node
-    setWeights(0, path[0]);
-
-    // Check if all endPoints can be reached
-    for(label leafI = 1; leafI < path.size(); leafI++)
-    {
-        if (weights_[path[leafI]] == labelMax)
-        {
-            //Info<< "Cannot route leaf from " << path[0]
-            //    << " to " << path[leafI] << " of path " << path
-            //    << " since there is no valid route between them" << endl;
-
-            // Do not fix any paths but return
-            return false;
-        }
-    }
-
-    // Search back from all endpoints to start and fix weights
-    for(label leafI = 1; leafI < path.size(); leafI++)
-    {
-        fixWeights
-        (
-            path[0],
-            path[leafI],
-            path[leafI],
-            -1
-        );
-
-        if (leafI < path.size() - 1)
-        {
-            // Update distance to take new connections into account
-            forAll(weights_, nodeI)
-            {
-                if (weights_[nodeI]== 0)
-                {
-                    // Include these nodes in distance calculation
-                    setWeights(0, nodeI);
-                }
-            }
-        }
-    }
-
-    // All nodes on the path will now have value 0.
-    // Mark these nodes with the (negative) pathvalue
-    forAll(weights_, nodeI)
-    {
-        if (weights_[nodeI] == 0)
-        {
-            weights_[nodeI] = pathValue;
-        }
-    }
-
-    // Reset unallocated weights to 0
-    forAll(weights_, nodeI)
-    {
-        if (weights_[nodeI] > 0)
-        {
-            weights_[nodeI] = 0;
-        }
-    }    
-
-    return true;
-}
-
-
-Foam::labelList Foam::router::getRoute(const label pathValue) const
-{
-    // Find a starting point
-    label pathNodeI = getValue(pathValue);
-
-    if (pathNodeI == -1)
-    {
-        FatalErrorIn("router::getRoute(const label)")
-            << "No route with value " << pathValue << endl;
-    }
-
-    // Find end or start by walking
-    label startNodeI = findEndNode(pathNodeI, -1, pathValue);
-
-    // Walk to other end and store
-
-    DynamicList<label> route(weights_.size());
-
-    route.append(startNodeI);
-
-    storeRoute(startNodeI, -1, pathValue, route);
-
-    route.shrink();
-
-    return route;
-}
-
-// ************************************************************************* //
diff --git a/applications/test/router/router.H b/applications/test/router/router.H
deleted file mode 100644
index f2dc89068..000000000
--- a/applications/test/router/router.H
+++ /dev/null
@@ -1,212 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
-    Foam::router
-
-Description
-    Lee's PCB routing algorithm. Construct with list of connections between
-    nodes (i.e. topology) and list of coordinates of nodes (can be vector::zero)
-
-    Use e.g.
-
-        // Enter topology/geometry
-        router cellRouter
-        (
-            mesh().cellCells(),
-            mesh().cellCentres()
-        );
-
-        // Try to route connections one by one. Specify unique value (<0) to
-        // mark path with.
-        forAll(wantedConnections, i)
-        {
-            bool success = cellRouter.route(wantedConnections[i], -(i+1));
-        }
-
-
-    The coordinates are only used at the moment for diagonal preference of
-    routing:
-
-    So not:
-
-    +A
-    |
-    |
-    |
-    |
-    ------+B
-        
-    But:
-
-    + A
-    |_
-      |_
-        |_
-          |_
-            |
-            + B
-
-
-    Lee algo: take array with same dimensions as grid of nodes. Initialize to
-    large number. Put 0 at starting point. Now recursively assign neighbours
-    as current value plus one. Stop if you hit node which has smaller number.
-    Phase two is where you search path with lowest value. These are assigned
-    negative number so they for next route are not overwritten.
-
-SourceFiles
-    router.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef router_H
-#define router_H
-
-#include "labelList.H"
-#include "pointField.H"
-#include "DynamicList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-
-/*---------------------------------------------------------------------------*\
-                           Class router Declaration
-\*---------------------------------------------------------------------------*/
-
-class router
-{
-    // Private data
-
-        //- Connections
-        const labelListList connections_;
-
-        //- Coordinates of nodes
-        const pointField coords_;
-
-        //- Routing table
-        labelList weights_;
-
-    // Private Member Functions
-
-        //- Return number of weights. Utility function
-        label count(const label weight) const;
-
-        //- Set distance from nodeI
-        void setWeights
-        (
-            const label weight,
-            const label nodeI
-        );
-
-        //- Finds path from nodeI to startNodeI by travelling in direction
-        //  of lowest weight
-        void fixWeights
-        (
-            const label startNodeI,
-            const label endNodeI,
-            const label nodeI,
-            const label prevNodeI
-        );
-
-        //- Routes single path
-        bool shortestPath
-        (
-            const labelList& path,
-            const label pathValue
-        );
-
-        //- Linear search for element with weight
-        label getValue(const label) const;
-
-        //- Find node which has no neighbours with pathValue
-        label findEndNode
-        (
-            const label startNodeI,
-            const label prevNodeI,
-            const label pathValue
-        ) const;
-
-        //- Append all pathValue weights to route.
-        void storeRoute
-        (
-            const label startNodeI,
-            const label prevNodeI,
-            const label pathValue,
-            DynamicList<label>& route
-        ) const;
-
-        //- Disallow default bitwise copy construct
-        router(const router&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const router&);
-
-
-public:
-
-    // Constructors
-
-        //- Construct from connections, route later.
-        router
-        (
-            const labelListList& connections,
-            const List<point>& coords
-        );
-
-
-    // Member Functions
-
-        // Access
-
-            const labelList& weights() const
-            {
-                return weights_;
-            }
-
-        // Edit
-
-            //- Find path from first element in path to all other elements
-            //  Mark resulting path in weights with (negative) pathValue.
-            //  Returns false and does not mark any elements if cannot route.
-            bool route(const labelList& path, const label pathValue);
-
-            //- Extract labels of route with given value.
-            labelList getRoute(const label pathValue) const;
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/test/router/routerDict b/applications/test/router/routerDict
deleted file mode 100644
index a1fce32c4..000000000
--- a/applications/test/router/routerDict
+++ /dev/null
@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.0                                   |
-|   \\  /    A nd           | Web:      http://www.openfoam.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-
-FoamFile
-{
-    version         2.0;
-    format          ascii;
-
-    root            "/home/penfold/mattijs/foam/mattijs2.1/run/icoFoam";
-    case            "cavity";
-    instance        "system";
-    local           "";
-
-    class           dictionary;
-    object          routeDict;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-// Connected cells
-paths
-(
-    (0 11)
-    (0 4)
-    (1 2)
-    (3 7)
-    (5 6)
-);
-
-// ************************************************************************* //
-
-
-
-
-
-
-
diff --git a/applications/test/simpleMatrix/Make/files b/applications/test/simpleMatrix/Make/files
deleted file mode 100644
index 584095406..000000000
--- a/applications/test/simpleMatrix/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-simpleMatrixTest.C
-
-EXE = $(FOAM_USER_APPBIN)/simpleMatrix
diff --git a/applications/test/simpleMatrix/Make/options b/applications/test/simpleMatrix/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/simpleMatrix/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/simpleMatrix/simpleMatrixTest.C b/applications/test/simpleMatrix/simpleMatrixTest.C
deleted file mode 100644
index e2af25331..000000000
--- a/applications/test/simpleMatrix/simpleMatrixTest.C
+++ /dev/null
@@ -1,65 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "simpleMatrix.H"
-#include "vector.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    simpleMatrix<vector> hmm(3);
-
-    hmm[0][0] = -3.0;
-    hmm[0][1] = 10.0;
-    hmm[0][2] = -4.0;
-    hmm[1][0] = 2.0;
-    hmm[1][1] = 3.0;
-    hmm[1][2] = 10.0;
-    hmm[2][0] = 2.0;
-    hmm[2][1] = 6.0;
-    hmm[2][2] = 1.0;
-
-    hmm.source()[0] = vector(2.0, 1.0, 3.0);
-    hmm.source()[1] = vector(1.0, 4.0, 3.0);
-    hmm.source()[2] = vector(0.0, 5.0, 2.0);
-
-    Info<< hmm << endl;
-    Info<< hmm.solve() << endl;
-    Info<< hmm << endl;
-    Info<< hmm.LUsolve() << endl;
-    Info<< hmm << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/slicedField/Make/files b/applications/test/slicedField/Make/files
deleted file mode 100644
index e2072db06..000000000
--- a/applications/test/slicedField/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-slicedFieldTest.C  
-
-EXE = $(FOAM_USER_APPBIN)/slicedFieldTest
diff --git a/applications/test/slicedField/Make/options b/applications/test/slicedField/Make/options
deleted file mode 100644
index 725122ea1..000000000
--- a/applications/test/slicedField/Make/options
+++ /dev/null
@@ -1,4 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = -lfiniteVolume
diff --git a/applications/test/slicedField/slicedFieldTest.C b/applications/test/slicedField/slicedFieldTest.C
deleted file mode 100644
index 8ec91b19f..000000000
--- a/applications/test/slicedField/slicedFieldTest.C
+++ /dev/null
@@ -1,114 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    slicedFieldTest
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "SlicedGeometricField.H"
-#include "slicedFvPatchFields.H"
-#include "slicedSurfaceFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-#   include "setRootCase.H"
-
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    Info<< "Reading field p\n" << endl;
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    //Info<< min(p, p);
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    SlicedGeometricField<vector, fvPatchField, slicedFvPatchField, volMesh>
-    C
-    (
-        IOobject
-        (
-            "C2",
-            runTime.timeName(),
-            mesh
-        ),
-        mesh,
-        dimLength,
-        mesh.cellCentres(),
-        mesh.faceCentres()
-    );
-
-    Info<< C << endl;
-    Info<< (C & U) << endl;
-
-    SlicedGeometricField<vector, fvsPatchField, slicedFvsPatchField, surfaceMesh>
-    Sf
-    (
-        IOobject
-        (
-            "Sf2",
-            runTime.timeName(),
-            mesh
-        ),
-        mesh,
-        dimArea,
-        mesh.faceAreas()
-    );
-
-    //Info<< Sf << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/sort/Make/files b/applications/test/sort/Make/files
deleted file mode 100644
index 8440d05c1..000000000
--- a/applications/test/sort/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-sortListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/sortListTest
diff --git a/applications/test/sort/Make/options b/applications/test/sort/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/sort/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/sort/sortListTest.C b/applications/test/sort/sortListTest.C
deleted file mode 100644
index f5a82f5d9..000000000
--- a/applications/test/sort/sortListTest.C
+++ /dev/null
@@ -1,55 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "labelList.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    labelList a(5);
-    a[0] = 7;
-    a[1] = 4;
-    a[2] = 1;
-    a[3] = 2;
-    a[4] = 9;
-
-    Info << "before: " << a << endl;
-    sort(a);
-    Info << "after: " << a << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/speed/Make/files b/applications/test/speed/Make/files
deleted file mode 100644
index 84a6d2fa6..000000000
--- a/applications/test/speed/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-speedTest.C
-
-EXE = $(FOAM_USER_APPBIN)/speedTest
diff --git a/applications/test/speed/Make/options b/applications/test/speed/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/speed/speedTest.C b/applications/test/speed/speedTest.C
deleted file mode 100644
index 052514359..000000000
--- a/applications/test/speed/speedTest.C
+++ /dev/null
@@ -1,99 +0,0 @@
-#include "primitiveFields.H"
-#include "cpuTime.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-int main()
-{
-    const label nIter = 10;
-    const label size = 10000000;
-
-    double* f1 = new double[size];
-    double* f2 = new double[size];
-    double* f3 = new double[size];
-    double* f4 = new double[size];
-
-    for (register label i=0; i<size; i++)
-    {
-        f1[i] = 1.0;
-        f2[i] = 1.0;
-        f3[i] = 1.0;
-    }
-
-    cpuTime executionTime1;
-
-    for (int j=0; j<nIter; j++)
-    {
-        for (register label i=0; i<size; i++)
-        {
-            f4[i] = f1[i] + f2[i] - f3[i];
-        }
-    }
-
-    Info<< "ExecutionTime = "
-        << executionTime1.elapsedCpuTime()
-        << " s\n" << endl;
-
-    Info << f4[1] << endl << endl;
-
-
-    scalarField sf1(size, 1.0), sf2(size, 1.0), sf3(size, 1.0), sf4(size);
-
-    cpuTime executionTime2;
-
-    for (register int j=0; j<nIter; j++)
-    {
-        sf4 = sf1 + sf2 - sf3;
-        //sf4 = sf1;
-        //sf4 += sf2;
-        //sf4 -= sf3;
-    }
-
-    Info<< "ExecutionTime = "
-        << executionTime2.elapsedCpuTime()
-        << " s\n" << endl;
-
-    Info << sf4[1] << endl << endl;
-
-
-    vectorField 
-        vf1(size, vector::one),
-        vf2(size, vector::one),
-        vf3(size, vector::one),
-        vf4(size);
-
-    cpuTime executionTime3;
-
-    for (register int j=0; j<nIter; j++)
-    {
-        vf4 = vf1 + vf2 - vf3;
-    }
-
-    Info<< "ExecutionTime = "
-        << executionTime3.elapsedCpuTime()
-        << " s\n" << endl;
-
-    Info << vf4[1] << endl << endl;
-
-    cpuTime executionTime4;
-
-    scalarField sf11(size, 1.0), sf12(size, 1.0), sf13(size, 1.0), sf14(size);
-    scalarField sf21(size, 1.0), sf22(size, 1.0), sf23(size, 1.0), sf24(size);
-    scalarField sf31(size, 1.0), sf32(size, 1.0), sf33(size, 1.0), sf34(size);
-
-    for (register int j=0; j<nIter; j++)
-    {
-        sf14 = sf11 + sf12 - sf13;
-        sf24 = sf21 + sf22 - sf23;
-        sf34 = sf31 + sf32 - sf33;
-    }
-
-    Info<< "ExecutionTime = "
-        << executionTime4.elapsedCpuTime()
-        << " s\n" << endl;
-
-    Info << sf14[1] << sf24[1] << sf34[1] << endl << endl;
-
-
-}
diff --git a/applications/test/sphericalTensorField/Make/files b/applications/test/sphericalTensorField/Make/files
deleted file mode 100644
index 12d2faa1b..000000000
--- a/applications/test/sphericalTensorField/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-sphericalTensorFieldTest.C
-
-EXE = $(FOAM_USER_APPBIN)/sphericalTensorFieldTest
diff --git a/applications/test/sphericalTensorField/Make/options b/applications/test/sphericalTensorField/Make/options
deleted file mode 100644
index 725122ea1..000000000
--- a/applications/test/sphericalTensorField/Make/options
+++ /dev/null
@@ -1,4 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = -lfiniteVolume
diff --git a/applications/test/sphericalTensorField/sphericalTensorFieldTest.C b/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
deleted file mode 100644
index 95246ac8e..000000000
--- a/applications/test/sphericalTensorField/sphericalTensorFieldTest.C
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    sphericalTensorFieldTest
-
-\*---------------------------------------------------------------------------*/
-
-#include "tensorField.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    scalarField f1(1, 1);
-    sphericalTensorField sf1(1, 1);
-    sphericalTensorField sf2(1, 2);
-    tensorField tf1(1, tensor::one);
-
-    Info<< (tf1 & sf2) << endl;
-
-    Info<< f1*sf1 << " " << sf1*3 << endl;
-
-    Info<< ((sf1 + sf2) & (sf1 + sf2)) << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/string/Make/files b/applications/test/string/Make/files
deleted file mode 100644
index 32363bd45..000000000
--- a/applications/test/string/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-stringTest.C
-
-EXE = $(FOAM_USER_APPBIN)/stringTest
diff --git a/applications/test/string/Make/options b/applications/test/string/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/string/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/string/stringTest.C b/applications/test/string/stringTest.C
deleted file mode 100644
index b3d125a14..000000000
--- a/applications/test/string/stringTest.C
+++ /dev/null
@@ -1,63 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "string.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    string test("$HOME kjhkjhkjh \" \\$HOME/tyetyery ${FOAM_RUN} \n ; hkjh ;$");
-
-    Info<< test << endl;
-
-    Info<< string(test).replace("kj", "zzz") << endl;
-    Info<< string(test).replace("kj", "") << endl;
-    Info<< string(test).replaceAll("kj", "zzz") << endl;
-    Info<< string(test).replaceAll("kj", "z") << endl;
-
-    Info<< string(test).expand() << endl;
-
-    string test2("~OpenFOAM/controlDict");
-    Info<< test2.expand() << endl;
-
-    string s;
-    Sin.getLine(s);
-    Info<< s.expand() << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/stringList/Make/files b/applications/test/stringList/Make/files
deleted file mode 100644
index a9461cc16..000000000
--- a/applications/test/stringList/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-stringListTest.C
-
-EXE = $(FOAM_USER_APPBIN)/stringListTest
diff --git a/applications/test/stringList/Make/options b/applications/test/stringList/Make/options
deleted file mode 100644
index 6a9e9810b..000000000
--- a/applications/test/stringList/Make/options
+++ /dev/null
@@ -1,2 +0,0 @@
-/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
-/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/stringList/stringListTest.C b/applications/test/stringList/stringListTest.C
deleted file mode 100644
index 40a00bec0..000000000
--- a/applications/test/stringList/stringListTest.C
+++ /dev/null
@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-
-\*---------------------------------------------------------------------------*/
-
-#include "stringList.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
-{
-    stringList sl(3);
-    sl[0] = "hello";
-    sl[1] = "heello";
-    sl[2] = "heeello";
-
-    labelList matches = findStrings(".*ee.*", sl);
-
-    Info<< "matches found for regexp .*ee.* : ";
-    forAll(matches, i)
-    {
-        Info<< " " << sl[matches[i]];
-    }
-    Info<< endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/symmTensorField/Make/files b/applications/test/symmTensorField/Make/files
deleted file mode 100644
index 89f301b07..000000000
--- a/applications/test/symmTensorField/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-symmTensorFieldTest.C
-
-EXE = $(FOAM_USER_APPBIN)/symmTensorFieldTest
diff --git a/applications/test/symmTensorField/Make/options b/applications/test/symmTensorField/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/symmTensorField/symmTensorFieldTest.C b/applications/test/symmTensorField/symmTensorFieldTest.C
deleted file mode 100644
index dfdf0fb45..000000000
--- a/applications/test/symmTensorField/symmTensorFieldTest.C
+++ /dev/null
@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    symmTensorFieldTest
-
-\*---------------------------------------------------------------------------*/
-
-#include "tensorField.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    scalarField f1(1, 1);
-    symmTensorField sf1(1, symmTensor::one);
-    symmTensorField sf2(1, symmTensor::one);
-    tensorField tf1(1, tensor(1, 2, 3, 4, 5, 6, 7, 8, 9));
-
-    Info<< (tf1 & sf2) << endl;
-
-    Info<< f1*sf1 << " " << sf1*3 << endl;
-
-    Info<< ((sf1 + sf2) & (sf1 + sf2)) << endl;
-
-    vectorField vf1(1, vector::one);
-    Info<< sqr(vf1) << endl;
-    Info<< pow<vector, 2>(vf1) << endl;
-
-    Info<< symm(tf1) << endl;
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/tensor/Make/files b/applications/test/tensor/Make/files
deleted file mode 100644
index d772d6162..000000000
--- a/applications/test/tensor/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-tensorTest.C
-
-EXE = $(FOAM_USER_APPBIN)/tensorTest
diff --git a/applications/test/tensor/Make/options b/applications/test/tensor/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/tensor/tensorTest.C b/applications/test/tensor/tensorTest.C
deleted file mode 100644
index 4530bc765..000000000
--- a/applications/test/tensor/tensorTest.C
+++ /dev/null
@@ -1,69 +0,0 @@
-#include "tensor.H"
-#include "symmTensor.H"
-#include "transform.H"
-#include "stringList.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-int main()
-{
-    tensor t1(1, 2, 3, 4, 5, 6, 7, 8, 9);
-    tensor t2(1, 2, 3, 1, 2, 3, 1, 2, 3);
-
-    tensor t3 = t1 + t2;
-
-    Info<< t3 << endl;
-
-    tensor t4(3,-2,1,-2,2,0,1, 0, 4);
-
-    Info<< inv(t4) << endl;
-    Info<< (inv(t4) & t4) << endl;
-
-    Info<< t1.x() << t1.y() << t1.z() << endl;
-
-    tensor t6(1,0,-4,0,5,4,-4,4,3);
-    //tensor t6(1,2,0,2,5,0,0,0,0);
-    Info<< "tensor " << t6 << endl;
-    vector e = eigenValues(t6);
-    Info<< "eigenvalues " << e << endl;
-    tensor ev = eigenVectors(t6);
-    Info<< "eigenvectors " << ev << endl;
-
-    Info<< "Check determinant " << e.x()*e.y()*e.z() << " " << det(t6) << endl;
-
-    Info<< "Check eigenvectors "
-        << (eigenVector(t6, e[0]) & t6) << e[0]*eigenVector(t6, e[0]) << " "
-        << (eigenVector(t6, e[1]) & t6) << e[1]*eigenVector(t6, e[1]) << " "
-        << (eigenVector(t6, e[2]) & t6) << e[2]*eigenVector(t6, e[2])
-        << endl;
-
-    Info<< "Check eigenvalues for symmTensor "
-        << eigenValues(symm(t6)) - eigenValues(tensor(symm(t6))) << endl;
-
-    Info<< "Check eigenvectors for symmTensor "
-        << eigenVectors(symm(t6)) - eigenVectors(tensor(symm(t6))) << endl;
-
-    tensor t7(1, 2, 3, 2, 4, 5, 3, 5, 6);
-
-    Info<< "Check transformation "
-        << (t1 & t7 & t1.T()) << " " << transform(t1, t7) << endl;
-
-    symmTensor st1(1, 2, 3, 4, 5, 6);
-
-    Info<< "Check symmetric transformation "
-        << transform(t1, st1) << endl;
-
-    vector v1(1, 2, 3);
-
-    Info<< sqr(v1) << endl;
-    Info<< symm(t7) << endl;
-    Info<< twoSymm(t7) << endl;
-    Info<< magSqr(st1) << endl;
-    Info<< mag(st1) << endl;
-
-    Info<< (symm(t7) && t7) - (0.5*(t7 + t7.T()) && t7) << endl;
-    Info<< (t7 && symm(t7)) - (t7 && 0.5*(t7 + t7.T())) << endl;
-
-    return(0);
-}
diff --git a/applications/test/testPointEdgeWave/Make/files b/applications/test/testPointEdgeWave/Make/files
deleted file mode 100644
index 7f30bf0c2..000000000
--- a/applications/test/testPointEdgeWave/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-testPointEdgeWave.C
-
-EXE = $(FOAM_USER_APPBIN)/testPointEdgeWave
diff --git a/applications/test/testPointEdgeWave/Make/options b/applications/test/testPointEdgeWave/Make/options
deleted file mode 100644
index 8940e1ec4..000000000
--- a/applications/test/testPointEdgeWave/Make/options
+++ /dev/null
@@ -1,6 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/meshTools/lnInclude
-
-EXE_LIBS = \
-    -lmeshTools
-
diff --git a/applications/test/testPointEdgeWave/testPointEdgeWave.C b/applications/test/testPointEdgeWave/testPointEdgeWave.C
deleted file mode 100644
index 476623d63..000000000
--- a/applications/test/testPointEdgeWave/testPointEdgeWave.C
+++ /dev/null
@@ -1,142 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Description
-    Test pointEdgeWave.
-
-\*---------------------------------------------------------------------------*/
-
-#include "argList.H"
-#include "Time.H"
-#include "polyMesh.H"
-#include "pointMesh.H"
-#include "OSspecific.H"
-#include "IFstream.H"
-#include "pointEdgePoint.H"
-#include "PointEdgeWave.H"
-
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-    argList::validArgs.append("patch");
-
-#   include "setRootCase.H"
-#   include "createTime.H"
-#   include "createPolyMesh.H"
-
-    pointMesh pMesh(mesh);
-
-    const polyBoundaryMesh& patches = mesh.boundaryMesh();
-
-    // Get name of patch
-    word patchName(args.additionalArgs()[0]);
-    
-    // Find the label in patches by name.
-    label patchI = patches.findPatchID(patchName);
-
-    {
-        // Test whether any processor has patch
-        label maxPatchI = patchI;
-
-        reduce(maxPatchI, maxOp<label>());
-
-        if (maxPatchI == -1)
-        {
-            FatalErrorIn(args.executable())
-                << "Cannot find patch named " << patchName << exit(FatalError);
-        }
-    }
-
-
-    // Set initial changed points to all the patch points(if patch present)
-    List<pointEdgePoint> wallInfo;
-    labelList wallPoints;
-
-    if (patchI != -1)
-    {
-        // Retrieve the patch now we have its index in patches.
-        const polyPatch& pp = mesh.boundaryMesh()[patchI];
-
-        wallPoints = pp.meshPoints();
-
-        wallInfo.setSize(pp.nPoints());
-
-        forAll(pp.localPoints(), ppI)
-        {
-            wallInfo[ppI] = pointEdgePoint(pp.localPoints()[ppI], 0.0);
-        }
-    }
-
-    // Current info on points
-    List<pointEdgePoint> allPointInfo(mesh.nPoints());
-
-    // Current info on edges
-    List<pointEdgePoint> allEdgeInfo(mesh.nEdges());
-
-    PointEdgeWave<pointEdgePoint> wallCalc
-    (
-        pMesh,
-        wallPoints,
-        wallInfo,
-
-        allPointInfo,
-        allEdgeInfo,
-        mesh.nPoints()  // max iterations
-    );
-
-
-    pointScalarField psf
-    (
-        IOobject
-        (
-            "wallDist",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::AUTO_WRITE
-        ),
-        pMesh,
-        dimensionedScalar("wallDist", dimLength, 0.0)
-    );
-
-    forAll(allPointInfo, pointI)
-    {
-        psf[pointI] = Foam::sqrt(allPointInfo[pointI].distSqr());
-    }
-
-    Info<< "Writing wallDist pointScalarField to " << runTime.value()
-        << endl;
-
-    psf.write();
-
-    Info << nl << "End" << endl;
-
-    return 0;
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/tmpField/Make/files b/applications/test/tmpField/Make/files
deleted file mode 100644
index b7dfa692c..000000000
--- a/applications/test/tmpField/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-tmpFieldTest.C
-
-EXE = $(FOAM_USER_APPBIN)/tmpFieldTest
diff --git a/applications/test/tmpField/Make/options b/applications/test/tmpField/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/triTet/Make/files b/applications/test/triTet/Make/files
deleted file mode 100644
index d1e128ece..000000000
--- a/applications/test/triTet/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-triTet.C
-
-EXE = $(FOAM_USER_APPBIN)/triTet
\ No newline at end of file
diff --git a/applications/test/triTet/Make/options b/applications/test/triTet/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/triTet/triTet.C b/applications/test/triTet/triTet.C
deleted file mode 100644
index 53b9cd139..000000000
--- a/applications/test/triTet/triTet.C
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "point.H"
-#include "triangle.H"
-#include "tetrahedron.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-int main()
-{
-    triangle<point, point> tri
-    (
-        vector(0, 0, 0),
-        vector(1, 0, 0),
-        vector(1, 1, 0)
-    );
-
-    Info<< "tri circumCentre = " << tri.circumCentre() << endl;
-    Info<< "tri circumRadius = " << tri.circumRadius() << endl;
-
-    tetrahedron<point, point> tet
-    (
-        vector(1, 0, 0),
-        vector(0, 1, 0),
-        vector(0, 0, 1),
-        vector(0.5773502, 0.5773502, 0.5773502)
-    );
-
-    Info<< "tet circumCentre = " << tet.circumCentre() << endl;
-    Info<< "tet circumRadius = " << tet.circumRadius() << endl;
-
-    vector a(Sin);
-    vector b(Sin);
-    vector c(Sin);
-    vector d(Sin);
-
-    Info<< "tet circumRadius = "
-        << tetrahedron<point, point>(a, b, c, d).circumRadius() << endl;
-
-    return(0);
-}
diff --git a/applications/test/vector/Make/files b/applications/test/vector/Make/files
deleted file mode 100644
index 95cdf62b0..000000000
--- a/applications/test/vector/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-vectorTest.C
-
-EXE = $(FOAM_USER_APPBIN)/vectorTest
diff --git a/applications/test/vector/Make/options b/applications/test/vector/Make/options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/applications/test/vector/vectorTest.C b/applications/test/vector/vectorTest.C
deleted file mode 100644
index f48f65d71..000000000
--- a/applications/test/vector/vectorTest.C
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "vector.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-int main()
-{
-    Info<< vector::zero << endl
-        << vector::one << endl
-        << vector::dim << endl
-        << vector::rank << endl;
-
-    vector d(0.5, 0.5, 0.5);
-    d /= mag(d);
-
-    vector dSmall = (1e-100)*d;
-    dSmall /= mag(dSmall);
-
-    Info<< (dSmall - d) << endl;
-
-    d *= 4.0;
-
-    Info<< d << endl;
-
-    Info<< d + d << endl;
-
-    Info<< magSqr(d) << endl;
-
-    vector d2(0.5, 0.51, -0.5);
-    Info<< cmptMax(d2) << " " << cmptSum(d2) << " " << cmptMag(d2) << endl;
-    Info<< min(d, d2) << endl;
-    return 0;
-}
diff --git a/applications/test/volField/Make/files b/applications/test/volField/Make/files
deleted file mode 100644
index 5b609d3ed..000000000
--- a/applications/test/volField/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-volFieldTest.C  
-
-EXE = $(FOAM_USER_APPBIN)/volFieldTest
diff --git a/applications/test/volField/Make/options b/applications/test/volField/Make/options
deleted file mode 100644
index 725122ea1..000000000
--- a/applications/test/volField/Make/options
+++ /dev/null
@@ -1,4 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = -lfiniteVolume
diff --git a/applications/test/volField/volFieldTest.C b/applications/test/volField/volFieldTest.C
deleted file mode 100644
index 7116b698d..000000000
--- a/applications/test/volField/volFieldTest.C
+++ /dev/null
@@ -1,98 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    volFieldTest
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "transformGeometricField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    Info<< "Reading field p\n" << endl;
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    //Info<< min(p, p);
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-#   include "createPhi.H"
-
-    GeometricField<symmTensor, fvPatchField, volMesh> st
-    (
-        IOobject
-        (
-            "st",
-            runTime.timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        mesh,
-        dimensioned<symmTensor>("st", dimless, symmTensor::one),
-        zeroGradientFvPatchSymmTensorField::typeName
-    );
-
-    //Info<< fvc::div(st) << endl;
-
-    solve(fvm::ddt(st) + fvm::div(phi, st) - fvm::laplacian(st));
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/applications/test/volPointInterpolation/Make/files b/applications/test/volPointInterpolation/Make/files
deleted file mode 100644
index 7dbcacf32..000000000
--- a/applications/test/volPointInterpolation/Make/files
+++ /dev/null
@@ -1,3 +0,0 @@
-volPointInterpolationTest.C
-
-EXE = $(FOAM_USER_APPBIN)/volPointInterpolationTest
diff --git a/applications/test/volPointInterpolation/Make/options b/applications/test/volPointInterpolation/Make/options
deleted file mode 100644
index 725122ea1..000000000
--- a/applications/test/volPointInterpolation/Make/options
+++ /dev/null
@@ -1,4 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude
-
-EXE_LIBS = -lfiniteVolume
diff --git a/applications/test/volPointInterpolation/volPointInterpolationTest.C b/applications/test/volPointInterpolation/volPointInterpolationTest.C
deleted file mode 100644
index 8cbe5f8a5..000000000
--- a/applications/test/volPointInterpolation/volPointInterpolationTest.C
+++ /dev/null
@@ -1,84 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Application
-    volPointInterpolationTest
-
-\*---------------------------------------------------------------------------*/
-
-#include "fvCFD.H"
-#include "volPointInterpolation.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main(int argc, char *argv[])
-{
-
-#   include "setRootCase.H"
-
-#   include "createTime.H"
-#   include "createMesh.H"
-
-    Info<< "Reading field p\n" << endl;
-    volScalarField p
-    (
-        IOobject
-        (
-            "p",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    Info<< "Reading field U\n" << endl;
-    volVectorField U
-    (
-        IOobject
-        (
-            "U",
-            runTime.timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    );
-
-    pointMesh pMesh(mesh);
-    volPointInterpolation pInterp(mesh, pMesh);
-
-    pointScalarField pp(pInterp.interpolate(p));
-    pp.write();
-
-    pointVectorField pU(pInterp.interpolate(U));
-    pU.write();
-
-    return(0);
-}
-
-
-// ************************************************************************* //
diff --git a/src/OSspecific/POSIX/signals/sigFpe.C b/src/OSspecific/POSIX/signals/sigFpe.C
index 54cb6559f..b5c79af19 100644
--- a/src/OSspecific/POSIX/signals/sigFpe.C
+++ b/src/OSspecific/POSIX/signals/sigFpe.C
@@ -24,6 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include <stdint.h>
 #include "error.H"
 #include "sigFpe.H"
 
diff --git a/src/finiteVolume/Make/files b/src/finiteVolume/Make/files
index 924b9afe8..8dc2a55ac 100644
--- a/src/finiteVolume/Make/files
+++ b/src/finiteVolume/Make/files
@@ -29,6 +29,7 @@ derivedFvPatches = $(fvPatches)/derived
 $(derivedFvPatches)/wall/wallFvPatch.C
 $(derivedFvPatches)/directMapped/directMappedFvPatch.C
 $(derivedFvPatches)/cohesive/cohesiveFvPatch.C
+$(derivedFvPatches)/directMapped/directMappedWallFvPatch.C
 
 wallDist = fvMesh/wallDist
 $(wallDist)/wallPointYPlus/wallPointYPlus.C
@@ -249,7 +250,7 @@ $(limitedSchemes)/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationS
 $(limitedSchemes)/upwind/upwind.C
 $(limitedSchemes)/blended/blended.C
 $(limitedSchemes)/linearUpwind/linearUpwind.C
-$(limitedSchemes)/linearUpwindV/linearUpwindV.C
+$(limitedSchemes)/linearUpwind/linearUpwindV.C
 $(limitedSchemes)/reconCentral/reconCentral.C
 $(limitedSchemes)/Gamma/Gamma.C
 $(limitedSchemes)/SFCD/SFCD.C
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
new file mode 100644
index 000000000..9b6acbcf3
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "MRFZone.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+#include "geometricOneField.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class RhoFieldType>
+void Foam::MRFZone::relativeRhoFlux
+(
+    const RhoFieldType& rho,
+    surfaceScalarField& phi
+) const
+{
+    const surfaceVectorField& Cf = mesh_.Cf();
+    const surfaceVectorField& Sf = mesh_.Sf();
+
+    const vector& origin = origin_.value();
+    const vector& Omega = Omega_.value();
+
+    // Internal faces
+    forAll(internalFaces_, i)
+    {
+        label facei = internalFaces_[i];
+        phi[facei] -= rho[facei]*(Omega ^ (Cf[facei] - origin)) & Sf[facei];
+    }
+
+    // Included patches
+    forAll(includedFaces_, patchi)
+    {
+        forAll(includedFaces_[patchi], i)
+        {
+            label patchFacei = includedFaces_[patchi][i];
+
+            phi.boundaryField()[patchi][patchFacei] = 0.0;
+        }
+    }
+
+    // Excluded patches
+    forAll(excludedFaces_, patchi)
+    {
+        forAll(excludedFaces_[patchi], i)
+        {
+            label patchFacei = excludedFaces_[patchi][i];
+
+            phi.boundaryField()[patchi][patchFacei] -=
+                rho.boundaryField()[patchi][patchFacei]
+               *(Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin))
+              & Sf.boundaryField()[patchi][patchFacei];
+        }
+    }
+}
+
+
+template<class RhoFieldType>
+void Foam::MRFZone::absoluteRhoFlux
+(
+    const RhoFieldType& rho,
+    surfaceScalarField& phi
+) const
+{
+    const surfaceVectorField& Cf = mesh_.Cf();
+    const surfaceVectorField& Sf = mesh_.Sf();
+
+    const vector& origin = origin_.value();
+    const vector& Omega = Omega_.value();
+
+    // Internal faces
+    forAll(internalFaces_, i)
+    {
+        label facei = internalFaces_[i];
+        phi[facei] += (Omega ^ (Cf[facei] - origin)) & Sf[facei];
+    }
+
+    // Included patches
+    forAll(includedFaces_, patchi)
+    {
+        forAll(includedFaces_[patchi], i)
+        {
+            label patchFacei = includedFaces_[patchi][i];
+
+            phi.boundaryField()[patchi][patchFacei] +=
+                (Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin))
+              & Sf.boundaryField()[patchi][patchFacei];
+        }
+    }
+
+    // Excluded patches
+    forAll(excludedFaces_, patchi)
+    {
+        forAll(excludedFaces_[patchi], i)
+        {
+            label patchFacei = excludedFaces_[patchi][i];
+
+            phi.boundaryField()[patchi][patchFacei] +=
+                (Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin))
+              & Sf.boundaryField()[patchi][patchFacei];
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
index f0bf9e7b2..9e41e6a3b 100644
--- a/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
+++ b/src/finiteVolume/cfdTools/general/SRF/SRFModel/SRFModel/SRFModel.C
@@ -22,10 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
-    Formulation based on relative velocities
-
 \*---------------------------------------------------------------------------*/
 
 #include "SRFModel.H"
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.C
new file mode 100644
index 000000000..87026a2c4
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.C
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "pressureGradientExplicitSource.H"
+#include "volFields.H"
+#include "IFstream.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::pressureGradientExplicitSource::writeGradP() const
+{
+    // Only write on output time
+    if (mesh_.time().outputTime())
+    {
+        IOdictionary propsDict
+        (
+            IOobject
+            (
+                sourceName_ + "Properties",
+                mesh_.time().timeName(),
+                "uniform",
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            )
+        );
+        propsDict.add("gradient", gradP_);
+        propsDict.regIOobject::write();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::pressureGradientExplicitSource::pressureGradientExplicitSource
+(
+    const word& sourceName,
+    volVectorField& U
+)
+:
+    sourceName_(sourceName),
+    mesh_(U.mesh()),
+    U_(U),
+    dict_
+    (
+        IOobject
+        (
+            sourceName + "Properties",
+            mesh_.time().constant(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    Ubar_(dict_.lookup("Ubar")),
+    gradPini_(dict_.lookup("gradPini")),
+    gradP_(gradPini_),
+    flowDir_(Ubar_/mag(Ubar_)),
+    cellSource_(dict_.lookup("cellSource")),
+    cellSelector_
+    (
+        topoSetSource::New
+        (
+            cellSource_,
+            mesh_,
+            dict_.subDict(cellSource_ + "Coeffs")
+        )
+    ),
+    selectedCellSet_
+    (
+        mesh_,
+        sourceName_ + "CellSet",
+        mesh_.nCells()/10 + 1  // Reasonable size estimate.
+    )
+{
+    // Create the cell set
+    cellSelector_->applyToSet
+    (
+        topoSetSource::NEW,
+        selectedCellSet_
+    );
+
+    // Give some feedback
+    Info<< "    Selected "
+        << returnReduce(selectedCellSet_.size(), sumOp<label>())
+        << " cells" << endl;
+
+    // Read the initial pressure gradient from file if it exists
+    IFstream propsFile
+    (
+        mesh_.time().timeName()/"uniform"/(sourceName_ + "Properties")
+    );
+
+    if (propsFile.good())
+    {
+        Info<< "    Reading pressure gradient from file" << endl;
+        dictionary propsDict(dictionary::null, propsFile);
+        propsDict.lookup("gradient") >> gradP_;
+    }
+
+    Info<< "    Initial pressure gradient = " << gradP_ << nl << endl;
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh> >
+Foam::pressureGradientExplicitSource::Su() const
+{
+    tmp<DimensionedField<vector, volMesh> > tSource
+    (
+        new DimensionedField<vector, volMesh>
+        (
+            IOobject
+            (
+                sourceName_,
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedVector("zero", gradP_.dimensions(), vector::zero)
+        )
+    );
+
+    DimensionedField<vector, volMesh>& sourceField = tSource();
+
+    forAllConstIter(cellSet, selectedCellSet_, iter)
+    {
+        label cellI = iter.key();
+
+        sourceField[cellI] = flowDir_*gradP_.value();
+    }
+
+    return tSource;
+}
+
+
+void Foam::pressureGradientExplicitSource::update()
+{
+    const volScalarField& rUA =
+        mesh_.lookupObject<volScalarField>("(1|A(" + U_.name() + "))");
+
+    // Integrate flow variables over cell set
+    scalar volTot = 0.0;
+    scalar magUbarAve = 0.0;
+    scalar rUAave = 0.0;
+    forAllConstIter(cellSet, selectedCellSet_, iter)
+    {
+        label cellI = iter.key();
+
+        scalar volCell = mesh_.V()[cellI];
+        volTot += volCell;
+
+        magUbarAve += (flowDir_ & U_[cellI])*volCell;
+        rUAave += rUA[cellI]*volCell;
+    }
+
+    // Collect across all processors
+    reduce(volTot, sumOp<scalar>());
+    reduce(magUbarAve, sumOp<scalar>());
+    reduce(rUAave, sumOp<scalar>());
+
+    // Volume averages
+    magUbarAve /= volTot;
+    rUAave /= volTot;
+
+    // Calculate the pressure gradient increment needed to adjust the average
+    // flow-rate to the desired value
+    scalar gradPplus = (mag(Ubar_) - magUbarAve)/rUAave;
+
+    // Apply correction to velocity field
+    forAllConstIter(cellSet, selectedCellSet_, iter)
+    {
+        label cellI = iter.key();
+        U_[cellI] += flowDir_*rUA[cellI]*gradPplus;
+    }
+
+    // Update pressure gradient
+    gradP_.value() += gradPplus;
+
+    Info<< "Uncorrected Ubar = " << magUbarAve << tab
+        << "Pressure gradient = " << gradP_.value() << endl;
+
+    writeGradP();
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.H
new file mode 100644
index 000000000..b4a49b017
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/pressureGradientExplicitSource/pressureGradientExplicitSource.H
@@ -0,0 +1,139 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::pressureGradientExplicitSource
+
+Description
+    Creates a cell set pressure gradient source
+
+    Note: Currently only handles kinematic pressure
+
+SourceFiles
+    pressureGradientExplicitSource.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pressureGradientExplicitSource_H
+#define pressureGradientExplicitSource_H
+
+#include "autoPtr.H"
+#include "topoSetSource.H"
+#include "cellSet.H"
+#include "fvMesh.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+              Class pressureGradientExplicitSource Declaration
+\*---------------------------------------------------------------------------*/
+
+class pressureGradientExplicitSource
+{
+    // Private data
+
+        //- Name of the source
+        const word sourceName_;
+
+        //- Reference to the mesh
+        const fvMesh& mesh_;
+
+        //- Reference to the velocity field
+        volVectorField& U_;
+
+        //- Properties dictionary
+        IOdictionary dict_;
+
+        //- Average velocity
+        vector Ubar_;
+
+        //- Initial pressure gradient
+        dimensionedScalar gradPini_;
+
+        //- Pressure gradient
+        dimensionedScalar gradP_;
+
+        //- Flow direction
+        vector flowDir_;
+
+        //- Name of cell source
+        word cellSource_;
+
+        //- The method by which the cells will be selecetd
+        autoPtr<topoSetSource> cellSelector_;
+
+        //- The set of selected cells
+        cellSet selectedCellSet_;
+
+
+    // Private Member Functions
+
+        //- Write the pressure gradient to file (for restarts etc)
+        void writeGradP() const;
+
+        //- Disallow default bitwise copy construct
+        pressureGradientExplicitSource(const pressureGradientExplicitSource&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const pressureGradientExplicitSource&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from explicit source name and mesh
+        pressureGradientExplicitSource
+        (
+            const word& sourceName,
+            volVectorField& U
+        );
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return a tmp field of the source
+            tmp<DimensionedField<vector, volMesh> > Su() const;
+
+
+        //- Correct driving force for a constant mass flow rate
+        void update();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.C b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.C
new file mode 100644
index 000000000..439e7c7e5
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.C
@@ -0,0 +1,360 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "TimeActivatedExplicitSource.H"
+#include "fvMesh.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
+
+template<class Type>
+const Foam::wordList Foam::TimeActivatedExplicitSource<Type>::
+selectionModeTypeNames_
+(
+    IStringStream("(points cellSet)")()
+);
+
+
+template<class Type>
+const Foam::wordList Foam::TimeActivatedExplicitSource<Type>::
+volumeModeTypeNames_
+(
+    IStringStream("(absolute specific)")()
+);
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+typename Foam::TimeActivatedExplicitSource<Type>::selectionModeType
+Foam::TimeActivatedExplicitSource<Type>::wordToSelectionModeType
+(
+    const word& smtName
+) const
+{
+    forAll(selectionModeTypeNames_, i)
+    {
+        if (smtName == selectionModeTypeNames_[i])
+        {
+            return selectionModeType(i);
+        }
+    }
+
+    FatalErrorIn
+    (
+        "TimeActivatedExplicitSource<Type>::selectionModeType"
+        "TimeActivatedExplicitSource<Type>::wordToSelectionModeType"
+        "("
+            "const word&"
+        ")"
+    )   << "Unknown selectionMode type " << smtName
+        << ". Valid selectionMode types are:" << nl << selectionModeTypeNames_
+        << exit(FatalError);
+
+    return selectionModeType(0);
+}
+
+
+template<class Type>
+typename Foam::TimeActivatedExplicitSource<Type>::volumeModeType
+Foam::TimeActivatedExplicitSource<Type>::wordToVolumeModeType
+(
+    const word& vmtName
+) const
+{
+    forAll(volumeModeTypeNames_, i)
+    {
+        if (vmtName == volumeModeTypeNames_[i])
+        {
+            return volumeModeType(i);
+        }
+    }
+
+    FatalErrorIn
+    (
+        "TimeActivatedExplicitSource<Type>::volumeModeType"
+        "TimeActivatedExplicitSource<Type>::wordToVolumeModeType(const word&)"
+    )   << "Unknown volumeMode type " << vmtName
+        << ". Valid volumeMode types are:" << nl << volumeModeTypeNames_
+        << exit(FatalError);
+
+    return volumeModeType(0);
+}
+
+
+template<class Type>
+Foam::word Foam::TimeActivatedExplicitSource<Type>::selectionModeTypeToWord
+(
+    const selectionModeType& smtType
+) const
+{
+    if (smtType > selectionModeTypeNames_.size())
+    {
+        return "UNKNOWN";
+    }
+    else
+    {
+        return selectionModeTypeNames_[smtType];
+    }
+}
+
+
+template<class Type>
+Foam::word Foam::TimeActivatedExplicitSource<Type>::volumeModeTypeToWord
+(
+    const volumeModeType& vmtType
+) const
+{
+    if (vmtType > volumeModeTypeNames_.size())
+    {
+        return "UNKNOWN";
+    }
+    else
+    {
+        return volumeModeTypeNames_[vmtType];
+    }
+}
+
+
+template<class Type>
+void Foam::TimeActivatedExplicitSource<Type>::setSelection
+(
+    const dictionary& dict
+)
+{
+    switch (selectionMode_)
+    {
+        case smPoints:
+        {
+            dict.lookup("points") >> points_;
+            break;
+        }
+        case smCellSet:
+        {
+            dict.lookup("cellSet") >> cellSetName_;
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "TimeActivatedExplicitSource::setSelection(const dictionary&)"
+            )   << "Unknown selectionMode "
+                << selectionModeTypeNames_[selectionMode_]
+                << ". Valid selectionMode types are" << selectionModeTypeNames_
+                << exit(FatalError);
+        }
+    }
+}
+
+
+template<class Type>
+void Foam::TimeActivatedExplicitSource<Type>::setFieldData
+(
+    const dictionary& dict,
+    const wordList& fieldNames
+)
+{
+    dict.lookup("fieldData") >> fieldData_;
+    labelList localFieldIds(fieldData_.size(), -1);
+    forAll(fieldNames, i)
+    {
+        forAll(fieldData_, j)
+        {
+            const word& fdName = fieldData_[j].first();
+            if (fdName == fieldNames[i])
+            {
+                fieldIds_[i] = j;
+                localFieldIds[j] = i;
+                break;
+            }
+        }
+    }
+    forAll(localFieldIds, i)
+    {
+        if (localFieldIds[i] < 0)
+        {
+            FatalErrorIn
+            (
+                "TimeActivatedExplicitSource<Type>::setFieldData"
+                "("
+                    "const dictionary&, "
+                    "const wordList&"
+                ")"
+            )   << "Field " << fieldData_[i].first() << " not found in "
+                << "field list. Available fields are: " << nl << fieldNames
+                << exit(FatalError);
+        }
+    }
+}
+
+
+template<class Type>
+void Foam::TimeActivatedExplicitSource<Type>::setCellSet()
+{
+    Info<< incrIndent << indent << "Source: " << name_ << endl;
+    switch (selectionMode_)
+    {
+        case smPoints:
+        {
+            Info<< indent << "- selecting cells using points" << endl;
+
+            labelHashSet cellOwners;
+            forAll(points_, i)
+            {
+                label cellI = mesh_.findCell(points_[i]);
+                if (cellI >= 0)
+                {
+                    cellOwners.insert(cellI);
+                }
+
+                label globalCellI = returnReduce(cellI, maxOp<label>());
+                if (globalCellI < 0)
+                {
+                    WarningIn("TimeActivatedExplicitSource<Type>::setCellIds()")
+                        << "Unable to find owner cell for point " << points_[i]
+                        << endl;
+                }
+            }
+
+            cellsPtr_.reset(new cellSet(mesh_, "points", cellOwners));
+
+            break;
+        }
+        case smCellSet:
+        {
+            Info<< indent << "- selecting cells using cellSet "
+                << cellSetName_ << endl;
+            cellsPtr_.reset(new cellSet(mesh_, cellSetName_));
+
+            break;
+        }
+        default:
+        {
+            FatalErrorIn("TimeActivatedExplicitSource<Type>::setCellIds()")
+                << "Unknown selectionMode "
+                << selectionModeTypeNames_[selectionMode_]
+                << ". Valid selectionMode types are" << selectionModeTypeNames_
+                << exit(FatalError);
+        }
+    }
+
+    const cellSet& cSet = cellsPtr_();
+
+    // Set volume normalisation
+    V_ = scalarField(cSet.size(), 1.0);
+    if (volumeMode_ == vmAbsolute)
+    {
+        label i = 0;
+        forAllConstIter(cellSet, cSet, iter)
+        {
+            V_[i++] = mesh_.V()[iter.key()];
+        }
+    }
+
+    Info<< indent << "- selected " << returnReduce(cSet.size(), sumOp<label>())
+        << " cell(s)" << nl << decrIndent << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::TimeActivatedExplicitSource<Type>::TimeActivatedExplicitSource
+(
+    const word& name,
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const wordList& fieldNames
+)
+:
+    name_(name),
+    mesh_(mesh),
+    active_(dict.lookup("active")),
+    timeStart_(readScalar(dict.lookup("timeStart"))),
+    duration_(readScalar(dict.lookup("duration"))),
+    volumeMode_(wordToVolumeModeType(dict.lookup("volumeMode"))),
+    selectionMode_(wordToSelectionModeType(dict.lookup("selectionMode"))),
+    points_(),
+    cellSetName_("none"),
+    V_(),
+    cellsPtr_(),
+    fieldData_(),
+    fieldIds_(fieldNames.size(), -1)
+{
+    setSelection(dict);
+
+    if (fieldNames.size() == 1)
+    {
+        fieldData_.setSize(1);
+        fieldData_[0].first() = fieldNames[0];
+        dict.lookup("fieldData") >> fieldData_[0].second();
+        fieldIds_[0] = 0;
+    }
+    else
+    {
+        setFieldData(dict, fieldNames);
+    }
+
+    setCellSet();
+}
+
+
+template<class Type>
+void Foam::TimeActivatedExplicitSource<Type>::addToField
+(
+    DimensionedField<Type, volMesh>& Su,
+    const label fieldI
+)
+{
+    const label fid = fieldIds_[fieldI];
+
+    if
+    (
+        active_
+     && (fid >= 0)
+     && (mesh_.time().value() >= timeStart_)
+     && (mesh_.time().value() <= timeEnd())
+    )
+    {
+        // Update the cell set if the mesh is changing
+        if (mesh_.changing())
+        {
+            setCellSet();
+        }
+
+        const cellSet& cSet = cellsPtr_();
+
+        label i = 0;
+        forAllConstIter(cellSet, cSet, iter)
+        {
+            Su[iter.key()] = fieldData_[fid].second()/V_[i++];
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.H
new file mode 100644
index 000000000..6f5f738a4
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSource.H
@@ -0,0 +1,392 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::TimeActivatedExplicitSource
+
+Description
+    Time activated explicit source.
+
+    Sources described by:
+
+    {
+        active          true;      // on/off switch
+        timeStart       0.2;       // start time
+        duration        2.0;       // duration
+        selectionMode   points;    // cellSet
+        volumeMode      absolute;  // specific
+
+        fieldData                  // field data - usage for multiple fields
+        (
+            (H2O 0.005)
+        );
+
+        fieldData       0.005;     // field data - usage for single field
+
+        points                     // list of points when selectionMode = points
+        (
+            (2.75 0.5 0)
+        );
+
+        cellSet         c0;        // cellSet name when selectionMode = cekllSet
+    }
+
+SourceFiles
+    TimeActivatedExplicitSource.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef TimeActivatedExplicitSource_H
+#define TimeActivatedExplicitSource_H
+
+#include "Tuple2.H"
+#include "cellSet.H"
+#include "volFieldsFwd.H"
+#include "DimensionedField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+
+class fvMesh;
+
+template<class Type>
+class TimeActivatedExplicitSource;
+
+// Forward declaration of friend functions
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const TimeActivatedExplicitSource<Type>&
+);
+
+/*---------------------------------------------------------------------------*\
+               Class TimeActivatedExplicitSource Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class TimeActivatedExplicitSource
+{
+public:
+
+    // Public data
+
+        //- Enumeration for selection mode types
+        enum selectionModeType
+        {
+            smPoints,
+            smCellSet
+        };
+
+        //- Word list of selection mode type names
+        static const wordList selectionModeTypeNames_;
+
+        //- Enumeration for volume types
+        enum volumeModeType
+        {
+            vmAbsolute,
+            vmSpecific
+        };
+
+        //- Word list of volume mode type names
+        static const wordList volumeModeTypeNames_;
+
+
+protected:
+
+    // Protected data
+
+        typedef Tuple2<word, Type> fieldNameValuePair;
+
+        //- Source name
+        word name_;
+
+        //- Reference to the mesh database
+        const fvMesh& mesh_;
+
+        //- Source active flag
+        bool active_;
+
+        //- Time start
+        scalar timeStart_;
+
+        //- Duration
+        scalar duration_;
+
+        //- Volume mode
+        volumeModeType volumeMode_;
+
+        //- Cell selection mode
+        selectionModeType selectionMode_;
+
+        //- List of points for "points" selectionMode
+        List<point> points_;
+
+        //- Name of cell set for "cellSet" selectionMode
+        word cellSetName_;
+
+        //- Field of cell volumes according to cell set cells
+        scalarList V_;
+
+        //- Cell set
+        autoPtr<cellSet> cellsPtr_;
+
+        //- List of source field name vs value pairs
+        List<fieldNameValuePair> fieldData_;
+
+        //- Map of fields ids from supplied fields to local field source ids
+        labelList fieldIds_;
+
+
+    // Protected functions
+
+        //- Helper function to convert from a word to a selectionModeType
+        selectionModeType wordToSelectionModeType(const word& smtName) const;
+
+        //- Helper function to convert from a word to a volumeModeType
+        volumeModeType wordToVolumeModeType(const word& vtName) const;
+
+        //- Helper function to convert from a selectionModeType to a word
+        word selectionModeTypeToWord(const selectionModeType& smtType) const;
+
+        //- Helper function to convert from a volumeModeType to a word
+        word volumeModeTypeToWord(const volumeModeType& vtType) const;
+
+        //- Set the cellSet or points selection
+        void setSelection(const dictionary& dict);
+
+        //- Set the local field data
+        void setFieldData(const dictionary& dict, const wordList& fieldNames);
+
+        //- Set the cell set based on the user input selection mode
+        void setCellSet();
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        TimeActivatedExplicitSource
+        (
+            const word& name,
+            const dictionary& dict,
+            const fvMesh& mesh,
+            const wordList& fieldNames
+        );
+
+        //- Return clone
+        autoPtr<TimeActivatedExplicitSource> clone() const
+        {
+            notImplemented
+            (
+                "autoPtr<TimeActivatedExplicitSource> clone() const"
+            );
+            return autoPtr<TimeActivatedExplicitSource>(NULL);
+        }
+
+        //- Return pointer to new TimeActivatedExplicitSource object created
+        //  on the freestore from an Istream
+        class iNew
+        {
+            //- Reference to the mesh database
+            const fvMesh& mesh_;
+
+            //- List of field names
+            const wordList& fieldNames_;
+
+
+        public:
+
+            iNew
+            (
+                const fvMesh& mesh,
+                const wordList& fieldNames
+            )
+            :
+                mesh_(mesh),
+                fieldNames_(fieldNames)
+            {}
+
+            autoPtr<TimeActivatedExplicitSource> operator()(Istream& is) const
+            {
+                const word name(is);
+                const dictionary dict(is);
+
+                return autoPtr<TimeActivatedExplicitSource>
+                (
+                    new TimeActivatedExplicitSource
+                    (
+                        name,
+                        dict,
+                        mesh_,
+                        fieldNames_
+                    )
+                );
+            }
+        };
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const access to the source name
+            inline const word& name() const;
+
+            //- Return const access to the mesh database
+            inline const fvMesh& mesh() const;
+
+            //- Return const access to the source active flag
+            inline bool active() const;
+
+            //- Return const access to the time start
+            inline scalar timeStart() const;
+
+            //- Return const access to the duration
+            inline scalar duration() const;
+
+            //- Return const access to the time end
+            inline scalar timeEnd() const;
+
+            //- Return const access to the volume mode
+            inline const volumeModeType& volumeMode() const;
+
+            //- Return const access to the cell selection mode
+            inline const selectionModeType& selectionMode() const;
+
+            //- Return const access to the list of points for "points"
+            //  selectionMode
+            inline const List<point>& points() const;
+
+            //- Return const access to the name of cell set for "cellSet"
+            //  selectionMode
+            inline const word& cellSetName() const;
+
+            //- Return const access to the field of cell volumes according to
+            //  cell set cells
+            inline const scalarList& V() const;
+
+            //- Return const access to the cell set
+            inline const cellSet& cells() const;
+
+            //- Return const access to the source field name vs value pairs
+            inline const List<fieldNameValuePair>& fieldData() const;
+
+            //- Return const access to the the map of fields ids from supplied
+            //  fields to local field source ids
+            inline const labelList& fieldIds() const;
+
+
+        // Edit
+
+            //- Return access to the source name
+            inline word& name();
+
+            //- Return access to the source active flag
+            inline bool& active();
+
+            //- Return access to the time start
+            inline scalar& timeStart();
+
+            //- Return access to the duration
+            inline scalar& duration();
+
+            //- Return access to the volume mode
+            inline volumeModeType& volumeMode();
+
+            //- Return access to the cell selection mode
+            inline selectionModeType& selectionMode();
+
+            //- Return access to the list of points for "points" selectionMode
+            inline List<point>& points();
+
+            //- Return access to the name of cell set for "cellSet"
+            //  selectionMode
+            inline word& cellSetName();
+
+            //- Return access to the field of cell volumes according to
+            //  cell set cells
+            inline scalarList& V();
+
+            //- Return access to the cell set
+            inline cellSet& cells();
+
+            //- Return access to the source field name vs value pairs
+            inline List<fieldNameValuePair>& fieldData();
+
+            //- Return access to the the map of fields ids from supplied
+            //  fields to local field source ids
+            inline labelList& fieldIds();
+
+
+        // Evaluation
+
+            //- Add the source contribution to field Su
+            void addToField
+            (
+                DimensionedField<Type, volMesh>& Su,
+                const label fieldI
+            );
+
+
+        // I-O
+
+            //- Write the source properties
+            void writeData(Ostream&) const;
+
+            //- Ostream operator
+            friend Ostream& operator<< <Type>
+            (
+                Ostream& os,
+                const TimeActivatedExplicitSource& source
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "TimeActivatedExplicitSource.C"
+#   include "TimeActivatedExplicitSourceIO.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "TimeActivatedExplicitSourceI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceI.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceI.H
new file mode 100644
index 000000000..c6656f540
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceI.H
@@ -0,0 +1,227 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "TimeActivatedExplicitSource.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+inline const Foam::word& Foam::TimeActivatedExplicitSource<Type>::name() const
+{
+    return name_;
+}
+
+
+template<class Type>
+inline const Foam::fvMesh& Foam::TimeActivatedExplicitSource<Type>::mesh() const
+{
+    return mesh_;
+}
+
+
+template<class Type>
+inline bool Foam::TimeActivatedExplicitSource<Type>::active() const
+{
+    return active_;
+}
+
+
+template<class Type>
+inline Foam::scalar Foam::TimeActivatedExplicitSource<Type>::timeStart() const
+{
+    return timeStart_;
+}
+
+
+template<class Type>
+inline Foam::scalar Foam::TimeActivatedExplicitSource<Type>::duration() const
+{
+    return duration_;
+}
+
+
+template<class Type>
+inline Foam::scalar Foam::TimeActivatedExplicitSource<Type>::timeEnd() const
+{
+    return timeStart_ + duration_;
+}
+
+
+template<class Type>
+inline const typename Foam::TimeActivatedExplicitSource<Type>::volumeModeType&
+Foam::TimeActivatedExplicitSource<Type>::volumeMode() const
+{
+    return volumeMode_;
+}
+
+
+template<class Type>
+inline const typename Foam::TimeActivatedExplicitSource<Type>::
+selectionModeType&
+Foam::TimeActivatedExplicitSource<Type>::selectionMode() const
+{
+    return selectionMode_;
+}
+
+
+template<class Type>
+inline const Foam::List<Foam::point>&
+Foam::TimeActivatedExplicitSource<Type>::points() const
+{
+    return points_;
+}
+
+
+template<class Type>
+inline const Foam::word&
+Foam::TimeActivatedExplicitSource<Type>::cellSetName() const
+{
+    return cellSetName_;
+}
+
+
+template<class Type>
+inline const Foam::scalarList&
+Foam::TimeActivatedExplicitSource<Type>::V() const
+{
+    return V_;
+}
+
+
+template<class Type>
+inline const Foam::cellSet&
+Foam::TimeActivatedExplicitSource<Type>::cells() const
+{
+    return cellsPtr_();
+}
+
+
+template<class Type>
+inline const Foam::List<typename Foam::TimeActivatedExplicitSource<Type>::
+fieldNameValuePair>&
+Foam::TimeActivatedExplicitSource<Type>::fieldData() const
+{
+    return fieldData_;
+}
+
+
+template<class Type>
+inline const Foam::labelList&
+Foam::TimeActivatedExplicitSource<Type>::fieldIds() const
+{
+    return fieldIds_;
+}
+
+
+template<class Type>
+inline Foam::word& Foam::TimeActivatedExplicitSource<Type>::name()
+{
+    return name_;
+}
+
+
+template<class Type>
+inline bool& Foam::TimeActivatedExplicitSource<Type>::active()
+{
+    return active_;
+}
+
+
+template<class Type>
+inline Foam::scalar& Foam::TimeActivatedExplicitSource<Type>::timeStart()
+{
+    return timeStart_;
+}
+
+
+template<class Type>
+inline Foam::scalar& Foam::TimeActivatedExplicitSource<Type>::duration()
+{
+    return duration_;
+}
+
+
+template<class Type>
+inline typename Foam::TimeActivatedExplicitSource<Type>::volumeModeType&
+Foam::TimeActivatedExplicitSource<Type>::volumeMode()
+{
+    return volumeMode_;
+}
+
+
+template<class Type>
+inline typename Foam::TimeActivatedExplicitSource<Type>::selectionModeType&
+Foam::TimeActivatedExplicitSource<Type>::selectionMode()
+{
+    return selectionMode_;
+}
+
+
+template<class Type>
+inline Foam::List<Foam::point>&
+Foam::TimeActivatedExplicitSource<Type>::points()
+{
+    return points_;
+}
+
+
+template<class Type>
+inline Foam::word& Foam::TimeActivatedExplicitSource<Type>::cellSetName()
+{
+    return cellSetName_;
+}
+
+
+template<class Type>
+inline Foam::scalarList& Foam::TimeActivatedExplicitSource<Type>::V()
+{
+    return V_;
+}
+
+
+template<class Type>
+inline Foam::cellSet& Foam::TimeActivatedExplicitSource<Type>::cells()
+{
+    return cellsPtr_();
+}
+
+
+template<class Type>
+inline Foam::List<typename Foam::TimeActivatedExplicitSource<Type>::fieldNameValuePair>&
+Foam::TimeActivatedExplicitSource<Type>::fieldData()
+{
+    return fieldData_;
+}
+
+
+template<class Type>
+inline Foam::labelList& Foam::TimeActivatedExplicitSource<Type>::fieldIds()
+{
+    return fieldIds_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceIO.C b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceIO.C
new file mode 100644
index 000000000..e7871341a
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceIO.C
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "TimeActivatedExplicitSource.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::TimeActivatedExplicitSource<Type>::writeData(Ostream& os) const
+{
+    os  << indent << name_ << nl
+        << indent << token::BEGIN_BLOCK << incrIndent << nl;
+
+    os.writeKeyword("active") << active_ << token::END_STATEMENT << nl;
+    os.writeKeyword("timeStart") << timeStart_ << token::END_STATEMENT << nl;
+    os.writeKeyword("duration") << duration_ << token::END_STATEMENT << nl;
+    os.writeKeyword("selectionMode") << selectionModeTypeToWord(selectionMode_)
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("volumeMode") << volumeModeTypeToWord(volumeMode_)
+        << token::END_STATEMENT << nl;
+
+    if (fieldIds_.size() == 1)
+    {
+        os.writeKeyword("fieldData") << fieldData_[0].second()
+            << token::END_STATEMENT << nl;
+    }
+    else
+    {
+        os.writeKeyword("fieldData") << fieldData_ << nl;
+    }
+
+    switch (selectionMode_)
+    {
+        case smPoints:
+        {
+            os.writeKeyword("points") << nl << indent << points_
+                << token::END_STATEMENT << nl;
+            break;
+        }
+        case smCellSet:
+        {
+            os.writeKeyword("cellSet") << cellSetName_
+                << token::END_STATEMENT << nl;
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "TimeActivatedExplicitSource<Type>::writeData"
+                "("
+                    "Ostream&, "
+                    "bool"
+                ") const"
+            )   << "Unknown selectionMode "
+                << selectionModeTypeToWord(selectionMode_)
+                << abort(FatalError);
+        }
+    }
+
+    os << decrIndent << indent << token::END_BLOCK << endl;
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const TimeActivatedExplicitSource<Type>& source
+)
+{
+    source.writeData(os);
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.C b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.C
new file mode 100644
index 000000000..2764b7dde
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.C
@@ -0,0 +1,223 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "TimeActivatedExplicitSourceList.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::TimeActivatedExplicitSourceList<Type>::TimeActivatedExplicitSourceList
+(
+    const word& name,
+    const fvMesh& mesh,
+    const dimensionSet& dimensions,
+    const wordList& fieldNames
+)
+:
+    IOPtrList<TimeActivatedExplicitSource<Type> >
+    (
+        IOobject
+        (
+            name + "SourceProperties",
+            mesh.time().constant(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        ),
+        typename TimeActivatedExplicitSource<Type>::iNew(mesh, fieldNames)
+    ),
+    name_(name),
+    mesh_(mesh),
+    dimensions_(dimensions),
+    fieldNames_(fieldNames)
+{}
+
+
+template<class Type>
+Foam::TimeActivatedExplicitSourceList<Type>::TimeActivatedExplicitSourceList
+(
+    const word& name,
+    const fvMesh& mesh,
+    const dimensionSet& dimensions,
+    const word& fieldName
+)
+:
+    IOPtrList<TimeActivatedExplicitSource<Type> >
+    (
+        IOobject
+        (
+            name + "SourceProperties",
+            mesh.time().constant(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        ),
+        typename TimeActivatedExplicitSource<Type>::iNew
+        (
+            mesh,
+            IStringStream('(' + fieldName + ')')()
+        )
+    ),
+    name_(name),
+    mesh_(mesh),
+    dimensions_(dimensions),
+    fieldNames_(1, fieldName)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
+Foam::TimeActivatedExplicitSourceList<Type>::Su(const label fieldI)
+{
+    tmp<DimensionedField<Type, volMesh> > tSu
+    (
+       new DimensionedField<Type, volMesh>
+       (
+           IOobject
+           (
+               name_ + "Source_" + fieldNames_[fieldI],
+               mesh_.time().timeName(),
+               mesh_,
+               IOobject::NO_READ,
+               IOobject::NO_WRITE
+           ),
+           mesh_,
+           dimensioned<Type>("zero", dimensions_, pTraits<Type>::zero)
+       )
+    );
+
+    DimensionedField<Type, volMesh>& Su = tSu();
+
+    forAll(*this, i)
+    {
+        this->operator[](i).addToField(Su, fieldI);
+    }
+
+    return tSu;
+}
+
+
+template<class Type>
+Foam::tmp<Foam::DimensionedField<Type, Foam::volMesh> >
+Foam::TimeActivatedExplicitSourceList<Type>::SuTot()
+{
+    tmp<DimensionedField<Type, volMesh> > tSuTot
+    (
+       new DimensionedField<Type, volMesh>
+       (
+           IOobject
+           (
+               name_ + "TotalSource",
+               mesh_.time().timeName(),
+               mesh_,
+               IOobject::NO_READ,
+               IOobject::NO_WRITE
+           ),
+           mesh_,
+           dimensioned<Type>("zero", dimensions_, pTraits<Type>::zero)
+       )
+    );
+
+    DimensionedField<Type, volMesh>& SuTot = tSuTot();
+
+    forAll(fieldNames_, fieldI)
+    {
+        forAll(*this, sourceI)
+        {
+            this->operator[](sourceI).addToField(SuTot, fieldI);
+        }
+    }
+
+    return tSuTot;
+}
+
+
+template<class Type>
+bool Foam::TimeActivatedExplicitSourceList<Type>::readData(Istream& is)
+{
+    this->clear();
+
+    IOPtrList<TimeActivatedExplicitSource<Type> > newSources
+    (
+        IOobject
+        (
+            name_ + "TimeActivatedExplicitSource",
+            mesh_.time().constant(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        ),
+        typename TimeActivatedExplicitSource<Type>::iNew(mesh_, fieldNames_)
+    );
+
+    transfer(newSources);
+
+    return is.good();
+}
+
+
+template<class Type>
+bool Foam::TimeActivatedExplicitSourceList<Type>::writeData(Ostream& os) const
+{
+    // Write size of list
+    os << nl << this->size();
+
+    // Write beginning of contents
+    os << nl << token::BEGIN_LIST;
+
+    // Write list contents
+    forAll(*this, i)
+    {
+        os << nl;
+        this->operator[](i).writeData(os);
+    }
+
+    // Write end of contents
+    os << token::END_LIST << token::END_STATEMENT << nl;
+
+    // Check state of IOstream
+    return os.good();
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const TimeActivatedExplicitSourceList<Type>& sources
+)
+{
+    sources.writeData(os);
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.H b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.H
new file mode 100644
index 000000000..68dc28ccd
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/fieldSources/timeActivatedExplicitSource/TimeActivatedExplicitSourceList.H
@@ -0,0 +1,172 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::TimeActivatedExplicitSourceList
+
+Description
+    List of time activeted explict sources
+
+SourceFiles
+    TimeActivatedExplicitSourceList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef TimeActivatedExplicitSourceList_H
+#define TimeActivatedExplicitSourceList_H
+
+#include "IOPtrList.H"
+#include "TimeActivatedExplicitSource.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class fvMesh;
+
+template<class Type>
+class TimeActivatedExplicitSource;
+
+template<class Type>
+class TimeActivatedExplicitSourceList;
+
+// Forward declaration of friend functions
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const TimeActivatedExplicitSourceList<Type>&
+);
+
+/*---------------------------------------------------------------------------*\
+             Class TimeActivatedExplicitSourceList Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class TimeActivatedExplicitSourceList
+:
+    public IOPtrList<TimeActivatedExplicitSource<Type> >
+{
+private:
+
+    // Private data
+
+        //- Name of source properties list
+        word name_;
+
+        //- Reference to the mesh database
+        const fvMesh& mesh_;
+
+        //- Dimensions of source properties
+        dimensionSet dimensions_;
+
+        //- List of field names the source is working on
+        wordList fieldNames_;
+
+
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        TimeActivatedExplicitSourceList
+        (
+            const TimeActivatedExplicitSourceList<Type>&
+        );
+
+        //- Disallow default bitwise assignment
+        void operator=(const TimeActivatedExplicitSourceList<Type>&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components with list of field names
+        TimeActivatedExplicitSourceList
+        (
+            const word& name,
+            const fvMesh& mesh,
+            const dimensionSet& dimensions,
+            const wordList& fieldNames
+        );
+
+        //- Construct from components with single field name
+        TimeActivatedExplicitSourceList
+        (
+            const word& name,
+            const fvMesh& mesh,
+            const dimensionSet& dimensions,
+            const word& fieldName
+        );
+
+
+    // Member Functions
+
+        // Evaluation
+
+            //- Return the source for field, fieldI
+            tmp<DimensionedField<Type, volMesh> > Su
+            (
+                const label fieldI = 0
+            );
+
+            //- Return the total source for all fields
+            tmp<DimensionedField<Type, volMesh> > SuTot();
+
+
+
+        // I-O
+
+            //- Read data from Istream
+            bool readData(Istream& is);
+
+            //- Write data to Istream
+            bool writeData(Ostream& os) const;
+
+            //- Ostream operator
+            friend Ostream& operator<< <Type>
+            (
+                Ostream& os,
+                const TimeActivatedExplicitSourceList& sources
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "TimeActivatedExplicitSourceList.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H b/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
new file mode 100644
index 000000000..2389d0bd2
--- /dev/null
+++ b/src/finiteVolume/cfdTools/general/include/readGravitationalAcceleration.H
@@ -0,0 +1,12 @@
+    Info << "\nReading g" << endl;
+    uniformDimensionedVectorField g
+    (
+        IOobject
+        (
+            "g",
+            runTime.constant(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    );
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C
index b9045dc80..06b15c3c8 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/basic/basicSymmetry/basicSymmetryFvPatchField.C
@@ -95,7 +95,7 @@ basicSymmetryFvPatchField<Type>::basicSymmetryFvPatchField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Return gradient at boundary
+// return gradient at boundary
 template<class Type>
 tmp<Field<Type> > basicSymmetryFvPatchField<Type>::snGrad() const
 {
diff --git a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
index d7f68e4f0..53f1420dd 100644
--- a/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
+++ b/src/finiteVolume/fields/fvPatchFields/basic/transform/transformFvPatchField.H
@@ -151,7 +151,7 @@ public:
 // * * * * * * * * * * * Template Specialisations  * * * * * * * * * * * * * //
 
 template<>
-tmp<scalarField >
+tmp<scalarField>
 transformFvPatchField<scalar>::gradientInternalCoeffs() const;
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
index e2b9fe5ea..026bdf544 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/advective/advectiveFvPatchField.C
@@ -48,8 +48,8 @@ advectiveFvPatchField<Type>::advectiveFvPatchField
 )
 :
     mixedFvPatchField<Type>(p, iF),
-    phiName_("Undefined"),
-    rhoName_("Undefined"),
+    phiName_("phi"),
+    rhoName_("rho"),
     fieldInf_(pTraits<Type>::zero),
     lInf_(0.0),
     inletOutlet_(false),
@@ -178,8 +178,8 @@ tmp<scalarField> advectiveFvPatchField<Type>::advectionSpeed() const
     fvsPatchField<scalar> phip = this->patch().lookupPatchField
     (
         phiName_,
-        reinterpret_cast<const surfaceScalarField*>(NULL),
-        reinterpret_cast<const scalar*>(NULL)
+        reinterpret_cast<const surfaceScalarField*>(0),
+        reinterpret_cast<const scalar*>(0)
     );
 
     if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
@@ -187,8 +187,8 @@ tmp<scalarField> advectiveFvPatchField<Type>::advectionSpeed() const
         const fvPatchScalarField& rhop = this->patch().lookupPatchField
         (
             rhoName_,
-            reinterpret_cast<const volScalarField*>(NULL),
-            reinterpret_cast<const scalar*>(NULL)
+            reinterpret_cast<const volScalarField*>(0),
+            reinterpret_cast<const scalar*>(0)
         );
 
         return phip/(rhop*this->patch().magSf());
@@ -428,7 +428,7 @@ void advectiveFvPatchField<Type>::write(Ostream& os) const
 
     if (phiName_ != "phi")
     {
-    os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
+        os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
     }
     if (rhoName_ != "rho")
     {
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
index 09020b771..3ec23ac17 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/fixedFluxPressure/fixedFluxPressureFvPatchScalarField.C
@@ -30,28 +30,23 @@ License
 #include "surfaceFields.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
+Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
     fixedGradientFvPatchScalarField(p, iF),
-    UName_("Undefined"),
-    phiName_("Undefined"),
-    rhoName_("Undefined"),
+    UName_("U"),
+    phiName_("phi"),
+    rhoName_("rho"),
     adjoint_(false)
 {}
 
 
-fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
+Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 (
     const fixedFluxPressureFvPatchScalarField& ptf,
     const fvPatch& p,
@@ -67,7 +62,7 @@ fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 {}
 
 
-fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
+Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -75,9 +70,9 @@ fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 )
 :
     fixedGradientFvPatchScalarField(p, iF),
-    UName_(dict.lookup("U")),
-    phiName_(dict.lookup("phi")),
-    rhoName_(dict.lookup("rho")),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    phiName_(dict.lookupOrDefault<word>("phi", "phi")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
     adjoint_(dict.lookup("adjoint"))
 {
     if (dict.found("gradient"))
@@ -94,7 +89,7 @@ fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 }
 
 
-fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
+Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 (
     const fixedFluxPressureFvPatchScalarField& wbppsf
 )
@@ -107,7 +102,7 @@ fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 {}
 
 
-fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
+Foam::fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 (
     const fixedFluxPressureFvPatchScalarField& wbppsf,
     const DimensionedField<scalar, volMesh>& iF
@@ -123,7 +118,7 @@ fixedFluxPressureFvPatchScalarField::fixedFluxPressureFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void fixedFluxPressureFvPatchScalarField::updateCoeffs()
+void Foam::fixedFluxPressureFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
@@ -133,8 +128,9 @@ void fixedFluxPressureFvPatchScalarField::updateCoeffs()
     const fvPatchField<vector>& Up =
         patch().lookupPatchField<volVectorField, vector>(UName_);
 
-    const surfaceScalarField& phi = 
+    const surfaceScalarField& phi =
         db().lookupObject<surfaceScalarField>(phiName_);
+
     fvsPatchField<scalar> phip =
         patch().patchField<surfaceScalarField, scalar>(phi);
 
@@ -162,12 +158,21 @@ void fixedFluxPressureFvPatchScalarField::updateCoeffs()
 }
 
 
-void fixedFluxPressureFvPatchScalarField::write(Ostream& os) const
+void Foam::fixedFluxPressureFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchScalarField::write(os);
-    os.writeKeyword("U") << UName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
+    if (UName_ != "U")
+    {
+        os.writeKeyword("U") << UName_ << token::END_STATEMENT << nl;
+    }
+    if (phiName_ != "phi")
+    {
+        os.writeKeyword("phi") << phiName_ << token::END_STATEMENT << nl;
+    }
+    if (rhoName_ != "rho")
+    {
+        os.writeKeyword("rho") << rhoName_ << token::END_STATEMENT << nl;
+    }
     os.writeKeyword("adjoint") << adjoint_ << token::END_STATEMENT << nl;
     gradient().writeEntry("gradient", os);
 }
@@ -175,10 +180,13 @@ void fixedFluxPressureFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, fixedFluxPressureFvPatchScalarField);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        fixedFluxPressureFvPatchScalarField
+    );
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
index 3dc0fda01..46104ec49 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/inletOutlet/inletOutletFvPatchField.C
@@ -130,8 +130,8 @@ void inletOutletFvPatchField<Type>::updateCoeffs()
     const Field<scalar>& phip = this->patch().lookupPatchField
     (
         phiName_,
-        reinterpret_cast<const surfaceScalarField*>(NULL),
-        reinterpret_cast<const scalar*>(NULL)
+        reinterpret_cast<const surfaceScalarField*>(0),
+        reinterpret_cast<const scalar*>(0)
     );
 
     this->valueFraction() = 1.0 - pos(phip);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
index 67a0186f4..3a8942aef 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/outletInlet/outletInletFvPatchField.C
@@ -124,8 +124,8 @@ void outletInletFvPatchField<Type>::updateCoeffs()
     const fvsPatchField<scalar>& phip = this->patch().lookupPatchField
     (
         "phi",
-        reinterpret_cast<const surfaceScalarField*>(NULL),
-        reinterpret_cast<const scalar*>(NULL)
+        reinterpret_cast<const surfaceScalarField*>(0),
+        reinterpret_cast<const scalar*>(0)
     );
 
     this->valueFraction() = pos(phip);
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H
index c5ca633c8..bea349b53 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureDirectedInletVelocity/pressureDirectedInletVelocityFvPatchVectorField.H
@@ -186,7 +186,7 @@ public:
 
         //- Write
         virtual void write(Ostream&) const;
-q
+
 
     // Member operators
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
index 0874d271c..455ecf850 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/pressureInletOutletVelocity/pressureInletOutletVelocityFvPatchVectorField.H
@@ -57,7 +57,7 @@ class pressureInletOutletVelocityFvPatchVectorField
 {
     // Private data
 
-q        //- Name of flux field
+        //- Name of flux field
         word phiName_;
 
         //- Optional tangential velocity component
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedTotalPressure/timeVaryingMappedTotalPressureFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedTotalPressure/timeVaryingMappedTotalPressureFvPatchScalarField.C
new file mode 100644
index 000000000..b7bb377f8
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedTotalPressure/timeVaryingMappedTotalPressureFvPatchScalarField.C
@@ -0,0 +1,298 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "timeVaryingMappedTotalPressureFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "surfaceFields.H"
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::timeVaryingMappedTotalPressureFvPatchScalarField::
+timeVaryingMappedTotalPressureFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    timeVaryingMappedFixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    phiName_("phi"),
+    rhoName_("none"),
+    rho_(1),
+    psiName_("none"),
+    gamma_(0.0)
+{}
+
+
+Foam::timeVaryingMappedTotalPressureFvPatchScalarField::
+timeVaryingMappedTotalPressureFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    timeVaryingMappedFixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("UName", "U")),
+    phiName_(dict.lookupOrDefault<word>("phiName", "phi")),
+    rhoName_(dict.lookupOrDefault<word>("rhoName", "none")),
+    rho_
+    (
+        iF.dimensions() == dimPressure/dimDensity && rhoName_ == "rho"
+        ? readScalar(dict.lookup("rho"))
+        : 1
+    ),
+    psiName_(dict.lookupOrDefault<word>("psiName", "none")),
+    gamma_
+    (
+        iF.dimensions() == dimPressure && psiName_ != "none"
+        ? readScalar(dict.lookup("gamma"))
+        : 1
+    )
+{}
+
+
+Foam::timeVaryingMappedTotalPressureFvPatchScalarField::
+timeVaryingMappedTotalPressureFvPatchScalarField
+(
+    const timeVaryingMappedTotalPressureFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    timeVaryingMappedFixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    phiName_(ptf.phiName_),
+    rhoName_(ptf.rhoName_),
+    rho_(ptf.rho_),
+    psiName_(ptf.psiName_),
+    gamma_(ptf.gamma_)
+{}
+
+
+Foam::timeVaryingMappedTotalPressureFvPatchScalarField::
+timeVaryingMappedTotalPressureFvPatchScalarField
+(
+    const timeVaryingMappedTotalPressureFvPatchScalarField& tppsf
+)
+:
+    timeVaryingMappedFixedValueFvPatchScalarField(tppsf),
+    UName_(tppsf.UName_),
+    phiName_(tppsf.phiName_),
+    rhoName_(tppsf.rhoName_),
+    rho_(tppsf.rho_),
+    psiName_(tppsf.psiName_),
+    gamma_(tppsf.gamma_)
+{}
+
+
+Foam::timeVaryingMappedTotalPressureFvPatchScalarField::
+timeVaryingMappedTotalPressureFvPatchScalarField
+(
+    const timeVaryingMappedTotalPressureFvPatchScalarField& tppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    timeVaryingMappedFixedValueFvPatchScalarField(tppsf, iF),
+    UName_(tppsf.UName_),
+    phiName_(tppsf.phiName_),
+    rhoName_(tppsf.rhoName_),
+    rho_(tppsf.rho_),
+    psiName_(tppsf.psiName_),
+    gamma_(tppsf.gamma_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::timeVaryingMappedTotalPressureFvPatchScalarField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    timeVaryingMappedFixedValueFvPatchScalarField::autoMap(m);
+}
+
+
+void Foam::timeVaryingMappedTotalPressureFvPatchScalarField::rmap
+(
+    const fvPatchScalarField& ptf,
+    const labelList& addr
+)
+{
+    timeVaryingMappedFixedValueFvPatchScalarField::rmap(ptf, addr);
+}
+
+
+void Foam::timeVaryingMappedTotalPressureFvPatchScalarField::updateCoeffs
+(
+    const vectorField& Up
+)
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Map the total-pressure field onto this field
+    timeVaryingMappedFixedValueFvPatchScalarField::updateCoeffs();
+    const scalarField p0 = *this;
+
+    const fvsPatchField<scalar>& phip =
+        patch().lookupPatchField<surfaceScalarField, scalar>(phiName_);
+
+    if (dimensionedInternalField().dimensions() == dimPressure/dimDensity)
+    {
+        if (rhoName_ == "none")
+        {
+            operator==(p0 - 0.5*(1.0 - pos(phip))*magSqr(Up));
+        }
+        else if (rhoName_ == "rho")
+        {
+            operator==(p0/rho_ - 0.5*(1.0 - pos(phip))*magSqr(Up));
+        }
+        else
+        {
+            FatalErrorIn
+            (
+                "timeVaryingMappedTotalPressureFvPatchScalarField::"
+                "updateCoeffs()"
+            )   << " rhoName set inconsistently, rhoName = " << rhoName_
+                << ".\n"
+                << "    Set rhoName to 'rho' or 'none' depending on the "
+                   "definition of total pressure." << nl
+                << "    on patch " << this->patch().name()
+                << " of field " << this->dimensionedInternalField().name()
+                << " in file " << this->dimensionedInternalField().objectPath()
+                << exit(FatalError);
+        }
+    }
+    else if (dimensionedInternalField().dimensions() == dimPressure)
+    {
+        if (rhoName_ != "none")
+        {
+            const fvPatchField<scalar>& rho =
+                patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+
+            operator==(p0 - 0.5*rho*(1.0 - pos(phip))*magSqr(Up));
+        }
+        else if (psiName_ != "none")
+        {
+            const fvPatchField<scalar>& psip =
+                patch().lookupPatchField<volScalarField, scalar>(psiName_);
+
+            if (gamma_ > 1.0)
+            {
+                scalar gM1ByG = (gamma_ - 1.0)/gamma_;
+
+                operator==
+                (
+                    p0
+                    /pow
+                    (
+                        (1.0 + 0.5*psip*gM1ByG*(1.0 - pos(phip))*magSqr(Up)),
+                        1.0/gM1ByG
+                    )
+                );
+            }
+            else
+            {
+                operator==(p0/(1.0 + 0.5*psip*(1.0 - pos(phip))*magSqr(Up)));
+            }
+        }
+        else
+        {
+            FatalErrorIn
+            (
+                "timeVaryingMappedTotalPressureFvPatchScalarField::"
+                "updateCoeffs()"
+            )   << " rhoName or psiName set inconsistently, rhoName = "
+                << rhoName_ << ", psiName = " << psiName_ << ".\n"
+                << "    Set either rhoName or psiName depending on the "
+                   "definition of total pressure." << nl
+                << "    Set the unused variable(s) to 'none'.\n"
+                << "    on patch " << this->patch().name()
+                << " of field " << this->dimensionedInternalField().name()
+                << " in file " << this->dimensionedInternalField().objectPath()
+                << exit(FatalError);
+        }
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "timeVaryingMappedTotalPressureFvPatchScalarField::updateCoeffs()"
+        )   << "Incorrect dimensions for pressure "
+            << dimensionedInternalField().dimensions()
+            << "    Should be either " << dimPressure
+            << " for compressible/variable density flow\n"
+            << "    or " << dimPressure/dimDensity
+            << " for incompressible flow.\n"
+            << "    on patch " << this->patch().name()
+            << " of field " << this->dimensionedInternalField().name()
+            << " in file " << this->dimensionedInternalField().objectPath()
+            << exit(FatalError);
+    }
+}
+
+
+void Foam::timeVaryingMappedTotalPressureFvPatchScalarField::updateCoeffs()
+{
+    updateCoeffs(patch().lookupPatchField<volVectorField, vector>(UName_));
+}
+
+
+void Foam::timeVaryingMappedTotalPressureFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    writeEntryIfDifferent<word>(os, "UName", "U", UName_);
+    writeEntryIfDifferent<word>(os, "phiName", "phi", phiName_);
+    os.writeKeyword("rhoName") << rhoName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("rho") << rho_ << token::END_STATEMENT << nl;
+    os.writeKeyword("psiName") << psiName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("gamma") << gamma_ << token::END_STATEMENT << nl;
+    timeVaryingMappedFixedValueFvPatchScalarField::write(os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        timeVaryingMappedTotalPressureFvPatchScalarField
+    );
+}
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedTotalPressure/timeVaryingMappedTotalPressureFvPatchScalarField.H b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedTotalPressure/timeVaryingMappedTotalPressureFvPatchScalarField.H
new file mode 100644
index 000000000..3b6568477
--- /dev/null
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedTotalPressure/timeVaryingMappedTotalPressureFvPatchScalarField.H
@@ -0,0 +1,213 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::timeVaryingMappedTotalPressureFvPatchScalarField
+
+Description
+    Foam::timeVaryingMappedTotalPressureFvPatchScalarField
+
+SourceFiles
+    timeVaryingMappedTotalPressureFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef timeVaryingMappedTotalPressureFvPatchScalarField_H
+#define timeVaryingMappedTotalPressureFvPatchScalarField_H
+
+#include "timeVaryingMappedFixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+           Class timeVaryingMappedTotalPressureFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class timeVaryingMappedTotalPressureFvPatchScalarField
+:
+    public timeVaryingMappedFixedValueFvPatchScalarField
+{
+    // Private data
+
+        //- Name of the velocity field
+        word UName_;
+
+        //- Name of the flux transporting the field
+        word phiName_;
+
+        //- Name of the density field used to normalise the mass flux
+        //  if neccessary
+        word rhoName_;
+
+        //- Rho value used to normalise the total pressure for incompressible flow
+        scalar rho_;
+
+        //- Name of the compressibility field used to calculate the wave speed
+        word psiName_;
+
+        //- Heat capacity ratio
+        scalar gamma_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("timeVaryingMappedTotalPressure");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        timeVaryingMappedTotalPressureFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        timeVaryingMappedTotalPressureFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given timeVaryingMappedTotalPressureFvPatchScalarField
+        //  onto a new patch
+        timeVaryingMappedTotalPressureFvPatchScalarField
+        (
+            const timeVaryingMappedTotalPressureFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        timeVaryingMappedTotalPressureFvPatchScalarField
+        (
+            const timeVaryingMappedTotalPressureFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new timeVaryingMappedTotalPressureFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        timeVaryingMappedTotalPressureFvPatchScalarField
+        (
+            const timeVaryingMappedTotalPressureFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new timeVaryingMappedTotalPressureFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Access
+
+            //- Return the name of the velocity field
+            const word& UName() const
+            {
+                return UName_;
+            }
+
+            //- Return reference to the name of the velocity field
+            //  to allow adjustment
+            word& UName()
+            {
+                return UName_;
+            }
+
+            //- Return the heat capacity ratio
+            scalar gamma() const
+            {
+                return gamma_;
+            }
+
+            //- Return reference to the heat capacity ratio to allow adjustment
+            scalar& gamma()
+            {
+                return gamma_;
+            }
+
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchScalarField&,
+                const labelList&
+            );
+
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            //  using the given patch velocity field
+            virtual void updateCoeffs(const vectorField& Up);
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
index 555edce67..e84c58a5d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentIntensityKineticEnergyInlet/turbulentIntensityKineticEnergyInletFvPatchScalarField.C
@@ -30,14 +30,9 @@ License
 #include "surfaceFields.H"
 #include "volFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-turbulentIntensityKineticEnergyInletFvPatchScalarField::
+Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
 turbulentIntensityKineticEnergyInletFvPatchScalarField
 (
     const fvPatch& p,
@@ -49,7 +44,7 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
     intensity_(0.05)
 {}
 
-turbulentIntensityKineticEnergyInletFvPatchScalarField::
+Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
 turbulentIntensityKineticEnergyInletFvPatchScalarField
 (
     const turbulentIntensityKineticEnergyInletFvPatchScalarField& ptf,
@@ -63,7 +58,7 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
     intensity_(ptf.intensity_)
 {}
 
-turbulentIntensityKineticEnergyInletFvPatchScalarField::
+Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
 turbulentIntensityKineticEnergyInletFvPatchScalarField
 (
     const fvPatch& p,
@@ -93,7 +88,7 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
     }
 }
 
-turbulentIntensityKineticEnergyInletFvPatchScalarField::
+Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
 turbulentIntensityKineticEnergyInletFvPatchScalarField
 (
     const turbulentIntensityKineticEnergyInletFvPatchScalarField& ptf
@@ -104,7 +99,8 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
     intensity_(ptf.intensity_)
 {}
 
-turbulentIntensityKineticEnergyInletFvPatchScalarField::
+
+Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
 turbulentIntensityKineticEnergyInletFvPatchScalarField
 (
     const turbulentIntensityKineticEnergyInletFvPatchScalarField& ptf,
@@ -119,7 +115,9 @@ turbulentIntensityKineticEnergyInletFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void turbulentIntensityKineticEnergyInletFvPatchScalarField::updateCoeffs()
+void
+Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::
+updateCoeffs()
 {
     if (updated())
     {
@@ -135,7 +133,7 @@ void turbulentIntensityKineticEnergyInletFvPatchScalarField::updateCoeffs()
 }
 
 
-void turbulentIntensityKineticEnergyInletFvPatchScalarField::write
+void Foam::turbulentIntensityKineticEnergyInletFvPatchScalarField::write
 (
     Ostream& os
 ) const
@@ -152,15 +150,13 @@ void turbulentIntensityKineticEnergyInletFvPatchScalarField::write
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField
-(
-    fvPatchScalarField,
-    turbulentIntensityKineticEnergyInletFvPatchScalarField
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        turbulentIntensityKineticEnergyInletFvPatchScalarField
+    );
+}
 
 // ************************************************************************* //
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
index 57f7fdbfe..573b8a686 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/waveTransmissive/waveTransmissiveFvPatchField.C
@@ -44,7 +44,7 @@ waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
 )
 :
     advectiveFvPatchField<Type>(p, iF),
-    psiName_("Undefined"),
+    psiName_("psi"),
     UName_("Undefined"),
     gamma_(0.0)
 {}
@@ -56,7 +56,6 @@ waveTransmissiveFvPatchField<Type>::waveTransmissiveFvPatchField
     const waveTransmissiveFvPatchField& ptf,
     const fvPatch& p,
     const DimensionedField<Type, volMesh>& iF,
-    const dictionary& dict
     const fvPatchFieldMapper& mapper
 )
 :
@@ -118,8 +117,8 @@ tmp<scalarField> waveTransmissiveFvPatchField<Type>::advectionSpeed() const
     const fvPatchField<scalar>& psip = this->patch().lookupPatchField
     (
         psiName_,
-        reinterpret_cast<const volScalarField*>(NULL),
-        reinterpret_cast<const scalar*>(NULL)
+        reinterpret_cast<const volScalarField*>(0),
+        reinterpret_cast<const scalar*>(0)
     );
 
     const surfaceScalarField& phi =
@@ -129,8 +128,8 @@ tmp<scalarField> waveTransmissiveFvPatchField<Type>::advectionSpeed() const
     fvsPatchField<scalar> phip = this->patch().lookupPatchField
     (
         this->phiName_,
-        reinterpret_cast<const surfaceScalarField*>(NULL),
-        reinterpret_cast<const scalar*>(NULL)
+        reinterpret_cast<const surfaceScalarField*>(0),
+        reinterpret_cast<const scalar*>(0)
     );
 
     if (phi.dimensions() == dimDensity*dimVelocity*dimArea)
@@ -138,8 +137,8 @@ tmp<scalarField> waveTransmissiveFvPatchField<Type>::advectionSpeed() const
         const fvPatchScalarField& rhop = this->patch().lookupPatchField
         (
             this->rhoName_,
-            reinterpret_cast<const volScalarField*>(NULL),
-            reinterpret_cast<const scalar*>(NULL)
+            reinterpret_cast<const volScalarField*>(0),
+            reinterpret_cast<const scalar*>(0)
         );
 
         phip /= rhop;
@@ -214,8 +213,6 @@ void waveTransmissiveFvPatchField<Type>::write(Ostream& os) const
     }
 
     this->writeEntry("value", os);
-
-    
 }
 
 
diff --git a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H
index 49ca331ec..fd2a0a7ac 100644
--- a/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H
+++ b/src/finiteVolume/finiteVolume/gradSchemes/extendedLeastSquaresGrad/extendedLeastSquaresGrad.H
@@ -91,7 +91,7 @@ public:
                 FatalIOErrorIn
                 (
                     "extendedLeastSquaresGrad"
-                    "(const fvMesh& mesh, Istream& schemeData)",
+                    "(const fvMesh&, Istream& schemeData)",
                     schemeData
                 )   << "Minimum determinant = " << minDet_
                     << " should be >= 0 and <= 8"
diff --git a/src/finiteVolume/fvMesh/fvMesh.C b/src/finiteVolume/fvMesh/fvMesh.C
index 9f2d60bb8..3cb0b1f62 100644
--- a/src/finiteVolume/fvMesh/fvMesh.C
+++ b/src/finiteVolume/fvMesh/fvMesh.C
@@ -110,6 +110,32 @@ void Foam::fvMesh::clearGeom()
 void Foam::fvMesh::clearAddressing()
 {
     deleteDemandDrivenData(lduPtr_);
+
+    // Hack until proper callbacks. Below are all the fvMesh-MeshObjects.
+
+    // HJ, review delete of new function objects
+/*
+    volPointInterpolation::Delete(*this);
+    extendedLeastSquaresVectors::Delete(*this);
+    leastSquaresVectors::Delete(*this);
+    CentredFitData<linearFitPolynomial>::Delete(*this);
+    CentredFitData<quadraticFitPolynomial>::Delete(*this);
+    CentredFitData<quadraticLinearFitPolynomial>::Delete(*this);
+    skewCorrectionVectors::Delete(*this);
+    //quadraticFitSnGradData::Delete(*this);
+
+    centredCECCellToFaceStencilObject::Delete(*this);
+    centredCFCCellToFaceStencilObject::Delete(*this);
+    centredCPCCellToFaceStencilObject::Delete(*this);
+    centredFECCellToFaceStencilObject::Delete(*this);
+    // Is this geometry related - cells distorting to upwind direction?
+    upwindCECCellToFaceStencilObject::Delete(*this);
+    upwindCFCCellToFaceStencilObject::Delete(*this);
+    upwindCPCCellToFaceStencilObject::Delete(*this);
+    upwindFECCellToFaceStencilObject::Delete(*this);
+
+    centredCFCFaceToCellStencilObject::Delete(*this);
+*/
 }
 
 
@@ -644,6 +670,20 @@ Foam::tmp<Foam::scalarField> Foam::fvMesh::movePoints(const pointField& p)
     surfaceInterpolation::movePoints();
     meshObjectBase::allMovePoints<fvMesh>(*this);
 
+    HJ, review
+    
+ /*
+    // Hack until proper callbacks. Below are all the fvMesh MeshObjects with a
+    // movePoints function.
+    MeshObjectMovePoints<volPointInterpolation>(*this);
+    MeshObjectMovePoints<extendedLeastSquaresVectors>(*this);
+    MeshObjectMovePoints<leastSquaresVectors>(*this);
+    MeshObjectMovePoints<CentredFitData<linearFitPolynomial> >(*this);
+    MeshObjectMovePoints<CentredFitData<quadraticFitPolynomial> >(*this);
+    MeshObjectMovePoints<CentredFitData<quadraticLinearFitPolynomial> >(*this);
+    MeshObjectMovePoints<skewCorrectionVectors>(*this);
+    //MeshObjectMovePoints<quadraticFitSnGradData>(*this);
+*/
     return tsweptVols;
 }
 
diff --git a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
index 27b487077..52ef5dde2 100644
--- a/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
+++ b/src/finiteVolume/fvMesh/fvMeshMapper/fvSurfaceMapper.H
@@ -39,7 +39,7 @@ SourceFiles
 #include "morphFieldMapper.H"
 #include "fvMesh.H"
 #include "faceMapper.H"
-#include "labelHashSet.H"
+#include "HashSet.H"
 #include "mapPolyMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/finiteVolume/fvMesh/fvPatches/derived/wall/wallFvPatch.C b/src/finiteVolume/fvMesh/fvPatches/derived/wall/wallFvPatch.C
index c502c8060..0edf4925b 100644
--- a/src/finiteVolume/fvMesh/fvPatches/derived/wall/wallFvPatch.C
+++ b/src/finiteVolume/fvMesh/fvPatches/derived/wall/wallFvPatch.C
@@ -44,13 +44,6 @@ addToRunTimeSelectionTable(fvPatch, wallFvPatch, polyPatch);
 
 void wallFvPatch::makeCorrVecs(vectorField& cv) const
 {
-    // Correction vector
-//     vectorField d = delta();
-//     vectorField n = nf();
-//     cv = n - d/(n & d);
-
-    // Old version: no non-orthogonal correction on the wall
-    // Testing.  HJ, 9/Apr/2009
     cv = vector::zero;
 }
 
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
index 937ef42d6..bf03f7f87 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/limitedSurfaceInterpolationScheme/limitedSurfaceInterpolationScheme.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Abstract base class for surface interpolation schemes.
-
 \*---------------------------------------------------------------------------*/
 
 #include "limitedSurfaceInterpolationScheme.H"
@@ -39,7 +36,6 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
 
-// Return weighting factors for scheme given by name in dictionary
 template<class Type>
 tmp<limitedSurfaceInterpolationScheme<Type> >
 limitedSurfaceInterpolationScheme<Type>::New
@@ -161,6 +157,9 @@ template<class Type>
 tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
 (
     const GeometricField<Type, fvPatchField, volMesh>& phi
+    const GeometricField<Type, fvPatchField, volMesh>& phi,
+    const surfaceScalarField& CDweights,
+    tmp<surfaceScalarField> tLimiter
 ) const
 {
     const fvMesh& mesh = this->mesh();
@@ -171,6 +170,7 @@ tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
     surfaceScalarField& Weights = tWeights();
 
     const surfaceScalarField& CDweights = mesh.surfaceInterpolation::weights();
+    surfaceScalarField& Weights = tLimiter();
 
     scalarField& pWeights = Weights.internalField();
 
@@ -200,8 +200,22 @@ tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
     }
 
     return tWeights;
+    return tLimiter;
 }
 
+template<class Type>
+tmp<surfaceScalarField> limitedSurfaceInterpolationScheme<Type>::weights
+(
+    const GeometricField<Type, fvPatchField, volMesh>& phi
+) const
+{
+    return this->weights
+    (
+        phi,
+        this->mesh().surfaceInterpolation::weights(),
+        this->limiter(phi)
+    );
+}
 
 template<class Type>
 tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.H b/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.H
deleted file mode 100644
index fe656ad12..000000000
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.H
+++ /dev/null
@@ -1,247 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
-    Foam::linearUpwindV
-
-Description
-    linearUpwindV interpolation scheme class derived from upwind and returns
-    upwind weighting factors but also applies an explicit correction.
-
-SourceFiles
-    linearUpwindV.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef linearUpwindV_H
-#define linearUpwindV_H
-
-#include "upwind.H"
-#include "gaussGrad.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                           Class linearUpwindV Declaration
-\*---------------------------------------------------------------------------*/
-
-template<class Type>
-class linearUpwindV
-:
-    public upwind<Type>
-{
-    // Private Data
-
-        tmp<fv::gradScheme<Type> > gradScheme_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        linearUpwindV(const linearUpwindV&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const linearUpwindV&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("linearUpwindV");
-
-
-    // Constructors
-
-        //- Construct from faceFlux
-        linearUpwindV
-        (
-            const fvMesh& mesh,
-            const surfaceScalarField& faceFlux
-        )
-        :
-            upwind<Type>(mesh, faceFlux),
-            gradScheme_
-            (
-                new fv::gaussGrad<Type>(mesh)
-            )
-        {}
-
-        //- Construct from Istream. 
-        //  The name of the flux field is read from the Istream and looked-up
-        //  from the mesh objectRegistry
-        linearUpwindV
-        (
-            const fvMesh& mesh,
-            Istream& schemeData
-        )
-        :
-            upwind<Type>(mesh, schemeData),
-            gradScheme_
-            (
-                fv::gradScheme<Type>::New
-                (
-                    mesh,
-                    schemeData
-                )
-            )
-        {}
-
-        //- Construct from faceFlux and Istream
-        linearUpwindV
-        (
-            const fvMesh& mesh,
-            const surfaceScalarField& faceFlux,
-            Istream& schemeData
-        )
-        :
-            upwind<Type>(mesh, faceFlux, schemeData),
-            gradScheme_
-            (
-                fv::gradScheme<Type>::New
-                (
-                    mesh,
-                    schemeData
-                )
-            )
-        {}
-
-
-    // Member Functions
-
-        //- Return true if this scheme uses an explicit correction
-        virtual bool corrected() const
-        {
-            return true;
-        }
-
-        //- Return the explicit correction to the face-interpolate
-        virtual tmp<GeometricField<Type, fvsPatchField, surfaceMesh> >
-        correction
-        (
-            const GeometricField<Type, fvPatchField, volMesh>& vf
-        ) const
-        {
-            const fvMesh& mesh = this->mesh();
-
-            tmp<GeometricField<Type, fvsPatchField, surfaceMesh> > tsfCorr
-            (
-                new GeometricField<Type, fvsPatchField, surfaceMesh>
-                (
-                    IOobject
-                    (
-                        vf.name(),
-                        mesh.time().timeName(),
-                        mesh
-                    ),
-                    mesh,
-                    dimensioned<Type>
-                    (
-                        vf.name(),
-                        vf.dimensions(),
-                        pTraits<Type>::zero
-                    )
-                )
-            );
-
-            GeometricField<Type, fvsPatchField, surfaceMesh>& sfCorr = tsfCorr();
-
-            const surfaceScalarField& faceFlux = this->faceFlux_;
-            const surfaceScalarField& w = mesh.weights();
-
-            const labelList& own = mesh.owner();
-            const labelList& nei = mesh.neighbour();
-
-            const vectorField& C = mesh.C();
-            const vectorField& Cf = mesh.Cf();
-
-            GeometricField
-            <typename outerProduct<vector, Type>::type, fvPatchField, volMesh>
-                gradVf = gradScheme_().grad(vf);
-
-            forAll(faceFlux, facei)
-            {
-                vector maxCorr;
-
-                if (faceFlux[facei] > 0.0)
-                {
-                    maxCorr =
-                        (1.0 - w[facei])
-                       *(vf[nei[facei]] - vf[own[facei]]);
-
-                    sfCorr[facei] = 
-                        (Cf[facei] - C[own[facei]]) & gradVf[own[facei]];
-                }
-                else
-                {
-                    maxCorr =
-                        w[facei]*(vf[own[facei]] - vf[nei[facei]]);
-
-                    sfCorr[facei] = 
-                        (Cf[facei] - C[nei[facei]]) & gradVf[nei[facei]];
-                }
-
-                scalar sfCorrs = magSqr(sfCorr[facei]);
-                scalar maxCorrs = sfCorr[facei] & maxCorr;
-
-                if (sfCorrs > 0)
-                {
-                    if (maxCorrs < 0)
-                    {
-                        sfCorr[facei] = vector::zero;
-                    }
-                    else if (sfCorrs > maxCorrs)
-                    {
-                        sfCorr[facei] *= maxCorrs/(sfCorrs + VSMALL);
-                    }
-                }
-                else if (sfCorrs < 0)
-                {
-                    if (maxCorrs > 0)
-                    {
-                        sfCorr[facei] = vector::zero;
-                    }
-                    else if (sfCorrs < maxCorrs)
-                    {
-                        sfCorr[facei] *= maxCorrs/(sfCorrs - VSMALL);
-                    }
-                }
-            }
-
-            return tsfCorr;
-        }
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/applications/test/dictionary/dictionaryTest.C b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFit.C
similarity index 78%
rename from applications/test/dictionary/dictionaryTest.C
rename to src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFit.C
index e5cde5b09..c0cc9df1f 100644
--- a/applications/test/dictionary/dictionaryTest.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFit.C
@@ -22,31 +22,28 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Application
-    dictionaryTest
-
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "IOstreams.H"
-#include "IFstream.H"
-#include "dictionary.H"
-
-using namespace Foam;
+#include "CentredFitScheme.H"
+#include "linearFitPolynomial.H"
+#include "centredCFCCellToFaceStencilObject.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
 
-int main(int argc, char *argv[])
+namespace Foam
 {
-    IFstream dictStream("testDict");
-    dictionary testDict(dictStream);
+    defineTemplateTypeNameAndDebug
+    (
+        CentredFitData<linearFitPolynomial>,
+        0
+    );
 
-    Info<< testDict << endl;
-
-    return 0;
+    makeCentredFitSurfaceInterpolationScheme
+    (
+        linearFit,
+        linearFitPolynomial,
+        centredCFCCellToFaceStencilObject
+    );
 }
 
-
 // ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFitPolynomial.H b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFitPolynomial.H
new file mode 100644
index 000000000..036758d3f
--- /dev/null
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/schemes/linearFit/linearFitPolynomial.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::linearFitPolynomial
+
+Description
+    Linear polynomial for interpolation fitting.
+
+    Can be used with the CentredFit scheme to create a linear surface
+    interpolation scheme
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef linearFitPolynomial_H
+#define linearFitPolynomial_H
+
+#include "vector.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class linearFitPolynomial Declaration
+\*---------------------------------------------------------------------------*/
+
+class linearFitPolynomial
+{
+public:
+
+    // Member functions
+
+        static label nTerms(const direction dim)
+        {
+            return
+            (
+                dim == 1 ? 2 :
+                dim == 2 ? 3 :
+                dim == 3 ? 4 : 0
+            );
+        }
+
+        static void addCoeffs
+        (
+            scalar* coeffs,
+            const vector& d,
+            const scalar weight,
+            const direction dim
+        )
+        {
+            register label curIdx = 0;
+
+            coeffs[curIdx++] = weight;
+            coeffs[curIdx++] = weight*d.x();
+
+            if (dim >= 2)
+            {
+                coeffs[curIdx++] = weight*d.y();
+            }
+            if (dim == 3)
+            {
+                coeffs[curIdx++] = weight*d.z();
+            }
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
index 2699463c0..2b806d5c7 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
+++ b/src/finiteVolume/interpolation/surfaceInterpolation/surfaceInterpolation/surfaceInterpolation.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Cell to face interpolation scheme. Included in fvMesh.
-
 \*---------------------------------------------------------------------------*/
 
 #include "fvMesh.H"
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.C b/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.C
index d00afbad2..2c1d4a1db 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.C
@@ -55,7 +55,7 @@ void pointPatchInterpolation::makePatchPatchAddressing()
     }
 
     const fvBoundaryMesh& bm = fvMesh_.boundary();
-    const pointBoundaryMesh& pbm = pointMesh_.boundary();
+    const pointBoundaryMesh& pbm = pointMesh::New(fvMesh_).boundary();
 
     // first count the total number of patch-patch points
 
@@ -188,7 +188,7 @@ void pointPatchInterpolation::makePatchPatchWeights()
             fvMesh_.polyMesh::instance(),
             fvMesh_
         ),
-        pointMesh_,
+        pointMesh::New(fvMesh_),
         dimensionedScalar("zero", dimless, 0)
     );
 
@@ -285,14 +285,9 @@ void pointPatchInterpolation::makePatchPatchWeights()
 
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
-pointPatchInterpolation::pointPatchInterpolation
-(
-    const fvMesh& vm,
-    const pointMesh& pm
-)
+pointPatchInterpolation::pointPatchInterpolation(const fvMesh& vm)
 :
-    fvMesh_(vm),
-    pointMesh_(pm)
+    fvMesh_(vm)
 {
     updateMesh();
 }
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.H
index 1255c6b33..d2e35bd6e 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/pointPatchInterpolation/pointPatchInterpolation.H
@@ -63,9 +63,6 @@ class pointPatchInterpolation
         //- Reference to volume mesh
         const fvMesh& fvMesh_;
 
-        //- Reference to point mesh
-        const pointMesh& pointMesh_;
-
         //- Primitive patch interpolators
         PtrList<primitivePatchInterpolation> patchInterpolators_;
 
@@ -104,7 +101,7 @@ public:
     // Constructors
 
         //- Constructor given fvMesh and pointMesh.
-        pointPatchInterpolation(const fvMesh&, const pointMesh&);
+        pointPatchInterpolation(const fvMesh&);
 
 
     // Destructor
@@ -121,11 +118,6 @@ public:
                 return fvMesh_;
             }
 
-            const pointMesh& pMesh() const
-            {
-                return pointMesh_;
-            }
-
 
         // Edit
 
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
index 0bda8f7cd..7a9d1fbf2 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolate.C
@@ -103,18 +103,20 @@ volPointInterpolation::interpolate
 {
     wordList types(patchFieldTypes);
 
+    const pointMesh& pMesh = pointMesh::New(vf.mesh());
+
     // If the last patch of the pointBoundaryMesh is the global patch
     // it must be added to the list of patchField types
     if
     (
         isType<globalPointPatch>
         (
-            pMesh().boundary()[pMesh().boundary().size() - 1]
+            pMesh.boundary()[pMesh.boundary().size() - 1]
         )
     )
     {
         types.setSize(types.size() + 1);
-        types[types.size()-1] = pMesh().boundary()[types.size()-1].type();
+        types[types.size()-1] = pMesh.boundary()[types.size()-1].type();
     }
 
     // Construct tmp<pointField>
@@ -126,9 +128,9 @@ volPointInterpolation::interpolate
             (
                 "volPointInterpolate(" + vf.name() + ')',
                 vf.instance(),
-                vf.db()
+                pMesh.thisDb()
             ),
-            pMesh(),
+            pMesh,
             vf.dimensions(),
             types
         )
@@ -166,6 +168,8 @@ volPointInterpolation::interpolate
     const GeometricField<Type, fvPatchField, volMesh>& vf
 ) const
 {
+    const pointMesh& pm = pointMesh::New(vf.mesh());
+
     tmp<GeometricField<Type, pointPatchField, pointMesh> > tpf
     (
         new GeometricField<Type, pointPatchField, pointMesh>
@@ -174,9 +178,9 @@ volPointInterpolation::interpolate
             (
                 "volPointInterpolate(" + vf.name() + ')',
                 vf.instance(),
-                vf.db()
+                pm.thisDb()
             ),
-            pMesh(),
+            pm,
             vf.dimensions()
         )
     );
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
index c5959820a..a41fb3b98 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.C
@@ -74,7 +74,7 @@ void volPointInterpolation::makeWeights()
             mesh().polyMesh::instance(),
             mesh()
         ),
-        pMesh(),
+        pointMesh::New(mesh()),
         dimensionedScalar("zero", dimless, 0)
     );
 
@@ -139,13 +139,10 @@ void volPointInterpolation::makeWeights()
 
 // * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
 
-volPointInterpolation::volPointInterpolation
-(
-    const fvMesh& vm,
-    const pointMesh& pm
-)
+volPointInterpolation::volPointInterpolation(const fvMesh& vm)
 :
-    boundaryInterpolator_(vm, pm)
+    MeshObject<fvMesh, volPointInterpolation>(vm),
+    boundaryInterpolator_(vm)
 {
     updateMesh();
 }
diff --git a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
index e6c6e534e..c5d4c323a 100644
--- a/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
+++ b/src/finiteVolume/interpolation/volPointInterpolation/volPointInterpolation.H
@@ -37,6 +37,7 @@ SourceFiles
 #ifndef volPointInterpolation_H
 #define volPointInterpolation_H
 
+#include "MeshObject.H"
 #include "pointPatchInterpolation.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,6 +53,8 @@ class pointMesh;
 \*---------------------------------------------------------------------------*/
 
 class volPointInterpolation
+:
+    public MeshObject<fvMesh, volPointInterpolation>
 {
     // Private data
 
@@ -83,12 +86,12 @@ public:
     // Constructors
 
         //- Constructor given fvMesh and pointMesh.
-        volPointInterpolation(const fvMesh&, const pointMesh&);
+        explicit volPointInterpolation(const fvMesh&);
 
 
     // Destructor
 
-        virtual ~volPointInterpolation();
+        ~volPointInterpolation();
 
 
     // Member functions
@@ -100,19 +103,14 @@ public:
                 return boundaryInterpolator_.mesh();
             }
 
-            const pointMesh& pMesh() const
-            {
-                return boundaryInterpolator_.pMesh();
-            }
-
 
         // Edit
 
             //- Update mesh topology using the morph engine
-            virtual void updateMesh();
+            void updateMesh();
 
             //- Correct weighting factors for moving mesh.
-            virtual bool movePoints();
+            bool movePoints();
 
 
     // Interpolation functions
diff --git a/src/fvMotionSolver/Make/files b/src/fvMotionSolver/Make/files
index fdb3d789f..f229ae322 100644
--- a/src/fvMotionSolver/Make/files
+++ b/src/fvMotionSolver/Make/files
@@ -1,5 +1,6 @@
 fvMotionSolvers/fvMotionSolver/fvMotionSolver.C
 fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
+fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.C
 fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
 fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
 fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
@@ -29,5 +30,6 @@ pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPo
 pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
 pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
 pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
 
-LIB = $(FOAM_LIBBIN)/libfvMotionSolver
+LIB = $(FOAM_LIBBIN)/libfvMotionSolvers
diff --git a/src/fvMotionSolver/Make/options b/src/fvMotionSolver/Make/options
index 966b56964..f6489f44a 100644
--- a/src/fvMotionSolver/Make/options
+++ b/src/fvMotionSolver/Make/options
@@ -1,10 +1,12 @@
 EXE_INC = \
+    -I$(LIB_SRC)/postProcessing/functionObjects/forces/lnInclude \
     -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/dynamicMesh/lnInclude \
     -I$(LIB_SRC)/finiteVolume/lnInclude
 
 LIB_LIBS = \
+    /*-lforces include in controlDict if needed */ \
     -ltriSurface \
     -lmeshTools \
     -ldynamicMesh \
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
index 978d81d52..011362e40 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.C
@@ -33,6 +33,7 @@ License
 #include "surfaceInterpolate.H"
 #include "fvcLaplacian.H"
 #include "mapPolyMesh.H"
+#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -54,25 +55,10 @@ namespace Foam
 Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
 (
     const polyMesh& mesh,
-    Istream& msData
+    Istream& is
 )
 :
-    fvMotionSolver(mesh),
-    points0_
-    (
-        pointIOField
-        (
-            IOobject
-            (
-                "points",
-                time().constant(),
-                polyMesh::meshSubDir,
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        )
-    ),
+    displacementFvMotionSolver(mesh, is),
     pointDisplacement_
     (
         IOobject
@@ -83,7 +69,7 @@ Foam::displacementSBRStressFvMotionSolver::displacementSBRStressFvMotionSolver
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        pointMesh_
+        pointMesh::New(fvMesh_)
     ),
     cellDisplacement_
     (
@@ -123,11 +109,15 @@ Foam::displacementSBRStressFvMotionSolver::
 Foam::tmp<Foam::pointField>
 Foam::displacementSBRStressFvMotionSolver::curPoints() const
 {
-    vpi_.interpolate(cellDisplacement_, pointDisplacement_);
+    volPointInterpolation::New(fvMesh_).interpolate
+    (
+        cellDisplacement_,
+        pointDisplacement_
+    );
 
     tmp<pointField> tcurPoints
     (
-        points0_ + pointDisplacement_.internalField()
+        points0() + pointDisplacement_.internalField()
     );
 
     twoDCorrectPoints(tcurPoints());
@@ -203,67 +193,7 @@ void Foam::displacementSBRStressFvMotionSolver::updateMesh
     const mapPolyMesh& mpm
 )
 {
-    fvMotionSolver::updateMesh(mpm);
-
-    // Map points0_
-    // Map points0_. Bit special since we somehow have to come up with
-    // a sensible points0 position for introduced points.
-    // Find out scaling between points0 and current points
-
-    // Get the new points either from the map or the mesh
-    const pointField& points =
-    (
-        mpm.hasMotionPoints()
-      ? mpm.preMotionPoints()
-      : fvMesh_.points()
-    );
-
-    // Note: boundBox does reduce
-    const boundBox bb0(points0_, true);
-    const vector span0(bb0.max()-bb0.min());
-    const boundBox bb(points, true);
-    const vector span(bb.max()-bb.min());
-
-    vector scaleFactors(cmptDivide(span0, span));
-
-    pointField newPoints0(mpm.pointMap().size());
-
-    forAll(newPoints0, pointI)
-    {
-        label oldPointI = mpm.pointMap()[pointI];
-
-        if (oldPointI >= 0)
-        {
-            label masterPointI = mpm.reversePointMap()[oldPointI];
-
-            if (masterPointI == pointI)
-            {
-                newPoints0[pointI] = points0_[oldPointI];
-            }
-            else
-            {
-                // New point. Assume motion is scaling.
-                newPoints0[pointI] =
-                    points0_[oldPointI]
-                  + cmptMultiply
-                    (
-                        scaleFactors,
-                        points[pointI]-points[masterPointI]
-                    );
-            }
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "displacementSBRStressFvMotionSolver::updateMesh"
-                "(const mapPolyMesh& mpm)"
-            )   << "Cannot work out coordinates of introduced vertices."
-                << " New vertex " << pointI << " at coordinate "
-                << points[pointI] << exit(FatalError);
-        }
-    }
-    points0_.transfer(newPoints0);
+    displacementFvMotionSolver::updateMesh(mpm);
 
     // Update diffusivity. Note two stage to make sure old one is de-registered
     // before creating/registering new one.
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
index 25f4b2193..d346f958f 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/SBRStress/displacementSBRStressFvMotionSolver.H
@@ -37,7 +37,7 @@ SourceFiles
 #ifndef displacementSBRStressFvMotionSolver_H
 #define displacementSBRStressFvMotionSolver_H
 
-#include "fvMotionSolver.H"
+#include "displacementFvMotionSolver.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,13 +53,10 @@ class motionDiffusivity;
 
 class displacementSBRStressFvMotionSolver
 :
-    public fvMotionSolver
+    public displacementFvMotionSolver
 {
     // Private data
 
-        //- Reference point field
-        pointField points0_;
-
         //- Point motion field
         mutable pointVectorField pointDisplacement_;
 
@@ -93,8 +90,8 @@ public:
         //- Construct from polyMesh and data stream
         displacementSBRStressFvMotionSolver
         (
-            const polyMesh& mesh,
-            Istream& msData
+            const polyMesh&,
+            Istream& msDataUnused
         );
 
 
@@ -105,12 +102,6 @@ public:
 
     // Member Functions
 
-        //- Return reference to the reference field
-        const pointField& points0() const
-        {
-            return points0_;
-        }
-
         //- Return reference to the point motion displacement field
         pointVectorField& pointDisplacement()
         {
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
index fb97ce305..00ae2546b 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.C
@@ -29,6 +29,7 @@ License
 #include "fvmLaplacian.H"
 #include "addToRunTimeSelectionTable.H"
 #include "mapPolyMesh.H"
+#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -117,7 +118,7 @@ displacementComponentLaplacianFvMotionSolver
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        pointMesh_
+        pointMesh::New(fvMesh_)
     ),
     cellDisplacement_
     (
@@ -173,7 +174,7 @@ displacementComponentLaplacianFvMotionSolver
             new pointVectorField
             (
                 io,
-                pointMesh_
+                pointMesh::New(fvMesh_)
             )
         );
 
@@ -202,7 +203,11 @@ Foam::displacementComponentLaplacianFvMotionSolver::
 Foam::tmp<Foam::pointField>
 Foam::displacementComponentLaplacianFvMotionSolver::curPoints() const
 {
-    vpi_.interpolate(cellDisplacement_, pointDisplacement_);
+    volPointInterpolation::New(fvMesh_).interpolate
+    (
+        cellDisplacement_,
+        pointDisplacement_
+    );
 
     if (pointLocation_.valid())
     {
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
index 3932bb634..5c604cc11 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/componentLaplacian/displacementComponentLaplacianFvMotionSolver.H
@@ -107,9 +107,10 @@ public:
 
     // Constructors
 
+        //- Construct from polyMesh and data stream
         displacementComponentLaplacianFvMotionSolver
         (
-            const polyMesh& mesh,
+            const polyMesh&,
             Istream& msData
         );
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.C
new file mode 100644
index 000000000..84b03a94e
--- /dev/null
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.C
@@ -0,0 +1,162 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "displacementFvMotionSolver.H"
+#include "addToRunTimeSelectionTable.H"
+#include "mapPolyMesh.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(displacementFvMotionSolver, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::displacementFvMotionSolver::displacementFvMotionSolver
+(
+    const polyMesh& mesh,
+    Istream&
+)
+:
+    fvMotionSolver(mesh),
+    points0_
+    (
+        pointIOField
+        (
+            IOobject
+            (
+                "points",
+                mesh.time().constant(),
+                polyMesh::meshSubDir,
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE,
+                false
+            )
+        )
+    )
+{
+    if (points0_.size() != mesh.nPoints())
+    {
+        FatalErrorIn
+        (
+            "displacementFvMotionSolver::displacementFvMotionSolver\n"
+            "(\n"
+            "    const polyMesh&,\n"
+            "    Istream&\n"
+            ")"
+        )   << "Number of points in mesh " << mesh.nPoints()
+            << " differs from number of points " << points0_.size()
+            << " read from file "
+            <<
+                IOobject
+                (
+                    "points",
+                    mesh.time().constant(),
+                    polyMesh::meshSubDir,
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ).filePath()
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::displacementFvMotionSolver::~displacementFvMotionSolver()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::displacementFvMotionSolver::updateMesh(const mapPolyMesh& mpm)
+{
+    fvMotionSolver::updateMesh(mpm);
+
+    // Map points0_. Bit special since we somehow have to come up with
+    // a sensible points0 position for introduced points.
+    // Find out scaling between points0 and current points
+
+    // Get the new points either from the map or the mesh
+    const pointField& points =
+    (
+        mpm.hasMotionPoints()
+      ? mpm.preMotionPoints()
+      : fvMesh_.points()
+    );
+
+    // Note: boundBox does reduce
+    const vector span0 = boundBox(points0_).span();
+    const vector span  = boundBox(points).span();
+
+    vector scaleFactors(cmptDivide(span0, span));
+
+    pointField newPoints0(mpm.pointMap().size());
+
+    forAll(newPoints0, pointI)
+    {
+        label oldPointI = mpm.pointMap()[pointI];
+
+        if (oldPointI >= 0)
+        {
+            label masterPointI = mpm.reversePointMap()[oldPointI];
+
+            if (masterPointI == pointI)
+            {
+                newPoints0[pointI] = points0_[oldPointI];
+            }
+            else
+            {
+                // New point. Assume motion is scaling.
+                newPoints0[pointI] = points0_[oldPointI] + cmptMultiply
+                (
+                    scaleFactors,
+                    points[pointI]-points[masterPointI]
+                );
+            }
+        }
+        else
+        {
+            FatalErrorIn
+            (
+                "displacementLaplacianFvMotionSolver::updateMesh"
+                "(const mapPolyMesh& mpm)"
+            )   << "Cannot work out coordinates of introduced vertices."
+                << " New vertex " << pointI << " at coordinate "
+                << points[pointI] << exit(FatalError);
+        }
+    }
+    points0_.transfer(newPoints0);
+}
+
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H
new file mode 100644
index 000000000..99b587b44
--- /dev/null
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/displacementFvMotionSolver/displacementFvMotionSolver.H
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::displacementFvMotionSolver.H
+
+Description
+    Base class for fvMotionSolvers which calculate displacement.
+
+SourceFiles
+    displacementFvMotionSolver.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef displacementFvMotionSolver_H
+#define displacementFvMotionSolver_H
+
+#include "fvMotionSolver.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+        Class displacementFvMotionSolver Declaration
+\*---------------------------------------------------------------------------*/
+
+class displacementFvMotionSolver
+:
+    public fvMotionSolver
+{
+    // Private data
+
+        //- Reference point field
+        pointField points0_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        displacementFvMotionSolver
+        (
+            const displacementFvMotionSolver&
+        );
+
+        //- Disallow default bitwise assignment
+        void operator=(const displacementFvMotionSolver&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("displacementInterpolation");
+
+
+    // Constructors
+
+        //- Construct from polyMesh and data stream
+        displacementFvMotionSolver
+        (
+            const polyMesh&,
+            Istream& msDataUnused
+        );
+
+
+    // Destructor
+
+        ~displacementFvMotionSolver();
+
+
+    // Member Functions
+
+        //- Return reference to the reference field
+        const pointField& points0() const
+        {
+            return points0_;
+        }
+
+        //- Update topology
+        virtual void updateMesh(const mapPolyMesh&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
index 8a73bf669..1dd007d09 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.C
@@ -58,26 +58,10 @@ Foam::displacementInterpolationFvMotionSolver::
 displacementInterpolationFvMotionSolver
 (
     const polyMesh& mesh,
-    Istream& msData
+    Istream& is
 )
 :
-    fvMotionSolver(mesh),
-    points0_
-    (
-        pointIOField
-        (
-            IOobject
-            (
-                "points",
-                mesh.time().constant(),
-                polyMesh::meshSubDir,
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE,
-                false
-            )
-        )
-    ),
+    displacementFvMotionSolver(mesh, is),
     dynamicMeshCoeffs_
     (
         IOdictionary
@@ -174,7 +158,7 @@ displacementInterpolationFvMotionSolver
             forAll(fz().meshPoints(), localI)
             {
                 label pointI = fz().meshPoints()[localI];
-                const scalar coord = points0_[pointI][dir];
+                const scalar coord = points0()[pointI][dir];
                 minCoord = min(minCoord, coord);
                 maxCoord = max(maxCoord, coord);
             }
@@ -198,7 +182,7 @@ displacementInterpolationFvMotionSolver
         zoneCoordinates[zoneCoordinates.size()-1] += SMALL;
 
         // Check if we have static min and max mesh bounds
-        const scalarField meshCoords = points0_.component(dir);
+        const scalarField meshCoords = points0().component(dir);
 
         scalar minCoord = gMin(meshCoords);
         scalar maxCoord = gMax(meshCoords);
@@ -288,7 +272,7 @@ displacementInterpolationFvMotionSolver
                     "displacementInterpolationFvMotionSolver::"
                     "displacementInterpolationFvMotionSolver"
                     "(const polyMesh&, Istream&)"
-                )   << "Did not find point " << points0_[pointI]
+                )   << "Did not find point " << points0()[pointI]
                     << " coordinate " << meshCoords[pointI]
                     << " in ranges " << rangeToCoord
                     << abort(FatalError);
@@ -334,7 +318,8 @@ displacementInterpolationFvMotionSolver
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::displacementInterpolationFvMotionSolver::~displacementInterpolationFvMotionSolver()
+Foam::displacementInterpolationFvMotionSolver::
+~displacementInterpolationFvMotionSolver()
 {}
 
 
@@ -343,25 +328,25 @@ Foam::displacementInterpolationFvMotionSolver::~displacementInterpolationFvMotio
 Foam::tmp<Foam::pointField>
 Foam::displacementInterpolationFvMotionSolver::curPoints() const
 {
-    if (mesh().nPoints() != points0_.size())
+    if (mesh().nPoints() != points0().size())
     {
         FatalErrorIn
         (
             "displacementInterpolationFvMotionSolver::curPoints() const"
         )   << "The number of points in the mesh seems to have changed." << endl
-            << "In constant/polyMesh there are " << points0_.size()
+            << "In constant/polyMesh there are " << points0().size()
             << " points; in the current mesh there are " << mesh().nPoints()
             << " points." << exit(FatalError);
     }
 
-    tmp<pointField> tcurPoints(new pointField(points0_));
+    tmp<pointField> tcurPoints(new pointField(points0()));
     pointField& curPoints = tcurPoints();
 
     // Interpolate the diplacement of the face zones.
     vectorField zoneDisp(displacements_.size(), vector::zero);
     forAll(zoneDisp, zoneI)
     {
-        if (times_[zoneI].size() > 0)
+        if (times_[zoneI].size())
         {
             zoneDisp[zoneI] = interpolateXY
             (
@@ -412,72 +397,4 @@ Foam::displacementInterpolationFvMotionSolver::curPoints() const
 }
 
 
-void Foam::displacementInterpolationFvMotionSolver::updateMesh
-(
-    const mapPolyMesh& mpm
-)
-{
-    fvMotionSolver::updateMesh(mpm);
-
-    // Map points0_. Bit special since we somehow have to come up with
-    // a sensible points0 position for introduced points.
-    // Find out scaling between points0 and current points
-
-    // Get the new points either from the map or the mesh
-    const pointField& points =
-    (
-        mpm.hasMotionPoints()
-      ? mpm.preMotionPoints()
-      : fvMesh_.points()
-    );
-
-    // Note: boundBox does reduce
-    const boundBox bb0(points0_, true);
-    const vector span0(bb0.max()-bb0.min());
-    const boundBox bb(points, true);
-    const vector span(bb.max()-bb.min());
-
-    vector scaleFactors(cmptDivide(span0, span));
-
-    pointField newPoints0(mpm.pointMap().size());
-
-    forAll(newPoints0, pointI)
-    {
-        label oldPointI = mpm.pointMap()[pointI];
-    
-        if (oldPointI >= 0)
-        {
-            label masterPointI = mpm.reversePointMap()[oldPointI];
-
-            if (masterPointI == pointI)
-            {
-                newPoints0[pointI] = points0_[oldPointI];
-            }
-            else
-            {
-                // New point. Assume motion is scaling.
-                newPoints0[pointI] =
-                    points0_[oldPointI]
-                  + cmptMultiply
-                    (
-                        scaleFactors,
-                        points[pointI]-points[masterPointI]
-                    );
-            }
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "displacementLaplacianFvMotionSolver::updateMesh"
-                "(const mapPolyMesh& mpm)"
-            )   << "Cannot work out coordinates of introduced vertices."
-                << " New vertex " << pointI << " at coordinate "
-                << points[pointI] << exit(FatalError);
-        }
-    }
-    points0_.transfer(newPoints0);
-}
-
-
 // ************************************************************************* //
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H
index 02c7e2424..13fc39da3 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/interpolation/displacementInterpolationFvMotionSolver.H
@@ -35,7 +35,7 @@ Description
     - interpolates the displacement of all points based on the
       faceZone motion.
 
-    Tables are in the <verbatim>constant/tables</verbatim> directory.
+    Tables are in the @a constant/tables directory.
 
 Note
     could be a motionSolver - does not use any fvMesh structure.
@@ -48,7 +48,7 @@ SourceFiles
 #ifndef displacementInterpolationFvMotionSolver_H
 #define displacementInterpolationFvMotionSolver_H
 
-#include "fvMotionSolver.H"
+#include "displacementFvMotionSolver.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,13 +61,10 @@ namespace Foam
 
 class displacementInterpolationFvMotionSolver
 :
-    public fvMotionSolver
+    public displacementFvMotionSolver
 {
     // Private data
 
-        //- Reference point field
-        pointField points0_;
-
         //- Additional settings for motion solver
         dictionary dynamicMeshCoeffs_;
 
@@ -115,10 +112,11 @@ public:
 
     // Constructors
 
+        //- Construct from polyMesh and data stream
         displacementInterpolationFvMotionSolver
         (
-            const polyMesh& mesh,
-            Istream& msData
+            const polyMesh&,
+            Istream& msDataUnused
         );
 
 
@@ -129,21 +127,12 @@ public:
 
     // Member Functions
 
-        //- Return reference to the reference field
-        const pointField& points0() const
-        {
-            return points0_;
-        }
-
         //- Return point location obtained from the current motion field
         virtual tmp<pointField> curPoints() const;
 
         //- Solve for motion
         virtual void solve()
         {}
-
-        //- Update topology
-        virtual void updateMesh(const mapPolyMesh&);
 };
 
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
index bafbd1b22..910501104 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.C
@@ -31,6 +31,7 @@ License
 #include "OFstream.H"
 #include "meshTools.H"
 #include "mapPolyMesh.H"
+#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -52,26 +53,10 @@ namespace Foam
 Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
 (
     const polyMesh& mesh,
-    Istream& msData
+    Istream& is
 )
 :
-    fvMotionSolver(mesh),
-    points0_
-    (
-        pointIOField
-        (
-            IOobject
-            (
-                "points",
-                time().constant(),
-                polyMesh::meshSubDir,
-                mesh,
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE,
-                false
-            )
-        )
-    ),
+    displacementFvMotionSolver(mesh, is),
     pointDisplacement_
     (
         IOobject
@@ -82,7 +67,7 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        pointMesh_
+        pointMesh::New(fvMesh_)
     ),
     cellDisplacement_
     (
@@ -139,7 +124,7 @@ Foam::displacementLaplacianFvMotionSolver::displacementLaplacianFvMotionSolver
             new pointVectorField
             (
                 io,
-                pointMesh_
+                pointMesh::New(fvMesh_)
             )
         );
 
@@ -165,10 +150,14 @@ Foam::displacementLaplacianFvMotionSolver::
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::tmp<Foam::pointField> 
+Foam::tmp<Foam::pointField>
 Foam::displacementLaplacianFvMotionSolver::curPoints() const
 {
-    vpi_.interpolate(cellDisplacement_, pointDisplacement_);
+    volPointInterpolation::New(fvMesh_).interpolate
+    (
+        cellDisplacement_,
+        pointDisplacement_
+    );
 
     if (pointLocation_.valid())
     {
@@ -181,7 +170,7 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
         }
 
         pointLocation_().internalField() =
-            points0_
+            points0()
           + pointDisplacement_.internalField();
 
         pointLocation_().correctBoundaryConditions();
@@ -193,7 +182,7 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
 
             forAll(pz, i)
             {
-                pointLocation_()[pz[i]] = points0_[pz[i]];
+                pointLocation_()[pz[i]] = points0()[pz[i]];
             }
         }
 
@@ -205,7 +194,7 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
     {
         tmp<pointField> tcurPoints
         (
-            points0_ + pointDisplacement_.internalField()
+            points0() + pointDisplacement_.internalField()
         );
 
         // Implement frozen points
@@ -215,7 +204,7 @@ Foam::displacementLaplacianFvMotionSolver::curPoints() const
 
             forAll(pz, i)
             {
-                tcurPoints()[pz[i]] = points0_[pz[i]];
+                tcurPoints()[pz[i]] = points0()[pz[i]];
             }
         }
 
@@ -252,78 +241,7 @@ void Foam::displacementLaplacianFvMotionSolver::updateMesh
     const mapPolyMesh& mpm
 )
 {
-    fvMotionSolver::updateMesh(mpm);
-
-    // Map points0_. Bit special since we somehow have to come up with
-    // a sensible points0 position for introduced points.
-    // Find out scaling between points0 and current points
-
-    // Get the new points either from the map or the mesh
-    const pointField& points =
-    (
-        mpm.hasMotionPoints()
-      ? mpm.preMotionPoints()
-      : fvMesh_.points()
-    );
-
-    // Note: boundBox does reduce
-    const boundBox bb0(points0_, true);
-    const vector span0(bb0.max()-bb0.min());
-    const boundBox bb(points, true);
-    const vector span(bb.max()-bb.min());
-
-    vector scaleFactors(cmptDivide(span0, span));
-
-    pointField newPoints0(mpm.pointMap().size());
-
-    forAll(newPoints0, pointI)
-    {
-        label oldPointI = mpm.pointMap()[pointI];
-    
-        if (oldPointI >= 0)
-        {
-            label masterPointI = mpm.reversePointMap()[oldPointI];
-
-            if (masterPointI == pointI)
-            {
-                newPoints0[pointI] = points0_[oldPointI];
-            }
-            else
-            {
-                // New point. Assume motion is scaling.
-                newPoints0[pointI] =
-                    points0_[oldPointI]
-                  + cmptMultiply
-                    (
-                        scaleFactors,
-                        points[pointI]-points[masterPointI]
-                    );
-            }
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "displacementLaplacianFvMotionSolver::updateMesh"
-                "(const mapPolyMesh& mpm)"
-            )   << "Cannot work out coordinates of introduced vertices."
-                << " New vertex " << pointI << " at coordinate "
-                << points[pointI] << exit(FatalError);
-        }
-    }
-    points0_.transfer(newPoints0);
-
-    if (debug & 2)
-    {
-        OFstream str(time().timePath()/"points0.obj");
-        Pout<< "displacementLaplacianFvMotionSolver :"
-            << " Writing points0_ to " << str.name() << endl;
-
-        forAll(points0_, pointI)
-        {
-            meshTools::writeOBJ(str, points0_[pointI]);
-        }
-    }
+    displacementFvMotionSolver::updateMesh(mpm);
 
     // Update diffusivity. Note two stage to make sure old one is de-registered
     // before creating/registering new one.
diff --git a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
index fc62133c1..7e2b93aac 100644
--- a/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/displacement/laplacian/displacementLaplacianFvMotionSolver.H
@@ -37,7 +37,7 @@ SourceFiles
 #ifndef displacementLaplacianFvMotionSolver_H
 #define displacementLaplacianFvMotionSolver_H
 
-#include "fvMotionSolver.H"
+#include "displacementFvMotionSolver.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,13 +53,10 @@ class motionDiffusivity;
 
 class displacementLaplacianFvMotionSolver
 :
-    public fvMotionSolver
+    public displacementFvMotionSolver
 {
     // Private data
 
-        //- Reference point field
-        pointField points0_;
-
         //- Point motion field
         mutable pointVectorField pointDisplacement_;
 
@@ -101,8 +98,8 @@ public:
         //- Construct from polyMesh and data stream
         displacementLaplacianFvMotionSolver
         (
-            const polyMesh& mesh,
-            Istream& msData
+            const polyMesh&,
+            Istream& msDataUnused
         );
 
 
@@ -113,13 +110,6 @@ public:
 
     // Member Functions
 
-
-        //- Return reference to the reference field
-        const pointField& points0() const
-        {
-            return points0_;
-        }
-
         //- Return reference to the point motion displacement field
         pointVectorField& pointDisplacement()
         {
diff --git a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.C
index 94db2ca5a..48ef5c8bd 100644
--- a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.C
@@ -25,6 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "fvMotionSolver.H"
+#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -39,9 +40,7 @@ namespace Foam
 Foam::fvMotionSolver::fvMotionSolver(const polyMesh& mesh)
 :
     motionSolver(mesh),
-    fvMesh_(refCast<const fvMesh>(mesh)),
-    pointMesh_(fvMesh_),
-    vpi_(fvMesh_, pointMesh_)
+    fvMesh_(refCast<const fvMesh>(mesh))
 {}
 
 
@@ -55,16 +54,14 @@ Foam::fvMotionSolver::~fvMotionSolver()
 
 void Foam::fvMotionSolver::movePoints(const pointField& p)
 {
-    pointMesh_.movePoints(p);
-    vpi_.movePoints();
+    // Movement of pointMesh and volPointInterpolation done by polyMesh,fvMesh
 }
 
 
 void Foam::fvMotionSolver::updateMesh(const mapPolyMesh& mpm)
 {
     motionSolver::updateMesh(mpm);
-    pointMesh_.updateMesh(mpm);
-    vpi_.updateMesh();
+    // Update of pointMesh and volPointInterpolation done by polyMesh,fvMesh
 }
 
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H
index 86ad989d7..ec94aa86a 100644
--- a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolver.H
@@ -40,13 +40,16 @@ SourceFiles
 #define fvMotionSolver_H
 
 #include "motionSolver.H"
-#include "volPointInterpolation.H"
+#include "pointFieldsFwd.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+class fvMesh;
+class mapPolyMesh;
+
 /*---------------------------------------------------------------------------*\
                            Class fvMotionSolver Declaration
 \*---------------------------------------------------------------------------*/
@@ -63,13 +66,6 @@ protected:
         //- The fvMesh to be moved
         const fvMesh& fvMesh_;
 
-        //- Point mesh needed by the volPointInterpolation
-        mutable pointMesh pointMesh_;
-
-        //- Vol-point interpolator used to obtain the point motion from
-        //  the cell-centre motion
-        mutable volPointInterpolation vpi_;
-
 
     // Protected member functions
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolverTemplates.C b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolverTemplates.C
index 303c7e84c..c997316e8 100644
--- a/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolverTemplates.C
+++ b/src/fvMotionSolver/fvMotionSolvers/fvMotionSolver/fvMotionSolverTemplates.C
@@ -44,19 +44,7 @@ Foam::wordList Foam::fvMotionSolver::cellMotionBoundaryTypes
 
     forAll(cmUbf, patchi)
     {
-        if
-        (
-            isA
-            <
-                FixedValuePointPatchField
-                <
-                    pointPatchField,
-                    pointMesh,
-                    pointPatch,
-                    DummyMatrix,
-                    Type
-                >
-            >(pmUbf[patchi]))
+        if (isA<fixedValuePointPatchField<Type> >(pmUbf[patchi]))
         {
             cmUbf[patchi] = cellMotionFvPatchField<Type>::typeName;
         }
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
index 3cb75fb32..23a5686d1 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.C
@@ -28,6 +28,7 @@ License
 #include "motionDiffusivity.H"
 #include "fvmLaplacian.H"
 #include "addToRunTimeSelectionTable.H"
+#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -66,7 +67,7 @@ velocityComponentLaplacianFvMotionSolver
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        pointMesh_
+        pointMesh::New(fvMesh_)
     ),
     cellMotionU_
     (
@@ -129,7 +130,11 @@ Foam::velocityComponentLaplacianFvMotionSolver::
 Foam::tmp<Foam::pointField>
 Foam::velocityComponentLaplacianFvMotionSolver::curPoints() const
 {
-    vpi_.interpolate(cellMotionU_, pointMotionU_);
+    volPointInterpolation::New(fvMesh_).interpolate
+    (
+        cellMotionU_,
+        pointMotionU_
+    );
 
     tmp<pointField> tcurPoints(new pointField(fvMesh_.points()));
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
index 9ba311870..724338f0b 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/componentLaplacian/velocityComponentLaplacianFvMotionSolver.H
@@ -93,9 +93,10 @@ public:
 
     // Constructors
 
+        //- Construct from polyMesh and data stream (provides component)
         velocityComponentLaplacianFvMotionSolver
         (
-            const polyMesh& mesh,
+            const polyMesh&,
             Istream& msData
         );
 
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
index 9c48c1848..9c5cea388 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.C
@@ -28,6 +28,7 @@ License
 #include "motionDiffusivity.H"
 #include "fvmLaplacian.H"
 #include "addToRunTimeSelectionTable.H"
+#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -49,7 +50,7 @@ namespace Foam
 Foam::velocityLaplacianFvMotionSolver::velocityLaplacianFvMotionSolver
 (
     const polyMesh& mesh,
-    Istream& msData
+    Istream&
 )
 :
     fvMotionSolver(mesh),
@@ -63,7 +64,7 @@ Foam::velocityLaplacianFvMotionSolver::velocityLaplacianFvMotionSolver
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        pointMesh_
+        pointMesh::New(fvMesh_)
     ),
     cellMotionU_
     (
@@ -102,7 +103,11 @@ Foam::velocityLaplacianFvMotionSolver::~velocityLaplacianFvMotionSolver()
 Foam::tmp<Foam::pointField>
 Foam::velocityLaplacianFvMotionSolver::curPoints() const
 {
-    vpi_.interpolate(cellMotionU_, pointMotionU_);
+    volPointInterpolation::New(fvMesh_).interpolate
+    (
+        cellMotionU_,
+        pointMotionU_
+    );
 
     tmp<pointField> tcurPoints
     (
diff --git a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
index b88282da7..786aca923 100644
--- a/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
+++ b/src/fvMotionSolver/fvMotionSolvers/velocity/laplacian/velocityLaplacianFvMotionSolver.H
@@ -88,7 +88,11 @@ public:
     // Constructors
 
         //- Construct from polyMesh and data stream
-        velocityLaplacianFvMotionSolver(const polyMesh& mesh, Istream& msData);
+        velocityLaplacianFvMotionSolver
+        (
+            const polyMesh&,
+            Istream& msDataUnused
+        );
 
 
     // Destructor
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
index 359c8ab46..cb8ba4a30 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
@@ -27,7 +27,7 @@ License
 #include "inverseDistanceDiffusivity.H"
 #include "addToRunTimeSelectionTable.H"
 #include "patchWave.H"
-#include "labelHashSet.H"
+#include "HashSet.H"
 #include "surfaceInterpolate.H"
 #include "zeroGradientFvPatchFields.H"
 
@@ -75,7 +75,7 @@ Foam::tmp<Foam::scalarField> Foam::inverseDistanceDiffusivity::y() const
 
     labelHashSet patchSet(mesh.boundaryMesh().patchSet(patchNames_));
 
-    if (patchSet.size() > 0)
+    if (patchSet.size())
     {
         return tmp<scalarField>
         (
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
index 73dcf3528..7baeff416 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
+++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                Class inverseDistanceDiffusivity Declaration
+                           Class inverseDistanceDiffusivity Declaration
 \*---------------------------------------------------------------------------*/
 
 class inverseDistanceDiffusivity
@@ -54,7 +54,7 @@ class inverseDistanceDiffusivity
     // Private data
         
         //- Patches selected to base the distance on
-        //  These can contain regular expressions and the actual patch names
+        //  These can contain regular expressions and the actuallt patch names
         //  will be searched for.
         wordList patchNames_;
 
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
index 1ee27ef09..68519ea10 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseFaceDistance/inverseFaceDistanceDiffusivity.C
@@ -26,7 +26,7 @@ License
 
 #include "inverseFaceDistanceDiffusivity.H"
 #include "addToRunTimeSelectionTable.H"
-#include "labelHashSet.H"
+#include "HashSet.H"
 #include "wallPoint.H"
 #include "MeshWave.H"
 
@@ -98,7 +98,7 @@ void Foam::inverseFaceDistanceDiffusivity::correct()
         const polyPatch& patch = bdry[iter.key()];
 
         const vectorField::subField fc = patch.faceCentres();
-        
+
         forAll(fc, patchFaceI)
         {
             changedFaces[nPatchFaces] = patch.start() + patchFaceI;
@@ -134,7 +134,7 @@ void Foam::inverseFaceDistanceDiffusivity::correct()
         fvsPatchScalarField& bfld = faceDiffusivity_.boundaryField()[patchI];
 
         const unallocLabelList& faceCells = bfld.patch().faceCells();
-        
+
         if (patchSet.found(patchI))
         {
             forAll(bfld, i)
diff --git a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
index 88721c586..f4d860a77 100644
--- a/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inversePointDistance/inversePointDistanceDiffusivity.C
@@ -26,7 +26,7 @@ License
 
 #include "inversePointDistanceDiffusivity.H"
 #include "addToRunTimeSelectionTable.H"
-#include "labelHashSet.H"
+#include "HashSet.H"
 #include "pointEdgePoint.H"
 #include "PointEdgeWave.H"
 
@@ -73,9 +73,6 @@ void Foam::inversePointDistanceDiffusivity::correct()
     const polyMesh& mesh = mSolver().mesh();
     const polyBoundaryMesh& bdry = mesh.boundaryMesh();
 
-    // Construct point mesh
-    const pointMesh pMesh(mesh);
-
     labelHashSet patchSet(bdry.size());
 
     label nPatchEdges = 0;
@@ -133,10 +130,10 @@ void Foam::inversePointDistanceDiffusivity::correct()
         // Do calculations
         PointEdgeWave<pointEdgePoint> waveInfo
         (
-            pMesh,
+            mesh,
             seedPoints,
             seedInfo,
-        
+
             pointWallDist,
             edgeWallDist,
             mesh.globalData().nTotalPoints() // max iterations
@@ -170,7 +167,7 @@ void Foam::inversePointDistanceDiffusivity::correct()
             forAll(bfld, i)
             {
                 const cell& ownFaces = mesh.cells()[faceCells[i]];
- 
+
                 labelHashSet cPoints(4*ownFaces.size());
 
                 scalar dist = 0;
@@ -188,7 +185,7 @@ void Foam::inversePointDistanceDiffusivity::correct()
                     }
                 }
                 dist /= cPoints.size();
-                
+
                 bfld[i] = 1.0/dist;
             }
         }
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C
index 25e3da867..998a25b21 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseVolume/inverseVolumeDiffusivity.C
@@ -27,7 +27,7 @@ License
 #include "inverseVolumeDiffusivity.H"
 #include "addToRunTimeSelectionTable.H"
 #include "patchWave.H"
-#include "labelHashSet.H"
+#include "HashSet.H"
 #include "surfaceInterpolate.H"
 #include "zeroGradientFvPatchFields.H"
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
index e9c4c8e8b..730d6a0b6 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.C
@@ -44,7 +44,7 @@ angularOscillatingDisplacementPointPatchVectorField
     const DimensionedField<vector, pointMesh>& iF
 )
 :
-    fixedValuePointPatchVectorField(p, iF),
+    fixedValuePointPatchField<vector>(p, iF),
     axis_(vector::zero),
     origin_(vector::zero),
     angle0_(0.0),
@@ -62,7 +62,7 @@ angularOscillatingDisplacementPointPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValuePointPatchVectorField(p, iF, dict),
+    fixedValuePointPatchField<vector>(p, iF, dict),
     axis_(dict.lookup("axis")),
     origin_(dict.lookup("origin")),
     angle0_(readScalar(dict.lookup("angle0"))),
@@ -91,16 +91,16 @@ angularOscillatingDisplacementPointPatchVectorField
     const angularOscillatingDisplacementPointPatchVectorField& ptf,
     const pointPatch& p,
     const DimensionedField<vector, pointMesh>& iF,
-    const PointPatchFieldMapper& mapper
+    const pointPatchFieldMapper& mapper
 )
 :
-    fixedValuePointPatchVectorField(ptf, p, iF, mapper),
+    fixedValuePointPatchField<vector>(ptf, p, iF, mapper),
     axis_(ptf.axis_),
     origin_(ptf.origin_),
     angle0_(ptf.angle0_),
     amplitude_(ptf.amplitude_),
     omega_(ptf.omega_),
-    p0_(ptf.p0_)
+    p0_(ptf.p0_, mapper)
 {}
 
 
@@ -111,7 +111,7 @@ angularOscillatingDisplacementPointPatchVectorField
     const DimensionedField<vector, pointMesh>& iF
 )
 :
-    fixedValuePointPatchVectorField(ptf, iF),
+    fixedValuePointPatchField<vector>(ptf, iF),
     axis_(ptf.axis_),
     origin_(ptf.origin_),
     angle0_(ptf.angle0_),
@@ -123,6 +123,32 @@ angularOscillatingDisplacementPointPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void angularOscillatingDisplacementPointPatchVectorField::autoMap
+(
+    const pointPatchFieldMapper& m
+)
+{
+    fixedValuePointPatchField<vector>::autoMap(m);
+
+    p0_.autoMap(m);
+}
+
+
+void angularOscillatingDisplacementPointPatchVectorField::rmap
+(
+    const pointPatchField<vector>& ptf,
+    const labelList& addr
+)
+{
+    const angularOscillatingDisplacementPointPatchVectorField& aODptf =
+        refCast<const angularOscillatingDisplacementPointPatchVectorField>(ptf);
+
+    fixedValuePointPatchField<vector>::rmap(aODptf, addr);
+
+    p0_.rmap(aODptf.p0_, addr);
+}
+
+
 void angularOscillatingDisplacementPointPatchVectorField::updateCoeffs()
 {
     if (this->updated())
@@ -144,7 +170,7 @@ void angularOscillatingDisplacementPointPatchVectorField::updateCoeffs()
       + (axisHat & p0Rel)*(1 - cos(angle))*axisHat
     );
 
-    fixedValuePointPatchVectorField::updateCoeffs();
+    fixedValuePointPatchField<vector>::updateCoeffs();
 }
 
 
@@ -153,8 +179,7 @@ void angularOscillatingDisplacementPointPatchVectorField::write
     Ostream& os
 ) const
 {
-    pointPatchVectorField::write(os);
-
+    pointPatchField<vector>::write(os);
     os.writeKeyword("axis")
         << axis_ << token::END_STATEMENT << nl;
     os.writeKeyword("origin")
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
index bbb9f5b71..814bdfaeb 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingDisplacement/angularOscillatingDisplacementPointPatchVectorField.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef angularOscillatingDisplacementPointPatchVectorField_H
 #define angularOscillatingDisplacementPointPatchVectorField_H
 
-#include "fixedValuePointPatchFields.H"
+#include "fixedValuePointPatchField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,14 +49,7 @@ namespace Foam
 
 class angularOscillatingDisplacementPointPatchVectorField
 :
-    public FixedValuePointPatchField
-    <
-        pointPatchField,
-        pointMesh,
-        pointPatch,
-        DummyMatrix,
-        vector
-    >
+    public fixedValuePointPatchField<vector>
 {
     // Private data
 
@@ -98,7 +91,7 @@ public:
             const angularOscillatingDisplacementPointPatchVectorField&,
             const pointPatch&,
             const DimensionedField<vector, pointMesh>&,
-            const PointPatchFieldMapper&
+            const pointPatchFieldMapper&
         );
 
         //- Construct and return a clone
@@ -139,6 +132,22 @@ public:
 
     // Member functions
 
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const pointPatchFieldMapper&
+            );
+
+            //- Reverse map the given pointPatchField onto this pointPatchField
+            virtual void rmap
+            (
+                const pointPatchField<vector>&,
+                const labelList&
+            );
+
+
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
index 1c20bf53e..7451bb719 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.C
@@ -44,7 +44,7 @@ angularOscillatingVelocityPointPatchVectorField
     const DimensionedField<vector, pointMesh>& iF
 )
 :
-    fixedValuePointPatchVectorField(p, iF),
+    fixedValuePointPatchField<vector>(p, iF),
     axis_(vector::zero),
     origin_(vector::zero),
     angle0_(0.0),
@@ -62,7 +62,7 @@ angularOscillatingVelocityPointPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValuePointPatchVectorField(p, iF, dict),
+    fixedValuePointPatchField<vector>(p, iF, dict),
     axis_(dict.lookup("axis")),
     origin_(dict.lookup("origin")),
     angle0_(readScalar(dict.lookup("angle0"))),
@@ -91,10 +91,10 @@ angularOscillatingVelocityPointPatchVectorField
     const angularOscillatingVelocityPointPatchVectorField& ptf,
     const pointPatch& p,
     const DimensionedField<vector, pointMesh>& iF,
-    const PointPatchFieldMapper& mapper
+    const pointPatchFieldMapper& mapper
 )
 :
-    fixedValuePointPatchVectorField(ptf, p, iF, mapper),
+    fixedValuePointPatchField<vector>(ptf, p, iF, mapper),
     axis_(ptf.axis_),
     origin_(ptf.origin_),
     angle0_(ptf.angle0_),
@@ -111,7 +111,7 @@ angularOscillatingVelocityPointPatchVectorField
     const DimensionedField<vector, pointMesh>& iF
 )
 :
-    fixedValuePointPatchVectorField(ptf, iF),
+    fixedValuePointPatchField<vector>(ptf, iF),
     axis_(ptf.axis_),
     origin_(ptf.origin_),
     angle0_(ptf.angle0_),
@@ -123,6 +123,32 @@ angularOscillatingVelocityPointPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void angularOscillatingVelocityPointPatchVectorField::autoMap
+(
+    const pointPatchFieldMapper& m
+)
+{
+    fixedValuePointPatchField<vector>::autoMap(m);
+
+    p0_.autoMap(m);
+}
+
+
+void angularOscillatingVelocityPointPatchVectorField::rmap
+(
+    const pointPatchField<vector>& ptf,
+    const labelList& addr
+)
+{
+    const angularOscillatingVelocityPointPatchVectorField& aOVptf =
+        refCast<const angularOscillatingVelocityPointPatchVectorField>(ptf);
+
+    fixedValuePointPatchField<vector>::rmap(aOVptf, addr);
+
+    p0_.rmap(aOVptf.p0_, addr);
+}
+
+
 void angularOscillatingVelocityPointPatchVectorField::updateCoeffs()
 {
     if (this->updated())
@@ -146,10 +172,10 @@ void angularOscillatingVelocityPointPatchVectorField::updateCoeffs()
           + (axisHat ^ p0Rel*sin(angle))
           + (axisHat & p0Rel)*(1 - cos(angle))*axisHat
           - p.localPoints()
-        )/t.deltaT().value()
+        )/t.deltaTValue()
     );
 
-    fixedValuePointPatchVectorField::updateCoeffs();
+    fixedValuePointPatchField<vector>::updateCoeffs();
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
index 8f90f17ce..d317c3edc 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/angularOscillatingVelocity/angularOscillatingVelocityPointPatchVectorField.H
@@ -23,9 +23,10 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    angularOscillatingVelocityPointPatchVectorField
+    Foam::angularOscillatingVelocityPointPatchVectorField
 
 Description
+    Foam::angularOscillatingVelocityPointPatchVectorField
 
 SourceFiles
     angularOscillatingVelocityPointPatchVectorField.C
@@ -35,7 +36,7 @@ SourceFiles
 #ifndef angularOscillatingVelocityPointPatchVectorField_H
 #define angularOscillatingVelocityPointPatchVectorField_H
 
-#include "fixedValuePointPatchFields.H"
+#include "fixedValuePointPatchField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,14 +49,7 @@ namespace Foam
 
 class angularOscillatingVelocityPointPatchVectorField
 :
-    public FixedValuePointPatchField
-    <
-        pointPatchField,
-        pointMesh,
-        pointPatch,
-        DummyMatrix,
-        vector
-    >
+    public fixedValuePointPatchField<vector>
 {
     // Private data
 
@@ -97,7 +91,7 @@ public:
             const angularOscillatingVelocityPointPatchVectorField&,
             const pointPatch&,
             const DimensionedField<vector, pointMesh>&,
-            const PointPatchFieldMapper&
+            const pointPatchFieldMapper&
         );
 
         //- Construct and return a clone
@@ -105,7 +99,10 @@ public:
         {
             return autoPtr<pointPatchField<vector> >
             (
-                new angularOscillatingVelocityPointPatchVectorField(*this)
+                new angularOscillatingVelocityPointPatchVectorField
+                (
+                    *this
+                )
             );
         }
 
@@ -124,13 +121,33 @@ public:
         {
             return autoPtr<pointPatchField<vector> >
             (
-                new angularOscillatingVelocityPointPatchVectorField(*this, iF)
+                new angularOscillatingVelocityPointPatchVectorField
+                (
+                    *this,
+                    iF
+                )
             );
         }
 
 
     // Member functions
 
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const pointPatchFieldMapper&
+            );
+
+            //- Reverse map the given pointPatchField onto this pointPatchField
+            virtual void rmap
+            (
+                const pointPatchField<vector>&,
+                const labelList&
+            );
+
+
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
index 2207349c7..5ffc5a430 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.C
@@ -44,7 +44,7 @@ oscillatingDisplacementPointPatchVectorField
     const DimensionedField<vector, pointMesh>& iF
 )
 :
-    fixedValuePointPatchVectorField(p, iF),
+    fixedValuePointPatchField<vector>(p, iF),
     amplitude_(vector::zero),
     omega_(0.0)
 {}
@@ -58,7 +58,7 @@ oscillatingDisplacementPointPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValuePointPatchVectorField(p, iF, dict),
+    fixedValuePointPatchField<vector>(p, iF, dict),
     amplitude_(dict.lookup("amplitude")),
     omega_(readScalar(dict.lookup("omega")))
 {
@@ -75,10 +75,10 @@ oscillatingDisplacementPointPatchVectorField
     const oscillatingDisplacementPointPatchVectorField& ptf,
     const pointPatch& p,
     const DimensionedField<vector, pointMesh>& iF,
-    const PointPatchFieldMapper& mapper
+    const pointPatchFieldMapper& mapper
 )
 :
-    fixedValuePointPatchVectorField(ptf, p, iF, mapper),
+    fixedValuePointPatchField<vector>(ptf, p, iF, mapper),
     amplitude_(ptf.amplitude_),
     omega_(ptf.omega_)
 {}
@@ -91,7 +91,7 @@ oscillatingDisplacementPointPatchVectorField
     const DimensionedField<vector, pointMesh>& iF
 )
 :
-    fixedValuePointPatchVectorField(ptf, iF),
+    fixedValuePointPatchField<vector>(ptf, iF),
     amplitude_(ptf.amplitude_),
     omega_(ptf.omega_)
 {}
@@ -111,7 +111,7 @@ void oscillatingDisplacementPointPatchVectorField::updateCoeffs()
 
     Field<vector>::operator=(amplitude_*sin(omega_*t.value()));
 
-    fixedValuePointPatchVectorField::updateCoeffs();
+    fixedValuePointPatchField<vector>::updateCoeffs();
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
index af4bdd4bb..9f624dea1 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingDisplacement/oscillatingDisplacementPointPatchVectorField.H
@@ -23,9 +23,10 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    oscillatingDisplacementPointPatchVectorField
+    Foam::oscillatingDisplacementPointPatchVectorField
 
 Description
+    Foam::oscillatingDisplacementPointPatchVectorField
 
 SourceFiles
     oscillatingDisplacementPointPatchVectorField.C
@@ -35,7 +36,7 @@ SourceFiles
 #ifndef oscillatingDisplacementPointPatchVectorField_H
 #define oscillatingDisplacementPointPatchVectorField_H
 
-#include "fixedValuePointPatchFields.H"
+#include "fixedValuePointPatchField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,14 +49,7 @@ namespace Foam
 
 class oscillatingDisplacementPointPatchVectorField
 :
-    public FixedValuePointPatchField
-    <
-        pointPatchField,
-        pointMesh,
-        pointPatch,
-        DummyMatrix,
-        vector
-    >
+    public fixedValuePointPatchField<vector>
 {
     // Private data
 
@@ -92,7 +86,7 @@ public:
             const oscillatingDisplacementPointPatchVectorField&,
             const pointPatch&,
             const DimensionedField<vector, pointMesh>&,
-            const PointPatchFieldMapper&
+            const pointPatchFieldMapper&
         );
 
         //- Construct and return a clone
@@ -100,7 +94,10 @@ public:
         {
             return autoPtr<pointPatchField<vector> >
             (
-                new oscillatingDisplacementPointPatchVectorField(*this)
+                new oscillatingDisplacementPointPatchVectorField
+                (
+                    *this
+                )
             );
         }
 
@@ -119,7 +116,11 @@ public:
         {
             return autoPtr<pointPatchField<vector> >
             (
-                new oscillatingDisplacementPointPatchVectorField(*this, iF)
+                new oscillatingDisplacementPointPatchVectorField
+                (
+                    *this,
+                    iF
+                )
             );
         }
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
index 592e3de53..0413ea27b 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.C
@@ -44,7 +44,7 @@ oscillatingVelocityPointPatchVectorField
     const DimensionedField<vector, pointMesh>& iF
 )
 :
-    fixedValuePointPatchVectorField(p, iF),
+    fixedValuePointPatchField<vector>(p, iF),
     amplitude_(vector::zero),
     omega_(0.0),
     p0_(p.localPoints())
@@ -59,7 +59,7 @@ oscillatingVelocityPointPatchVectorField
     const dictionary& dict
 )
 :
-    fixedValuePointPatchVectorField(p, iF, dict),
+    fixedValuePointPatchField<vector>(p, iF, dict),
     amplitude_(dict.lookup("amplitude")),
     omega_(readScalar(dict.lookup("omega")))
 {
@@ -85,13 +85,13 @@ oscillatingVelocityPointPatchVectorField
     const oscillatingVelocityPointPatchVectorField& ptf,
     const pointPatch& p,
     const DimensionedField<vector, pointMesh>& iF,
-    const PointPatchFieldMapper& mapper
+    const pointPatchFieldMapper& mapper
 )
 :
-    fixedValuePointPatchVectorField(ptf, p, iF, mapper),
+    fixedValuePointPatchField<vector>(ptf, p, iF, mapper),
     amplitude_(ptf.amplitude_),
     omega_(ptf.omega_),
-    p0_(ptf.p0_)
+    p0_(ptf.p0_, mapper)
 {}
 
 
@@ -102,7 +102,7 @@ oscillatingVelocityPointPatchVectorField
     const DimensionedField<vector, pointMesh>& iF
 )
 :
-    fixedValuePointPatchVectorField(ptf, iF),
+    fixedValuePointPatchField<vector>(ptf, iF),
     amplitude_(ptf.amplitude_),
     omega_(ptf.omega_),
     p0_(ptf.p0_)
@@ -111,6 +111,32 @@ oscillatingVelocityPointPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void oscillatingVelocityPointPatchVectorField::autoMap
+(
+    const pointPatchFieldMapper& m
+)
+{
+    fixedValuePointPatchField<vector>::autoMap(m);
+
+    p0_.autoMap(m);
+}
+
+
+void oscillatingVelocityPointPatchVectorField::rmap
+(
+    const pointPatchField<vector>& ptf,
+    const labelList& addr
+)
+{
+    const oscillatingVelocityPointPatchVectorField& oVptf =
+        refCast<const oscillatingVelocityPointPatchVectorField>(ptf);
+
+    fixedValuePointPatchField<vector>::rmap(oVptf, addr);
+
+    p0_.rmap(oVptf.p0_, addr);
+}
+
+
 void oscillatingVelocityPointPatchVectorField::updateCoeffs()
 {
     if (this->updated())
@@ -125,10 +151,10 @@ void oscillatingVelocityPointPatchVectorField::updateCoeffs()
     Field<vector>::operator=
     (
         (p0_ + amplitude_*sin(omega_*t.value()) - p.localPoints())
-       /t.deltaT().value()
+       /t.deltaTValue()
     );
 
-    fixedValuePointPatchVectorField::updateCoeffs();
+    fixedValuePointPatchField<vector>::updateCoeffs();
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
index 179f75f67..c33bc9614 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/oscillatingVelocity/oscillatingVelocityPointPatchVectorField.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef oscillatingVelocityPointPatchVectorField_H
 #define oscillatingVelocityPointPatchVectorField_H
 
-#include "fixedValuePointPatchFields.H"
+#include "fixedValuePointPatchField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,14 +49,7 @@ namespace Foam
 
 class oscillatingVelocityPointPatchVectorField
 :
-    public FixedValuePointPatchField
-    <
-        pointPatchField,
-        pointMesh,
-        pointPatch,
-        DummyMatrix,
-        vector
-    >
+    public fixedValuePointPatchField<vector>
 {
     // Private data
 
@@ -95,7 +88,7 @@ public:
             const oscillatingVelocityPointPatchVectorField&,
             const pointPatch&,
             const DimensionedField<vector, pointMesh>&,
-            const PointPatchFieldMapper&
+            const pointPatchFieldMapper&
         );
 
         //- Construct and return a clone
@@ -103,7 +96,10 @@ public:
         {
             return autoPtr<pointPatchField<vector> >
             (
-                new oscillatingVelocityPointPatchVectorField(*this)
+                new oscillatingVelocityPointPatchVectorField
+                (
+                    *this
+                )
             );
         }
 
@@ -122,13 +118,33 @@ public:
         {
             return autoPtr<pointPatchField<vector> >
             (
-                new oscillatingVelocityPointPatchVectorField(*this, iF)
+                new oscillatingVelocityPointPatchVectorField
+                (
+                    *this,
+                    iF
+                )
             );
         }
 
 
     // Member functions
 
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const pointPatchFieldMapper&
+            );
+
+            //- Reverse map the given pointPatchField onto this pointPatchField
+            virtual void rmap
+            (
+                const pointPatchField<vector>&,
+                const labelList&
+            );
+
+
         // Evaluation functions
 
             //- Update the coefficients associated with the patch field
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
new file mode 100644
index 000000000..dd3657929
--- /dev/null
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.C
@@ -0,0 +1,514 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "surfaceDisplacementPointPatchVectorField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "Time.H"
+#include "transformField.H"
+#include "fvMesh.H"
+#include "displacementLaplacianFvMotionSolver.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char*
+NamedEnum<surfaceDisplacementPointPatchVectorField::projectMode, 3>::
+names[] =
+{
+    "nearest",
+    "pointNormal",
+    "fixedNormal"
+};
+
+const NamedEnum<surfaceDisplacementPointPatchVectorField::projectMode, 3>
+    surfaceDisplacementPointPatchVectorField::projectModeNames_;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void surfaceDisplacementPointPatchVectorField::calcProjection
+(
+    vectorField& displacement
+) const
+{
+    const polyMesh& mesh = patch().boundaryMesh().mesh()();
+    const pointField& localPoints = patch().localPoints();
+    const labelList& meshPoints = patch().meshPoints();
+
+    //const scalar deltaT = mesh.time().deltaT().value();
+
+    // Construct large enough vector in direction of projectDir so
+    // we're guaranteed to hit something.
+
+    //- Per point projection vector:
+    const scalar projectLen = mag(mesh.bounds().max()-mesh.bounds().min());
+
+    // For case of fixed projection vector:
+    vector projectVec;
+    if (projectMode_ == FIXEDNORMAL)
+    {
+        vector n = projectDir_/mag(projectDir_);
+        projectVec = projectLen*n;
+    }
+
+
+    // Get fixed points (bit of a hack)
+    const pointZone* zonePtr = NULL;
+
+    if (frozenPointsZone_.size() > 0)
+    {
+        const pointZoneMesh& pZones = mesh.pointZones();
+
+        zonePtr = &pZones[pZones.findZoneID(frozenPointsZone_)];
+
+        Pout<< "surfaceDisplacementPointPatchVectorField : Fixing all "
+            << zonePtr->size() << " points in pointZone " << zonePtr->name()
+            << endl;
+    }
+
+    // Get the starting locations from the motionSolver
+    const pointField& points0 = mesh.lookupObject<displacementFvMotionSolver>
+    (
+        "dynamicMeshDict"
+    ).points0();
+
+
+    pointField start(meshPoints.size());
+    forAll(start, i)
+    {
+        start[i] = points0[meshPoints[i]] + displacement[i];
+    }
+
+    label nNotProjected = 0;
+
+    if (projectMode_ == NEAREST)
+    {
+        List<pointIndexHit> nearest;
+        labelList hitSurfaces;
+        surfaces().findNearest
+        (
+            start,
+            scalarField(start.size(), sqr(projectLen)),
+            hitSurfaces,
+            nearest
+        );
+
+        forAll(nearest, i)
+        {
+            if (zonePtr && (zonePtr->whichPoint(meshPoints[i]) >= 0))
+            {
+                // Fixed point. Reset to point0 location.
+                displacement[i] = points0[meshPoints[i]] - localPoints[i];
+            }
+            else if (nearest[i].hit())
+            {
+                displacement[i] =
+                    nearest[i].hitPoint()
+                  - points0[meshPoints[i]];
+            }
+            else
+            {
+                nNotProjected++;
+
+                if (debug)
+                {
+                    Pout<< "    point:" << meshPoints[i]
+                        << " coord:" << localPoints[i]
+                        << "  did not find any surface within " << projectLen
+                        << endl;
+                }
+            }
+        }
+    }
+    else
+    {
+        // Do tests on all points. Combine later on.
+
+        // 1. Check if already on surface
+        List<pointIndexHit> nearest;
+        {
+            labelList nearestSurface;
+            surfaces().findNearest
+            (
+                start,
+                scalarField(start.size(), sqr(SMALL)),
+                nearestSurface,
+                nearest
+            );
+        }
+
+        // 2. intersection. (combined later on with information from nearest
+        // above)
+        vectorField projectVecs(start.size(), projectVec);
+
+        if (projectMode_ == POINTNORMAL)
+        {
+            projectVecs = projectLen*patch().pointNormals();
+        }
+
+        // Knock out any wedge component
+        scalarField offset(start.size(), 0.0);
+        if (wedgePlane_ >= 0 && wedgePlane_ <= vector::nComponents)
+        {
+            forAll(offset, i)
+            {
+                offset[i] = start[i][wedgePlane_];
+                start[i][wedgePlane_] = 0;
+                projectVecs[i][wedgePlane_] = 0;
+            }
+        }
+
+        List<pointIndexHit> rightHit;
+        {
+            labelList rightSurf;
+            surfaces().findAnyIntersection
+            (
+                start,
+                start+projectVecs,
+                rightSurf,
+                rightHit
+            );
+        }
+        
+        List<pointIndexHit> leftHit;
+        {
+            labelList leftSurf;
+            surfaces().findAnyIntersection
+            (
+                start,
+                start-projectVecs,
+                leftSurf,
+                leftHit
+            );
+        }
+
+        // 3. Choose either -fixed, nearest, right, left.
+        forAll(displacement, i)
+        {
+            if (zonePtr && (zonePtr->whichPoint(meshPoints[i]) >= 0))
+            {
+                // Fixed point. Reset to point0 location.
+                displacement[i] = points0[meshPoints[i]] - localPoints[i];
+            }
+            else if (nearest[i].hit())
+            {
+                // Found nearest.
+                displacement[i] =
+                    nearest[i].hitPoint()
+                  - points0[meshPoints[i]];
+            }
+            else
+            {
+                pointIndexHit interPt;
+
+                if (rightHit[i].hit())
+                {
+                    if (leftHit[i].hit())
+                    {
+                        if
+                        (
+                            magSqr(rightHit[i].hitPoint()-start[i])
+                          < magSqr(leftHit[i].hitPoint()-start[i])
+                        )
+                        {
+                            interPt = rightHit[i];
+                        }
+                        else
+                        {
+                            interPt = leftHit[i];
+                        }
+                    }
+                    else
+                    {
+                        interPt = rightHit[i];
+                    }
+                }
+                else
+                {
+                    if (leftHit[i].hit())
+                    {
+                        interPt = leftHit[i];
+                    }
+                }
+
+
+                if (interPt.hit())
+                {
+                    if (wedgePlane_ >= 0 && wedgePlane_ <= vector::nComponents)
+                    {
+                        interPt.rawPoint()[wedgePlane_] += offset[i];
+                    }
+                    displacement[i] = interPt.rawPoint()-points0[meshPoints[i]];
+                }
+                else
+                {
+                    nNotProjected++;
+
+                    if (debug)
+                    {
+                        Pout<< "    point:" << meshPoints[i]
+                            << " coord:" << localPoints[i]
+                            << "  did not find any intersection between"
+                            << " ray from " << start[i]-projectVecs[i]
+                            << " to " << start[i]+projectVecs[i] << endl;
+                    }
+                }
+            }
+        }
+    }
+
+    reduce(nNotProjected, sumOp<label>());
+
+    if (nNotProjected > 0)
+    {
+        Info<< "surfaceDisplacement :"
+            << " on patch " << patch().name()
+            << " did not project " << nNotProjected
+            << " out of " << returnReduce(localPoints.size(), sumOp<label>())
+            << " points." << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+surfaceDisplacementPointPatchVectorField::
+surfaceDisplacementPointPatchVectorField
+(
+    const pointPatch& p,
+    const DimensionedField<vector, pointMesh>& iF
+)
+:
+    fixedValuePointPatchVectorField(p, iF),
+    velocity_(vector::zero),
+    projectMode_(NEAREST),
+    projectDir_(vector::zero),
+    wedgePlane_(-1)
+{}
+
+
+surfaceDisplacementPointPatchVectorField::
+surfaceDisplacementPointPatchVectorField
+(
+    const pointPatch& p,
+    const DimensionedField<vector, pointMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValuePointPatchVectorField(p, iF, dict),
+    velocity_(dict.lookup("velocity")),
+    surfacesDict_(dict.subDict("geometry")),
+    projectMode_(projectModeNames_.read(dict.lookup("projectMode"))),
+    projectDir_(dict.lookup("projectDirection")),
+    wedgePlane_(dict.lookupOrDefault("wedgePlane", -1)),
+    frozenPointsZone_(dict.lookupOrDefault("frozenPointsZone", word::null))
+{
+    if (velocity_.x() < 0 || velocity_.y() < 0 || velocity_.z() < 0)
+    {
+        FatalErrorIn
+        (
+            "surfaceDisplacementPointPatchVectorField::\n"
+            "surfaceDisplacementPointPatchVectorField\n"
+            "(\n"
+            "    const pointPatch& p,\n"
+            "    const DimensionedField<vector, pointMesh>& iF,\n"
+            "    const dictionary& dict\n"
+            ")\n"
+        )   << "All components of velocity have to be positive : "
+            << velocity_ << nl
+            << "Set velocity components to a great value if no clipping"
+            << " necessary." << exit(FatalError);
+    }
+}
+
+
+surfaceDisplacementPointPatchVectorField::
+surfaceDisplacementPointPatchVectorField
+(
+    const surfaceDisplacementPointPatchVectorField& ppf,
+    const pointPatch& p,
+    const DimensionedField<vector, pointMesh>& iF,
+    const pointPatchFieldMapper& mapper
+)
+:
+    fixedValuePointPatchVectorField(ppf, p, iF, mapper),
+    velocity_(ppf.velocity_),
+    surfacesDict_(ppf.surfacesDict_),
+    projectMode_(ppf.projectMode_),
+    projectDir_(ppf.projectDir_),
+    wedgePlane_(ppf.wedgePlane_),
+    frozenPointsZone_(ppf.frozenPointsZone_)
+{}
+
+
+surfaceDisplacementPointPatchVectorField::
+surfaceDisplacementPointPatchVectorField
+(
+    const surfaceDisplacementPointPatchVectorField& ppf
+)
+:
+    fixedValuePointPatchVectorField(ppf),
+    velocity_(ppf.velocity_),
+    surfacesDict_(ppf.surfacesDict_),
+    projectMode_(ppf.projectMode_),
+    projectDir_(ppf.projectDir_),
+    wedgePlane_(ppf.wedgePlane_),
+    frozenPointsZone_(ppf.frozenPointsZone_)
+{}
+
+
+surfaceDisplacementPointPatchVectorField::
+surfaceDisplacementPointPatchVectorField
+(
+    const surfaceDisplacementPointPatchVectorField& ppf,
+    const DimensionedField<vector, pointMesh>& iF
+)
+:
+    fixedValuePointPatchVectorField(ppf, iF),
+    velocity_(ppf.velocity_),
+    surfacesDict_(ppf.surfacesDict_),
+    projectMode_(ppf.projectMode_),
+    projectDir_(ppf.projectDir_),
+    wedgePlane_(ppf.wedgePlane_),
+    frozenPointsZone_(ppf.frozenPointsZone_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const searchableSurfaces&
+surfaceDisplacementPointPatchVectorField::surfaces() const
+{
+    if (surfacesPtr_.empty())
+    {
+        surfacesPtr_.reset
+        (
+            new searchableSurfaces
+            (
+                IOobject
+                (
+                    "abc",                              // dummy name
+                    db().time().constant(),             // directory
+                    "triSurface",                       // instance
+                    db().time(),                        // registry
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                ),
+                surfacesDict_
+            )
+        );
+    }
+    return surfacesPtr_();
+}
+
+
+void surfaceDisplacementPointPatchVectorField::updateCoeffs()
+{
+    if (this->updated())
+    {
+        return;
+    }
+
+    const polyMesh& mesh = patch().boundaryMesh().mesh()();
+
+    vectorField currentDisplacement = this->patchInternalField();
+
+    // Calculate intersections with surface w.r.t points0.
+    vectorField displacement(currentDisplacement);
+    calcProjection(displacement);
+
+    // offset wrt current displacement
+    vectorField offset = displacement-currentDisplacement;
+
+    // Clip offset to maximum displacement possible: velocity*timestep
+
+    const scalar deltaT = mesh.time().deltaT().value();
+    const vector clipVelocity = velocity_*deltaT;
+
+    forAll(displacement, i)
+    {
+        vector& d = offset[i];
+
+        for (direction cmpt = 0; cmpt < vector::nComponents; cmpt++)
+        {
+            if (d[cmpt] < 0)
+            {
+                d[cmpt] = max(d[cmpt], -clipVelocity[cmpt]);
+            }
+            else
+            {
+                d[cmpt] = min(d[cmpt], clipVelocity[cmpt]);
+            }
+        }
+    }
+
+    this->operator==(currentDisplacement+offset);
+
+    fixedValuePointPatchVectorField::updateCoeffs();
+}
+
+
+void surfaceDisplacementPointPatchVectorField::write(Ostream& os) const
+{
+    fixedValuePointPatchVectorField::write(os);
+    os.writeKeyword("velocity") << velocity_
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("geometry") << surfacesDict_
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("projectMode") << projectModeNames_[projectMode_]
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("projectDirection") << projectDir_
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("wedgePlane") << wedgePlane_
+        << token::END_STATEMENT << nl;
+    if (frozenPointsZone_ != word::null)
+    {
+        os.writeKeyword("frozenPointsZone") << frozenPointsZone_
+            << token::END_STATEMENT << nl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePointPatchTypeField
+(
+    fixedValuePointPatchVectorField,
+    surfaceDisplacementPointPatchVectorField
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
new file mode 100644
index 000000000..0e3cb834f
--- /dev/null
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceDisplacement/surfaceDisplacementPointPatchVectorField.H
@@ -0,0 +1,223 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    surfaceDisplacementPointPatchVectorField
+
+Description
+    Displacement fixed by projection onto triSurface.
+    Use in a displacement fvMotionSolver
+    as a bc on the pointDisplacement field.
+
+    Calculates the projection onto the surface according
+    to the projectMode
+    - NEAREST : nearest
+    - POINTNORMAL : intersection with point normal
+    - FIXEDNORMAL : intersection with fixed vector
+
+    This displacement is then clipped with the specified velocity * deltaT.
+
+    Optionally (intersection only) removes a component ("wedgePlane") to
+    stay in 2D.
+
+    Needs:
+    - geometry : dictionary with searchableSurfaces. (usually
+      triSurfaceMeshes in constant/triSurface)
+    - projectMode : see above
+    - projectDirection : if projectMode = fixedNormal
+    - wedgePlane : -1 or component to knock out of intersection normal
+    - frozenPointsZone : empty or name of pointZone containing points
+                         that do not move
+
+SourceFiles
+    surfaceDisplacementPointPatchVectorField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef surfaceDisplacementPointPatchVectorField_H
+#define surfaceDisplacementPointPatchVectorField_H
+
+#include "pointPatchFields.H"
+#include "fixedValuePointPatchFields.H"
+#include "searchableSurfaces.H"
+#include "Switch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+          Class surfaceDisplacementPointPatchVectorField Declaration
+\*---------------------------------------------------------------------------*/
+
+class surfaceDisplacementPointPatchVectorField
+:
+    public fixedValuePointPatchVectorField
+{
+
+public:
+
+    // Public data types
+
+        enum projectMode
+        {
+            NEAREST,
+            POINTNORMAL,
+            FIXEDNORMAL
+        };
+
+private:
+
+    // Private data
+
+        //- project mode names
+        static const NamedEnum<projectMode, 3> projectModeNames_;
+
+        //- Maximum velocity
+        const vector velocity_;
+
+        //- names of surfaces
+        const dictionary surfacesDict_;
+
+        //- How to project/project onto surface
+        const projectMode projectMode_;
+
+        //- direction to project
+        const vector projectDir_;
+
+        //- plane for 2D wedge case or -1.
+        const label wedgePlane_;
+
+        //- pointZone with frozen points
+        const word frozenPointsZone_;
+
+        //- Demand driven: surface to project
+        mutable autoPtr<searchableSurfaces> surfacesPtr_;
+
+
+    // Private Member Functions
+
+        //- Calculate displacement (w.r.t. points0()) to project onto surface
+        void calcProjection(vectorField& displacement) const;
+
+
+        //- Disallow default bitwise assignment
+        void operator=(const surfaceDisplacementPointPatchVectorField&);
+
+public:
+
+    //- Runtime type information
+    TypeName("surfaceDisplacement");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        surfaceDisplacementPointPatchVectorField
+        (
+            const pointPatch&,
+            const DimensionedField<vector, pointMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        surfaceDisplacementPointPatchVectorField
+        (
+            const pointPatch&,
+            const DimensionedField<vector, pointMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given patchField<vector> onto a new patch
+        surfaceDisplacementPointPatchVectorField
+        (
+            const surfaceDisplacementPointPatchVectorField&,
+            const pointPatch&,
+            const DimensionedField<vector, pointMesh>&,
+            const pointPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        surfaceDisplacementPointPatchVectorField
+        (
+            const surfaceDisplacementPointPatchVectorField&
+        );
+
+        //- Construct and return a clone
+        virtual autoPtr<pointPatchVectorField> clone() const
+        {
+            return autoPtr<pointPatchVectorField>
+            (
+                new surfaceDisplacementPointPatchVectorField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        surfaceDisplacementPointPatchVectorField
+        (
+            const surfaceDisplacementPointPatchVectorField&,
+            const DimensionedField<vector, pointMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual autoPtr<pointPatchVectorField> clone
+        (
+            const DimensionedField<vector, pointMesh>& iF
+        ) const
+        {
+            return autoPtr<pointPatchVectorField>
+            (
+                new surfaceDisplacementPointPatchVectorField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+    // Member Functions
+
+        //- Surface to follow. Demand loads surfaceNames.
+        const searchableSurfaces& surfaces() const;
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
index 9e8dedabf..bde2fc459 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.C
@@ -29,7 +29,7 @@ License
 #include "Time.H"
 #include "transformField.H"
 #include "fvMesh.H"
-#include "displacementLaplacianFvMotionSolver.H"
+#include "displacementFvMotionSolver.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,7 +40,7 @@ namespace Foam
 
 template<>
 const char*
-NamedEnum<surfaceSlipDisplacementPointPatchVectorField::followMode, 3>::
+NamedEnum<surfaceSlipDisplacementPointPatchVectorField::projectMode, 3>::
 names[] =
 {
     "nearest",
@@ -48,132 +48,27 @@ names[] =
     "fixedNormal"
 };
 
-const NamedEnum<surfaceSlipDisplacementPointPatchVectorField::followMode, 3>
-    surfaceSlipDisplacementPointPatchVectorField::followModeNames_;
+const NamedEnum<surfaceSlipDisplacementPointPatchVectorField::projectMode, 3>
+    surfaceSlipDisplacementPointPatchVectorField::projectModeNames_;
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-surfaceSlipDisplacementPointPatchVectorField::
-surfaceSlipDisplacementPointPatchVectorField
+void surfaceSlipDisplacementPointPatchVectorField::calcProjection
 (
-    const pointPatch& p,
-    const DimensionedField<vector, pointMesh>& iF
-)
-:
-    pointPatchVectorField(p, iF),
-    projectMode_(NEAREST),
-    projectDir_(vector::zero),
-    wedgePlane_(-1)
-{}
-
-
-surfaceSlipDisplacementPointPatchVectorField::
-surfaceSlipDisplacementPointPatchVectorField
-(
-    const pointPatch& p,
-    const DimensionedField<vector, pointMesh>& iF,
-    const dictionary& dict
-)
-:
-    pointPatchVectorField(p, iF),
-    surfacesDict_(dict.subDict("geometry")),
-    projectMode_(followModeNames_.read(dict.lookup("followMode"))),
-    projectDir_(dict.lookup("projectDirection")),
-    wedgePlane_(readLabel(dict.lookup("wedgePlane"))),
-    frozenPointsZone_(dict.lookup("frozenPointsZone"))
-{}
-
-
-surfaceSlipDisplacementPointPatchVectorField::
-surfaceSlipDisplacementPointPatchVectorField
-(
-    const surfaceSlipDisplacementPointPatchVectorField& ppf,
-    const pointPatch& p,
-    const DimensionedField<vector, pointMesh>& iF,
-    const PointPatchFieldMapper&
-)
-:
-    pointPatchVectorField(p, iF),
-    surfacesDict_(ppf.surfacesDict()),
-    projectMode_(ppf.projectMode()),
-    projectDir_(ppf.projectDir()),
-    wedgePlane_(ppf.wedgePlane()),
-    frozenPointsZone_(ppf.frozenPointsZone())
-{}
-
-
-surfaceSlipDisplacementPointPatchVectorField::
-surfaceSlipDisplacementPointPatchVectorField
-(
-    const surfaceSlipDisplacementPointPatchVectorField& ppf
-)
-:
-    pointPatchVectorField(ppf),
-    surfacesDict_(ppf.surfacesDict()),
-    projectMode_(ppf.projectMode()),
-    projectDir_(ppf.projectDir()),
-    wedgePlane_(ppf.wedgePlane()),
-    frozenPointsZone_(ppf.frozenPointsZone())
-{}
-
-
-surfaceSlipDisplacementPointPatchVectorField::
-surfaceSlipDisplacementPointPatchVectorField
-(
-    const surfaceSlipDisplacementPointPatchVectorField& ppf,
-    const DimensionedField<vector, pointMesh>& iF
-)
-:
-    pointPatchVectorField(ppf, iF),
-    surfacesDict_(ppf.surfacesDict()),
-    projectMode_(ppf.projectMode()),
-    projectDir_(ppf.projectDir()),
-    wedgePlane_(ppf.wedgePlane()),
-    frozenPointsZone_(ppf.frozenPointsZone())
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-const searchableSurfaces& surfaceSlipDisplacementPointPatchVectorField::
-surfaces() const
-{
-    if (!surfacesPtr_.valid())
-    {
-        surfacesPtr_.reset
-        (
-            new searchableSurfaces
-            (
-                IOobject
-                (
-                    "abc",                              // dummy name
-                    db().time().constant(),             // directory
-                    "triSurface",                       // instance
-                    db().time(),                        // registry
-                    IOobject::MUST_READ,
-                    IOobject::NO_WRITE
-                ),
-                surfacesDict_
-            )
-        );
-    }
-    return surfacesPtr_();
-}
-
-
-void surfaceSlipDisplacementPointPatchVectorField::evaluate
-(
-    const Pstream::commsTypes commsType
-)
+    vectorField& displacement
+) const
 {
     const polyMesh& mesh = patch().boundaryMesh().mesh()();
+    const pointField& localPoints = patch().localPoints();
+    const labelList& meshPoints = patch().meshPoints();
 
     //const scalar deltaT = mesh.time().deltaT().value();
 
     // Construct large enough vector in direction of projectDir so
     // we're guaranteed to hit something.
 
+    //- Per point projection vector:
     const scalar projectLen = mag(mesh.bounds().max()-mesh.bounds().min());
 
     // For case of fixed projection vector:
@@ -184,13 +79,6 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
         projectVec = projectLen*n;
     }
 
-    //- Per point projection vector:
-
-    const pointField& localPoints = patch().localPoints();
-    const labelList& meshPoints = patch().meshPoints();
-
-    vectorField displacement(this->patchInternalField());
-
 
     // Get fixed points (bit of a hack)
     const pointZone* zonePtr = NULL;
@@ -207,15 +95,10 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
     }
 
     // Get the starting locations from the motionSolver
-    const displacementLaplacianFvMotionSolver& motionSolver =
-        mesh.lookupObject<displacementLaplacianFvMotionSolver>
-        (
-            "dynamicMeshDict"
-        );
-    const pointField& points0 = motionSolver.points0();
-
-
-//XXXXXX
+    const pointField& points0 = mesh.lookupObject<displacementFvMotionSolver>
+    (
+        "dynamicMeshDict"
+    ).points0();
 
 
     pointField start(meshPoints.size());
@@ -224,6 +107,8 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
         start[i] = points0[meshPoints[i]] + displacement[i];
     }
 
+    label nNotProjected = 0;
+
     if (projectMode_ == NEAREST)
     {
         List<pointIndexHit> nearest;
@@ -251,10 +136,15 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
             }
             else
             {
-                Pout<< "    point:" << meshPoints[i]
-                    << " coord:" << localPoints[i]
-                    << "  did not find any surface within " << projectLen
-                    << endl;
+                nNotProjected++;
+
+                if (debug)
+                {
+                    Pout<< "    point:" << meshPoints[i]
+                        << " coord:" << localPoints[i]
+                        << "  did not find any surface within " << projectLen
+                        << endl;
+                }
             }
         }
     }
@@ -286,7 +176,7 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
 
         // Knock out any wedge component
         scalarField offset(start.size(), 0.0);
-        if (wedgePlane_ >= 0 && wedgePlane_ <= vector::nComponents)
+        if (wedgePlane_ >= 0 && wedgePlane_ < vector::nComponents)
         {
             forAll(offset, i)
             {
@@ -307,7 +197,7 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
                 rightHit
             );
         }
-        
+
         List<pointIndexHit> leftHit;
         {
             labelList leftSurf;
@@ -372,7 +262,7 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
 
                 if (interPt.hit())
                 {
-                    if (wedgePlane_ >= 0 && wedgePlane_ <= vector::nComponents)
+                    if (wedgePlane_ >= 0 && wedgePlane_ < vector::nComponents)
                     {
                         interPt.rawPoint()[wedgePlane_] += offset[i];
                     }
@@ -380,17 +270,154 @@ void surfaceSlipDisplacementPointPatchVectorField::evaluate
                 }
                 else
                 {
-                    Pout<< "    point:" << meshPoints[i]
-                        << " coord:" << localPoints[i]
-                        << "  did not find any intersection between ray from "
-                        << start[i]-projectVecs[i]
-                        << " to " << start[i]+projectVecs[i]
-                        << endl;
+                    nNotProjected++;
+
+                    if (debug)
+                    {
+                        Pout<< "    point:" << meshPoints[i]
+                            << " coord:" << localPoints[i]
+                            << "  did not find any intersection between"
+                            << " ray from " << start[i]-projectVecs[i]
+                            << " to " << start[i]+projectVecs[i] << endl;
+                    }
                 }
             }
         }
     }
 
+    reduce(nNotProjected, sumOp<label>());
+
+    if (nNotProjected > 0)
+    {
+        Info<< "surfaceSlipDisplacement :"
+            << " on patch " << patch().name()
+            << " did not project " << nNotProjected
+            << " out of " << returnReduce(localPoints.size(), sumOp<label>())
+            << " points." << endl;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+surfaceSlipDisplacementPointPatchVectorField::
+surfaceSlipDisplacementPointPatchVectorField
+(
+    const pointPatch& p,
+    const DimensionedField<vector, pointMesh>& iF
+)
+:
+    pointPatchVectorField(p, iF),
+    projectMode_(NEAREST),
+    projectDir_(vector::zero),
+    wedgePlane_(-1)
+{}
+
+
+surfaceSlipDisplacementPointPatchVectorField::
+surfaceSlipDisplacementPointPatchVectorField
+(
+    const pointPatch& p,
+    const DimensionedField<vector, pointMesh>& iF,
+    const dictionary& dict
+)
+:
+    pointPatchVectorField(p, iF, dict),
+    surfacesDict_(dict.subDict("geometry")),
+    projectMode_(projectModeNames_.read(dict.lookup("projectMode"))),
+    projectDir_(dict.lookup("projectDirection")),
+    wedgePlane_(dict.lookupOrDefault("wedgePlane", -1)),
+    frozenPointsZone_(dict.lookupOrDefault("frozenPointsZone", word::null))
+{}
+
+
+surfaceSlipDisplacementPointPatchVectorField::
+surfaceSlipDisplacementPointPatchVectorField
+(
+    const surfaceSlipDisplacementPointPatchVectorField& ppf,
+    const pointPatch& p,
+    const DimensionedField<vector, pointMesh>& iF,
+    const pointPatchFieldMapper&
+)
+:
+    pointPatchVectorField(p, iF),
+    surfacesDict_(ppf.surfacesDict_),
+    projectMode_(ppf.projectMode_),
+    projectDir_(ppf.projectDir_),
+    wedgePlane_(ppf.wedgePlane_),
+    frozenPointsZone_(ppf.frozenPointsZone_)
+{}
+
+
+surfaceSlipDisplacementPointPatchVectorField::
+surfaceSlipDisplacementPointPatchVectorField
+(
+    const surfaceSlipDisplacementPointPatchVectorField& ppf
+)
+:
+    pointPatchVectorField(ppf),
+    surfacesDict_(ppf.surfacesDict_),
+    projectMode_(ppf.projectMode_),
+    projectDir_(ppf.projectDir_),
+    wedgePlane_(ppf.wedgePlane_),
+    frozenPointsZone_(ppf.frozenPointsZone_)
+{}
+
+
+surfaceSlipDisplacementPointPatchVectorField::
+surfaceSlipDisplacementPointPatchVectorField
+(
+    const surfaceSlipDisplacementPointPatchVectorField& ppf,
+    const DimensionedField<vector, pointMesh>& iF
+)
+:
+    pointPatchVectorField(ppf, iF),
+    surfacesDict_(ppf.surfacesDict_),
+    projectMode_(ppf.projectMode_),
+    projectDir_(ppf.projectDir_),
+    wedgePlane_(ppf.wedgePlane_),
+    frozenPointsZone_(ppf.frozenPointsZone_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const searchableSurfaces&
+surfaceSlipDisplacementPointPatchVectorField::surfaces() const
+{
+    if (surfacesPtr_.empty())
+    {
+        surfacesPtr_.reset
+        (
+            new searchableSurfaces
+            (
+                IOobject
+                (
+                    "abc",                              // dummy name
+                    db().time().constant(),             // directory
+                    "triSurface",                       // instance
+                    db().time(),                        // registry
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE
+                ),
+                surfacesDict_
+            )
+        );
+    }
+    return surfacesPtr_();
+}
+
+
+void surfaceSlipDisplacementPointPatchVectorField::evaluate
+(
+    const Pstream::commsTypes commsType
+)
+{
+    vectorField displacement(this->patchInternalField());
+
+    // Calculate displacement to project points onto surface
+    calcProjection(displacement);
+
     // Get internal field to insert values into
     Field<vector>& iF = const_cast<Field<vector>&>(this->internalField());
 
@@ -406,14 +433,17 @@ void surfaceSlipDisplacementPointPatchVectorField::write(Ostream& os) const
     pointPatchVectorField::write(os);
     os.writeKeyword("geometry") << surfacesDict_
         << token::END_STATEMENT << nl;
-    os.writeKeyword("followMode") << followModeNames_[projectMode_]
+    os.writeKeyword("projectMode") << projectModeNames_[projectMode_]
         << token::END_STATEMENT << nl;
     os.writeKeyword("projectDirection") << projectDir_
         << token::END_STATEMENT << nl;
     os.writeKeyword("wedgePlane") << wedgePlane_
         << token::END_STATEMENT << nl;
-    os.writeKeyword("frozenPointsZone") << frozenPointsZone_
-        << token::END_STATEMENT << nl;
+    if (frozenPointsZone_ != word::null)
+    {
+        os.writeKeyword("frozenPointsZone") << frozenPointsZone_
+            << token::END_STATEMENT << nl;
+    }
 }
 
 
diff --git a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
index b2052df78..38ab4bbb8 100644
--- a/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
+++ b/src/fvMotionSolver/pointPatchFields/derived/surfaceSlipDisplacement/surfaceSlipDisplacementPointPatchVectorField.H
@@ -26,8 +26,10 @@ Class
     Foam::surfaceSlipDisplacementPointPatchVectorField
 
 Description
-    Displacement follows a triSurface. Use in a displacement fvMotionSolver.
-    Following is either
+    Displacement follows a triSurface. Use in a displacement fvMotionSolver
+    as a bc on the pointDisplacement field.
+    Following is done by calculating the projection onto the surface according
+    to the projectMode
     - NEAREST : nearest
     - POINTNORMAL : intersection with point normal
     - FIXEDNORMAL : intersection with fixed vector
@@ -36,9 +38,10 @@ Description
     stay in 2D.
 
     Needs:
-    - projectSurfaces : names of triSurfaceMeshes (in constant/triSurface)
-    - followMode : see above
-    - projectDirection : if followMode = fixedNormal
+    - geometry : dictionary with searchableSurfaces. (usually
+      triSurfaceMeshes in constant/triSurface)
+    - projectMode : see above
+    - projectDirection : if projectMode = fixedNormal
     - wedgePlane : -1 or component to knock out of intersection normal
     - frozenPointsZone : empty or name of pointZone containing points
                          that do not move
@@ -72,7 +75,7 @@ public:
 
     // Public data types
 
-        enum followMode
+        enum projectMode
         {
             NEAREST,
             POINTNORMAL,
@@ -83,14 +86,14 @@ private:
 
     // Private data
 
-        //- follow mode names
-        static const NamedEnum<followMode, 3> followModeNames_;
+        //- project mode names
+        static const NamedEnum<projectMode, 3> projectModeNames_;
 
         //- names of surfaces
         const dictionary surfacesDict_;
 
-        //- How to follow/project onto surface
-        const followMode projectMode_;
+        //- How to project/project onto surface
+        const projectMode projectMode_;
 
         //- direction to project
         const vector projectDir_;
@@ -101,12 +104,15 @@ private:
         //- pointZone with frozen points
         const word frozenPointsZone_;
 
-        //- Demand driven: surface to follow
+        //- Demand driven: surface to project
         mutable autoPtr<searchableSurfaces> surfacesPtr_;
 
 
     // Private Member Functions
 
+        //- Calculate displacement (w.r.t. points0()) to project onto surface
+        void calcProjection(vectorField& displacement) const;
+
         //- Disallow default bitwise assignment
         void operator=(const surfaceSlipDisplacementPointPatchVectorField&);
 
@@ -140,7 +146,7 @@ public:
             const surfaceSlipDisplacementPointPatchVectorField&,
             const pointPatch&,
             const DimensionedField<vector, pointMesh>&,
-            const PointPatchFieldMapper&
+            const pointPatchFieldMapper&
         );
 
         //- Construct as copy
@@ -186,40 +192,9 @@ public:
 
     // Member Functions
 
-        //- Surfaces to follow
-        const dictionary& surfacesDict() const
-        {
-            return surfacesDict_;
-        }
-
         //- Surface to follow. Demand loads surfaceNames.
         const searchableSurfaces& surfaces() const;
 
-        //- Mode of projection/following
-        followMode projectMode() const
-        {
-            return projectMode_;
-        }
-
-        //- Direction to project back onto surface
-        const vector& projectDir() const
-        {
-            return projectDir_;
-        }
-
-        //- Normal of wedgeplane (0, 1, 2) or -1. Note: should be obtained
-        //  from twoDPointCorrector.
-        label wedgePlane() const
-        {
-            return wedgePlane_;
-        }
-
-        //- Zone containing frozen points
-        const word& frozenPointsZone() const
-        {
-            return frozenPointsZone_;
-        }
-
         //- Update the patch field
         virtual void evaluate
         (
diff --git a/src/lagrangian/basic/Cloud/Cloud.C b/src/lagrangian/basic/Cloud/Cloud.C
index 4bd04b564..cd5249cb0 100644
--- a/src/lagrangian/basic/Cloud/Cloud.C
+++ b/src/lagrangian/basic/Cloud/Cloud.C
@@ -30,6 +30,7 @@ License
 #include "PstreamCombineReduceOps.H"
 #include "mapPolyMesh.H"
 #include "Time.H"
+#include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -41,16 +42,12 @@ Foam::Cloud<ParticleType>::Cloud
 )
 :
     cloud(pMesh),
-    IDLList<ParticleType>(particles),
+    IDLList<ParticleType>(),
     polyMesh_(pMesh),
-    allFaces_(pMesh.faces()),
-    points_(pMesh.points()),
-    cellFaces_(pMesh.cells()),
-    allFaceCentres_(pMesh.faceCentres()),
-    owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour()),
-    meshInfo_(polyMesh_)
-{}
+    particleCount_(0)
+{
+    IDLList<ParticleType>::operator=(particles);
+}
 
 
 template<class ParticleType>
@@ -62,20 +59,31 @@ Foam::Cloud<ParticleType>::Cloud
 )
 :
     cloud(pMesh, cloudName),
-    IDLList<ParticleType>(particles),
+    IDLList<ParticleType>(),
     polyMesh_(pMesh),
-    allFaces_(pMesh.faces()),
-    points_(pMesh.points()),
-    cellFaces_(pMesh.cells()),
-    allFaceCentres_(pMesh.faceCentres()),
-    owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour()),
-    meshInfo_(polyMesh_)
-{}
+    particleCount_(0)
+{
+    IDLList<ParticleType>::operator=(particles);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class ParticleType>
+Foam::label Foam::Cloud<ParticleType>::getNewParticleID() const
+{
+    label id = particleCount_++;
+
+    if (id == labelMax)
+    {
+        WarningIn("Cloud<ParticleType>::getNewParticleID() const")
+            << "Particle counter has overflowed. This might cause problems"
+            << " when reconstructing particle tracks." << endl;
+    }
+    return id;
+}
+
+
 template<class ParticleType>
 void Foam::Cloud<ParticleType>::addParticle(ParticleType* pPtr)
 {
@@ -317,7 +325,7 @@ void Foam::Cloud<ParticleType>::autoMap(const mapPolyMesh& mapper)
             {
                 pIter().celli_ = polyMesh_.findCell(pIter().position());
             }
-                
+
             vector p = pIter().position();
             const_cast<vector&>(pIter().position()) =
                 polyMesh_.cellCentres()[trackStartCell];
@@ -328,6 +336,25 @@ void Foam::Cloud<ParticleType>::autoMap(const mapPolyMesh& mapper)
 }
 
 
+template<class ParticleType>
+void Foam::Cloud<ParticleType>::writePositions() const
+{
+    OFstream pObj
+    (
+        this->db().time().path()/this->name() + "_positions.obj"
+    );
+
+    forAllConstIter(typename Cloud<ParticleType>, *this, pIter)
+    {
+        const ParticleType& p = pIter();
+        pObj<< "v " << p.position().x() << " " << p.position().y() << " "
+            << p.position().z() << nl;
+    }
+
+    pObj.flush();
+}
+
+
 // * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
 
 #include "CloudIO.C"
diff --git a/src/lagrangian/basic/Cloud/Cloud.H b/src/lagrangian/basic/Cloud/Cloud.H
index d003ac0ee..a993d8fe9 100644
--- a/src/lagrangian/basic/Cloud/Cloud.H
+++ b/src/lagrangian/basic/Cloud/Cloud.H
@@ -37,20 +37,22 @@ SourceFiles
 #define Cloud_H
 
 #include "cloud.H"
-#include "pointMesh.H"
 #include "IDLList.H"
 #include "IOField.H"
-
-#include "polyMeshInfo.H"
+#include "polyMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward declaration of functions
 template<class ParticleType>
 class Cloud;
 
+template<class ParticleType>
+class IOPosition;
+
 template<class ParticleType>
 Ostream& operator<<
 (
@@ -69,19 +71,15 @@ class Cloud
     public cloud,
     public IDLList<ParticleType>
 {
-
     // Private data
 
         const polyMesh& polyMesh_;
-        const faceList& allFaces_;
-        const vectorField& points_;
-        const cellList& cellFaces_;
-        const vectorField& allFaceCentres_;
-        const unallocLabelList& owner_;
-        const unallocLabelList& neighbour_;
 
-        //- Mesh information object
-        const polyMeshInfo meshInfo_;
+        //- Overall count of particles ever created. Never decreases.
+        mutable label particleCount_;
+
+        //- Temporary storage for addressing. Used in findFaces.
+        mutable DynamicList<label> labels_;
 
 
     // Private member functions
@@ -89,11 +87,19 @@ class Cloud
         //- Initialise cloud on IO constructor
         void initCloud(const bool checkClass);
 
+        //- Read cloud properties dictionary
+        void readCloudUniformProperties();
+
+        //- Write cloud properties dictionary
+        void writeCloudUniformProperties() const;
+
 
 public:
 
     template<class ParticleT>
     friend class Particle;
+    template<class ParticleT>
+    friend class IOPosition;
 
     typedef ParticleType particleType;
 
@@ -104,6 +110,12 @@ public:
     TypeName("Cloud");
 
 
+    // Static data
+
+        //- Name of cloud properties dictionary
+        static word cloudPropertiesName;
+
+
     // Constructors
 
         //- Construct from mesh and a list of particles
@@ -174,44 +186,54 @@ public:
                 return polyMesh_.boundaryMesh()[patchi].whichFace(facei);
             }
 
-            //- Return reference to the mesh information object
-            const polyMeshInfo& meshInfo() const
-            {
-                return meshInfo_;
-            }
-
             label size() const
             {
                 return IDLList<ParticleType>::size();
             };
 
-            const const_iterator begin() const
-            {
-                return IDLList<ParticleType>::begin();
-            };
 
-            const const_iterator end() const
-            {
-                return IDLList<ParticleType>::end();
-            };
+            // Iterators
 
-            iterator begin()
-            {
-                return IDLList<ParticleType>::begin();
-            };
+                const const_iterator begin() const
+                {
+                    return IDLList<ParticleType>::begin();
+                };
 
-            iterator end()
-            {
-                return IDLList<ParticleType>::end();
-            };
+                const const_iterator cbegin() const
+                {
+                    return IDLList<ParticleType>::cbegin();
+                };
+
+                const const_iterator end() const
+                {
+                    return IDLList<ParticleType>::end();
+                };
+
+                const const_iterator cend() const
+                {
+                    return IDLList<ParticleType>::cend();
+                };
+
+                iterator begin()
+                {
+                    return IDLList<ParticleType>::begin();
+                };
+
+                iterator end()
+                {
+                    return IDLList<ParticleType>::end();
+                };
+
+
+        // Edit
 
             void clear()
             {
                 return IDLList<ParticleType>::clear();
             };
 
-
-        // Edit
+            //- Get unique particle creation id
+            label getNewParticleID() const;
 
             //- Transfer particle to cloud
             void addParticle(ParticleType* pPtr);
@@ -231,8 +253,14 @@ public:
 
         // Read
 
-            //- Read and return a lagrangian data field
-            //  Checks that data is valid
+            //- Helper to construct IOobject for field and current time.
+            IOobject fieldIOobject
+            (
+                const word& fieldName,
+                const IOobject::readOption r
+            ) const;
+
+            //- Check lagrangian data field
             template<class DataType>
             void checkFieldIOobject
             (
@@ -240,20 +268,15 @@ public:
                 const IOField<DataType>& data
             ) const;
 
-            //- Read and return a lagrangian data field
-            IOobject fieldIOobject(const word& fieldName) const;
-
-            //- Read and return a lagrangian data field
-            template<class Type>
-            tmp<IOField<Type> > readField(const word& fieldName) const;
-
-            //- Read the field data for the cloud of particles
-            void readFields();
+            //- Read the field data for the cloud of particles. Dummy at
+            //  this level.
+            virtual void readFields();
 
 
         // Write
 
-            //- Write the field data for the cloud of particles
+            //- Write the field data for the cloud of particles Dummy at
+            //  this level.
             virtual void writeFields() const;
 
             //- Write using given format, version and compression.
@@ -265,6 +288,9 @@ public:
                 IOstream::compressionType cmp
             ) const;
 
+            //- Write positions to <cloudName>_positions.obj file
+            void writePositions() const;
+
 
     // Ostream Operator
 
diff --git a/src/lagrangian/basic/Cloud/CloudIO.C b/src/lagrangian/basic/Cloud/CloudIO.C
index 4b3fbfdbf..a586e9c75 100644
--- a/src/lagrangian/basic/Cloud/CloudIO.C
+++ b/src/lagrangian/basic/Cloud/CloudIO.C
@@ -29,11 +29,85 @@ License
 #include "Time.H"
 #include "IOPosition.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class ParticleType>
+Foam::word Foam::Cloud<ParticleType>::cloudPropertiesName("cloudProperties");
+
+
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
+template<class ParticleType>
+void Foam::Cloud<ParticleType>::readCloudUniformProperties()
+{
+    IOobject uniformPropsDictHeader
+    (
+        cloudPropertiesName,
+        time().timeName(),
+        "uniform"/cloud::prefix/name(),
+        db(),
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (uniformPropsDictHeader.headerOk())
+    {
+        const IOdictionary uniformPropsDict(uniformPropsDictHeader);
+
+        word procName("processor" + Foam::name(Pstream::myProcNo()));
+        if (uniformPropsDict.found(procName))
+        {
+            uniformPropsDict.subDict(procName).lookup("particleCount")
+                >> particleCount_;
+        }
+    }
+    else
+    {
+        particleCount_ = 0;
+    }
+}
+
+
+template<class ParticleType>
+void Foam::Cloud<ParticleType>::writeCloudUniformProperties() const
+{
+    IOdictionary uniformPropsDict
+    (
+        IOobject
+        (
+            cloudPropertiesName,
+            time().timeName(),
+            "uniform"/cloud::prefix/name(),
+            db(),
+            IOobject::NO_READ,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    labelList np(Pstream::nProcs(), 0);
+    np[Pstream::myProcNo()] = particleCount_;
+
+    Pstream::listCombineGather(np, maxEqOp<label>());
+    Pstream::listCombineScatter(np);
+
+    forAll(np, i)
+    {
+        word procName("processor" + Foam::name(i));
+        uniformPropsDict.add(procName, dictionary());
+        uniformPropsDict.subDict(procName).add("particleCount", np[i]);
+    }
+
+    uniformPropsDict.regIOobject::write();
+}
+
+
 template<class ParticleType>
 void Foam::Cloud<ParticleType>::initCloud(const bool checkClass)
 {
+    readCloudUniformProperties();
+
     IOPosition<ParticleType> ioP(*this);
 
     if (ioP.headerOk())
@@ -67,13 +141,7 @@ Foam::Cloud<ParticleType>::Cloud
 :
     cloud(pMesh),
     polyMesh_(pMesh),
-    allFaces_(pMesh.faces()),
-    points_(pMesh.points()),
-    cellFaces_(pMesh.cells()),
-    allFaceCentres_(pMesh.faceCentres()),
-    owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour()),
-    meshInfo_(polyMesh_)
+    particleCount_(0)
 {
     initCloud(checkClass);
 }
@@ -89,13 +157,7 @@ Foam::Cloud<ParticleType>::Cloud
 :
     cloud(pMesh, cloudName),
     polyMesh_(pMesh),
-    allFaces_(pMesh.faces()),
-    points_(pMesh.points()),
-    cellFaces_(pMesh.cells()),
-    allFaceCentres_(pMesh.faceCentres()),
-    owner_(pMesh.faceOwner()),
-    neighbour_(pMesh.faceNeighbour()),
-    meshInfo_(polyMesh_)
+    particleCount_(0)
 {
     initCloud(checkClass);
 }
@@ -103,6 +165,25 @@ Foam::Cloud<ParticleType>::Cloud
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class ParticleType>
+Foam::IOobject Foam::Cloud<ParticleType>::fieldIOobject
+(
+    const word& fieldName,
+    const IOobject::readOption r
+) const
+{
+    return IOobject
+    (
+        fieldName,
+        time().timeName(),
+        *this,
+        r,
+        IOobject::NO_WRITE,
+        false
+    );
+}
+
+
 template<class ParticleType>
 template<class DataType>
 void Foam::Cloud<ParticleType>::checkFieldIOobject
@@ -116,43 +197,15 @@ void Foam::Cloud<ParticleType>::checkFieldIOobject
         FatalErrorIn
         (
             "void Cloud<ParticleType>::checkFieldIOobject"
-            "(Cloud<ParticleType>, IOField<DataType>)"
+            "(const Cloud<ParticleType>&, const IOField<DataType>&) const"
         )   << "Size of " << data.name()
-            << " field does not match the number of particles"
+            << " field " << data.size()
+            << " does not match the number of particles " << c.size()
             << abort(FatalError);
     }
 }
 
 
-template<class ParticleType>
-Foam::IOobject Foam::Cloud<ParticleType>::fieldIOobject
-(
-    const word& fieldName
-) const
-{
-    return IOobject
-    (
-        fieldName,
-        time().timeName(),
-        *this,
-        IOobject::MUST_READ,
-        IOobject::NO_WRITE,
-        false
-    );
-}
-
-
-template<class ParticleType>
-template<class Type>
-Foam::tmp<Foam::IOField<Type> > Foam::Cloud<ParticleType>::readField
-(
-    const word& fieldName
-) const
-{
-    return tmp<IOField<Type> >(new IOField<Type>(fieldIOobject(fieldName)));
-}
-
-
 template<class ParticleType>
 void Foam::Cloud<ParticleType>::readFields()
 {}
@@ -160,7 +213,13 @@ void Foam::Cloud<ParticleType>::readFields()
 
 template<class ParticleType>
 void Foam::Cloud<ParticleType>::writeFields() const
-{}
+{
+    if (this->size())
+    {
+        const ParticleType& p = *this->first();
+        ParticleType::writeFields(p.cloud());
+    }
+}
 
 
 template<class ParticleType>
@@ -171,6 +230,8 @@ bool Foam::Cloud<ParticleType>::writeObject
     IOstream::compressionType cmp
 ) const
 {
+    writeCloudUniformProperties();
+
     if (this->size())
     {
         writeFields();
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.C b/src/lagrangian/basic/IOPosition/IOPosition.C
index 00415d991..bf5984bb2 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.C
+++ b/src/lagrangian/basic/IOPosition/IOPosition.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "IOPosition.H"
@@ -74,7 +72,13 @@ bool Foam::IOPosition<ParticleType>::writeData(Ostream& os) const
 
     forAllConstIter(typename Cloud<ParticleType>, cloud_, iter)
     {
-        os<< static_cast<const Particle<ParticleType>&>(iter()) << nl;
+        // Prevent writing additional fields
+        static_cast<const Particle<ParticleType>&>(iter()).write
+        (
+            os,
+            false
+        );
+        os  << nl;
     }
 
     os<< token::END_LIST << endl;
@@ -103,6 +107,7 @@ void Foam::IOPosition<ParticleType>::readData
 
         for (label i=0; i<s; i++)
         {
+            // Do not read any fields, position only
             c.append(new ParticleType(c, is, false));
         }
 
@@ -133,6 +138,7 @@ void Foam::IOPosition<ParticleType>::readData
         )
         {
             is.putBack(lastToken);
+            // Do not read any fields, position only
             c.append(new ParticleType(c, is, false));
             is >> lastToken;
         }
diff --git a/src/lagrangian/basic/IOPosition/IOPosition.H b/src/lagrangian/basic/IOPosition/IOPosition.H
index d1d89cdf6..3cd24b619 100644
--- a/src/lagrangian/basic/IOPosition/IOPosition.H
+++ b/src/lagrangian/basic/IOPosition/IOPosition.H
@@ -26,7 +26,7 @@ Class
     Foam::IOPosition
 
 Description
-    Helper IO class to write particle positions
+    Helper IO class to read and write particle positions
 
 SourceFiles
     IOPosition.C
@@ -61,32 +61,28 @@ class IOPosition
 
 public:
 
-    //- Runtime type name information
-    virtual const word& type() const
-    {
-        return cloud_.type();
-    }
+    // Static data
+
+        //- Runtime type name information. Use cloud type.
+        virtual const word& type() const
+        {
+            return cloud_.type();
+        }
+
 
     // Constructors
 
         //- Construct from cloud
-        IOPosition
-        (
-            const Cloud<ParticleType>&
-        );
+        IOPosition(const Cloud<ParticleType>&);
 
 
     // Member functions
 
-        void readData
-        (
-            Cloud<ParticleType>& c,
-            bool checkClass
-        );
+        virtual void readData(Cloud<ParticleType>& c, bool checkClass);
 
-        bool write() const;
+        virtual bool write() const;
 
-        bool writeData(Ostream& os) const;
+        virtual bool writeData(Ostream& os) const;
 };
 
 
diff --git a/src/lagrangian/basic/Make/files b/src/lagrangian/basic/Make/files
index 629d47f47..969b966f1 100644
--- a/src/lagrangian/basic/Make/files
+++ b/src/lagrangian/basic/Make/files
@@ -6,6 +6,4 @@ indexedParticle = indexedParticle
 $(passiveParticle)/passiveParticleCloud.C
 $(indexedParticle)/indexedParticleCloud.C
 
-polyMeshInfo/polyMeshInfo.C
-
 LIB = $(FOAM_LIBBIN)/liblagrangian
diff --git a/src/lagrangian/basic/Particle/Particle.C b/src/lagrangian/basic/Particle/Particle.C
index 189f9c263..cc2927231 100644
--- a/src/lagrangian/basic/Particle/Particle.C
+++ b/src/lagrangian/basic/Particle/Particle.C
@@ -36,16 +36,17 @@ License
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class ParticleType>
-Foam::labelList Foam::Particle<ParticleType>::findFaces
+void Foam::Particle<ParticleType>::findFaces
 (
-    const vector& position
+    const vector& position,
+    DynamicList<label>& faceList
 ) const
 {
     const polyMesh& mesh = cloud_.polyMesh_;
     const labelList& faces = mesh.cells()[celli_];
     const vector& C = mesh.cellCentres()[celli_];
 
-    labelList faceList(0);
+    faceList.clear();
     forAll(faces, i)
     {
         label facei = faces[i];
@@ -53,29 +54,26 @@ Foam::labelList Foam::Particle<ParticleType>::findFaces
 
         if ((lam > 0) && (lam < 1.0))
         {
-            label n = faceList.size();
-            faceList.setSize(n+1);
-            faceList[n] = facei;
+            faceList.append(facei);
         }
     }
-
-    return faceList;
 }
 
 
 template<class ParticleType>
-Foam::labelList Foam::Particle<ParticleType>::findFaces
+void Foam::Particle<ParticleType>::findFaces
 (
     const vector& position,
     const label celli,
-    const scalar stepFraction
+    const scalar stepFraction,
+    DynamicList<label>& faceList
 ) const
 {
-    const polyMesh& mesh = cloud_.polyMesh_;
+    const polyMesh& mesh = cloud_.pMesh();
     const labelList& faces = mesh.cells()[celli];
     const vector& C = mesh.cellCentres()[celli];
 
-    labelList faceList(0);
+    faceList.clear();
     forAll(faces, i)
     {
         label facei = faces[i];
@@ -83,13 +81,9 @@ Foam::labelList Foam::Particle<ParticleType>::findFaces
 
         if ((lam > 0) && (lam < 1.0))
         {
-            label n = faceList.size();
-            faceList.setSize(n+1);
-            faceList[n] = facei;
+            faceList.append(facei);
         }
     }
-
-    return faceList;
 }
 
 
@@ -182,7 +176,22 @@ Foam::Particle<ParticleType>::Particle
     position_(position),
     celli_(celli),
     facei_(-1),
-    stepFraction_(0.0)
+    stepFraction_(0.0),
+    origProc_(Pstream::myProcNo()),
+    origId_(cloud_.getNewParticleID())
+{}
+
+
+template<class ParticleType>
+Foam::Particle<ParticleType>::Particle(const Particle<ParticleType>& p)
+:
+    cloud_(p.cloud_),
+    position_(p.position_),
+    celli_(p.celli_),
+    facei_(p.facei_),
+    stepFraction_(p.stepFraction_),
+    origProc_(p.origProc_),
+    origId_(p.origId_)
 {}
 
 
@@ -226,12 +235,13 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
 {
     const polyMesh& mesh = cloud_.polyMesh_;
 
-    labelList faces = findFaces(endPosition);
+    DynamicList<label>& faces = cloud_.labels_;
+    findFaces(endPosition, faces);
 
     facei_ = -1;
     scalar trackFraction = 0.0;
 
-    if (faces.size() == 0) // inside cell
+    if (faces.empty())  // inside cell
     {
         trackFraction = 1.0;
         position_ = endPosition;
@@ -297,13 +307,13 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
         // change cell
         if (internalFace) // Internal face
         {
-            if (celli_ == cloud_.owner_[facei_])
+            if (celli_ == mesh.faceOwner()[facei_])
             {
-                celli_ = cloud_.neighbour_[facei_];
+                celli_ = mesh.faceNeighbour()[facei_];
             }
-            else if (celli_ == cloud_.neighbour_[facei_])
+            else if (celli_ == mesh.faceNeighbour()[facei_])
             {
-                celli_ = cloud_.owner_[facei_];
+                celli_ = mesh.faceOwner()[facei_];
             }
             else
             {
@@ -328,56 +338,47 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
             label patchi = patch(facei_);
             const polyPatch& patch = mesh.boundaryMesh()[patchi];
 
-            if (isA<wedgePolyPatch>(patch))
+            if (!p.hitPatch(patch, td, patchi))
             {
-                p.hitWedgePatch
-                (
-                    static_cast<const wedgePolyPatch&>(patch), td
-                );
-            }
-            else if (isA<symmetryPolyPatch>(patch))
+                if (isA<wedgePolyPatch>(patch))
+                {
+                    p.hitWedgePatch
+                    (
+                        static_cast<const wedgePolyPatch&>(patch), td
+                    );
+                }
+                else if (isA<symmetryPolyPatch>(patch))
+                {
+                    p.hitSymmetryPatch
+                    (
+                        static_cast<const symmetryPolyPatch&>(patch), td
+                    );
+                }
+                else if (isA<cyclicPolyPatch>(patch))
+                {
+                    p.hitCyclicPatch
+                    (
+                        static_cast<const cyclicPolyPatch&>(patch), td
+                    );
+                }
+                else if (isA<processorPolyPatch>(patch))
+                {
+                    p.hitProcessorPatch
+                    (
+                        static_cast<const processorPolyPatch&>(patch), td
+                    );
+                }
+                else if (isA<wallPolyPatch>(patch))
+                {
+                    p.hitWallPatch
+                    (
+                        static_cast<const wallPolyPatch&>(patch), td
+                    );
+                }
+                else
             {
-                p.hitSymmetryPatch
-                (
-                    static_cast<const symmetryPolyPatch&>(patch), td
-                );
-            }
-            else if (isA<cyclicPolyPatch>(patch))
-            {
-                p.hitCyclicPatch
-                (
-                    static_cast<const cyclicPolyPatch&>(patch), td
-                );
-            }
-            else if (isA<processorPolyPatch>(patch))
-            {
-                p.hitProcessorPatch
-                (
-                    static_cast<const processorPolyPatch&>(patch), td
-                );
-            }
-            else if (isA<wallPolyPatch>(patch))
-            {
-                p.hitWallPatch
-                (
-                    static_cast<const wallPolyPatch&>(patch), td
-                );
-            }
-            else if (isA<polyPatch>(patch))
-            {
-                p.hitPatch
-                (
-                    static_cast<const polyPatch&>(patch), td
-                );
-            }
-            else
-            {
-                FatalErrorIn
-                (
-                    "Particle::trackToFace"
-                    "(const vector& endPosition, scalar& trackFraction)"
-                )<< "patch type " << patch.type() << " not suported" << nl
-                 << abort(FatalError);
+                    p.hitPatch(patch, td);
+                }
             }
         }
     }
@@ -390,7 +391,7 @@ Foam::scalar Foam::Particle<ParticleType>::trackToFace
     // slightly towards the cell-centre.
     if (trackFraction < SMALL)
     {
-        position_ += 1.0e-6*(mesh.cellCentres()[celli_] - position_);
+        position_ += 1.0e-3*(mesh.cellCentres()[celli_] - position_);
     }
 
     return trackFraction;
@@ -423,6 +424,19 @@ void Foam::Particle<ParticleType>::transformProperties(const vector&)
 {}
 
 
+template<class ParticleType>
+template<class TrackData>
+bool Foam::Particle<ParticleType>::hitPatch
+(
+    const polyPatch&,
+    TrackData&,
+    const label
+)
+{
+    return false;
+}
+
+
 template<class ParticleType>
 template<class TrackData>
 void Foam::Particle<ParticleType>::hitWedgePatch
diff --git a/src/lagrangian/basic/Particle/Particle.H b/src/lagrangian/basic/Particle/Particle.H
index 28e7b20cf..643c6eb5d 100644
--- a/src/lagrangian/basic/Particle/Particle.H
+++ b/src/lagrangian/basic/Particle/Particle.H
@@ -98,10 +98,7 @@ public:
 
         // Constructors
 
-            inline trackData
-            (
-                Cloud<ParticleType>& cloud
-            );
+            inline trackData(Cloud<ParticleType>& cloud);
 
 
         // Member functions
@@ -130,6 +127,12 @@ protected:
         //- Fraction of time-step completed
         scalar stepFraction_;
 
+        //- Originating processor id
+        label origProc_;
+
+        //- Local particle id on originating processor
+        label origId_;
+
 
     // Private member functions
 
@@ -154,23 +157,35 @@ protected:
             const label facei
         ) const;
 
-        //- Return the faces between position and cell centre
-        labelList findFaces
+        //- Find the faces between position and cell centre
+        void findFaces
         (
-            const vector& position
+            const vector& position,
+            DynamicList<label>& faceList
         ) const;
 
-        //- Return the faces between position and cell centre
-        labelList findFaces
+        //- Find the faces between position and cell centre
+        void findFaces
         (
             const vector& position,
             const label celli,
-            const scalar stepFraction
+            const scalar stepFraction,
+            DynamicList<label>& faceList
         ) const;
 
 
     // Patch interactions
 
+        //- Overridable function to handle the particle hitting a patch
+        //  Executed before other patch-hitting functions
+        template<class TrackData>
+        bool hitPatch
+        (
+            const polyPatch&,
+            TrackData& td,
+            const label patchI
+        );
+
         //- Overridable function to handle the particle hitting a wedgePatch
         template<class TrackData>
         void hitWedgePatch
@@ -256,8 +271,13 @@ public:
     friend class Cloud<ParticleType>;
 
 
-    //- Runtime type information
-    TypeName("Particle");
+    // Static data members
+
+        //- Runtime type information
+        TypeName("Particle");
+
+        //- String representation of properties
+        static string propHeader;
 
 
     // Constructors
@@ -278,14 +298,24 @@ public:
             bool readFields = true
         );
 
+        //- Construct as a copy
+        Particle(const Particle& p);
+
+        //- Construct a clone
+        autoPtr<ParticleType> clone() const
+        {
+            return autoPtr<Particle>(new Particle(*this));
+        }
+
+
         //- Factory class to read-construct particles used for
         //  parallel transfer
         class iNew
         {
-
             // Private data
 
-            const Cloud<ParticleType>& cloud_;
+                //- Reference to the cloud
+                const Cloud<ParticleType>& cloud_;
 
 
         public:
@@ -297,15 +327,22 @@ public:
 
             autoPtr<ParticleType> operator()(Istream& is) const
             {
-                return autoPtr<ParticleType>(new ParticleType(cloud_, is));
+                return autoPtr<ParticleType>
+                (
+                    new ParticleType
+                    (
+                        cloud_,
+                        is,
+                        true
+                    )
+                );
             }
         };
 
 
     //- Destructor
-
-        virtual ~Particle()
-        {}
+    virtual ~Particle()
+    {}
 
 
     // Member Functions
@@ -344,6 +381,9 @@ public:
             //- Return the impact model to be used, soft or hard (default).
             inline bool softImpact() const;
 
+            //- Return the particle current time
+            inline scalar currentTime() const;
+
 
         // Check
 
@@ -370,6 +410,12 @@ public:
             //-  Return the fraction of time-step completed
             inline scalar stepFraction() const;
 
+            //- Return the originating processor id
+            inline label origProc() const;
+
+            //- Return the particle id on originating processor
+            inline label origId() const;
+
 
         // Track
 
@@ -413,12 +459,14 @@ public:
 
     // I-O
 
-        //- Write the fields associated with the owner cloud
-        static void writeFields
-        (
-            const Cloud<ParticleType>& c
-        );
+        //- Read the fields associated with the owner cloud
+        static void readFields(Cloud<ParticleType>& c);
 
+        //- Write the fields associated with the owner cloud
+        static void writeFields(const Cloud<ParticleType>& c);
+
+        //- Write the particle data
+        void write(Ostream& os, bool writeFields) const;
 
     // Ostream Operator
 
diff --git a/src/lagrangian/basic/Particle/ParticleI.H b/src/lagrangian/basic/Particle/ParticleI.H
index fa082b810..811da36c4 100644
--- a/src/lagrangian/basic/Particle/ParticleI.H
+++ b/src/lagrangian/basic/Particle/ParticleI.H
@@ -26,15 +26,10 @@ License
 
 #include "polyMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class ParticleType>
-inline scalar Particle<ParticleType>::lambda
+inline Foam::scalar Foam::Particle<ParticleType>::lambda
 (
     const vector& from,
     const vector& to,
@@ -182,7 +177,7 @@ inline scalar Particle<ParticleType>::lambda
 
 
 template<class ParticleType>
-inline scalar Particle<ParticleType>::lambda
+inline Foam::scalar Foam::Particle<ParticleType>::lambda
 (
     const vector& from,
     const vector& to,
@@ -234,23 +229,25 @@ inline scalar Particle<ParticleType>::lambda
 
 
 template<class ParticleType>
-inline bool Particle<ParticleType>::inCell() const
+inline bool Foam::Particle<ParticleType>::inCell() const
 {
-    labelList faces = findFaces(position_);
+    DynamicList<label>& faces = cloud_.labels_;
+    findFaces(position_, faces);
 
     return (!faces.size());
 }
 
 
 template<class ParticleType>
-inline bool Particle<ParticleType>::inCell
+inline bool Foam::Particle<ParticleType>::inCell
 (
     const vector& position,
     const label celli,
     const scalar stepFraction
 ) const
 {
-    labelList faces = findFaces(position, celli, stepFraction);
+    DynamicList<label>& faces = cloud_.labels_;
+    findFaces(position, celli, stepFraction, faces);
 
     return (!faces.size());
 }
@@ -259,7 +256,7 @@ inline bool Particle<ParticleType>::inCell
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ParticleType>
-inline Particle<ParticleType>::trackData::trackData
+inline Foam::Particle<ParticleType>::trackData::trackData
 (
     Cloud<ParticleType>& cloud
 )
@@ -267,8 +264,10 @@ inline Particle<ParticleType>::trackData::trackData
     cloud_(cloud)
 {}
 
+
 template<class ParticleType>
-inline Cloud<ParticleType>& Particle<ParticleType>::trackData::cloud()
+inline Foam::Cloud<ParticleType>&
+Foam::Particle<ParticleType>::trackData::cloud()
 {
     return cloud_;
 }
@@ -277,83 +276,108 @@ inline Cloud<ParticleType>& Particle<ParticleType>::trackData::cloud()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ParticleType>
-inline const Cloud<ParticleType>& Particle<ParticleType>::cloud() const
+inline const Foam::Cloud<ParticleType>&
+Foam::Particle<ParticleType>::cloud() const
 {
     return cloud_;
 }
 
 
 template<class ParticleType>
-inline const vector& Particle<ParticleType>::position() const
+inline const Foam::vector& Foam::Particle<ParticleType>::position() const
 {
     return position_;
 }
 
 
 template<class ParticleType>
-inline vector& Particle<ParticleType>::position()
+inline Foam::vector& Foam::Particle<ParticleType>::position()
 {
     return position_;
 }
 
 
 template<class ParticleType>
-inline label Particle<ParticleType>::cell() const
-{
-    return celli_;
-}
-
-template<class ParticleType>
-inline label& Particle<ParticleType>::cell()
+inline Foam::label Foam::Particle<ParticleType>::cell() const
 {
     return celli_;
 }
 
 
 template<class ParticleType>
-inline label Particle<ParticleType>::face() const
+inline Foam::label& Foam::Particle<ParticleType>::cell()
+{
+    return celli_;
+}
+
+
+template<class ParticleType>
+inline Foam::label Foam::Particle<ParticleType>::face() const
 {
     return facei_;
 }
 
 
 template<class ParticleType>
-inline bool Particle<ParticleType>::onBoundary() const
+inline bool Foam::Particle<ParticleType>::onBoundary() const
 {
     return facei_ != -1 && facei_ >= cloud_.pMesh().nInternalFaces();
 }
 
 
 template<class ParticleType>
-inline scalar& Particle<ParticleType>::stepFraction()
+inline Foam::scalar& Foam::Particle<ParticleType>::stepFraction()
 {
     return stepFraction_;
 }
 
 
 template<class ParticleType>
-inline scalar Particle<ParticleType>::stepFraction() const
+inline Foam::scalar Foam::Particle<ParticleType>::stepFraction() const
 {
     return stepFraction_;
 }
 
 
 template<class ParticleType>
-inline bool Particle<ParticleType>::softImpact() const
+inline Foam::label Foam::Particle<ParticleType>::origProc() const
+{
+    return origProc_;
+}
+
+
+template<class ParticleType>
+inline Foam::label Foam::Particle<ParticleType>::origId() const
+{
+    return origId_;
+}
+
+
+template<class ParticleType>
+inline bool Foam::Particle<ParticleType>::softImpact() const
 {
     return false;
 }
 
 
 template<class ParticleType>
-inline label Particle<ParticleType>::patch(const label facei) const
+inline Foam::scalar Foam::Particle<ParticleType>::currentTime() const
+{
+    return
+        cloud_.pMesh().time().value()
+      + stepFraction_*cloud_.pMesh().time().deltaT().value();
+}
+
+
+template<class ParticleType>
+inline Foam::label Foam::Particle<ParticleType>::patch(const label facei) const
 {
     return cloud_.facePatch(facei);
 }
 
 
 template<class ParticleType>
-inline label Particle<ParticleType>::patchFace
+inline Foam::label Foam::Particle<ParticleType>::patchFace
 (
     const label patchi,
     const label facei
@@ -364,21 +388,18 @@ inline label Particle<ParticleType>::patchFace
 
 
 template<class ParticleType>
-inline scalar Particle<ParticleType>::wallImpactDistance(const vector&) const
+inline Foam::scalar
+Foam::Particle<ParticleType>::wallImpactDistance(const vector&) const
 {
     return 0.0;
 }
 
 
 template<class ParticleType>
-inline label Particle<ParticleType>::faceInterpolation() const
+inline Foam::label Foam::Particle<ParticleType>::faceInterpolation() const
 {
     return facei_;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/lagrangian/basic/Particle/ParticleIO.C b/src/lagrangian/basic/Particle/ParticleIO.C
index 3e3518055..a5c198b93 100644
--- a/src/lagrangian/basic/Particle/ParticleIO.C
+++ b/src/lagrangian/basic/Particle/ParticleIO.C
@@ -28,9 +28,14 @@ License
 #include "IOstreams.H"
 #include "IOPosition.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class ParticleType>
+Foam::string Foam::Particle<ParticleType>::propHeader =
+    "(Px Py Pz) cellI origProc origId";
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from Istream
 template<class ParticleType>
 Foam::Particle<ParticleType>::Particle
 (
@@ -41,21 +46,48 @@ Foam::Particle<ParticleType>::Particle
 :
     cloud_(cloud),
     facei_(-1),
-    stepFraction_(0.0)
+    stepFraction_(0.0),
+    origProc_(Pstream::myProcNo()),
+    origId_(-1)
 {
+
+    // readFields : read additional data. Should be consistent with writeFields.
+
     if (is.format() == IOstream::ASCII)
     {
         is >> position_ >> celli_;
+        if (readFields)
+        {
+            is >> origProc_ >> origId_;
+        }
     }
     else
     {
-        // In binary read both celli_ and facei_, needed for parallel transfer
-        is.read
-        (
-            reinterpret_cast<char*>(&position_),
-            sizeof(position_) + sizeof(celli_)
-          + sizeof(facei_) + sizeof(stepFraction_)
-        );
+        // In binary read all particle data - needed for parallel transfer
+        if (readFields)
+        {
+            is.read
+            (
+                reinterpret_cast<char*>(&position_),
+                sizeof(position_)
+              + sizeof(celli_)
+              + sizeof(facei_)
+              + sizeof(stepFraction_)
+              + sizeof(origProc_)
+              + sizeof(origId_)
+            );
+        }
+        else
+        {
+            is.read
+            (
+                reinterpret_cast<char*>(&position_),
+                sizeof(position_)
+              + sizeof(celli_)
+              + sizeof(facei_)
+              + sizeof(stepFraction_)
+            );
+        }
     }
 
     if (celli_ == -1)
@@ -68,6 +100,39 @@ Foam::Particle<ParticleType>::Particle
 }
 
 
+template<class ParticleType>
+void Foam::Particle<ParticleType>::readFields
+(
+    Cloud<ParticleType>& c
+)
+{
+    if (!c.size())
+    {
+        return;
+    }
+
+    IOobject procIO(c.fieldIOobject("origProcId", IOobject::MUST_READ));
+
+    if (procIO.headerOk())
+    {
+        IOField<label> origProcId(procIO);
+        c.checkFieldIOobject(c, origProcId);
+        IOField<label> origId(c.fieldIOobject("origId", IOobject::MUST_READ));
+        c.checkFieldIOobject(c, origId);
+
+        label i = 0;
+        forAllIter(typename Cloud<ParticleType>, c, iter)
+        {
+            ParticleType& p = iter();
+
+            p.origProc_ = origProcId[i];
+            p.origId_ = origId[i];
+            i++;
+        }
+    }
+}
+
+
 template<class ParticleType>
 void Foam::Particle<ParticleType>::writeFields
 (
@@ -77,30 +142,91 @@ void Foam::Particle<ParticleType>::writeFields
     // Write the cloud position file
     IOPosition<ParticleType> ioP(c);
     ioP.write();
+
+    label np =  c.size();
+
+    IOField<label> origProc
+    (
+        c.fieldIOobject
+        (
+            "origProcId",
+            IOobject::NO_READ
+        ),
+        np
+    );
+    IOField<label> origId(c.fieldIOobject("origId", IOobject::NO_READ), np);
+
+    label i = 0;
+    forAllConstIter(typename Cloud<ParticleType>, c, iter)
+    {
+        origProc[i] = iter().origProc_;
+        origId[i] = iter().origId_;
+        i++;
+    }
+
+    origProc.write();
+    origId.write();
+}
+
+
+template<class ParticleType>
+void Foam::Particle<ParticleType>::write(Ostream& os, bool writeFields) const
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        if (writeFields)
+        {
+            // Write the additional entries
+            os << position_
+               << token::SPACE << celli_
+               << token::SPACE << origProc_
+               << token::SPACE << origId_;
+        }
+        else
+        {
+            os << position_
+               << token::SPACE << celli_;
+        }
+    }
+    else
+    {
+        // In binary write both celli_ and facei_, needed for parallel transfer
+        if (writeFields)
+        {
+            os.write
+            (
+                reinterpret_cast<const char*>(&position_),
+                sizeof(position_)
+              + sizeof(celli_)
+              + sizeof(facei_)
+              + sizeof(stepFraction_)
+              + sizeof(origProc_)
+              + sizeof(origId_)
+            );
+        }
+        else
+        {
+            os.write
+            (
+                reinterpret_cast<const char*>(&position_),
+                sizeof(position_)
+              + sizeof(celli_)
+              + sizeof(facei_)
+              + sizeof(stepFraction_)
+            );
+        }
+    }
+
+    // Check state of Ostream
+    os.check("Particle<ParticleType>::write(Ostream& os, bool) const");
 }
 
 
 template<class ParticleType>
 Foam::Ostream& Foam::operator<<(Ostream& os, const Particle<ParticleType>& p)
 {
-    if (os.format() == IOstream::ASCII)
-    {
-        os << p.position_
-           << token::SPACE << p.celli_;
-    }
-    else
-    {
-        // In binary write both celli_ and facei_, needed for parallel transfer
-        os.write
-        (
-            reinterpret_cast<const char*>(&p.position_),
-            sizeof(p.position_) + sizeof(p.celli_)
-          + sizeof(p.facei_) + sizeof(p.stepFraction_)
-        );
-    }
-
-    // Check state of Ostream
-    os.check("Ostream& operator<<(Ostream&, const Particle<ParticleType>&)");
+    // Write all data
+    p.write(os, true);
 
     return os;
 }
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticle.H b/src/lagrangian/basic/indexedParticle/indexedParticle.H
index 8c8e06900..b3f093623 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticle.H
+++ b/src/lagrangian/basic/indexedParticle/indexedParticle.H
@@ -84,7 +84,13 @@ public:
             bool readFields = true
         )
         :
-            Particle<indexedParticle>(c, is)
+            Particle<indexedParticle>(c, is, readFields)
+        {}
+
+        //- Construct as a copy
+        indexedParticle(const indexedParticle& p)
+        :
+            Particle<indexedParticle>(p)
         {}
 
         //- Construct and return a clone
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
index 5c87df962..6f7c17721 100644
--- a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
+++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.C
@@ -22,12 +22,9 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "indexedParticle.H"
-#include "Cloud.H"
+#include "indexedParticleCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -43,4 +40,22 @@ defineTemplateTypeNameAndDebug(Cloud<indexedParticle>, 0);
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::indexedParticleCloud::indexedParticleCloud
+(
+    const polyMesh& mesh,
+    const word& cloudName,
+    bool readFields
+)
+:
+    Cloud<indexedParticle>(mesh, cloudName, false)
+{
+    if (readFields)
+    {
+        indexedParticle::readFields(*this);
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
new file mode 100644
index 000000000..a0b0ef876
--- /dev/null
+++ b/src/lagrangian/basic/indexedParticle/indexedParticleCloud.H
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::indexedParticleCloud
+
+Description
+    A Cloud of particles carrying an additional index.
+
+SourceFiles
+    indexedParticleCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef indexedParticleCloud_H
+#define indexedParticleCloud_H
+
+#include "Cloud.H"
+#include "indexedParticle.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class indexedParticleCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+class indexedParticleCloud
+:
+    public Cloud<indexedParticle>
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        indexedParticleCloud(const indexedParticleCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const indexedParticleCloud&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct given mesh
+        indexedParticleCloud
+        (
+            const polyMesh&,
+            const word& cloudName = "defaultCloud",
+            bool readFields = true
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticle.H b/src/lagrangian/basic/passiveParticle/passiveParticle.H
index 4b8ba0e01..ea7965131 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticle.H
+++ b/src/lagrangian/basic/passiveParticle/passiveParticle.H
@@ -47,7 +47,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class passiveParticle Declaration
+                      Class passiveParticle Declaration
 \*---------------------------------------------------------------------------*/
 
 class passiveParticle
@@ -78,7 +78,13 @@ public:
             bool readFields = true
         )
         :
-            Particle<passiveParticle>(c, is)
+            Particle<passiveParticle>(c, is, readFields)
+        {}
+
+        //- Construct as copy
+        passiveParticle(const passiveParticle& p)
+        :
+            Particle<passiveParticle>(p)
         {}
 
         //- Construct and return a clone
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
index c81fab34d..6d7c89e85 100644
--- a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.C
@@ -22,12 +22,9 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "passiveParticle.H"
-#include "Cloud.H"
+#include "passiveParticleCloud.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -39,8 +36,35 @@ namespace Foam
 defineParticleTypeNameAndDebug(passiveParticle, 0);
 defineTemplateTypeNameAndDebug(Cloud<passiveParticle>, 0);
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+};
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::passiveParticleCloud::passiveParticleCloud
+(
+    const polyMesh& mesh,
+    const word& cloudName,
+    bool readFields
+)
+:
+    Cloud<passiveParticle>(mesh, cloudName, false)
+{
+    if (readFields)
+    {
+        passiveParticle::readFields(*this);
+    }
+}
+
+
+Foam::passiveParticleCloud::passiveParticleCloud
+(
+    const polyMesh& mesh,
+    const word& cloudName,
+    const IDLList<passiveParticle>& particles
+)
+:
+    Cloud<passiveParticle>(mesh, cloudName, particles)
+{}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
new file mode 100644
index 000000000..86327145c
--- /dev/null
+++ b/src/lagrangian/basic/passiveParticle/passiveParticleCloud.H
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::passiveParticleCloud
+
+Description
+    A Cloud of passive particles
+
+SourceFiles
+    passiveParticleCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef passiveParticleCloud_H
+#define passiveParticleCloud_H
+
+#include "Cloud.H"
+#include "passiveParticle.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class passiveParticleCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+class passiveParticleCloud
+:
+    public Cloud<passiveParticle>
+{
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        passiveParticleCloud(const passiveParticleCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const passiveParticleCloud&);
+
+
+public:
+
+    //- Type of parcel the cloud was instantiated for
+    typedef passiveParticle parcelType;
+
+    // Constructors
+
+        //- Construct given mesh
+        passiveParticleCloud
+        (
+            const polyMesh&,
+            const word& cloudName = "defaultCloud",
+            bool readFields = true
+        );
+
+        //- Construct from mesh, cloud name, and a list of particles
+        passiveParticleCloud
+        (
+            const polyMesh& mesh,
+            const word& cloudName,
+            const IDLList<passiveParticle>& particles
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.C b/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.C
deleted file mode 100644
index 4e1eb0066..000000000
--- a/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.C
+++ /dev/null
@@ -1,325 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "polyMeshInfo.H"
-#include "wedgePolyPatch.H"
-#include "symmetryPolyPatch.H"
-#include "emptyPolyPatch.H"
-#include "mathematicalConstants.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(polyMeshInfo, 0);
-}
-
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
-void Foam::polyMeshInfo::setCentrePoint()
-{
-    boundBox bounds = mesh_.bounds();
-
-    centrePoint_ = 0.5*(bounds.max() + bounds.min());
-}
-
-
-void Foam::polyMeshInfo::setEmptyComponent(const vector& dir)
-{
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        if (dir[cmpt] > 1.0e-6)
-        {
-            emptyComponent_ = cmpt;
-        }
-    }
-}
-
-
-void Foam::polyMeshInfo::queryWedge()
-{
-    label patchId[4];
-
-    bool symmPlaneExists = false;
-
-    forAll(mesh_.boundaryMesh(), patchi)
-    {
-        const polyPatch& patch = mesh_.boundaryMesh()[patchi];
-        if (isA<wedgePolyPatch>(patch))
-        {
-            if (patch.size())
-            {
-                nWedge_++;
-                if (nWedge_ > 4)
-                {
-                    break;
-                }
-                patchId[nWedge_-1] = patchi;
-           }
-        }
-        else if (isA<symmetryPolyPatch>(patch))
-        {
-            symmPlaneExists = true;
-        }
-    }
-
-    if (nWedge_ != 0 && nWedge_ != 2 && nWedge_ != 4)
-    {
-        FatalErrorIn("void polyMeshInfo::queryWedge() const")
-            << "Number of wedge patches " << nWedge_ << " is incorrect, "
-               "should be 0, 2 or 4"
-            << exit(FatalError);
-    }
-    else
-    {
-        if (symmPlaneExists)
-        {
-            wedgeAngle_ = mathematicalConstant::pi;
-        }
-        else
-        {
-            if (nWedge_)
-            {
-               if (nWedge_ > 2)
-                {
-                    WarningIn("void polyMeshInfo::queryWedge() const")
-                        << "Only configured for cases with 2 wedges. "
-                        << "Lagrangian calculations may result in errors"
-                        << endl;
-                }
-               // Get the vector normal to wedge patch1
-                const wedgePolyPatch& patch1 = refCast<const wedgePolyPatch>
-                    (mesh_.boundaryMesh()[patchId[0]]);
-                vector n1 = patch1.patchNormal();
-
-                // Get the vector normal to wedge patch2
-                const wedgePolyPatch& patch2 = refCast<const wedgePolyPatch>
-                    (mesh_.boundaryMesh()[patchId[1]]);
-                vector n2 = patch2.patchNormal();
-
-                // Calculate the angle swept between the patches
-                const scalar arcCos = (n1 & n2)/mag(n1);
-                wedgeAngle_ = mathematicalConstant::pi - acos(arcCos);
-
-                // Get the centre normal
-                centreNormal_ = patch1.centreNormal();
-
-                // Get the wedge axis
-                wedgeAxis_  = patch1.axis();
-            }
-        }
-    }
-}
-
-
-void Foam::polyMeshInfo::queryDirections()
-{
-    vector dirVec = vector::zero;
-
-    forAll(mesh_.boundaryMesh(), patchi)
-    {
-        if (isA<emptyPolyPatch>(mesh_.boundaryMesh()[patchi]))
-        {
-            if (mesh_.boundaryMesh()[patchi].size())
-            {
-                nEmpty_++;
-                dirVec +=
-                    sum(cmptMag(mesh_.boundaryMesh()[patchi].faceAreas()));
-            }
-        }
-    }
-
-
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        directions_[cmpt] = 1;
-    }
-
-    if (nEmpty_)
-    {
-        reduce(dirVec, sumOp<vector>());
-
-        dirVec /= mag(dirVec);
-
-        for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-        {
-            if (dirVec[cmpt] > 1.0e-6)
-            {
-                directions_[cmpt] = -1;
-                emptyComponent_ = cmpt;
-            }
-            else
-            {
-                directions_[cmpt] = 1;
-            }
-        }
-
-        // Set the patch normal
-        centreNormal_ = dirVec;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::polyMeshInfo::polyMeshInfo
-(
-    const polyMesh& mesh
-)
-:
-    mesh_(mesh),
-    nGeometricD_(0),
-    nSolutionD_(0),
-    centreNormal_(vector::zero),
-    emptyComponent_(0),
-    centrePoint_(vector::zero),
-    nEmpty_(0),
-    nWedge_(0),
-    wedgeAxis_(vector::zero),
-    wedgeAngle_(0)
-{
-    setCentrePoint();
-
-    queryWedge();
-
-    queryDirections();
-
-    nSolutionD_ = cmptSum(directions_ + Vector<label>::one)/2;
-
-    nGeometricD_ = nSolutionD_ - nWedge_/2;
-
-    if (nGeometricD_ == 2)
-    {
-        setEmptyComponent(centreNormal_);
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::polyMeshInfo::~polyMeshInfo()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::label Foam::polyMeshInfo::nGeometricD() const
-{
-    return nGeometricD_;
-}
-
-
-Foam::label Foam::polyMeshInfo::nSolutionD() const
-{
-    return nSolutionD_;
-}
-
-
-bool Foam::polyMeshInfo::caseIs2dWedge() const
-{
-    return (nWedge_ > 0);
-}
-
-
-bool Foam::polyMeshInfo::caseIs2dSlab() const
-{
-    return (nEmpty_ > 0);
-}
-
-
-bool Foam::polyMeshInfo::caseIs2d() const
-{
-    return (nGeometricD_ == 2);
-}
-
-
-bool Foam::polyMeshInfo::caseIs3d() const
-{
-    return (nGeometricD_ == 3);
-}
-
-
-Foam::vector Foam::polyMeshInfo::wedgeAxis() const
-{
-    if (nWedge_)
-    {
-        return wedgeAxis_;
-    }
-    else
-    {
-        WarningIn("Foam::polyMeshInfo::wedgeAxis()")
-            << "wedgeAxis() requested, but case is not of wedge type. "
-            << "Returning zero vector" << endl;
-        return vector::zero;
-    }
-}
-
-
-Foam::scalar Foam::polyMeshInfo::wedgeAngle() const
-{
-    if (nWedge_)
-    {
-        return wedgeAngle_;
-    }
-    else
-    {
-        WarningIn("Foam::polyMeshInfo::wedgeAngle()")
-            << "wedgeAngle() requested, but case is not of wedge type. "
-            << "Returning zero" << endl;
-        return 0.0;
-    }
-}
-
-
-Foam::vector Foam::polyMeshInfo::centreNormal() const
-{
-    if (nGeometricD_ == 2)
-    {
-        return centreNormal_;
-    }
-    else
-    {
-        WarningIn("Foam::polyMeshInfo::centreNormal()")
-            << "centreNormal() requested, but case is not 2-D. "
-            << "Returning zero vector" << endl;
-        return vector::zero;
-    }
-}
-
-
-Foam::label Foam::polyMeshInfo::emptyComponent() const
-{
-    return emptyComponent_;
-}
-
-
-Foam::vector Foam::polyMeshInfo::centrePoint() const
-{
-    return centrePoint_;
-}
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.H b/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.H
deleted file mode 100644
index ef44a063e..000000000
--- a/src/lagrangian/basic/polyMeshInfo/polyMeshInfo.H
+++ /dev/null
@@ -1,176 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Class
-    Foam::polyMeshInfo
-
-Description
-
-
-SourceFiles
-    polyMeshInfo.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef polyMeshInfo_H
-#define polyMeshInfo_H
-
-#include "polyMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-/*---------------------------------------------------------------------------*\
-                        Class polyMeshInfo Declaration
-\*---------------------------------------------------------------------------*/
-
-class polyMeshInfo
-{
-
-    // Private data
-
-        //- Reference to the mesh
-        const polyMesh& mesh_;
-
-        //- Vector of valid directions in mesh
-        //  defined according to the presence of empty patches
-        mutable Vector<label> directions_;
-
-        //- Number of number of valid geoemtric dimensions in the mesh
-        label nGeometricD_;
-
-        //- Number of number of valid solution dimensions in the mesh
-        //  For wedge cases this includes the circumferential direction
-        //  in case of swirl
-        label nSolutionD_;
-
-        //- Plane normal to the wedge patches, or between empty patches
-        // for slab 2-D cases
-        vector centreNormal_;
-
-        //- Empty/unused component for 2-D cases
-        label emptyComponent_;
-
-        //- Geometric centre point
-        vector centrePoint_;
-
-        //- Number of empty patches
-        label nEmpty_;
-
-        //- Number of wedge patches
-        label nWedge_;
-
-        //- Axis of wedge
-        vector wedgeAxis_;
-
-        //- Angle of wedge
-        scalar wedgeAngle_;
-
-
-    // Private member functions
-
-        //- Set the value of the mesh centre point
-        void setCentrePoint();
-
-        //- Determine wedge information
-        void queryWedge();
-
-        //- Determine mesh directions
-        void queryDirections();
-
-
-public:
-
-    //- Runtime type information
-    TypeName("polyMeshInfo");
-
-    // Constructors
-
-        //- Construct from components
-        polyMeshInfo
-        (
-            const polyMesh& mesh
-        );
-
-
-    // Destructors
-
-        virtual ~polyMeshInfo();
-
-
-    // Member functions
-
-        //- Access
-
-            //- Return the number of valid geoemtric dimensions in the mesh
-            label nGeometricD() const;
-
-            //- Return the number of valid solution dimensions in the mesh
-            label nSolutionD() const;
-
-            //- Flag to indicate whether case is a 2-D wedge
-            bool caseIs2dWedge() const;
-
-            //- Flag to indicate whether case is a 2-D slab
-            bool caseIs2dSlab() const;
-
-            //- Flag to indicate whether case is 2-D
-            bool caseIs2d() const;
-
-            //- Flag to indicate whether case is 3-D
-            bool caseIs3d() const;
-
-            //- Return axis of wedge
-            vector wedgeAxis() const;
-
-            //- Return angle of wedge
-            scalar wedgeAngle() const;
-
-            //- Return the centre normal
-            vector centreNormal() const;
-
-            //- Return empty component
-            label emptyComponent() const;
-
-            //- Return centre point
-            vector centrePoint() const;
-
-            //- Set the empty component direction based on normal vector dir
-            void setEmptyComponent(const vector& dir);
-
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
-
diff --git a/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H b/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
new file mode 100644
index 000000000..e122e095d
--- /dev/null
+++ b/src/lagrangian/coalCombustion/CoalCloud/CoalCloud.H
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    CoalCloud
+
+Description
+    Coal cloud templated on the type of carrier phase thermodynamics
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef CoalCloud_H
+#define CoalCloud_H
+
+#include "ReactingMultiphaseCloud.H"
+#include "CoalParcel.H"
+#include "thermoPhysicsTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef ReactingMultiphaseCloud<CoalParcel<constGasThermoPhysics> >
+        constThermoCoalCloud;
+
+    typedef ReactingMultiphaseCloud<CoalParcel<gasThermoPhysics> >
+        thermoCoalCloud;
+
+    typedef ReactingMultiphaseCloud<CoalParcel<icoPoly8ThermoPhysics> >
+        icoPoly8ThermoCoalCloud;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C
similarity index 68%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
rename to src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C
index 46bb1f46c..9030657c4 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.C
+++ b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.C
@@ -24,68 +24,75 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicReactingParcel.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(basicReactingParcel, 0);
-    defineParticleTypeNameAndDebug(basicReactingParcel, 0);
-    defineParcelTypeNameAndDebug(basicReactingParcel, 0);
-};
-
+#include "CoalParcel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::basicReactingParcel::basicReactingParcel
+template<class ThermoType>
+Foam::CoalParcel<ThermoType>::CoalParcel
 (
-    ReactingCloud<basicReactingParcel>& owner,
-    const label typeId,
+    ReactingMultiphaseCloud<CoalParcel<ThermoType> >& owner,
     const vector& position,
-    const label celli,
+    const label cellI
+)
+:
+    ReactingMultiphaseParcel<CoalParcel<ThermoType> >(owner, position, cellI)
+{}
+
+
+template<class ThermoType>
+Foam::CoalParcel<ThermoType>::CoalParcel
+(
+    ReactingMultiphaseCloud<CoalParcel<ThermoType> >& owner,
+    const vector& position,
+    const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
+    const scalarField& YMixture0,
     const scalarField& YGas0,
     const scalarField& YLiquid0,
     const scalarField& YSolid0,
-    const scalarField& YMixture0,
-    const constantProperties& constProps
+    const typename
+        ReactingMultiphaseParcel<CoalParcel<ThermoType> >::
+        constantProperties& constProps
 )
 :
-    ReactingParcel<basicReactingParcel>
+    ReactingMultiphaseParcel<CoalParcel<ThermoType> >
     (
         owner,
-        typeId,
         position,
-        celli,
+        cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
+        YMixture0,
         YGas0,
         YLiquid0,
         YSolid0,
-        YMixture0,
         constProps
     )
 {}
 
 
-Foam::basicReactingParcel::basicReactingParcel
+template<class ThermoType>
+Foam::CoalParcel<ThermoType>::CoalParcel
 (
-    const Cloud<basicReactingParcel>& cloud,
+    const Cloud<CoalParcel<ThermoType> >& cloud,
     Istream& is,
     bool readFields
 )
 :
-    ReactingParcel<basicReactingParcel>(cloud, is, readFields)
+    ReactingMultiphaseParcel<CoalParcel<ThermoType> >(cloud, is, readFields)
 {}
 
 
 // * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
 
-Foam::basicReactingParcel::~basicReactingParcel()
+template<class ThermoType>
+Foam::CoalParcel<ThermoType>::~CoalParcel()
 {}
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H
similarity index 63%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
rename to src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H
index 8d281c50a..1993bed65 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/basicReactingParcel.H
+++ b/src/lagrangian/coalCombustion/CoalParcel/CoalParcel.H
@@ -23,95 +23,110 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::basicReactingParcel
+    CoalParcel
 
 Description
 
 
 SourceFiles
-    basicReactingParcel.C
-    basicReactingParcelIO.C
+    CoalParcel.C
+    CoalParcelIO.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef basicReactingParcel_H
-#define basicReactingParcel_H
+#ifndef CoalParcel_H
+#define CoalParcel_H
 
-#include "ReactingParcel.H"
+#include "ReactingMultiphaseParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward declaration of classes
+template<class ThermoType>
+class CoalParcel;
+
 /*---------------------------------------------------------------------------*\
-                        Class basicReactingParcel Declaration
+                         Class CoalParcel Declaration
 \*---------------------------------------------------------------------------*/
 
-class basicReactingParcel
+template<class ThermoType>
+class CoalParcel
 :
-    public ReactingParcel<basicReactingParcel>
+    public ReactingMultiphaseParcel<CoalParcel<ThermoType> >
 {
-
 public:
 
-    //- Run-time type information
-    TypeName("basicReactingParcel");
+    //- The type of thermodynamics this parcel was instantiated for
+    typedef ThermoType thermoType;
+
+    // Run-time type information
+    TypeName("CoalParcel");
 
     // Constructors
 
-        //- Construct from components
-        basicReactingParcel
+        //- Construct from owner, position, and cloud owner
+        //  Other properties initialised as null
+        CoalParcel
         (
-             ReactingCloud<basicReactingParcel>& owner,
-             const label typeId,
+             ReactingMultiphaseCloud<CoalParcel>& owner,
              const vector& position,
-             const label celli,
+             const label cellI
+        );
+
+        //- Construct from components
+        CoalParcel
+        (
+             ReactingMultiphaseCloud<CoalParcel>& owner,
+             const vector& position,
+             const label cellI,
+             const label typeId,
+             const scalar nParticle0,
              const scalar d0,
              const vector& U0,
-             const scalar nParticle0,
+             const scalarField& YMixture0,
              const scalarField& YGas0,
              const scalarField& YLiquid0,
              const scalarField& YSolid0,
-             const scalarField& YMixture0,
-             const constantProperties& constProps
+             const typename
+                 ReactingMultiphaseParcel<CoalParcel>::
+                 constantProperties& constProps
         );
 
         //- Construct from Istream
-        basicReactingParcel
+        CoalParcel
         (
-            const Cloud<basicReactingParcel>& c,
+            const Cloud<CoalParcel>& c,
             Istream& is,
             bool readFields = true
         );
 
         //- Construct and return a clone
-        autoPtr<basicReactingParcel> clone() const
+        autoPtr<CoalParcel> clone() const
         {
-            return autoPtr<basicReactingParcel>
-                (new basicReactingParcel(*this));
+            return autoPtr<CoalParcel>(new CoalParcel(*this));
         }
 
 
-    // Destructors
-
-        virtual ~basicReactingParcel();
+    //- Destructor
+    virtual ~CoalParcel();
 };
 
 
-template<>
-inline bool contiguous<basicReactingParcel>()
-{
-    return false; // Now have scalar lists/fields (mass fractions)
-}
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+    #include "CoalParcel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C b/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C
new file mode 100644
index 000000000..00a936e20
--- /dev/null
+++ b/src/lagrangian/coalCombustion/CoalParcel/defineCoalParcel.C
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "createCoalParcelTypes.H"
+#include "CoalParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    createCoalParcelType(CoalParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/CoalParcel/makeCoalParcelSubmodels.C b/src/lagrangian/coalCombustion/CoalParcel/makeCoalParcelSubmodels.C
new file mode 100644
index 000000000..1066a4f0f
--- /dev/null
+++ b/src/lagrangian/coalCombustion/CoalParcel/makeCoalParcelSubmodels.C
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "CoalParcel.H"
+
+// Kinematic
+#include "makeReactingParcelDispersionModels.H"
+#include "makeReactingParcelDragModels.H"
+#include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
+#include "makeReactingParcelPatchInteractionModels.H"
+#include "makeReactingParcelPostProcessingModels.H"
+
+// Thermodynamic
+#include "makeReactingParcelHeatTransferModels.H"
+
+// Reacting
+#include "makeReactingMultiphaseParcelCompositionModels.H" // MP variant
+#include "makeReactingParcelPhaseChangeModels.H"
+
+// Reacting multiphase
+#include "makeReactingMultiphaseParcelDevolatilisationModels.H"
+#include "makeCoalParcelSurfaceReactionModels.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    // Kinematic sub-models
+    makeReactingDispersionModels(CoalParcel);
+    makeReactingDragModels(CoalParcel);
+    makeReactingMultiphaseInjectionModels(CoalParcel);
+    makeReactingPatchInteractionModels(CoalParcel);
+    makeReactingPostProcessingModels(CoalParcel);
+
+    // Thermo sub-models
+    makeReactingHeatTransferModels(CoalParcel);
+
+    // Reacting sub-models
+    makeReactingMultiphaseCompositionModels(CoalParcel);
+    makeReactingPhaseChangeModels(CoalParcel);
+
+    // Reacting multiphase sub-models
+    makeReactingMultiphaseDevolatilisationModels(CoalParcel);
+    makeCoalSurfaceReactionModels(CoalParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/Make/files b/src/lagrangian/coalCombustion/Make/files
new file mode 100644
index 000000000..e00ab1713
--- /dev/null
+++ b/src/lagrangian/coalCombustion/Make/files
@@ -0,0 +1,5 @@
+/* Coal parcel and sub-models */
+CoalParcel/defineCoalParcel.C
+CoalParcel/makeCoalParcelSubmodels.C
+
+LIB = $(FOAM_LIBBIN)/libcoalCombustion
diff --git a/src/lagrangian/coalCombustion/Make/options b/src/lagrangian/coalCombustion/Make/options
new file mode 100644
index 000000000..965409487
--- /dev/null
+++ b/src/lagrangian/coalCombustion/Make/options
@@ -0,0 +1,35 @@
+EXE_INC = \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
+    -I$(LIB_SRC)/lagrangian/intermediate/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/liquids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude
+
+LIB_LIBS = \
+    -lfiniteVolume \
+    -lmeshTools \
+    -llagrangian \
+    -llagrangianIntermediate \
+    -lpdf \
+    -lspecie \
+    -lbasicThermophysicalModels \
+    -lliquids \
+    -lliquidMixture \
+    -lsolids \
+    -lsolidMixture \
+    -lreactionThermophysicalModels \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels
diff --git a/src/lagrangian/coalCombustion/include/createCoalParcelTypes.H b/src/lagrangian/coalCombustion/include/createCoalParcelTypes.H
new file mode 100644
index 000000000..e5763031b
--- /dev/null
+++ b/src/lagrangian/coalCombustion/include/createCoalParcelTypes.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef createCoalParcelTypes_H
+#define createCoalParcelTypes_H
+
+#include "thermoPhysicsTypes.H"
+#include "CoalCloud.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define createCoalParcelType(ParcelType)                                      \
+                                                                              \
+    createCoalParcelThermoType                                                \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+    createCoalParcelThermoType                                                \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+    createCoalParcelThermoType                                                \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define createCoalParcelThermoType(ParcelType, ThermoType)                    \
+                                                                              \
+    typedef ParcelType<ThermoType> ParcelType##ThermoType;                    \
+                                                                              \
+    defineTemplateTypeNameAndDebug(ParcelType##ThermoType, 0);                \
+    defineTemplateTypeNameAndDebug(Particle<ParcelType##ThermoType>, 0);      \
+    defineTemplateTypeNameAndDebug(Cloud<ParcelType##ThermoType>, 0);         \
+                                                                              \
+    defineParcelTypeNameAndDebug(KinematicParcel<ParcelType##ThermoType>, 0); \
+    defineTemplateTypeNameAndDebug                                            \
+    (                                                                         \
+        KinematicParcel<ParcelType##ThermoType>,                              \
+        0                                                                     \
+    );                                                                        \
+    defineParcelTypeNameAndDebug(ThermoParcel<ParcelType##ThermoType>, 0);    \
+    defineTemplateTypeNameAndDebug(ThermoParcel<ParcelType##ThermoType>, 0);  \
+    defineParcelTypeNameAndDebug(ReactingParcel<ParcelType##ThermoType>, 0);  \
+    defineTemplateTypeNameAndDebug(ReactingParcel<ParcelType##ThermoType>, 0);\
+    defineParcelTypeNameAndDebug                                              \
+    (                                                                         \
+        ReactingMultiphaseParcel<ParcelType##ThermoType>,                     \
+        0                                                                     \
+    );                                                                        \
+    defineTemplateTypeNameAndDebug                                            \
+    (                                                                         \
+        ReactingMultiphaseParcel<ParcelType##ThermoType>,                     \
+        0                                                                     \
+    );                                                                        \
+    defineParcelTypeNameAndDebug(CoalParcel<ParcelType##ThermoType>, 0);      \
+    defineTemplateTypeNameAndDebug(CoalParcel<ParcelType##ThermoType>, 0);    \
+                                                                              \
+    defineParcelTypeNameAndDebug(KinematicCloud<ParcelType##ThermoType>, 0);  \
+    defineParcelTypeNameAndDebug(ThermoCloud<ParcelType##ThermoType>, 0);     \
+    defineParcelTypeNameAndDebug(ReactingCloud<ParcelType##ThermoType>, 0);   \
+    defineParcelTypeNameAndDebug                                              \
+    (                                                                         \
+        ReactingMultiphaseCloud<ParcelType##ThermoType>,                      \
+        0                                                                     \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
new file mode 100644
index 000000000..e0d609f62
--- /dev/null
+++ b/src/lagrangian/coalCombustion/include/makeCoalParcelSurfaceReactionModels.H
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeCoalParcelSurfaceReactionModels_H
+#define makeCoalParcelSurfaceReactionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "ReactingMultiphaseCloud.H"
+
+#include "NoSurfaceReaction.H"
+#include "COxidationDiffusionLimitedRate.H"
+#include "COxidationKineticDiffusionLimitedRate.H"
+#include "COxidationMurphyShaddix.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeCoalSurfaceReactionModels(ParcelType)                             \
+                                                                              \
+    makeCoalSurfaceReactionModelThermoType                                    \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+    makeCoalSurfaceReactionModelThermoType                                    \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+    makeCoalSurfaceReactionModelThermoType                                    \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeCoalSurfaceReactionModelThermoType(ParcelType, ThermoType)        \
+                                                                              \
+    makeSurfaceReactionModel                                                  \
+    (                                                                         \
+        ReactingMultiphaseCloud<ParcelType<ThermoType> >                      \
+    );                                                                        \
+                                                                              \
+    makeSurfaceReactionModelThermoType                                        \
+    (                                                                         \
+        NoSurfaceReaction,                                                    \
+        ReactingMultiphaseCloud,                                              \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeSurfaceReactionModelThermoType                                        \
+    (                                                                         \
+        COxidationDiffusionLimitedRate,                                       \
+        ReactingMultiphaseCloud,                                              \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeSurfaceReactionModelThermoType                                        \
+    (                                                                         \
+        COxidationKineticDiffusionLimitedRate,                                \
+        ReactingMultiphaseCloud,                                              \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeSurfaceReactionModelThermoType                                        \
+    (                                                                         \
+        COxidationMurphyShaddix,                                              \
+        ReactingMultiphaseCloud,                                              \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
new file mode 100644
index 000000000..5ed0e77db
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.C
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "COxidationDiffusionLimitedRate.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::COxidationDiffusionLimitedRate<CloudType>::COxidationDiffusionLimitedRate
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    SurfaceReactionModel<CloudType>(dict, owner, typeName),
+    Sb_(dimensionedScalar(this->coeffDict().lookup("Sb")).value()),
+    D_(dimensionedScalar(this->coeffDict().lookup("D")).value()),
+    CsLocalId_(-1),
+    O2GlobalId_(owner.composition().globalCarrierId("O2")),
+    CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
+    WC_(0.0),
+    WO2_(0.0),
+    HcCO2_(0.0)
+{
+    // Determine Cs ids
+    label idSolid = owner.composition().idSolid();
+    CsLocalId_ = owner.composition().localId(idSolid, "C");
+
+    // Set local copies of thermo properties
+    WO2_ = owner.mcCarrierThermo().speciesData()[O2GlobalId_].W();
+    scalar WCO2 = owner.mcCarrierThermo().speciesData()[CO2GlobalId_].W();
+    WC_ = WCO2 - WO2_;
+    HcCO2_ = owner.mcCarrierThermo().speciesData()[CO2GlobalId_].Hc();
+
+    if (Sb_ < 0)
+    {
+        FatalErrorIn
+        (
+            "COxidationDiffusionLimitedRate<CloudType>"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Stoichiometry of reaction, Sb, must be greater than zero" << nl
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::COxidationDiffusionLimitedRate<CloudType>::
+~COxidationDiffusionLimitedRate()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::COxidationDiffusionLimitedRate<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::COxidationDiffusionLimitedRate<CloudType>::calculate
+(
+    const scalar dt,
+    const label cellI,
+    const scalar d,
+    const scalar T,
+    const scalar Tc,
+    const scalar pc,
+    const scalar rhoc,
+    const scalar mass,
+    const scalarField& YGas,
+    const scalarField& YLiquid,
+    const scalarField& YSolid,
+    const scalarField& YMixture,
+    const scalar N,
+    scalarField& dMassGas,
+    scalarField& dMassLiquid,
+    scalarField& dMassSolid,
+    scalarField& dMassSRCarrier
+) const
+{
+    // Fraction of remaining combustible material
+    const label idSolid = CloudType::parcelType::SLD;
+    const scalar fComb = YMixture[idSolid]*YSolid[CsLocalId_];
+
+    // Surface combustion active combustible fraction is consumed
+    if (fComb < SMALL)
+    {
+        return 0.0;
+    }
+
+    // Local mass fraction of O2 in the carrier phase
+    const scalar YO2 = this->owner().mcCarrierThermo().Y(O2GlobalId_)[cellI];
+
+    // Change in C mass [kg]
+    scalar dmC =
+        4.0*mathematicalConstant::pi*d*D_*YO2*Tc*rhoc/(Sb_*(T + Tc))*dt;
+
+    // Limit mass transfer by availability of C
+    dmC = min(mass*fComb, dmC);
+
+    // Change in O2 mass [kg]
+    const scalar dmO2 = dmC/WC_*Sb_*WO2_;
+
+    // Mass of newly created CO2 [kg]
+    const scalar dmCO2 = dmC + dmO2;
+
+    // Update local particle C mass
+    dMassSolid[CsLocalId_] += dmC;
+
+    // Update carrier O2 and CO2 mass
+    dMassSRCarrier[O2GlobalId_] -= dmO2;
+    dMassSRCarrier[CO2GlobalId_] += dmCO2;
+
+    // Heat of reaction [J]
+    return -HcCO2_*dmCO2;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
new file mode 100644
index 000000000..84656fbae
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationDiffusionLimitedRate/COxidationDiffusionLimitedRate.H
@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    COxidationDiffusionLimitedRate
+
+Description
+    Diffusion limited rate surface reaction model for coal parcels. Limited to:
+
+        C(s) + Sb*O2 -> CO2
+
+    where Sb is the stoichiometry of the reaction
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef COxidationDiffusionLimitedRate_H
+#define COxidationDiffusionLimitedRate_H
+
+#include "SurfaceReactionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Forward class declarations
+template<class CloudType>
+class COxidationDiffusionLimitedRate;
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+              Class COxidationDiffusionLimitedRate Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class COxidationDiffusionLimitedRate
+:
+    public SurfaceReactionModel<CloudType>
+{
+    // Private data
+
+        // Model constants
+
+            //- Stoichiometry of reaction
+            const scalar Sb_;
+
+            //- Diffusion coefficient of oxidants [m2/s]
+            const scalar D_;
+
+
+        // Addressing
+
+            //- Cs positions in global/local lists
+            label CsLocalId_;
+
+            //- O2 position in global list
+            label O2GlobalId_;
+
+            //- CO2 positions in global list
+            label CO2GlobalId_;
+
+
+        // Local copies of thermo properties
+
+            //- Molecular weight of C [kg/kmol]
+            scalar WC_;
+
+            //- Molecular weight of O2 [kg/kmol]
+            scalar WO2_;
+
+            //- Chemical enthalpy of CO2 [J/kg]
+            scalar HcCO2_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("COxidationDiffusionLimitedRate");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        COxidationDiffusionLimitedRate
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~COxidationDiffusionLimitedRate();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates surface reaction model
+        virtual bool active() const;
+
+        //- Update surface reactions
+        virtual scalar calculate
+        (
+            const scalar dt,
+            const label cellI,
+            const scalar d,
+            const scalar T,
+            const scalar Tc,
+            const scalar pc,
+            const scalar rhoc,
+            const scalar mass,
+            const scalarField& YGas,
+            const scalarField& YLiquid,
+            const scalarField& YSolid,
+            const scalarField& YMixture,
+            const scalar N,
+            scalarField& dMassGas,
+            scalarField& dMassLiquid,
+            scalarField& dMassSolid,
+            scalarField& dMassSRCarrier
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "COxidationDiffusionLimitedRate.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
new file mode 100644
index 000000000..951813fbe
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.C
@@ -0,0 +1,167 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "COxidationKineticDiffusionLimitedRate.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::COxidationKineticDiffusionLimitedRate<CloudType>::
+COxidationKineticDiffusionLimitedRate
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    SurfaceReactionModel<CloudType>
+    (
+        dict,
+        owner,
+        typeName
+    ),
+    Sb_(dimensionedScalar(this->coeffDict().lookup("Sb")).value()),
+    C1_(dimensionedScalar(this->coeffDict().lookup("C1")).value()),
+    C2_(dimensionedScalar(this->coeffDict().lookup("C2")).value()),
+    E_(dimensionedScalar(this->coeffDict().lookup("E")).value()),
+    CsLocalId_(-1),
+    O2GlobalId_(owner.composition().globalCarrierId("O2")),
+    CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
+    WC_(0.0),
+    WO2_(0.0),
+    HcCO2_(0.0)
+{
+    // Determine Cs ids
+    label idSolid = owner.composition().idSolid();
+    CsLocalId_ = owner.composition().localId(idSolid, "C");
+
+    // Set local copies of thermo properties
+    WO2_ = owner.mcCarrierThermo().speciesData()[O2GlobalId_].W();
+    scalar WCO2 = owner.mcCarrierThermo().speciesData()[CO2GlobalId_].W();
+    WC_ = WCO2 - WO2_;
+    HcCO2_ = owner.mcCarrierThermo().speciesData()[CO2GlobalId_].Hc();
+
+    if (Sb_ < 0)
+    {
+        FatalErrorIn
+        (
+            "COxidationKineticDiffusionLimitedRate"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Stoichiometry of reaction, Sb, must be greater than zero" << nl
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::COxidationKineticDiffusionLimitedRate<CloudType>::
+~COxidationKineticDiffusionLimitedRate()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::COxidationKineticDiffusionLimitedRate<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::COxidationKineticDiffusionLimitedRate<CloudType>::calculate
+(
+    const scalar dt,
+    const label cellI,
+    const scalar d,
+    const scalar T,
+    const scalar Tc,
+    const scalar pc,
+    const scalar rhoc,
+    const scalar mass,
+    const scalarField& YGas,
+    const scalarField& YLiquid,
+    const scalarField& YSolid,
+    const scalarField& YMixture,
+    const scalar N,
+    scalarField& dMassGas,
+    scalarField& dMassLiquid,
+    scalarField& dMassSolid,
+    scalarField& dMassSRCarrier
+) const
+{
+    // Fraction of remaining combustible material
+    const label idSolid = CloudType::parcelType::SLD;
+    const scalar fComb = YMixture[idSolid]*YSolid[CsLocalId_];
+
+    // Surface combustion active combustible fraction is consumed
+    if (fComb < SMALL)
+    {
+        return 0.0;
+    }
+
+    // Local mass fraction of O2 in the carrier phase
+    const scalar YO2 = this->owner().mcCarrierThermo().Y(O2GlobalId_)[cellI];
+
+    // Diffusion rate coefficient
+    const scalar D0 = C1_/d*pow(0.5*(T + Tc), 0.75);
+
+    // Kinetic rate
+    const scalar Rk = C2_*exp(-E_/(specie::RR*Tc));
+
+    // Particle surface area
+    const scalar Ap = mathematicalConstant::pi*sqr(d);
+
+    // Change in C mass [kg]
+    scalar dmC = Ap*rhoc*specie::RR*Tc*YO2/WO2_*D0*Rk/(D0 + Rk);
+
+    // Limit mass transfer by availability of C
+    dmC = min(mass*fComb, dmC);
+
+    // Change in O2 mass [kg]
+    const scalar dmO2 = dmC/WC_*Sb_*WO2_;
+
+    // Mass of newly created CO2 [kg]
+    const scalar dmCO2 = dmC + dmO2;
+
+    // Update local particle C mass
+    dMassSolid[CsLocalId_] += dmC;
+
+    // Update carrier O2 and CO2 mass
+    dMassSRCarrier[O2GlobalId_] -= dmO2;
+    dMassSRCarrier[CO2GlobalId_] += dmCO2;
+
+    // Heat of reaction [J]
+    return -HcCO2_*dmCO2;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
new file mode 100644
index 000000000..3218bbe43
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationKineticDiffusionLimitedRate/COxidationKineticDiffusionLimitedRate.H
@@ -0,0 +1,165 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    COxidationKineticDiffusionLimitedRate
+
+Description
+    Kinetic/diffusion limited rate surface reaction model for coal parcels.
+    Limited to:
+
+        C(s) + Sb*O2 -> CO2
+
+    where Sb is the stoichiometry of the reaction
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef COxidationKineticDiffusionLimitedRate_H
+#define COxidationKineticDiffusionLimitedRate_H
+
+#include "SurfaceReactionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward class declarations
+template<class CloudType>
+class COxidationKineticDiffusionLimitedRate;
+
+/*---------------------------------------------------------------------------*\
+            Class COxidationKineticDiffusionLimitedRate Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class COxidationKineticDiffusionLimitedRate
+:
+    public SurfaceReactionModel<CloudType>
+{
+    // Private data
+
+        // Model constants
+
+            //- Stoichiometry of reaction
+            const scalar Sb_;
+
+            //- Mass diffusion limited rate constant, C1
+            const scalar C1_;
+
+            //- Kinetics limited rate pre-exponential constant, C2
+            const scalar C2_;
+
+            //- Kinetics limited rate activation energy
+            const scalar E_;
+
+
+        // Addressing
+
+            //- Cs positions in global/local lists
+            label CsLocalId_;
+
+            //- O2 position in global list
+            label O2GlobalId_;
+
+            //- CO2 positions in global list
+            label CO2GlobalId_;
+
+
+        // Local copies of thermo properties
+
+            //- Molecular weight of C [kg/kmol]
+            scalar WC_;
+
+            //- Molecular weight of O2 [kg/kmol]
+            scalar WO2_;
+
+            //- Chemical enthalpy of CO2 [J/kg]
+            scalar HcCO2_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("COxidationKineticDiffusionLimitedRate");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        COxidationKineticDiffusionLimitedRate
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~COxidationKineticDiffusionLimitedRate();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates surface reaction model
+        virtual bool active() const;
+
+        //- Update surface reactions
+        virtual scalar calculate
+        (
+            const scalar dt,
+            const label cellI,
+            const scalar d,
+            const scalar T,
+            const scalar Tc,
+            const scalar pc,
+            const scalar rhoc,
+            const scalar mass,
+            const scalarField& YGas,
+            const scalarField& YLiquid,
+            const scalarField& YSolid,
+            const scalarField& YMixture,
+            const scalar N,
+            scalarField& dMassGas,
+            scalarField& dMassLiquid,
+            scalarField& dMassSolid,
+            scalarField& dMassSRCarrier
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "COxidationKineticDiffusionLimitedRate.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
new file mode 100644
index 000000000..4a96524a1
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.C
@@ -0,0 +1,221 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "COxidationMurphyShaddix.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::COxidationMurphyShaddix<CloudType>::maxIters_ = 1000;
+
+template<class CloudType>
+Foam::scalar Foam::COxidationMurphyShaddix<CloudType>::tolerance_ = 1e-06;
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::COxidationMurphyShaddix<CloudType>::COxidationMurphyShaddix
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    SurfaceReactionModel<CloudType>
+    (
+        dict,
+        owner,
+        typeName
+    ),
+    D0_(dimensionedScalar(this->coeffDict().lookup("D0")).value()),
+    rho0_(dimensionedScalar(this->coeffDict().lookup("rho0")).value()),
+    T0_(dimensionedScalar(this->coeffDict().lookup("T0")).value()),
+    Dn_(dimensionedScalar(this->coeffDict().lookup("Dn")).value()),
+    A_(dimensionedScalar(this->coeffDict().lookup("A")).value()),
+    E_(dimensionedScalar(this->coeffDict().lookup("E")).value()),
+    n_(dimensionedScalar(this->coeffDict().lookup("n")).value()),
+    WVol_(dimensionedScalar(this->coeffDict().lookup("WVol")).value()),
+    CsLocalId_(-1),
+    O2GlobalId_(owner.composition().globalCarrierId("O2")),
+    CO2GlobalId_(owner.composition().globalCarrierId("CO2")),
+    WC_(0.0),
+    WO2_(0.0)
+{
+    // Determine Cs ids
+    label idSolid = owner.composition().idSolid();
+    CsLocalId_ = owner.composition().localId(idSolid, "C");
+
+    // Set local copies of thermo properties
+    WO2_ = owner.mcCarrierThermo().speciesData()[O2GlobalId_].W();
+    scalar WCO2 = owner.mcCarrierThermo().speciesData()[CO2GlobalId_].W();
+    WC_ = WCO2 - WO2_;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::COxidationMurphyShaddix<CloudType>::~COxidationMurphyShaddix()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::COxidationMurphyShaddix<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::COxidationMurphyShaddix<CloudType>::calculate
+(
+    const scalar dt,
+    const label cellI,
+    const scalar d,
+    const scalar T,
+    const scalar Tc,
+    const scalar pc,
+    const scalar rhoc,
+    const scalar mass,
+    const scalarField& YGas,
+    const scalarField& YLiquid,
+    const scalarField& YSolid,
+    const scalarField& YMixture,
+    const scalar N,
+    scalarField& dMassGas,
+    scalarField& dMassLiquid,
+    scalarField& dMassSolid,
+    scalarField& dMassSRCarrier
+) const
+{
+    // Fraction of remaining combustible material
+    const label idSolid = CloudType::parcelType::SLD;
+    const scalar fComb = YMixture[idSolid]*YSolid[CsLocalId_];
+
+    // Surface combustion until combustible fraction is consumed
+    if (fComb < SMALL)
+    {
+        return 0.0;
+    }
+
+    // Cell carrier phase O2 species density [kg/m^3]
+    const scalar rhoO2 =
+        rhoc*this->owner().mcCarrierThermo().Y(O2GlobalId_)[cellI];
+
+    if (rhoO2 < SMALL)
+    {
+        return 0.0;
+    }
+
+    // Particle surface area [m^2]
+    const scalar Ap = mathematicalConstant::pi*sqr(d);
+
+    // Calculate diffision constant at continuous phase temperature
+    // and density [m^2/s]
+    const scalar D = D0_*(rho0_/rhoc)*pow(Tc/T0_, Dn_);
+
+    // Far field partial pressure O2 [Pa]
+    const scalar ppO2 = rhoO2/WO2_*specie::RR*Tc;
+
+    // Total molar concentration of the carrier phase [kmol/m^3]
+    const scalar C = pc/(specie::RR*Tc);
+
+    if (debug)
+    {
+        Pout<< "mass  = " << mass << nl
+            << "fComb = " << fComb << nl
+            << "Ap    = " << Ap << nl
+            << "dt    = " << dt << nl
+            << "C     = " << C << nl
+            << endl;
+    }
+
+    // Molar reaction rate per unit surface area [kmol/(m^2.s)]
+    scalar qCsOld = 0;
+    scalar qCs = 1;
+
+    const scalar qCsLim = mass*fComb/(WC_*Ap*dt);
+
+    if (debug)
+    {
+        Pout << "qCsLim = " << qCsLim << endl;
+    }
+
+    label iter = 0;
+    while ((mag(qCs - qCsOld)/qCs > tolerance_) && (iter <= maxIters_))
+    {
+        qCsOld = qCs;
+        const scalar PO2Surface = ppO2*exp(-(qCs + N)*d/(2*C*D));
+        qCs = A_*exp(-E_/(specie::RR*T))*pow(PO2Surface, n_);
+        qCs = (100.0*qCs + iter*qCsOld)/(100.0 + iter);
+        qCs = min(qCs, qCsLim);
+
+        if (debug)
+        {
+            Pout<< "iter = " << iter
+                << ", qCsOld = " << qCsOld
+                << ", qCs = " << qCs
+                << nl << endl;
+        }
+
+        iter++;
+    }
+
+    if (iter > maxIters_)
+    {
+        WarningIn
+        (
+            "scalar Foam::COxidationMurphyShaddix<CloudType>::calculate(...)"
+        )   << "iter limit reached (" << maxIters_ << ")" << nl << endl;
+    }
+
+    // Calculate the number of molar units reacted
+    scalar dOmega = qCs*Ap*dt;
+
+    // Add to carrier phase mass transfer
+    dMassSRCarrier[O2GlobalId_] += -dOmega*WO2_;
+    dMassSRCarrier[CO2GlobalId_] += dOmega*(WC_ + WO2_);
+
+    // Add to particle mass transfer
+    dMassSolid[CsLocalId_] += dOmega*WC_;
+
+    const scalar HC =
+        this->owner().composition().solids().properties()[CsLocalId_].Hf()
+      + this->owner().composition().solids().properties()[CsLocalId_].cp()*T;
+    const scalar HCO2 =
+        this->owner().mcCarrierThermo().speciesData()[CO2GlobalId_].H(T);
+    const scalar HO2 =
+        this->owner().mcCarrierThermo().speciesData()[O2GlobalId_].H(T);
+
+    // Heat of reaction
+    return dOmega*(WC_*HC + WO2_*HO2 - (WC_ + WO2_)*HCO2);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
new file mode 100644
index 000000000..a2bdfcc4b
--- /dev/null
+++ b/src/lagrangian/coalCombustion/submodels/surfaceReactionModel/COxidationMurphyShaddix/COxidationMurphyShaddix.H
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    COxidationMurphyShaddix
+
+Description
+    Limited to C(s) + O2 -> CO2
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef COxidationMurphyShaddix_H
+#define COxidationMurphyShaddix_H
+
+#include "SurfaceReactionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward class declarations
+template<class CloudType>
+class COxidationMurphyShaddix;
+
+/*---------------------------------------------------------------------------*\
+                  Class COxidationMurphyShaddix Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class COxidationMurphyShaddix
+:
+    public SurfaceReactionModel<CloudType>
+{
+    // Private data
+
+        // Model constants
+
+            //- Reference diffusion constant
+            const scalar D0_;
+
+            //- Reference density for reference diffusion constant
+            const scalar rho0_;
+
+            //- Reference temperature for reference diffusion constant
+            const scalar T0_;
+
+            //- Exponent for diffusion equation
+            const scalar Dn_;
+
+            //- Kinetic rate coefficient
+            const scalar A_;
+
+            //- Kinetic rate activation energy
+            const scalar E_;
+
+            //- Reaction order
+            const scalar n_;
+
+            //- Effective molecular weight of gaseous volatiles
+            const scalar WVol_;
+
+
+        // Static constants
+
+            //- Maximum number of iterations
+            static label maxIters_;
+
+            //- Tolerance used in inner iterations
+            static scalar tolerance_;
+
+
+        // Addressing
+
+            //- Cs positions in global/local lists
+            label CsLocalId_;
+
+            //- O2 position in global list
+            label O2GlobalId_;
+
+            //- CO2 positions in global list
+            label CO2GlobalId_;
+
+
+        // Local copies of thermo properties
+
+            //- Molecular weight of C [kg/kmol]
+            scalar WC_;
+
+            //- Molecular weight of O2 [kg/kmol]
+            scalar WO2_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("COxidationMurphyShaddix");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        COxidationMurphyShaddix
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~COxidationMurphyShaddix();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates surface reaction model
+        virtual bool active() const;
+
+        //- Update surface reactions
+        virtual scalar calculate
+        (
+            const scalar dt,
+            const label cellI,
+            const scalar d,
+            const scalar T,
+            const scalar Tc,
+            const scalar pc,
+            const scalar rhoc,
+            const scalar mass,
+            const scalarField& YGas,
+            const scalarField& YLiquid,
+            const scalarField& YSolid,
+            const scalarField& YMixture,
+            const scalar N,
+            scalarField& dMassGas,
+            scalarField& dMassLiquid,
+            scalarField& dMassSolid,
+            scalarField& dMassSRCarrier
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "COxidationMurphyShaddix.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C
index cd0ad0597..ba765d2f5 100644
--- a/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C
+++ b/src/lagrangian/dieselSpray/injector/swirlInjector/swirlInjector.C
@@ -30,24 +30,22 @@ License
 #include "mathematicalConstants.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
+    defineTypeNameAndDebug(swirlInjector, 0);
 
-defineTypeNameAndDebug(swirlInjector, 0);
-
-addToRunTimeSelectionTable
-(
-    injectorType,
-    swirlInjector,
-    dictionary
-);
+    addToRunTimeSelectionTable
+    (
+        injectorType,
+        swirlInjector,
+        dictionary
+    );
 }
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::swirlInjector::swirlInjector
 (
     const Foam::Time& t,
@@ -66,40 +64,56 @@ Foam::swirlInjector::swirlInjector
     X_(propsDict_.lookup("X")),
     massFlowRateProfile_(propsDict_.lookup("massFlowRateProfile")),
     injectionPressureProfile_(propsDict_.lookup("injectionPressureProfile")),
-    velocityProfile_(injectionPressureProfile_),
-    CdProfile_(injectionPressureProfile_),
-    TProfile_(injectionPressureProfile_),
+    velocityProfile_(massFlowRateProfile_),
+    CdProfile_(massFlowRateProfile_),
+    TProfile_(massFlowRateProfile_),
     averageParcelMass_(mass_/nParcels_),
     pressureIndependentVelocity_(false)
 {
     // convert CA to real time
     forAll(massFlowRateProfile_, i)
     {
-        massFlowRateProfile_[i][0] = t.userTimeToTime(massFlowRateProfile_[i][0]);
+        massFlowRateProfile_[i][0] =
+            t.userTimeToTime(massFlowRateProfile_[i][0]);
     }
     forAll(injectionPressureProfile_, i)
     {
-        injectionPressureProfile_[i][0] = t.userTimeToTime(injectionPressureProfile_[i][0]);
+        injectionPressureProfile_[i][0] =
+            t.userTimeToTime(injectionPressureProfile_[i][0]);
     }
 
     // check if time entries match
     if (mag(massFlowRateProfile_[0][0]-injectionPressureProfile_[0][0]) > SMALL)
     {
-        FatalError << "swirlInjector::swirlInjector(const time& t, const dictionary dict) " << endl
-            << " start-times do not match for injectionPressureProfile and massFlowRateProfile."
+        FatalErrorIn
+        (
+            "swirlInjector::swirlInjector(const time& t, const dictionary dict)"
+        )   << "Start-times do not match for "
+               "injectionPressureProfile and massFlowRateProfile."
             << abort(FatalError);
     }
 
     // check if time entries match
-    if (mag(massFlowRateProfile_[massFlowRateProfile_.size()-1][0]-injectionPressureProfile_[injectionPressureProfile_.size()-1][0]) > SMALL)
+    if
+    (
+        mag
+        (
+            massFlowRateProfile_[massFlowRateProfile_.size() - 1][0]
+          - injectionPressureProfile_[injectionPressureProfile_.size() - 1][0]
+        ) > SMALL
+    )
     {
-        FatalError << "swirlInjector::swirlInjector(const time& t, const dictionary dict) " << endl
-            << " end-times do not match for injectionPressureProfile and massFlowRateProfile."
+        FatalErrorIn
+        (
+            "swirlInjector::swirlInjector(const time& t, const dictionary dict)"
+        )   << "End-times do not match for "
+               "injectionPressureProfile and massFlowRateProfile."
             << abort(FatalError);
     }
 
     scalar integratedMFR = integrateTable(massFlowRateProfile_);
-    scalar integratedPressure = integrateTable(injectionPressureProfile_)/(teoi()-tsoi());
+    scalar integratedPressure =
+        integrateTable(injectionPressureProfile_)/(teoi()-tsoi());
 
     forAll(massFlowRateProfile_, i)
     {
@@ -118,12 +132,13 @@ Foam::swirlInjector::swirlInjector
     forAll(injectionPressureProfile_, i)
     {
         // correct the pressureProfile to match the injection pressure
-        injectionPressureProfile_[i][1] *= injectionPressure_/integratedPressure;
+        injectionPressureProfile_[i][1] *=
+            injectionPressure_/integratedPressure;
     }
 
     // Normalize the direction vector
     direction_ /= mag(direction_);
-    
+
     setTangentialVectors();
 
     // check molar fractions
@@ -135,17 +150,19 @@ Foam::swirlInjector::swirlInjector
 
     if (mag(Xsum - 1.0) > SMALL)
     {
-        Info << "Warning!!!\n swirlInjector::swirlInjector(const time& t, Istream& is)"
-            << "X does not add up to 1.0, correcting molar fractions."
-            << endl;
+        WarningIn
+        (
+            "swirlInjector::swirlInjector(const time& t, const dictionary dict)"
+        )   << "X does not add up to 1.0, correcting molar fractions." << endl;
+
         forAll(X_, i)
         {
             X_[i] /= Xsum;
         }
     }
-
 }
 
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::swirlInjector::~swirlInjector()
@@ -170,10 +187,8 @@ void Foam::swirlInjector::setTangentialVectors()
 
     tangentialInjectionVector1_ = tangent/magV;
     tangentialInjectionVector2_ = direction_ ^ tangentialInjectionVector1_;
-
 }
 
-
 Foam::label Foam::swirlInjector::nParcelsToInject
 (
     const scalar time0,
@@ -183,7 +198,7 @@ Foam::label Foam::swirlInjector::nParcelsToInject
 
     scalar mInj = mass_*(fractionOfInjection(time1)-fractionOfInjection(time0));
     label nParcels = label(mInj/averageParcelMass_ + 0.49);
-    
+
     return nParcels;
 }
 
@@ -223,7 +238,7 @@ Foam::vector Foam::swirlInjector::position
         scalar iAngle = 2.0*mathematicalConstant::pi*rndGen.scalar01();
 
         return
-        ( 
+        (
             position_
           + iRadius
           * (
@@ -231,7 +246,7 @@ Foam::vector Foam::swirlInjector::position
             + tangentialInjectionVector2_*sin(iAngle)
           )
         );
-        
+
     }
 
     return position_;
@@ -266,7 +281,7 @@ Foam::scalar Foam::swirlInjector::mass
 {
     scalar mInj = mass_*(fractionOfInjection(time1)-fractionOfInjection(time0));
 
-    // correct mass if calculation is 2D 
+    // correct mass if calculation is 2D
     if (twoD)
     {
         mInj *= 0.5*angleOfWedge/mathematicalConstant::pi;
@@ -280,7 +295,8 @@ Foam::scalar Foam::swirlInjector::mass() const
     return mass_;
 }
 
-Foam::List<Foam::swirlInjector::pair> Foam::swirlInjector::massFlowRateProfile() const
+Foam::List<Foam::swirlInjector::pair>
+Foam::swirlInjector::massFlowRateProfile() const
 {
     return massFlowRateProfile_;
 }
@@ -290,7 +306,8 @@ Foam::scalar Foam::swirlInjector::massFlowRate(const scalar time) const
     return getTableValue(massFlowRateProfile_, time);
 }
 
-Foam::List<Foam::swirlInjector::pair> Foam::swirlInjector::injectionPressureProfile() const
+Foam::List<Foam::swirlInjector::pair>
+Foam::swirlInjector::injectionPressureProfile() const
 {
     return injectionPressureProfile_;
 }
@@ -300,7 +317,8 @@ Foam::scalar Foam::swirlInjector::injectionPressure(const scalar time) const
     return getTableValue(injectionPressureProfile_, time);
 }
 
-Foam::List<Foam::swirlInjector::pair> Foam::swirlInjector::velocityProfile() const
+Foam::List<Foam::swirlInjector::pair>
+Foam::swirlInjector::velocityProfile() const
 {
     return velocityProfile_;
 }
@@ -309,7 +327,7 @@ Foam::scalar Foam::swirlInjector::velocity(const scalar time) const
 {
     return getTableValue(velocityProfile_, time);
 }
-    
+
 Foam::List<Foam::swirlInjector::pair> Foam::swirlInjector::CdProfile() const
 {
     return CdProfile_;
@@ -350,7 +368,6 @@ Foam::scalar Foam::swirlInjector::fractionOfInjection(const scalar time) const
     return integrateTable(massFlowRateProfile_, time)/mass_;
 }
 
-
 Foam::scalar Foam::swirlInjector::injectedMass
 (
     const scalar t
@@ -372,7 +389,11 @@ void Foam::swirlInjector::correctProfiles
 
     forAll(velocityProfile_, i)
     {
-        scalar Pinj = getTableValue(injectionPressureProfile_, massFlowRateProfile_[i][0]);
+        scalar Pinj = getTableValue
+        (
+            injectionPressureProfile_,
+            massFlowRateProfile_[i][0]
+        );
         scalar mfr = massFlowRateProfile_[i][1]/(rho*A);
         scalar v = sqrt(2.0*(Pinj - referencePressure)/rho);
         velocityProfile_[i][1] = v;
@@ -390,4 +411,5 @@ Foam::vector Foam::swirlInjector::tan2(const label n) const
     return tangentialInjectionVector2_;
 }
 
+
 // ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
index 5b122731b..7656d9bd7 100644
--- a/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
+++ b/src/lagrangian/dieselSpray/injector/unitInjector/unitInjector.C
@@ -30,19 +30,19 @@ License
 #include "mathematicalConstants.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
 namespace Foam
 {
+    defineTypeNameAndDebug(unitInjector, 0);
 
-defineTypeNameAndDebug(unitInjector, 0);
-
-addToRunTimeSelectionTable
-(
-    injectorType,
-    unitInjector,
-    dictionary
-);
+    addToRunTimeSelectionTable
+    (
+        injectorType,
+        unitInjector,
+        dictionary
+    );
 }
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -74,26 +74,36 @@ Foam::unitInjector::unitInjector
     // check if time entries for soi and eoi match
     if (mag(massFlowRateProfile_[0][0]-TProfile_[0][0]) > SMALL)
     {
-        FatalError << "unitInjector::unitInjector(const time& t, const dictionary dict) " << endl
-            << " start-times do not match for TemperatureProfile and massFlowRateProfile."
-            << abort(FatalError);
+        FatalErrorIn
+        (
+            "unitInjector::unitInjector(const time& t, const dictionary dict)"
+        )<< "start-times do not match for TemperatureProfile and "
+         << " massFlowRateProfile." << nl << exit (FatalError);
     }
 
-    if (mag(massFlowRateProfile_[massFlowRateProfile_.size()-1][0]-TProfile_[TProfile_.size()-1][0]) > SMALL)
+    if
+    (
+        mag(massFlowRateProfile_[massFlowRateProfile_.size()-1][0]
+      - TProfile_[TProfile_.size()-1][0])
+      > SMALL
+    )
     {
-        FatalError << "unitInjector::unitInjector(const time& t, const dictionary dict) " << endl
-            << " end-times do not match for TemperatureProfile and massFlowRateProfile."
-            << abort(FatalError);
+        FatalErrorIn
+        (
+            "unitInjector::unitInjector(const time& t, const dictionary dict)"
+        )<< "end-times do not match for TemperatureProfile and "
+         << "massFlowRateProfile." << nl << exit(FatalError);
     }
 
     // convert CA to real time
     forAll(massFlowRateProfile_, i)
     {
-        massFlowRateProfile_[i][0] = t.userTimeToTime(massFlowRateProfile_[i][0]);
+        massFlowRateProfile_[i][0] =
+            t.userTimeToTime(massFlowRateProfile_[i][0]);
         velocityProfile_[i][0] = massFlowRateProfile_[i][0];
         injectionPressureProfile_[i][0] = massFlowRateProfile_[i][0];
     }
-    
+
     forAll(TProfile_, i)
     {
         TProfile_[i][0] = t.userTimeToTime(TProfile_[i][0]);
@@ -105,14 +115,14 @@ Foam::unitInjector::unitInjector
     {
         // correct the massFlowRateProfile to match the injected mass
         massFlowRateProfile_[i][1] *= mass_/integratedMFR;
-        
+
         CdProfile_[i][0] = massFlowRateProfile_[i][0];
         CdProfile_[i][1] = Cd_;
     }
 
     // Normalize the direction vector
     direction_ /= mag(direction_);
-    
+
     setTangentialVectors();
 
     // check molar fractions
@@ -124,9 +134,9 @@ Foam::unitInjector::unitInjector
 
     if (mag(Xsum - 1.0) > SMALL)
     {
-        Info << "Warning!!!\n unitInjector::unitInjector(const time& t, Istream& is)"
-            << "X does not add up to 1.0, correcting molar fractions."
-            << endl;
+        WarningIn("unitInjector::unitInjector(const time& t, Istream& is)")
+            << "X does not sum to 1.0, correcting molar fractions."
+            << nl << endl;
         forAll(X_, i)
         {
             X_[i] /= Xsum;
@@ -169,18 +179,18 @@ Foam::label Foam::unitInjector::nParcelsToInject
     const scalar time1
 ) const
 {
-
     scalar mInj = mass_*(fractionOfInjection(time1)-fractionOfInjection(time0));
     label nParcels = label(mInj/averageParcelMass_ + 0.49);
-    
     return nParcels;
 }
 
+
 const Foam::vector Foam::unitInjector::position(const label n) const
 {
     return position_;
 }
 
+
 Foam::vector Foam::unitInjector::position
 (
     const label n,
@@ -212,7 +222,7 @@ Foam::vector Foam::unitInjector::position
         scalar iAngle = 2.0*mathematicalConstant::pi*rndGen.scalar01();
 
         return
-        ( 
+        (
             position_
           + iRadius
           * (
@@ -220,22 +230,25 @@ Foam::vector Foam::unitInjector::position
             + tangentialInjectionVector2_*sin(iAngle)
           )
         );
-        
+
     }
 
     return position_;
 }
 
+
 Foam::label Foam::unitInjector::nHoles() const
 {
     return 1;
 }
 
+
 Foam::scalar Foam::unitInjector::d() const
 {
     return d_;
 }
 
+
 const Foam::vector& Foam::unitInjector::direction
 (
     const label i,
@@ -245,6 +258,7 @@ const Foam::vector& Foam::unitInjector::direction
     return direction_;
 }
 
+
 Foam::scalar Foam::unitInjector::mass
 (
     const scalar time0,
@@ -255,7 +269,7 @@ Foam::scalar Foam::unitInjector::mass
 {
     scalar mInj = mass_*(fractionOfInjection(time1)-fractionOfInjection(time0));
 
-    // correct mass if calculation is 2D 
+    // correct mass if calculation is 2D
     if (twoD)
     {
         mInj *= 0.5*angleOfWedge/mathematicalConstant::pi;
@@ -264,82 +278,80 @@ Foam::scalar Foam::unitInjector::mass
     return mInj;
 }
 
+
 Foam::scalar Foam::unitInjector::mass() const
 {
     return mass_;
 }
 
+
 const Foam::scalarField& Foam::unitInjector::X() const
 {
     return X_;
 }
 
+
 Foam::List<Foam::unitInjector::pair> Foam::unitInjector::T() const
 {
     return TProfile_;
 }
 
+
 Foam::scalar Foam::unitInjector::T(const scalar time) const
 {
     return getTableValue(TProfile_, time);
 }
 
+
 Foam::scalar Foam::unitInjector::tsoi() const
 {
     return massFlowRateProfile_[0][0];
 }
 
+
 Foam::scalar Foam::unitInjector::teoi() const
 {
     return massFlowRateProfile_[massFlowRateProfile_.size()-1][0];
 }
 
-Foam::scalar Foam::unitInjector::massFlowRate
-(
-    const scalar time
-) const
+
+Foam::scalar Foam::unitInjector::massFlowRate(const scalar time) const
 {
     return getTableValue(massFlowRateProfile_, time);
 }
 
-Foam::scalar Foam::unitInjector::injectionPressure
-(
-    const scalar time
-) const
+
+Foam::scalar Foam::unitInjector::injectionPressure(const scalar time) const
 {
     return getTableValue(injectionPressureProfile_, time);
 }
 
-Foam::scalar Foam::unitInjector::velocity
-(
-    const scalar time
-) const
+
+Foam::scalar Foam::unitInjector::velocity(const scalar time) const
 {
     return getTableValue(velocityProfile_, time);
 }
 
+
 Foam::List<Foam::unitInjector::pair> Foam::unitInjector::CdProfile() const
 {
     return CdProfile_;
 }
 
-Foam::scalar Foam::unitInjector::Cd
-(
-    const scalar time
-) const
+
+Foam::scalar Foam::unitInjector::Cd(const scalar time) const
 {
     return Cd_;
 }
 
+
 Foam::scalar Foam::unitInjector::fractionOfInjection(const scalar time) const
 {
     return integrateTable(massFlowRateProfile_, time)/mass_;
 }
 
-Foam::scalar Foam::unitInjector::injectedMass
-(
-    const scalar t
-) const
+
+Foam::scalar Foam::unitInjector::injectedMass(const scalar t) const
 {
     return mass_*fractionOfInjection(t);
 }
@@ -351,7 +363,6 @@ void Foam::unitInjector::correctProfiles
     const scalar referencePressure
 )
 {
-
     scalar A = 0.25*mathematicalConstant::pi*pow(d_, 2.0);
     scalar pDummy = 1.0e+5;
 
@@ -365,14 +376,17 @@ void Foam::unitInjector::correctProfiles
     }
 }
 
-Foam::vector Foam::unitInjector::tan1(const label n) const
+
+Foam::vector Foam::unitInjector::tan1(const label) const
 {
     return tangentialInjectionVector1_;
 }
 
-Foam::vector Foam::unitInjector::tan2(const label n) const
+
+Foam::vector Foam::unitInjector::tan2(const label) const
 {
     return tangentialInjectionVector2_;
 }
 
+
 // ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H b/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
index 19dea2eec..b8702112f 100644
--- a/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
+++ b/src/lagrangian/dieselSpray/parcel/boundaryTreatment.H
@@ -1,4 +1,4 @@
-if (isType<wallPolyPatch>(pbMesh[patch(face())]))
+if (isA<wallPolyPatch>(pbMesh[patch(face())]))
 {
     keepParcel = sDB.wall().wallTreatment(*this, face());
 
@@ -12,7 +12,7 @@ if (isType<wallPolyPatch>(pbMesh[patch(face())]))
         U() = (magUs/magV1)*v1*n() + vs*sDB.axisOfSymmetry();
     }
 }
-else if (isType<wedgePolyPatch>(pbMesh[patch(face())]))
+else if (isA<wedgePolyPatch>(pbMesh[patch(face())]))
 {
     // check if parcel is trying to move out of the domain
     label patchi = patch(face());
@@ -27,7 +27,7 @@ else if (isType<wedgePolyPatch>(pbMesh[patch(face())]))
         U() -= 2.0*Un2*n();
     }
 }
-else if (isType<symmetryPolyPatch>(pbMesh[patch(face())]))
+else if (isA<symmetryPolyPatch>(pbMesh[patch(face())]))
 {
     // check if parcel is trying to move out of the domain
     label patchi = patch(face());
diff --git a/src/lagrangian/dieselSpray/parcel/parcel.C b/src/lagrangian/dieselSpray/parcel/parcel.C
index 643452060..e0f7a4f0e 100644
--- a/src/lagrangian/dieselSpray/parcel/parcel.C
+++ b/src/lagrangian/dieselSpray/parcel/parcel.C
@@ -34,18 +34,16 @@ License
 #include "wallPolyPatch.H"
 #include "wedgePolyPatch.H"
 #include "processorPolyPatch.H"
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
     defineParticleTypeNameAndDebug(parcel, 0);
-
     defineTemplateTypeNameAndDebug(Cloud<parcel>, 0);
 }
 
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::parcel::parcel
@@ -160,7 +158,7 @@ bool Foam::parcel::move(spray& sDB)
     );
 
 
-    // Set the end-time for the track
+    // set the end-time for the track
     scalar tEnd = (1.0 - stepFraction())*deltaT;
 
     // Set the maximum time step for this parcel
@@ -255,14 +253,13 @@ bool Foam::parcel::move(spray& sDB)
         {
             oMass[i] = m()*oYf[i];
             label j = sDB.liquidToGasIndex()[i];
-            oHg += oYf[i]*sDB.gasProperties()[j].H(T());
+            oHg += oYf[i]*sDB.gasProperties()[j].Hs(T());
         }
 
         vector oMom = m()*U();
         scalar oHv = fuels.hl(p, T(), X());
         scalar oH = oHg - oHv;
         scalar oPE = (p - fuels.pv(p, T(), X()))/oRho;
-        scalar oKE = 0.5*pow(mag(U()), 2);
 
         // update the parcel properties (U, T, D)
         updateParcelProperties
@@ -282,14 +279,13 @@ bool Foam::parcel::move(spray& sDB)
         {
             nMass[i] = m()*nYf[i];
             label j = sDB.liquidToGasIndex()[i];
-            nHg += nYf[i]*sDB.gasProperties()[j].H(T());
+            nHg += nYf[i]*sDB.gasProperties()[j].Hs(T());
         }
 
         vector nMom = m()*U();
         scalar nHv = fuels.hl(p, T(), X());
         scalar nH = nHg - nHv;
         scalar nPE = (p - fuels.pv(p, T(), X()))/nRho;
-        scalar nKE = 0.5*pow(mag(U()), 2);
 
         // Update the Spray Source Terms
         forAll(nMass, i)
@@ -298,11 +294,9 @@ bool Foam::parcel::move(spray& sDB)
         }
         sDB.sms()[celli]   += oMom - nMom;
 
-        sDB.sms()[celli] += oMom - nMom;
-
-        sDB.shs()[celli] += 
-            oTotMass*(oH + oPE + oKE)
-          - m()*(nH + nPE + nKE); 
+        sDB.shs()[celli]   +=
+            oTotMass*(oH + oPE)
+          - m()*(nH + nPE);
 
         // Remove evaporated mass from stripped mass
         ms() -= ms()*(oTotMass-m())/oTotMass;
@@ -329,7 +323,7 @@ bool Foam::parcel::move(spray& sDB)
         {
             if (face() > -1)
             {
-                if (isType<processorPolyPatch>(pbMesh[patch(face())]))
+                if (isA<processorPolyPatch>(pbMesh[patch(face())]))
                 {
                     switchProcessor = true;
                 }
@@ -461,7 +455,7 @@ void Foam::parcel::updateParcelProperties
     for (label i=0; i<Nf; i++)
     {
         label j = sDB.liquidToGasIndex()[i];
-        oldhg += Yf0[i]*sDB.gasProperties()[j].H(T());
+        oldhg += Yf0[i]*sDB.gasProperties()[j].Hs(T());
     }
 
     scalar oldhv = fuels.hl(pg, T(), X());
@@ -503,9 +497,9 @@ void Foam::parcel::updateParcelProperties
             for(label i=0; i<Nf; i++)
             {
                 label j = sDB.liquidToGasIndex()[i];
-                newhg += Ynew[i]*sDB.gasProperties()[j].H(Tnew);
+                newhg += Ynew[i]*sDB.gasProperties()[j].Hs(Tnew);
             }
-            
+
             newhv = fuels.hl(pg, Tnew, X());
 
             scalar dm = oldMass - newMass;
@@ -598,6 +592,56 @@ void Foam::parcel::updateParcelProperties
             // Prevent droplet temperature to go too low
             // Mainly a numerical stability issue
             Tnew = max(200.0, Tnew);
+            scalar Td = Tnew;
+
+            scalar pAtSurface = fuels.pv(pg, Td, X());
+            scalar pCompare = 0.999*pg;
+            scalar boiling = pAtSurface >= pCompare;
+            if (boiling)
+            {
+                // can not go above boiling temperature
+                scalar Terr = 1.0e-3;
+                label n=0;
+                scalar dT = 1.0;
+                scalar pOld = pAtSurface;
+                while (dT > Terr)
+                {
+                    n++;
+                    pAtSurface = fuels.pv(pg, Td, X());
+                    if ((pAtSurface < pCompare) && (pOld < pCompare))
+                    {
+                        Td += dT;
+                    }
+                    else
+                    {
+                        if ((pAtSurface > pCompare) && (pOld > pCompare))
+                        {
+                            Td -= dT;
+                        }
+                        else
+                        {
+                            dT *= 0.5;
+                            if ((pAtSurface > pCompare) && (pOld < pCompare))
+                            {
+                                Td -= dT;
+                            }
+                            else
+                            {
+                                Td += dT;
+                            }
+                        }
+                    }
+                    pOld = pAtSurface;
+                    if (debug)
+                    {
+                        if (n>100)
+                        {
+                            Info << "n = " << n << ", T = " << Td << ", pv = " << pAtSurface << endl;
+                        }
+                    }
+                }
+                Tnew = Td;
+            }
         }
 
         // Evaporate droplet!
@@ -690,6 +734,4 @@ void Foam::parcel::transformProperties(const vector&)
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 // ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/parcel/parcelIO.C b/src/lagrangian/dieselSpray/parcel/parcelIO.C
index 816f8780c..737768140 100644
--- a/src/lagrangian/dieselSpray/parcel/parcelIO.C
+++ b/src/lagrangian/dieselSpray/parcel/parcelIO.C
@@ -36,7 +36,7 @@ Foam::parcel::parcel
     bool readFields
 )
 :
-    Particle<parcel>(cloud, is),
+    Particle<parcel>(cloud, is, readFields),
 
     liquidComponents_
     (
@@ -106,43 +106,48 @@ void Foam::parcel::readFields
         return;
     }
 
-    IOField<scalar> d(c.fieldIOobject("d"));
+    Particle<parcel>::readFields(c);
+
+    IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ));
     c.checkFieldIOobject(c, d);
 
-    IOField<scalar> T(c.fieldIOobject("T"));
+    IOField<scalar> T(c.fieldIOobject("T", IOobject::MUST_READ));
     c.checkFieldIOobject(c, T);
 
-    IOField<scalar> m(c.fieldIOobject("m"));
+    IOField<scalar> m(c.fieldIOobject("m", IOobject::MUST_READ));
     c.checkFieldIOobject(c, m);
 
-    IOField<scalar> y(c.fieldIOobject("y"));
+    IOField<scalar> y(c.fieldIOobject("y", IOobject::MUST_READ));
     c.checkFieldIOobject(c, y);
 
-    IOField<scalar> yDot(c.fieldIOobject("yDot"));
+    IOField<scalar> yDot(c.fieldIOobject("yDot", IOobject::MUST_READ));
     c.checkFieldIOobject(c, yDot);
 
-    IOField<scalar> ct(c.fieldIOobject("ct"));
+    IOField<scalar> ct(c.fieldIOobject("ct", IOobject::MUST_READ));
     c.checkFieldIOobject(c, ct);
 
-    IOField<scalar> ms(c.fieldIOobject("ms"));
+    IOField<scalar> ms(c.fieldIOobject("ms", IOobject::MUST_READ));
     c.checkFieldIOobject(c, ms);
 
-    IOField<scalar> tTurb(c.fieldIOobject("tTurb"));
+    IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::MUST_READ));
     c.checkFieldIOobject(c, tTurb);
 
-    IOField<scalar> liquidCore(c.fieldIOobject("liquidCore"));
+    IOField<scalar> liquidCore
+    (
+        c.fieldIOobject("liquidCore", IOobject::MUST_READ)
+    );
     c.checkFieldIOobject(c, liquidCore);
 
-    IOField<scalar> injector(c.fieldIOobject("injector"));
+    IOField<scalar> injector(c.fieldIOobject("injector", IOobject::MUST_READ));
     c.checkFieldIOobject(c, injector);
 
-    IOField<vector> U(c.fieldIOobject("U"));
+    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
     c.checkFieldIOobject(c, U);
 
-    IOField<vector> Uturb(c.fieldIOobject("Uturb"));
+    IOField<vector> Uturb(c.fieldIOobject("Uturb", IOobject::MUST_READ));
     c.checkFieldIOobject(c, Uturb);
 
-    IOField<vector> n(c.fieldIOobject("n"));
+    IOField<vector> n(c.fieldIOobject("n", IOobject::MUST_READ));
     c.checkFieldIOobject(c, n);
 
     label i = 0;
@@ -169,7 +174,7 @@ void Foam::parcel::readFields
     }
 
     // read the liquid molar fractions
-    if (c.size() > 0)
+    if (c.size())
     {
         Cloud<parcel>::const_iterator iter = c.begin();
         const parcel& p0 = iter();
@@ -179,7 +184,7 @@ void Foam::parcel::readFields
 
         for (label j=0; j<nX; j++)
         {
-            IOField<scalar> X(c.fieldIOobject(names[j]));
+            IOField<scalar> X(c.fieldIOobject(names[j], IOobject::MUST_READ));
 
             label i = 0;
             forAllIter(Cloud<parcel>, c, iter)
@@ -201,20 +206,27 @@ void Foam::parcel::writeFields
 
     label np = c.size();
 
-    IOField<scalar> d(c.fieldIOobject("d"), np);
-    IOField<scalar> T(c.fieldIOobject("T"), np);
-    IOField<scalar> m(c.fieldIOobject("m"), np);
-    IOField<scalar> y(c.fieldIOobject("y"), np);
-    IOField<scalar> yDot(c.fieldIOobject("yDot"), np);
-    IOField<scalar> ct(c.fieldIOobject("ct"), np);
-    IOField<scalar> ms(c.fieldIOobject("ms"), np);
-    IOField<scalar> tTurb(c.fieldIOobject("tTurb"), np);
-    IOField<scalar> liquidCore(c.fieldIOobject("liquidCore"), np);
-    IOField<scalar> injector(c.fieldIOobject("injector"), np);
-
-    IOField<vector> U(c.fieldIOobject("U"), np);
-    IOField<vector> Uturb(c.fieldIOobject("Uturb"), np);
-    IOField<vector> n(c.fieldIOobject("n"), np);
+    IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
+    IOField<scalar> T(c.fieldIOobject("T", IOobject::NO_READ), np);
+    IOField<scalar> m(c.fieldIOobject("m", IOobject::NO_READ), np);
+    IOField<scalar> y(c.fieldIOobject("y", IOobject::NO_READ), np);
+    IOField<scalar> yDot(c.fieldIOobject("yDot", IOobject::NO_READ), np);
+    IOField<scalar> ct(c.fieldIOobject("ct", IOobject::NO_READ), np);
+    IOField<scalar> ms(c.fieldIOobject("ms", IOobject::NO_READ), np);
+    IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::NO_READ), np);
+    IOField<scalar> liquidCore
+    (
+        c.fieldIOobject("liquidCore", IOobject::NO_READ),
+        np
+    );
+    IOField<scalar> injector
+    (
+        c.fieldIOobject("injector", IOobject::NO_READ),
+        np
+    );
+    IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
+    IOField<vector> Uturb(c.fieldIOobject("Uturb", IOobject::NO_READ), np);
+    IOField<vector> n(c.fieldIOobject("n", IOobject::NO_READ), np);
 
     label i = 0;
     forAllConstIter(Cloud<parcel>, c, iter)
@@ -265,7 +277,7 @@ void Foam::parcel::writeFields
 
         for (label j=0; j<nX; j++)
         {
-            IOField<scalar> X(c.fieldIOobject(names[j]), np);
+            IOField<scalar> X(c.fieldIOobject(names[j], IOobject::NO_READ), np);
 
             label i = 0;
             forAllConstIter(Cloud<parcel>, c, iter)
diff --git a/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C b/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
index 11684993a..a088d7b35 100644
--- a/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
+++ b/src/lagrangian/dieselSpray/parcel/setRelaxationTimes.C
@@ -30,7 +30,7 @@ License
 #include "dragModel.H"
 #include "evaporationModel.H"
 #include "heatTransferModel.H"
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -93,7 +93,7 @@ void parcel::setRelaxationTimes
     for(label i=0; i<Nf; i++)
     {
         label j = sDB.liquidToGasIndex()[i];
-        scalar Y = sDB.composition().Y()[j][celli];        
+        scalar Y = sDB.composition().Y()[j][celli];
         scalar Wi = sDB.gasProperties()[j].W();
         Yf[i] = Y;
         Xf[i] = Y*W/Wi;
@@ -139,14 +139,14 @@ void parcel::setRelaxationTimes
     scalar Prandtl = Pr(cpMixture, muf, kMixture);
 
     // calculate the characteritic times
-      
+
     if(liquidCore_> 0.5)
     {
 //      no drag for parcels in the liquid core..
         tauMomentum = GREAT;
     }
     else
-    {    
+    {
         tauMomentum = sDB.drag().relaxationTime
         (
             Urel(Up),
@@ -218,10 +218,10 @@ void parcel::setRelaxationTimes
             {
                 scalar Nusselt =
                     sDB.heatTransfer().Nu(Reynolds, Prandtl);
-                
+
 //              calculating the boiling temperature of the liquid at ambient pressure
                 scalar tBoilingSurface = Td;
-                
+
                 label Niter = 0;
                 scalar deltaT = 10.0;
                 scalar dp0 = fuels.properties()[i].pv(pressure, tBoilingSurface) - pressure;
@@ -255,16 +255,16 @@ void parcel::setRelaxationTimes
                     }
                     dp0 = dp;
                 }
-                
+
                 scalar vapourSurfaceEnthalpy = 0.0;
                 scalar vapourFarEnthalpy = 0.0;
-                
+
                 for(label k = 0; k < sDB.gasProperties().size(); k++)
                 {
                     vapourSurfaceEnthalpy += sDB.composition().Y()[k][celli]*sDB.gasProperties()[k].H(tBoilingSurface);
                     vapourFarEnthalpy += sDB.composition().Y()[k][celli]*sDB.gasProperties()[k].H(temperature);
                 }
-               
+
                 scalar kLiquid = fuels.properties()[i].K(pressure, 0.5*(tBoilingSurface+T()));
 
                 tauBoiling[i] = sDB.evaporation().boilingTime
diff --git a/src/lagrangian/dieselSpray/spray/spray.C b/src/lagrangian/dieselSpray/spray/spray.C
index 00b4503b3..64b9317cf 100644
--- a/src/lagrangian/dieselSpray/spray/spray.C
+++ b/src/lagrangian/dieselSpray/spray/spray.C
@@ -36,7 +36,7 @@ License
 #include "injectorModel.H"
 #include "wallModel.H"
 
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 #include "symmetryPolyPatch.H"
 #include "wedgePolyPatch.H"
@@ -52,23 +52,23 @@ defineTemplateTypeNameAndDebug(IOPtrList<injector>, 0);
 // Construct from components
 Foam::spray::spray
 (
-    const volPointInterpolation& vpi,
     const volVectorField& U,
     const volScalarField& rho,
     const volScalarField& p,
     const volScalarField& T,
-    const combustionMixture& composition,
-    const PtrList<specieProperties>& gasProperties,
+    const basicMultiComponentMixture& composition,
+    const PtrList<gasThermoPhysics>& gasProperties,
     const dictionary&,
-    const dictionary& environmentalProperties
+    const dimensionedVector& g,
+    bool readFields
 )
 :
     Cloud<parcel>(U.mesh(), false), // suppress className checking on positions
     runTime_(U.time()),
     time0_(runTime_.value()),
     mesh_(U.mesh()),
-    volPointInterpolation_(vpi),
     rndGen_(label(0)),
+    g_(g.value()),
 
     U_(U),
     rho_(rho),
@@ -180,7 +180,7 @@ Foam::spray::spray
             sprayProperties_,
             *this
         )
-    ),    
+    ),
 
     sprayIteration_(sprayProperties_.subDict("sprayIteration")),
     sprayIterate_(readLabel(sprayIteration_.lookup("sprayIterate"))),
@@ -188,7 +188,6 @@ Foam::spray::spray
     minimumParcelMass_(readScalar(sprayIteration_.lookup("minimumParcelMass"))),
 
     subCycles_(readLabel(sprayProperties_.lookup("subCycles"))),
-    g_(dimensionedVector(environmentalProperties.lookup("g")).value()),
 
     gasProperties_(gasProperties),
     composition_(composition),
@@ -248,11 +247,11 @@ Foam::spray::spray
     // check for the type of boundary condition
     forAll(bMesh, patchi)
     {
-        if (isType<symmetryPolyPatch>(bMesh[patchi]))
+        if (isA<symmetryPolyPatch>(bMesh[patchi]))
         {
             symPlaneExist = true;
         }
-        else if (isType<wedgePolyPatch>(bMesh[patchi]))
+        else if (isA<wedgePolyPatch>(bMesh[patchi]))
         {
             wedgeExist = true;
             patches[n++] = patchi;
@@ -268,12 +267,12 @@ Foam::spray::spray
         {
             FatalErrorIn
             (
-                "spray::spray(const pointMesh& pMesh, const volVectorField& U, "
+                "spray::spray(const volVectorField& U, "
                 "const volScalarField& rho, const volScalarField& p, "
                 "const volScalarField& T, const combustionMixture& composition,"
-                "const PtrList<specieProperties>& gaseousFuelProperties, "
+                "const PtrList<gasThermoPhsyics>& gaseousFuelProperties, "
                 "const dictionary& thermophysicalProperties, "
-                "const dictionary& environmentalProperties)"
+                "const dimensionedScalar& g)"
             )   << "spray::(...) only one wedgePolyPatch found. "
                    "Please check you BC-setup."
                 << abort(FatalError);
@@ -352,7 +351,10 @@ Foam::spray::spray
         }
     }
 
-    parcel::readFields(*this);
+    if (readFields)
+    {
+        parcel::readFields(*this);
+    }
 }
 
 
@@ -362,12 +364,4 @@ Foam::spray::~spray()
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void Foam::spray::writeFields() const
-{
-    parcel::writeFields(*this);
-}
-
-
 // ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/spray/spray.H b/src/lagrangian/dieselSpray/spray/spray.H
index 177e37cae..faa480918 100644
--- a/src/lagrangian/dieselSpray/spray/spray.H
+++ b/src/lagrangian/dieselSpray/spray/spray.H
@@ -36,13 +36,12 @@ Description
 #include "parcel.H"
 #include "injector.H"
 #include "IOPtrList.H"
-#include "volPointInterpolation.H"
 #include "interpolation.H"
 #include "liquid.H"
-#include "sprayThermoTypes.H"
 #include "autoPtr.H"
 #include "liquidMixture.H"
 #include "Random.H"
+#include "thermoPhysicsTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -59,7 +58,7 @@ class injectorModel;
 class heatTransferModel;
 class wallModel;
 
-class combustionMixture;
+class basicMultiComponentMixture;
 
 /*---------------------------------------------------------------------------*\
                         Class spray Declaration
@@ -76,11 +75,13 @@ class spray
             const Time& runTime_;
             scalar time0_;
             const fvMesh& mesh_;
-            const volPointInterpolation& volPointInterpolation_;
 
             //- Random number generator
             Random rndGen_;
 
+        //- Acceleration due to gravity
+        const vector& g_;
+
 
         // References to the physical fields
 
@@ -95,14 +96,14 @@ class spray
 
 
         //- Ambient Pressure
-            scalar ambientPressure_;
+        scalar ambientPressure_;
 
         //- Ambient Temperature
-            scalar ambientTemperature_;
+        scalar ambientTemperature_;
 
 
         //- The injectors
-            IOPtrList<injector> injectors_;
+        IOPtrList<injector> injectors_;
 
 
         // References to the spray sub-models
@@ -117,26 +118,23 @@ class spray
             autoPtr<dispersionModel> dispersionModel_;
             autoPtr<liquidMixture> fuels_;
             autoPtr<injectorModel> injectorModel_;
-    
+
         // Iterations to avoid errors due to too small parcels causing temperature out of range
 
-        dictionary sprayIteration_;
-        const label sprayIterate_;
-        const scalar sprayRelaxFactor_;
-        const scalar minimumParcelMass_;
+            dictionary sprayIteration_;
+            const label sprayIterate_;
+            const scalar sprayRelaxFactor_;
+            const scalar minimumParcelMass_;
+
 
         //- Minimum number of lagrangian subcycles
         const label subCycles_;
 
 
-        //- Acceleration due to gravity
-        vector g_;
-
-
         // Composition properties
 
-            const PtrList<specieProperties>& gasProperties_;
-            const combustionMixture& composition_;
+            const PtrList<gasThermoPhysics>& gasProperties_;
+            const basicMultiComponentMixture& composition_;
 
             List<label> liquidToGasIndex_;
             List<label> gasToLiquidIndex_;
@@ -196,15 +194,15 @@ public:
         //- Construct from components
         spray
         (
-            const volPointInterpolation& vpi,
             const volVectorField& U,
             const volScalarField& rho,
             const volScalarField& p,
             const volScalarField& T,
-            const combustionMixture& composition,
-            const PtrList<specieProperties>& gasProperties,
+            const basicMultiComponentMixture& composition,
+            const PtrList<gasThermoPhysics>& gasProperties,
             const dictionary& thermophysicalProperties,
-            const dictionary& environmentalProperties
+            const dimensionedVector& g,
+            bool readFields = true
         );
 
 
@@ -271,8 +269,8 @@ public:
             inline const vector& g() const;
 
             inline const liquidMixture& fuels() const;
-            inline const PtrList<specieProperties>& gasProperties() const;
-            inline const combustionMixture& composition() const;
+            inline const PtrList<gasThermoPhysics>& gasProperties() const;
+            inline const basicMultiComponentMixture& composition() const;
 
             inline const List<label>& liquidToGasIndex() const;
             inline const List<label>& gasToLiquidIndex() const;
@@ -355,12 +353,6 @@ public:
 
             //- Return Ambient Temperature
             void calculateAmbientTemperature();
-
-
-    // I/O
-
-            //- Write fields
-            void writeFields() const;
 };
 
 
diff --git a/src/lagrangian/dieselSpray/spray/sprayI.H b/src/lagrangian/dieselSpray/spray/sprayI.H
index d32fde2d0..46fd38f98 100644
--- a/src/lagrangian/dieselSpray/spray/sprayI.H
+++ b/src/lagrangian/dieselSpray/spray/sprayI.H
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -267,13 +265,13 @@ inline const liquidMixture& spray::fuels() const
 }
 
 
-inline const PtrList<specieProperties>& spray::gasProperties() const
+inline const PtrList<gasThermoPhysics>& spray::gasProperties() const
 {
     return gasProperties_;
 }
 
 
-inline const combustionMixture& spray::composition() const
+inline const basicMultiComponentMixture& spray::composition() const
 {
     return composition_;
 }
@@ -368,6 +366,7 @@ inline scalarField& spray::shs()
     return shs_;
 }
 
+
 inline const scalarField& spray::shs() const
 {
     return shs_;
diff --git a/src/lagrangian/dieselSpray/spray/sprayInject.C b/src/lagrangian/dieselSpray/spray/sprayInject.C
index 41cd35aaf..46a3265b7 100644
--- a/src/lagrangian/dieselSpray/spray/sprayInject.C
+++ b/src/lagrangian/dieselSpray/spray/sprayInject.C
@@ -63,14 +63,10 @@ void spray::inject()
         {
             Np = max(1, Np);
             scalar mp = mass/Np/nHoles;
-        
-            // constT is only larger than zero for the first 
+
+            // constT is only larger than zero for the first
             // part of the injection
-            scalar constT = max
-            (
-                0.0,
-                it->tsoi() - time0
-            );
+            scalar constT = max(0.0, it->tsoi() - time0);
 
             // deltaT is the duration of injection during this timestep
             scalar deltaT = min
@@ -103,7 +99,7 @@ void spray::inject()
                         axisOfWedgeNormal_,
                         rndGen_
                     );
-                
+
                     scalar diameter = injection().d0(i, toi);
                     vector direction = injection().direction(i, n, toi, diameter);
                     vector U = injection().velocity(i, toi)*direction;
@@ -119,11 +115,11 @@ void spray::inject()
                     label injectorCell = mesh_.findCell(injectionPosition);
                 
 #                   include "findInjectorCell.H"
-   
+
                     if (injectorCell >= 0)
                     {
                         scalar liquidCore = 1.0;
-                
+
                         // construct the parcel that is to be injected
 
                         parcel* pPtr = new parcel
@@ -148,19 +144,16 @@ void spray::inject()
                             fuels_->components()
                         );
 
-                        injectedLiquidKE_ += 0.5*pPtr->m()*pow(mag(U), 2.0);
-                    
+                        injectedLiquidKE_ += 0.5*pPtr->m()*magSqr(U);
+
                         scalar dt = time - toi;
 
                         pPtr->stepFraction() =
                             (runTime_.deltaT().value() - dt)
                            /runTime_.deltaT().value();
 
-                        bool keepParcel = pPtr->move
-                        (
-                            *this
-                        );
-  
+                        bool keepParcel = pPtr->move(*this);
+
                         if (keepParcel)
                         {
                             addParticle(pPtr);
diff --git a/src/lagrangian/dieselSpray/spray/sprayOps.C b/src/lagrangian/dieselSpray/spray/sprayOps.C
index 2e9d58452..3ceb28c2c 100644
--- a/src/lagrangian/dieselSpray/spray/sprayOps.C
+++ b/src/lagrangian/dieselSpray/spray/sprayOps.C
@@ -49,33 +49,13 @@ void spray::evolve()
         srhos_[i].setSize(rho_.size());
     }
 
-    UInterpolator_ = interpolation<vector>::New
-    (
-        interpolationSchemes_,
-        volPointInterpolation_,
-        U_
-    );
+    UInterpolator_ = interpolation<vector>::New(interpolationSchemes_, U_);
 
-    rhoInterpolator_ = interpolation<scalar>::New
-    (
-        interpolationSchemes_,
-        volPointInterpolation_,
-        rho_
-    );
+    rhoInterpolator_ = interpolation<scalar>::New(interpolationSchemes_, rho_);
 
-    pInterpolator_ = interpolation<scalar>::New
-    (
-        interpolationSchemes_,
-        volPointInterpolation_,
-        p_
-    );
+    pInterpolator_ = interpolation<scalar>::New(interpolationSchemes_, p_);
 
-    TInterpolator_ = interpolation<scalar>::New
-    (
-        interpolationSchemes_,
-        volPointInterpolation_,
-        T_
-    );
+    TInterpolator_ = interpolation<scalar>::New(interpolationSchemes_, T_);
 
     calculateAmbientPressure();
     calculateAmbientTemperature();
@@ -85,7 +65,7 @@ void spray::evolve()
     inject();
     atomizationLoop();
     breakupLoop();
-            
+
     UInterpolator_.clear();
     rhoInterpolator_.clear();
     pInterpolator_.clear();
@@ -109,12 +89,7 @@ void spray::move()
 
 void spray::breakupLoop()
 {
-    for
-    (
-        spray::iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllIter(spray, *this, elmnt)
     {
         // interpolate...
         vector velocity = UInterpolator().interpolate
@@ -148,12 +123,7 @@ void spray::breakupLoop()
 
 void spray::atomizationLoop()
 {
-    for
-    (
-        spray::iterator elmnt = begin();
-        elmnt != end();
-        ++elmnt
-    )
+    forAllIter(spray, *this, elmnt)
     {
         // interpolate...
         vector velocity = UInterpolator().interpolate
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
index c7679c7d5..9c32547b3 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/LISA/LISA.C
@@ -28,7 +28,7 @@ License
 
 #include "LISA.H"
 #include "addToRunTimeSelectionTable.H"
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 #include "RosinRammler.H"
 
@@ -84,7 +84,7 @@ void LISA::atomizeParcel
 ) const
 {
 
-   
+
     const PtrList<volScalarField>& Y = spray_.composition().Y();
 
     label Ns = Y.size();
@@ -98,7 +98,7 @@ void LISA::atomizeParcel
     {
         Winv += Y[i][cellI]/spray_.gasProperties()[i].W();
     }
-    
+
     scalar R = specie::RR*Winv;
 
     // ideal gas law to evaluate density
@@ -113,31 +113,31 @@ void LISA::atomizeParcel
     scalar WeberNumber = p.We(vel, rhoAverage, sigma);
 
     scalar tau = 0.0;
-    scalar dL = 0.0;   
+    scalar dL = 0.0;
     scalar k = 0.0;
     scalar muFuel = fuels.mu(pressure, p.T(), p.X());
     scalar rhoFuel = fuels.rho(1.0e+5, p.T(), p.X());
     scalar nuFuel = muFuel/rhoFuel;
 
     vector uDir = p.U()/mag(p.U());
-    
+
     scalar uGas = mag(vel & uDir);
     vector Ug = uGas*uDir;
 
-/*  
+/*
     TL
     It might be the relative velocity between Liquid and Gas, but I use the
-    absolute velocity of the parcel as suggested by the authors    
+    absolute velocity of the parcel as suggested by the authors
 */
-    
+
 //    scalar U = mag(p.Urel(vel));
     scalar U = mag(p.U());
-    
+
     p.ct() += deltaT;
 
     scalar Q = rhoAverage/rhoFuel;
 
-    const injectorType& it = 
+    const injectorType& it =
         spray_.injectors()[label(p.injector())].properties();
 
     if (it.nHoles() > 1)
@@ -150,38 +150,38 @@ void LISA::atomizeParcel
     scalar pWalk = mag(p.position() - itPosition);
 
 //  Updating liquid sheet tickness... that is the droplet diameter
- 
+
     const vector direction = it.direction(0, spray_.runTime().value());
-    
+
     scalar h = (p.position() - itPosition) & direction;
 
     scalar d = sqrt(sqr(pWalk)-sqr(h));
-    
+
     scalar time = pWalk/mag(p.U());
-       
+
     scalar elapsedTime = spray_.runTime().value();
-    
+
     scalar massFlow = it.massFlowRate(max(0.0,elapsedTime-time));
-    
-    scalar hSheet = massFlow/(mathematicalConstant::pi*d*rhoFuel*mag(p.U()));    
-    
+
+    scalar hSheet = massFlow/(mathematicalConstant::pi*d*rhoFuel*mag(p.U()));
+
     p.d() = min(hSheet,p.d());
 
     if(WeberNumber > 27.0/16.0)
     {
-               
+
         scalar kPos = 0.0;
         scalar kNeg = Q*pow(U, 2.0)*rhoFuel/sigma;
-               
+
         scalar derivativePos = sqrt
         (
             Q*pow(U,2.0)
-        );   
-        
-        scalar derivativeNeg =    
+        );
+
+        scalar derivativeNeg =
         (
-            8.0*pow(nuFuel, 2.0)*pow(kNeg, 3.0) 
-            + Q*pow(U, 2.0)*kNeg 
+            8.0*pow(nuFuel, 2.0)*pow(kNeg, 3.0)
+            + Q*pow(U, 2.0)*kNeg
             - 3.0*sigma/2.0/rhoFuel*pow(kNeg, 2.0)
         )
         /
@@ -189,23 +189,23 @@ void LISA::atomizeParcel
         (
             4.0*pow(nuFuel, 2.0)*pow(kNeg, 4.0)
             + Q*pow(U, 2.0)*pow(kNeg, 2.0)
-            - sigma*pow(kNeg, 3.0)/rhoFuel 
+            - sigma*pow(kNeg, 3.0)/rhoFuel
         )
         -
         4.0*nuFuel*kNeg;
 
-        scalar kOld = 0.0;        
+        scalar kOld = 0.0;
+
 
-       
         for(label i=0; i<40; i++)
         {
 
             k = kPos - (derivativePos/((derivativeNeg-derivativePos)/(kNeg-kPos)));
-           
-            scalar derivativek = 
+
+            scalar derivativek =
             (
-                8.0*pow(nuFuel, 2.0)*pow(k, 3.0) 
-                + Q*pow(U, 2.0)*k 
+                8.0*pow(nuFuel, 2.0)*pow(k, 3.0)
+                + Q*pow(U, 2.0)*k
                 - 3.0*sigma/2.0/rhoFuel*pow(k, 2.0)
             )
             /
@@ -213,10 +213,10 @@ void LISA::atomizeParcel
             (
                 4.0*pow(nuFuel, 2.0)*pow(k, 4.0)
                 + Q*pow(U, 2.0)*pow(k, 2.0)
-                - sigma*pow(k, 3.0)/rhoFuel 
+                - sigma*pow(k, 3.0)/rhoFuel
             )
             -
-            4.0*nuFuel*k;            
+            4.0*nuFuel*k;
 
             if(derivativek > 0)
             {
@@ -228,17 +228,17 @@ void LISA::atomizeParcel
                 derivativeNeg = derivativek;
                 kNeg = k;
             }
-            
+
             if(mag(k-kOld)/k < 1e-4)
             {
                 break;
             }
-            
+
             kOld = k;
-                       
+
         }
-        
-        scalar omegaS = 
+
+        scalar omegaS =
         - 2.0 * nuFuel * pow(k, 2.0)
         + sqrt
         (
@@ -246,22 +246,22 @@ void LISA::atomizeParcel
             +   Q*pow(U, 2.0)*pow(k, 2.0)
             -   sigma*pow(k, 3.0)/rhoFuel
         );
-        
-        tau = cTau_/omegaS;        
-                       
+
+        tau = cTau_/omegaS;
+
         dL = sqrt(8.0*p.d()/k);
 
     }
     else
     {
-                
-        k = 
+
+        k =
         rhoAverage*pow(U, 2.0)
         /
         2.0*sigma;
-        
+
         scalar J = pWalk*p.d()/2.0;
-        
+
         tau = pow(3.0*cTau_,2.0/3.0)*cbrt(J*sigma/(sqr(Q)*pow(U,4.0)*rhoFuel));
 
         dL = sqrt(4.0*p.d()/k);
@@ -269,78 +269,78 @@ void LISA::atomizeParcel
 
 
 
-    scalar kL = 
+    scalar kL =
         1.0
         /
         (
-            dL * 
+            dL *
             pow(0.5 + 1.5 * muFuel/pow((rhoFuel*sigma*dL), 0.5), 0.5)
         );
 
-    scalar dD = cbrt(3.0*mathematicalConstant::pi*pow(dL, 2.0)/kL);     
-    
+    scalar dD = cbrt(3.0*mathematicalConstant::pi*pow(dL, 2.0)/kL);
+
     scalar lisaExp = 0.27;
     scalar ambientPressure = 1.0e+5;
-    
+
     scalar pRatio = spray_.ambientPressure()/ambientPressure;
-    
+
     dD = dD*pow(pRatio,lisaExp);
 
 //  modifications to take account of the flash boiling on primary breakUp
 
     scalar pExp = 0.135;
-       
+
     scalar chi = 0.0;
-    
-    label Nf = fuels.components().size();        
+
+    label Nf = fuels.components().size();
 
     scalar Td = p.T();
-                
+
     for(label i = 0; i < Nf ; i++)
     {
-    
+
         if(fuels.properties()[i].pv(spray_.ambientPressure(), Td) >= 0.999*spray_.ambientPressure())
         {
 
 //          The fuel is boiling.....
-//          Calculation of the boiling temperature            
-            
+//          Calculation of the boiling temperature
+
             scalar tBoilingSurface = Td;
-            
+
             label Niter = 200;
-            
+
             for(label k=0; k< Niter ; k++)
             {
                 scalar pBoil = fuels.properties()[i].pv(pressure, tBoilingSurface);
-            
+
                 if(pBoil > pressure)
                 {
-                    tBoilingSurface = tBoilingSurface - (Td-temperature)/Niter;   
+                    tBoilingSurface = tBoilingSurface - (Td-temperature)/Niter;
                 }
                 else
                 {
                     break;
                 }
             }
-            
+
             scalar hl = fuels.properties()[i].hl(spray_.ambientPressure(), tBoilingSurface);
             scalar iTp = fuels.properties()[i].h(spray_.ambientPressure(), Td) - spray_.ambientPressure()/fuels.properties()[i].rho(spray_.ambientPressure(), Td);
             scalar iTb = fuels.properties()[i].h(spray_.ambientPressure(), tBoilingSurface) - spray_.ambientPressure()/fuels.properties()[i].rho(spray_.ambientPressure(), tBoilingSurface);
-            
+
             chi += p.X()[i]*(iTp-iTb)/hl;
-                   
+
         }
-    }    
-    
+    }
+
     //  bounding chi
-    
+
     chi = max(chi, 0.0);
     chi = min(chi, 1.0);
-    
+
     //  modifing dD to take account of flash boiling
-    
+
     dD = dD*(1.0 - chi*pow(pRatio, -pExp));
-    
+
     scalar lBU = Cl_ * mag(p.U())*tau;
 
     if(pWalk > lBU)
@@ -349,7 +349,7 @@ void LISA::atomizeParcel
         p.liquidCore() = 0.0;
 
 //      calculate the new diameter with a Rosin Rammler distribution
-     
+
         scalar minValue = min(p.d(),dD/10.0);
 
         scalar maxValue = dD;
@@ -357,30 +357,30 @@ void LISA::atomizeParcel
         if(maxValue - minValue < SMALL)
         {
             minValue = p.d()/10.0;
-        }     
-     
+        }
+
         scalar range = maxValue - minValue;
-      
+
         scalar y = 0;
         scalar x = 0;
 
         bool success = false;
-                              
+
         while(!success)
         {
-        
+
             x = minValue + range*rndGen_.scalar01();
             y = rndGen_.scalar01();
 
             scalar p = 0.0;
-        
+
             scalar nExp = 1;
-                                                                                          
+
             scalar xx = pow(x/dD, nExp);
 
             p = xx*exp(-xx);
 
-            if (y<p) 
+            if (y<p)
             {
                 success = true;
             }
@@ -388,13 +388,13 @@ void LISA::atomizeParcel
         }
 
 //  New droplet diameter
-    
+
         p.d() = x;
         p.ct() = 0.0;
-                            
-    }           
-        
-    
+
+    }
+
+
 }
 
 
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
index adffd2e2f..efc01f64f 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/blobsSheetAtomization/blobsSheetAtomization.C
@@ -28,7 +28,7 @@ License
 
 #include "blobsSheetAtomization.H"
 #include "addToRunTimeSelectionTable.H"
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 #include "RosinRammler.H"
 
diff --git a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
index e9442a30d..c87c8b6bf 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/atomizationModel/noAtomization/noAtomization.C
@@ -28,7 +28,7 @@ License
 
 #include "noAtomization.H"
 #include "addToRunTimeSelectionTable.H"
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
index d0c89ffb1..2bc706f60 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzDiwakar/reitzDiwakar.C
@@ -28,7 +28,7 @@ License
 
 #include "reitzDiwakar.H"
 #include "addToRunTimeSelectionTable.H"
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
index 46a6fda26..0274a13bf 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/breakupModel/reitzKHRT/reitzKHRT.C
@@ -115,7 +115,7 @@ void reitzKHRT::breakupParcel
         (1 + ohnesorge)*(1 + 1.4*pow(taylor, 0.6))
     )*sqrt(sigma/(rhoLiquid*pow(r, 3)) );
 
-    // ... and the corresponding KH wave-length.
+    // corresponding KH wave-length.
     scalar lambdaKH =
     9.02*r*
     (
@@ -132,7 +132,7 @@ void reitzKHRT::breakupParcel
         0.6
     );
 
-    // the characteristic Kelvin-Helmholtz breakup time
+    // characteristic Kelvin-Helmholtz breakup time
     scalar tauKH = 3.726*b1_*r/(omegaKH*lambdaKH);
 
     // stable KH diameter
@@ -140,7 +140,6 @@ void reitzKHRT::breakupParcel
 
     // the frequency of the fastest growing RT wavelength.
     scalar helpVariable = mag(gt*(rhoLiquid - rhoGas));
-
     scalar omegaRT = sqrt
     (
         2.0*pow(helpVariable, 1.5)
@@ -148,12 +147,9 @@ void reitzKHRT::breakupParcel
     );
 
     // RT wave number
-    scalar KRT = sqrt
-    (
-        helpVariable/(3.0*sigma + VSMALL)
-    );
+    scalar KRT = sqrt(helpVariable/(3.0*sigma + VSMALL));
 
-    // the wavelength of the fastest growing Raleigh-Taylor frequency
+    // Wavelength of the fastest growing Raleigh-Taylor frequency
     scalar lambdaRT = 2.0*mathematicalConstant::pi*cRT_/(KRT + VSMALL);
 
     // if lambdaRT < diameter, then RT waves are growing on the surface
@@ -163,7 +159,7 @@ void reitzKHRT::breakupParcel
         p.ct() += deltaT;
     }
 
-    // the characteristic RT breakup time
+    // characteristic RT breakup time
     scalar tauRT = cTau_/(omegaRT + VSMALL);
 
     // check if we have RT breakup
@@ -178,7 +174,7 @@ void reitzKHRT::breakupParcel
     // otherwise check for KH breakup
     else if (dc < p.d())
     {
-        // no breakup below weber = 12
+        // no breakup below Weber = 12
         if (weGas > weberLimit_)
         {
 
@@ -206,7 +202,7 @@ void reitzKHRT::breakupParcel
             )
             {
                 // set the initial ms value to -GREAT. This prevents
-                // new droplets from being formed from the childDroplet
+                // new droplets from being formed from the child droplet
                 // from the KH instability
 
                 // mass of stripped child parcel
diff --git a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
index 89bc1ea5e..8deb4dd4c 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/injectorModel/definedHollowCone/definedHollowCone.C
@@ -90,7 +90,7 @@ definedHollowConeInjector::definedHollowConeInjector
     }
  
     // check number of entries in innerConeAngle list
-    if (innerConeAngle_.size() < 1)
+    if (innerConeAngle_.empty())
     {
         FatalError << "definedHollowConeInjector::definedHollowConeInjector"
              << "(const dictionary& dict, spray& sm)\n"
@@ -99,7 +99,7 @@ definedHollowConeInjector::definedHollowConeInjector
     }
 
     // check number of entries in outerConeAngle list
-    if (outerConeAngle_.size() < 1)
+    if (outerConeAngle_.empty())
     {
         FatalError << "definedHollowConeInjector::definedHollowConeInjector"
              << "(const dictionary& dict, spray& sm)\n"
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
index ca2790147..d30544374 100644
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
+++ b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C
@@ -82,7 +82,7 @@ bool reflectParcel::wallTreatment
 
     const polyMesh& mesh = spray_.mesh();
 
-    if (isType<wallPolyPatch>(mesh_.boundaryMesh()[patchi]))
+    if (isA<wallPolyPatch>(mesh_.boundaryMesh()[patchi]))
     {
         // wallNormal defined to point outwards of domain
         vector Sf = mesh_.Sf().boundaryField()[patchi][facei];
diff --git a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C2 b/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C2
deleted file mode 100644
index 419ac5423..000000000
--- a/src/lagrangian/dieselSpray/spraySubModels/wallModel/reflectParcel/reflectParcel.C2
+++ /dev/null
@@ -1,211 +0,0 @@
-// The FOAM Project // File: reflectParcel.C
-/*
--------------------------------------------------------------------------------
- =========         | Class Implementation
- \\      /         |
-  \\    /          | Name:   reflectParcel
-   \\  /           | Family: wallModel
-    \\/            |
-    F ield         | FOAM version: 2.3
-    O peration     |
-    A and          | Copyright held by original author
-    M anipulation  |          All Rights Reserved.
--------------------------------------------------------------------------------
-DESCRIPTION
-
-AUTHOR
-    Henry G Weller.
-
--------------------------------------------------------------------------------
-*/
-
-#include "reflectParcel.H"
-#include "addToRunTimeSelectionTable.H"
-#include "wallPolyPatch.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(reflectParcel, 0);
-
-addToRunTimeSelectionTable
-(
-    wallModel,
-    reflectParcel,
-    dictionary
-);
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-// Construct from components
-reflectParcel::reflectParcel
-(
-    const dictionary& dict,
-    const fvMesh& mesh,
-    spray& sm
-)
-:
-    wallModel(dict, mesh, sm),
-    coeffsDict_(dict.subDict(typeName + "Coeffs")),
-    elasticity_(readScalar(coeffsDict_.lookup("elasticity")))
-{}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-reflectParcel::~reflectParcel()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-// Return 'keepParcel'
-bool reflectParcel::wallTreatment
-(
-    parcel& p
-) const
-{
-    label patchi = p.patch();
-    label facei = p.patchFace(patchi);
-
-    const polyMesh& mesh = spray_.mesh();
-
-    if (typeid(mesh_.boundaryMesh()[patchi]) == typeid(wallPolyPatch))
-    {
-        // wallNormal defined to point outwards of domain
-        vector Sf = mesh_.Sf().boundaryField()[patchi][facei];
-        Sf /= mag(Sf);
-
-        // adjust velocity when wall is moving
-        if (!mesh.moving())
-        {
-            scalar Un = p.U() & Sf;
-            
-            if (Un > 0)
-            {
-                p.U() -= (1.0 + elasticity_)*Un*Sf;
-            }
-
-        }
-        else
-        {
-            label facep = p.face();
-
-            scalar dt = spray_.runTime().deltaT().value();
-            scalar fraction = p.t0()/dt;
-            const vectorField& oldPoints = mesh.oldPoints();
-            const vector& Cf1 = mesh.faceCentres()[facep];
-
-            vector Cf0 = mesh.faces()[facep].centre(oldPoints);
-            vector Cf = Cf0 + fraction*(Cf1 - Cf0);
-            vector Sf0 = mesh.faces()[facep].normal(oldPoints);
-            Sf0 /= mag(Sf0);
-
-            scalar magSfDiff = mag(Sf - Sf0);
-
-            if (magSfDiff > SMALL)
-            {
-                bool pureRotation = false;
-
-                if (pureRotation)
-                {
-                    // rotation
-                    
-                    // find center of rotation
-                    vector omega = Sf0 ^ Sf;
-                    scalar magOmega = mag(omega);
-                    omega /= magOmega+SMALL;
-                    vector n0 = omega ^ Sf0;
-                    scalar lam = ((Cf1 - Cf0) & Sf)/(n0 & Sf);
-                    vector r0 = Cf0 + lam*n0;
-                    
-                    scalar phiVel = ::asin(magOmega)/dt;
-                    
-                    vector pos = p.position() - r0;
-                    vector v = phiVel*(omega ^ pos);
-
-                    vector Sfp = Sf0 + fraction*(Sf - Sf0);
-                    //vector Sfp = Sf;
-
-                    vector Ur = p.U() - v;
-                    scalar Urn = Ur & Sfp;
-                    /*
-                    scalar dd = (p.position() - r0) & Sfp;
-                    Info << "Urn = " << Urn
-                        << ", dd = " << dd
-                        << ", pos = " << p.position()
-                        << ", Sfp = " << Sfp
-                        << ", omega = " << omega
-                        << ", r0 = " << r0
-                        << endl;
-                        */
-                    if (Urn > 0.0)
-                    {
-                        p.U() -= (1.0 + elasticity_)*Urn*Sfp;
-                    }
-                }
-                else
-                {
-                    vector Sfp = Sf0 + fraction*(Sf - Sf0);
-                    //vector Sfp = Sf;
-                    vector omega = Sf0 ^ Sf;
-                    scalar magOmega = mag(omega);
-                    omega /= magOmega+SMALL;
-                    
-                    scalar phiVel = ::asin(magOmega)/dt;
-                    
-                    scalar dist = (p.position() - Cf) & Sfp;
-                    vector pos = p.position() - dist*Sfp;
-                    vector vrot = phiVel*(omega ^ (pos - Cf));
-                    vector vtrans = (Cf1 - Cf0)/dt;
-                    vector v = vtrans + vrot;
-
-                    scalar Un = ((p.U() - v) & Sfp);
-                    
-                    if (Un > 0.0)
-                    {
-                        p.U() -= (1.0 + elasticity_)*Un*Sfp;
-                    }
-                }
-            }
-            else
-            {
-                // translation
-
-                vector v = (Cf1 - Cf0)/dt;
-                vector Ur = p.U() - v;
-                scalar Urn = Ur & Sf;
-
-                if (Urn > 0.0)
-                {
-                    Ur -= (1.0 + elasticity_)*Urn*Sf;
-                    p.U() = Ur + v;
-                }
-
-
-            }
-        }
-
-    }
-    else
-    {
-        FatalError
-            << "bool reflectParcel::wallTreatment(parcel& parcel) const "
-                << " parcel has hit a boundary " 
-                << mesh_.boundary()[patchi].type()
-                << " which not yet has been implemented."
-            << abort(FatalError);
-    }
-    return true;
-}
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/Make/files b/src/lagrangian/dsmc/Make/files
new file mode 100644
index 000000000..983de123a
--- /dev/null
+++ b/src/lagrangian/dsmc/Make/files
@@ -0,0 +1,13 @@
+/* Parcels */
+parcels/derived/dsmcParcel/dsmcParcel.C
+
+/* Cloud base classes */
+clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
+
+/* submodels */
+parcels/derived/dsmcParcel/defineDsmcParcel.C
+parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
+parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
+parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
+
+LIB = $(FOAM_LIBBIN)/libdsmc
diff --git a/applications/test/findCell-octree/Make/options b/src/lagrangian/dsmc/Make/options
similarity index 62%
rename from applications/test/findCell-octree/Make/options
rename to src/lagrangian/dsmc/Make/options
index d27c95d03..55865dfab 100644
--- a/applications/test/findCell-octree/Make/options
+++ b/src/lagrangian/dsmc/Make/options
@@ -1,7 +1,9 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
+    -llagrangian \
     -lfiniteVolume \
     -lmeshTools
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
new file mode 100644
index 000000000..df832a08a
--- /dev/null
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.C
@@ -0,0 +1,1197 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "DsmcCloud.H"
+#include "BinaryCollisionModel.H"
+#include "WallInteractionModel.H"
+#include "InflowBoundaryModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::scalar Foam::DsmcCloud<ParcelType>::kb = 1.380650277e-23;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class ParcelType>
+void Foam::DsmcCloud<ParcelType>::buildConstProps()
+{
+    Info<< nl << "Constructing constant properties for" << endl;
+    constProps_.setSize(typeIdList_.size());
+
+    dictionary moleculeProperties
+    (
+        particleProperties_.subDict("moleculeProperties")
+    );
+
+    forAll(typeIdList_, i)
+    {
+        const word& id(typeIdList_[i]);
+
+        Info<< "    " << id << endl;
+
+        const dictionary& molDict(moleculeProperties.subDict(id));
+
+        constProps_[i] =
+        typename ParcelType::constantProperties::constantProperties(molDict);
+    }
+}
+
+
+template<class ParcelType>
+void Foam::DsmcCloud<ParcelType>::buildCellOccupancy()
+{
+    forAll(cellOccupancy_, cO)
+    {
+        cellOccupancy_[cO].clear();
+    }
+
+    forAllIter(typename DsmcCloud<ParcelType>, *this, iter)
+    {
+        cellOccupancy_[iter().cell()].append(&iter());
+    }
+}
+
+
+template<class ParcelType>
+void Foam::DsmcCloud<ParcelType>::initialise
+(
+    const IOdictionary& dsmcInitialiseDict
+)
+{
+    Info<< nl << "Initialising particles" << endl;
+
+    const scalar temperature
+    (
+        readScalar(dsmcInitialiseDict.lookup("temperature"))
+    );
+
+    const vector velocity(dsmcInitialiseDict.lookup("velocity"));
+
+    const dictionary& numberDensitiesDict
+    (
+        dsmcInitialiseDict.subDict("numberDensities")
+    );
+
+    List<word> molecules(numberDensitiesDict.toc());
+
+    Field<scalar> numberDensities(molecules.size());
+
+    forAll(molecules, i)
+    {
+        numberDensities[i] = readScalar
+        (
+            numberDensitiesDict.lookup(molecules[i])
+        );
+    }
+
+    numberDensities /= nParticle_;
+
+    forAll(mesh_.cells(), cell)
+    {
+        const vector& cC = mesh_.cellCentres()[cell];
+        const labelList& cellFaces = mesh_.cells()[cell];
+        const scalar cV = mesh_.cellVolumes()[cell];
+
+        label nTets = 0;
+
+        // Each face is split into nEdges (or nVertices) - 2 tets.
+        forAll(cellFaces, face)
+        {
+            nTets += mesh_.faces()[cellFaces[face]].size() - 2;
+        }
+
+        // Calculate the cumulative tet volumes circulating around the cell and
+        // record the vertex labels of each.
+        scalarList cTetVFracs(nTets, 0.0);
+
+        List<labelList> tetPtIs(nTets, labelList(3,-1));
+
+        // Keep track of which tet this is.
+        label tet = 0;
+
+        forAll(cellFaces, face)
+        {
+            const labelList& facePoints = mesh_.faces()[cellFaces[face]];
+
+            label pointI = 1;
+            while ((pointI + 1) < facePoints.size())
+            {
+
+                const vector& pA = mesh_.points()[facePoints[0]];
+                const vector& pB = mesh_.points()[facePoints[pointI]];
+                const vector& pC = mesh_.points()[facePoints[pointI + 1]];
+
+                cTetVFracs[tet] =
+                    mag(((pA - cC) ^ (pB - cC)) & (pC - cC))/(cV*6.0)
+                  + cTetVFracs[max((tet - 1),0)];
+
+                tetPtIs[tet][0] = facePoints[0];
+                tetPtIs[tet][1] = facePoints[pointI];
+                tetPtIs[tet][2] = facePoints[pointI + 1];
+
+                pointI++;
+                tet++;
+            }
+        }
+
+        // Force the last volume fraction value to 1.0 to avoid any
+        // rounding/non-flat face errors giving a value < 1.0
+        cTetVFracs[nTets - 1] = 1.0;
+
+        forAll(molecules, i)
+        {
+            const word& moleculeName(molecules[i]);
+
+            label typeId(findIndex(typeIdList_, moleculeName));
+
+            if (typeId == -1)
+            {
+                FatalErrorIn("Foam::DsmcCloud<ParcelType>::initialise")
+                << "typeId " << moleculeName << "not defined." << nl
+                    << abort(FatalError);
+            }
+
+            const typename ParcelType::constantProperties& cP =
+                constProps(typeId);
+
+            scalar numberDensity = numberDensities[i];
+
+            // Calculate the number of particles required
+            scalar particlesRequired = numberDensity*mesh_.cellVolumes()[cell];
+
+            // Only integer numbers of particles can be inserted
+            label nParticlesToInsert = label(particlesRequired);
+
+            // Add another particle with a probability proportional to the
+            // remainder of taking the integer part of particlesRequired
+            if ((particlesRequired - nParticlesToInsert) > rndGen_.scalar01())
+            {
+                nParticlesToInsert++;
+            }
+
+            for (label pI = 0; pI < nParticlesToInsert; pI++)
+            {
+                // Choose a random point in a generic tetrahedron
+
+                scalar s = rndGen_.scalar01();
+                scalar t = rndGen_.scalar01();
+                scalar u = rndGen_.scalar01();
+
+                if (s + t > 1.0)
+                {
+                    s = 1.0 - s;
+                    t = 1.0 - t;
+                }
+
+                if (t + u > 1.0)
+                {
+                    scalar tmp = u;
+                    u = 1.0 - s - t;
+                    t = 1.0 - tmp;
+                }
+                else if (s + t + u > 1.0)
+                {
+                    scalar tmp = u;
+                    u = s + t + u - 1.0;
+                    s = 1.0 - t - tmp;
+                }
+
+                // Choose a tetrahedron to insert in, based on their relative
+                // volumes
+                scalar tetSelection = rndGen_.scalar01();
+
+                // Selected tetrahedron
+                label sTet = -1;
+
+                forAll(cTetVFracs, tet)
+                {
+                    sTet = tet;
+
+                    if (cTetVFracs[tet] >= tetSelection)
+                    {
+                        break;
+                    }
+                }
+
+                vector p =
+                    (1 - s - t - u)*cC
+                  + s*mesh_.points()[tetPtIs[sTet][0]]
+                  + t*mesh_.points()[tetPtIs[sTet][1]]
+                  + u*mesh_.points()[tetPtIs[sTet][2]];
+
+                vector U = equipartitionLinearVelocity
+                (
+                    temperature,
+                    cP.mass()
+                );
+
+                scalar Ei = equipartitionInternalEnergy
+                (
+                    temperature,
+                    cP.internalDegreesOfFreedom()
+                );
+
+                U += velocity;
+
+                addNewParcel
+                (
+                    p,
+                    U,
+                    Ei,
+                    cell,
+                    typeId
+                );
+            }
+        }
+    }
+
+    // Initialise the sigmaTcRMax_ field to the product of the cross section of
+    // the most abundant species and the most probable thermal speed (Bird,
+    // p222-223)
+
+    label mostAbundantType(findMax(numberDensities));
+
+    const typename ParcelType::constantProperties& cP = constProps
+    (
+        mostAbundantType
+    );
+
+    sigmaTcRMax_.internalField() = cP.sigmaT()*maxwellianMostProbableSpeed
+    (
+        temperature,
+        cP.mass()
+    );
+
+    sigmaTcRMax_.correctBoundaryConditions();
+}
+
+
+template<class ParcelType>
+void Foam::DsmcCloud<ParcelType>::collisions()
+{
+    buildCellOccupancy();
+
+    // Temporary storage for subCells
+    List<DynamicList<label> > subCells(8);
+
+    scalar deltaT = mesh().time().deltaTValue();
+
+    label collisionCandidates = 0;
+
+    label collisions = 0;
+
+    forAll(cellOccupancy_, celli)
+    {
+        const DynamicList<ParcelType*>& cellParcels(cellOccupancy_[celli]);
+
+        label nC(cellParcels.size());
+
+        if (nC > 1)
+        {
+
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+            // Assign particles to one of 8 Cartesian subCells
+
+            // Clear temporary lists
+            forAll(subCells, i)
+            {
+                subCells[i].clear();
+            }
+
+            // Inverse addressing specifying which subCell a parcel is in
+            List<label> whichSubCell(cellParcels.size());
+
+            const point& cC = mesh_.cellCentres()[celli];
+
+            forAll(cellParcels, i)
+            {
+                ParcelType* p = cellParcels[i];
+
+                vector relPos = p->position() - cC;
+
+                label subCell =
+                    pos(relPos.x()) + 2*pos(relPos.y()) + 4*pos(relPos.z());
+
+                subCells[subCell].append(i);
+
+                whichSubCell[i] = subCell;
+            }
+
+            // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+            scalar sigmaTcRMax = sigmaTcRMax_[celli];
+
+            scalar selectedPairs =
+                collisionSelectionRemainder_[celli]
+              + 0.5*nC*(nC - 1)*nParticle_*sigmaTcRMax*deltaT
+               /mesh_.cellVolumes()[celli];
+
+            label nCandidates(selectedPairs);
+
+            collisionSelectionRemainder_[celli] = selectedPairs - nCandidates;
+
+            collisionCandidates += nCandidates;
+
+            for (label c = 0; c < nCandidates; c++)
+            {
+                // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // subCell candidate selection procedure
+
+                // Select the first collision candidate
+                label candidateP = rndGen_.integer(0, nC - 1);
+
+                // Declare the second collision candidate
+                label candidateQ = -1;
+
+                List<label> subCellPs = subCells[whichSubCell[candidateP]];
+
+                label nSC = subCellPs.size();
+
+                if (nSC > 1)
+                {
+                    // If there are two or more particle in a subCell, choose
+                    // another from the same cell.  If the same candidate is
+                    // chosen, choose again.
+
+                    do
+                    {
+                        candidateQ = subCellPs[rndGen_.integer(0, nSC - 1)];
+
+                    } while(candidateP == candidateQ);
+                }
+                else
+                {
+                    // Select a possible second collision candidate from the
+                    // whole cell.  If the same candidate is chosen, choose
+                    // again.
+
+                    do
+                    {
+                        candidateQ = rndGen_.integer(0, nC - 1);
+
+                    } while(candidateP == candidateQ);
+                }
+
+                // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // uniform candidate selection procedure
+
+                // // Select the first collision candidate
+                // label candidateP = rndGen_.integer(0, nC-1);
+
+                // // Select a possible second collision candidate
+                // label candidateQ = rndGen_.integer(0, nC-1);
+
+                // // If the same candidate is chosen, choose again
+                // while(candidateP == candidateQ)
+                // {
+                //     candidateQ = rndGen_.integer(0, nC-1);
+                // }
+
+                // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                ParcelType* parcelP = cellParcels[candidateP];
+                ParcelType* parcelQ = cellParcels[candidateQ];
+
+                label typeIdP = parcelP->typeId();
+                label typeIdQ = parcelQ->typeId();
+
+                scalar sigmaTcR = binaryCollision().sigmaTcR
+                (
+                    typeIdP,
+                    typeIdQ,
+                    parcelP->U(),
+                    parcelQ->U()
+                );
+
+                // Update the maximum value of sigmaTcR stored, but use the
+                // initial value in the acceptance-rejection criteria because
+                // the number of collision candidates selected was based on this
+
+                if (sigmaTcR > sigmaTcRMax_[celli])
+                {
+                    sigmaTcRMax_[celli] = sigmaTcR;
+                }
+
+                if ((sigmaTcR/sigmaTcRMax) > rndGen_.scalar01())
+                {
+                    binaryCollision().collide
+                    (
+                        typeIdP,
+                        typeIdQ,
+                        parcelP->U(),
+                        parcelQ->U(),
+                        parcelP->Ei(),
+                        parcelQ->Ei()
+                    );
+
+                    collisions++;
+                }
+            }
+        }
+    }
+
+    reduce(collisions, sumOp<label>());
+
+    reduce(collisionCandidates, sumOp<label>());
+
+    if (collisionCandidates)
+    {
+        Info<< "    Collisions                      = "
+            << collisions << nl
+            << "    Acceptance rate                 = "
+            << scalar(collisions)/scalar(collisionCandidates) << nl
+            << endl;
+    }
+    else
+    {
+        Info<< "    No collisions" << endl;
+    }
+}
+
+
+template<class ParcelType>
+void Foam::DsmcCloud<ParcelType>::resetFields()
+{
+    q_ = dimensionedScalar("zero",  dimensionSet(1, 0, -3, 0, 0), 0.0);
+
+    fD_ = dimensionedVector
+    (
+        "zero",
+        dimensionSet(1, -1, -2, 0, 0),
+        vector::zero
+    );
+
+    rhoN_ = dimensionedScalar("zero",  dimensionSet(0, -3, 0, 0, 0), VSMALL);
+
+    rhoM_ =  dimensionedScalar("zero",  dimensionSet(1, -3, 0, 0, 0), VSMALL);
+
+    dsmcRhoN_ = dimensionedScalar("zero",  dimensionSet(0, -3, 0, 0, 0), 0.0);
+
+    linearKE_ = dimensionedScalar("zero",  dimensionSet(1, -1, -2, 0, 0), 0.0);
+
+    internalE_ = dimensionedScalar("zero",  dimensionSet(1, -1, -2, 0, 0), 0.0);
+
+    iDof_ = dimensionedScalar("zero",  dimensionSet(0, -3, 0, 0, 0), VSMALL);
+
+    momentum_ = dimensionedVector
+    (
+        "zero",
+        dimensionSet(1, -2, -1, 0, 0),
+        vector::zero
+    );
+}
+
+
+template<class ParcelType>
+void Foam::DsmcCloud<ParcelType>::calculateFields()
+{
+    scalarField& rhoN = rhoN_.internalField();
+
+    scalarField& rhoM = rhoM_.internalField();
+
+    scalarField& dsmcRhoN = dsmcRhoN_.internalField();
+
+    scalarField& linearKE = linearKE_.internalField();
+
+    scalarField& internalE = internalE_.internalField();
+
+    scalarField& iDof = iDof_.internalField();
+
+    vectorField& momentum = momentum_.internalField();
+
+    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+        const label cellI = p.cell();
+
+        rhoN[cellI]++;
+
+        rhoM[cellI] += constProps(p.typeId()).mass();
+
+        dsmcRhoN[cellI]++;
+
+        linearKE[cellI] += 0.5*constProps(p.typeId()).mass()*(p.U() & p.U());
+
+        internalE[cellI] += p.Ei();
+
+        iDof[cellI] += constProps(p.typeId()).internalDegreesOfFreedom();
+
+        momentum[cellI] += constProps(p.typeId()).mass()*p.U();
+    }
+
+    rhoN *= nParticle_/mesh().cellVolumes();
+    rhoN_.correctBoundaryConditions();
+
+    rhoM *= nParticle_/mesh().cellVolumes();
+    rhoM_.correctBoundaryConditions();
+
+    linearKE *= nParticle_/mesh().cellVolumes();
+    linearKE_.correctBoundaryConditions();
+
+    internalE *= nParticle_/mesh().cellVolumes();
+    internalE_.correctBoundaryConditions();
+
+    iDof *= nParticle_/mesh().cellVolumes();
+    iDof_.correctBoundaryConditions();
+
+    momentum *= nParticle_/mesh().cellVolumes();
+    momentum_.correctBoundaryConditions();
+}
+
+
+// * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
+
+template<class ParcelType>
+void Foam::DsmcCloud<ParcelType>::addNewParcel
+(
+    const vector& position,
+    const vector& U,
+    const scalar Ei,
+    const label cellId,
+    const label typeId
+)
+{
+    ParcelType* pPtr = new ParcelType
+    (
+        *this,
+        position,
+        U,
+        Ei,
+        cellId,
+        typeId
+    );
+
+    addParticle(pPtr);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::DsmcCloud<ParcelType>::DsmcCloud
+(
+    const word& cloudName,
+    const fvMesh& mesh,
+    bool readFields
+)
+:
+    Cloud<ParcelType>(mesh, cloudName, false),
+    DsmcBaseCloud(),
+    cloudName_(cloudName),
+    mesh_(mesh),
+    particleProperties_
+    (
+        IOobject
+        (
+            cloudName + "Properties",
+            mesh_.time().constant(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    typeIdList_(particleProperties_.lookup("typeIdList")),
+    nParticle_(readScalar(particleProperties_.lookup("nEquivalentParticles"))),
+    cellOccupancy_(mesh_.nCells()),
+    sigmaTcRMax_
+    (
+        IOobject
+        (
+            this->name() + "SigmaTcRMax",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+    collisionSelectionRemainder_(mesh_.nCells(), 0),
+    q_
+    (
+        IOobject
+        (
+            "q",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+    fD_
+    (
+        IOobject
+        (
+            "fD",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+    rhoN_
+    (
+        IOobject
+        (
+            "rhoN",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+    rhoM_
+    (
+        IOobject
+        (
+            "rhoM",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+    dsmcRhoN_
+    (
+        IOobject
+        (
+            "dsmcRhoN",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+    linearKE_
+    (
+        IOobject
+        (
+            "linearKE",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+    internalE_
+    (
+        IOobject
+        (
+            "internalE",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+    iDof_
+    (
+        IOobject
+        (
+            "iDof",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+    momentum_
+    (
+        IOobject
+        (
+            "momentum",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+    constProps_(),
+    rndGen_(label(149382906) + 7183*Pstream::myProcNo()),
+    boundaryT_
+    (
+        volScalarField
+        (
+            IOobject
+            (
+                "boundaryT",
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::MUST_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh_
+        )
+    ),
+    boundaryU_
+    (
+        volVectorField
+        (
+            IOobject
+            (
+                "boundaryU",
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::MUST_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh_
+        )
+    ),
+    binaryCollisionModel_
+    (
+        BinaryCollisionModel<DsmcCloud<ParcelType> >::New
+        (
+            particleProperties_,
+            *this
+        )
+    ),
+    wallInteractionModel_
+    (
+        WallInteractionModel<DsmcCloud<ParcelType> >::New
+        (
+            particleProperties_,
+            *this
+        )
+    ),
+    inflowBoundaryModel_
+    (
+        InflowBoundaryModel<DsmcCloud<ParcelType> >::New
+        (
+            particleProperties_,
+            *this
+        )
+    )
+{
+    buildConstProps();
+
+    buildCellOccupancy();
+
+    // Initialise the collision selection remainder to a random value between 0
+    // and 1.
+    forAll(collisionSelectionRemainder_, i)
+    {
+        collisionSelectionRemainder_[i] = rndGen_.scalar01();
+    }
+
+    if (readFields)
+    {
+        ParcelType::readFields(*this);
+    }
+}
+
+
+template<class ParcelType>
+Foam::DsmcCloud<ParcelType>::DsmcCloud
+(
+    const word& cloudName,
+    const fvMesh& mesh,
+    const IOdictionary& dsmcInitialiseDict
+)
+    :
+    Cloud<ParcelType>(mesh, cloudName, false),
+    DsmcBaseCloud(),
+    cloudName_(cloudName),
+    mesh_(mesh),
+    particleProperties_
+    (
+        IOobject
+        (
+            cloudName + "Properties",
+            mesh_.time().constant(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    typeIdList_(particleProperties_.lookup("typeIdList")),
+    nParticle_(readScalar(particleProperties_.lookup("nEquivalentParticles"))),
+    cellOccupancy_(),
+    sigmaTcRMax_
+    (
+        IOobject
+        (
+            this->name() + "SigmaTcRMax",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_,
+        dimensionedScalar("zero",  dimensionSet(0, 3, -1, 0, 0), 0.0)
+    ),
+    collisionSelectionRemainder_(),
+    q_
+    (
+        IOobject
+        (
+            this->name() + "q_",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedScalar("zero",  dimensionSet(1, 0, -3, 0, 0), 0.0)
+    ),
+    fD_
+    (
+        IOobject
+        (
+            this->name() + "fD_",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedVector
+        (
+            "zero",
+            dimensionSet(1, -1, -2, 0, 0),
+            vector::zero
+        )
+    ),
+    rhoN_
+    (
+        IOobject
+        (
+            this->name() + "rhoN_",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedScalar("zero",  dimensionSet(0, -3, 0, 0, 0), VSMALL)
+    ),
+    rhoM_
+    (
+        IOobject
+        (
+            this->name() + "rhoM_",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedScalar("zero",  dimensionSet(1, -3, 0, 0, 0), VSMALL)
+    ),
+    dsmcRhoN_
+    (
+        IOobject
+        (
+            this->name() + "dsmcRhoN_",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedScalar("zero",  dimensionSet(0, -3, 0, 0, 0), 0.0)
+    ),
+    linearKE_
+    (
+        IOobject
+        (
+            this->name() + "linearKE_",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedScalar("zero",  dimensionSet(1, -1, -2, 0, 0), 0.0)
+    ),
+    internalE_
+    (
+        IOobject
+        (
+            this->name() + "internalE_",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedScalar("zero",  dimensionSet(1, -1, -2, 0, 0), 0.0)
+    ),
+    iDof_
+    (
+        IOobject
+        (
+            this->name() + "iDof_",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedScalar("zero",  dimensionSet(0, -3, 0, 0, 0), VSMALL)
+    ),
+    momentum_
+    (
+        IOobject
+        (
+            this->name() + "momentum_",
+            mesh_.time().timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh_,
+        dimensionedVector
+        (
+            "zero",
+            dimensionSet(1, -2, -1, 0, 0),
+            vector::zero
+        )
+    ),
+    constProps_(),
+    rndGen_(label(971501) + 1526*Pstream::myProcNo()),
+    boundaryT_
+    (
+        volScalarField
+        (
+            IOobject
+            (
+                "boundaryT",
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar("zero",  dimensionSet(0, 0, 0, 1, 0), 0.0)
+        )
+    ),
+    boundaryU_
+    (
+        volVectorField
+        (
+            IOobject
+            (
+                "boundaryU",
+                mesh_.time().timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedVector
+            (
+                "zero",
+                dimensionSet(0, 1, -1, 0, 0),
+                vector::zero
+            )
+        )
+    ),
+    binaryCollisionModel_(),
+    wallInteractionModel_(),
+    inflowBoundaryModel_()
+{
+    clear();
+
+    buildConstProps();
+
+    initialise(dsmcInitialiseDict);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::DsmcCloud<ParcelType>::~DsmcCloud()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParcelType>
+void Foam::DsmcCloud<ParcelType>::evolve()
+{
+    typename ParcelType::trackData td(*this);
+
+    // Reset the data collection fields
+    resetFields();
+
+    if (debug)
+    {
+        this->dumpParticlePositions();
+    }
+
+    // Insert new particles from the inflow boundary
+    this->inflowBoundary().inflow();
+
+    // Move the particles ballistically with their current velocities
+    Cloud<ParcelType>::move(td);
+
+    // Calculate new velocities via stochastic collisions
+    collisions();
+
+    // Calculate the volume field data
+    calculateFields();
+}
+
+
+template<class ParcelType>
+void Foam::DsmcCloud<ParcelType>::info() const
+{
+    label nDsmcParticles = this->size();
+    reduce(nDsmcParticles, sumOp<label>());
+
+    scalar nMol = nDsmcParticles*nParticle_;
+
+    vector linearMomentum = linearMomentumOfSystem();
+    reduce(linearMomentum, sumOp<vector>());
+
+    scalar linearKineticEnergy = linearKineticEnergyOfSystem();
+    reduce(linearKineticEnergy, sumOp<scalar>());
+
+    scalar internalEnergy = internalEnergyOfSystem();
+    reduce(internalEnergy, sumOp<scalar>());
+
+    Info<< "Cloud name: " << this->name() << nl
+        << "    Number of dsmc particles        = "
+        << nDsmcParticles
+        << endl;
+
+    if (nDsmcParticles)
+    {
+        Info<< "    Number of molecules             = "
+            << nMol << nl
+            << "    Mass in system                  = "
+            << returnReduce(massInSystem(), sumOp<scalar>()) << nl
+            << "    Average linear momentum         = "
+            << linearMomentum/nMol << nl
+            << "   |Average linear momentum|        = "
+            << mag(linearMomentum)/nMol << nl
+            << "    Average linear kinetic energy   = "
+            << linearKineticEnergy/nMol << nl
+            << "    Average internal energy         = "
+            << internalEnergy/nMol << nl
+            << "    Average total energy            = "
+            << (internalEnergy + linearKineticEnergy)/nMol
+            << endl;
+    }
+}
+
+
+template<class ParcelType>
+Foam::vector Foam::DsmcCloud<ParcelType>::equipartitionLinearVelocity
+(
+    scalar temperature,
+    scalar mass
+)
+{
+    return
+        sqrt(kb*temperature/mass)
+       *vector
+        (
+            rndGen_.GaussNormal(),
+            rndGen_.GaussNormal(),
+            rndGen_.GaussNormal()
+        );
+}
+
+
+template<class ParcelType>
+Foam::scalar Foam::DsmcCloud<ParcelType>::equipartitionInternalEnergy
+(
+    scalar temperature,
+    scalar iDof
+)
+{
+    scalar Ei = 0.0;
+
+    if (iDof < SMALL)
+    {
+        return Ei;
+    }
+    else if (iDof < 2.0 + SMALL && iDof > 2.0 - SMALL)
+    {
+        // Special case for iDof = 2, i.e. diatomics;
+        Ei = -log(rndGen_.scalar01())*kb*temperature;
+    }
+    else
+    {
+        scalar a = 0.5*iDof - 1;
+
+        scalar energyRatio;
+
+        scalar P = -1;
+
+        do
+        {
+            energyRatio = 10*rndGen_.scalar01();
+
+            P = pow((energyRatio/a), a)*exp(a - energyRatio);
+
+        } while (P < rndGen_.scalar01());
+
+        Ei = energyRatio*kb*temperature;
+    }
+
+    return Ei;
+}
+
+
+template<class ParcelType>
+void Foam::DsmcCloud<ParcelType>::dumpParticlePositions() const
+{
+    OFstream pObj
+    (
+        this->db().time().path()/"parcelPositions_"
+      + this->name() + "_"
+      + this->db().time().timeName() + ".obj"
+    );
+
+    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+
+        pObj<< "v " << p.position().x()
+            << " "  << p.position().y()
+            << " "  << p.position().z()
+            << nl;
+    }
+
+    pObj.flush();
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
new file mode 100644
index 000000000..a6a9c5ac9
--- /dev/null
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloud.H
@@ -0,0 +1,492 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::DsmcCloud
+
+Description
+    Templated base class for dsmc cloud
+
+SourceFiles
+    DsmcCloudI.H
+    DsmcCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef DsmcCloud_H
+#define DsmcCloud_H
+
+#include "Cloud.H"
+#include "DsmcBaseCloud.H"
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "Random.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "scalarIOField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+
+template<class CloudType>
+class BinaryCollisionModel;
+
+template<class CloudType>
+class WallInteractionModel;
+
+template<class CloudType>
+class InflowBoundaryModel;
+
+/*---------------------------------------------------------------------------*\
+                         Class DsmcCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ParcelType>
+class DsmcCloud
+:
+    public Cloud<ParcelType>,
+    public DsmcBaseCloud
+{
+    // Private data
+
+        //- Cloud type - used to set the name of the parcel properties
+        //  dictionary by appending "Properties"
+        const word cloudName_;
+
+        //- References to the mesh and time databases
+        const fvMesh& mesh_;
+
+        //- Dictionary of particle properties
+        IOdictionary particleProperties_;
+
+        //- A list of unique instances of molecule types in the simulation.
+        // The position of an entry in the list maps to the label identifying
+        // the typeId, i.e. where typeIdList_ = (N2 O2 CO2)
+        // N2 has typeId label = 0, O2 = 1, CO2 = 2.
+        List<word> typeIdList_;
+
+        //- Number of real atoms/molecules represented by a parcel
+        scalar nParticle_;
+
+        //- A data structure holding which particles are in which cell
+        List<DynamicList<ParcelType*> > cellOccupancy_;
+
+        //- An IOField holding the value of (sigmaT * cR)max for each cell (see
+        // Bird p220). Initialised with the parcels, updated as required, and
+        // read in on start/restart.
+        volScalarField sigmaTcRMax_;
+
+        //- A field holding the remainder from the previous collision selections
+        scalarField collisionSelectionRemainder_;
+
+        //- Heat flux at surface field
+        volScalarField q_;
+
+        //- Force density at surface field
+        volVectorField fD_;
+
+        //- number density field
+        volScalarField rhoN_;
+
+        //- Mass density field
+        volScalarField rhoM_;
+
+        //- dsmc particle density field
+        volScalarField dsmcRhoN_;
+
+        //- linear kinetic energy density field
+        volScalarField linearKE_;
+
+        //- Internal energy density field
+        volScalarField internalE_;
+
+        // Internal degree of freedom density field
+        volScalarField iDof_;
+
+        //- Momentum density field
+        volVectorField momentum_;
+
+        //- Parcel constant properties - one for each type
+        List<typename ParcelType::constantProperties> constProps_;
+
+        //- Random number generator
+        Random rndGen_;
+
+
+        // boundary value fields
+
+            //- boundary temperature
+            volScalarField boundaryT_;
+
+            //- boundary velocity
+            volVectorField boundaryU_;
+
+
+        // References to the cloud sub-models
+
+            //- Binary collision model
+            autoPtr<BinaryCollisionModel<DsmcCloud<ParcelType> > >
+                binaryCollisionModel_;
+
+            //- Wall interaction model
+            autoPtr<WallInteractionModel<DsmcCloud<ParcelType> > >
+                wallInteractionModel_;
+
+            //- Inflow boundary model
+            autoPtr<InflowBoundaryModel<DsmcCloud<ParcelType> > >
+                inflowBoundaryModel_;
+
+
+    // Private Member Functions
+
+        //- Build the constant properties for all of the species
+        void buildConstProps();
+
+        //- Record which particles are in which cell
+        void buildCellOccupancy();
+
+        //- Initialise the system
+        void initialise(const IOdictionary& dsmcInitialiseDict);
+
+        //- Calculate collisions between molecules
+        void collisions();
+
+        //- Reset the data accumulation field values to zero
+        void resetFields();
+
+        //- Calculate the volume field data
+        void calculateFields();
+
+        //- Disallow default bitwise copy construct
+        DsmcCloud(const DsmcCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const DsmcCloud&);
+
+
+public:
+
+    // Static data members
+
+        //- Boltzmann constant
+        static scalar kb;
+
+
+    // Constructors
+
+        //- Construct given name and mesh, will read Parcels and fields from
+        //  file
+        DsmcCloud
+        (
+            const word& cloudName,
+            const fvMesh& mesh,
+            bool readFields = true
+        );
+
+        //- Construct given name, mesh and initialisation dictionary.
+        DsmcCloud
+        (
+            const word& cloudName,
+            const fvMesh& mesh,
+            const IOdictionary& dsmcInitialiseDict
+        );
+
+
+    //- Destructor
+    virtual ~DsmcCloud();
+
+
+    // Member Functions
+
+        // Access
+
+            // References to the mesh and databases
+
+                //- Return the cloud type
+                inline const word& cloudName() const;
+
+                //- Return refernce to the mesh
+                inline const fvMesh& mesh() const;
+
+
+            // References to the dsmc specific data
+
+                //- Return particle properties dictionary
+                inline const IOdictionary& particleProperties() const;
+
+                //- Return the idList
+                inline const List<word>& typeIdList() const;
+
+                //- Return the number of real particles represented by one
+                //  parcel
+                inline scalar nParticle() const;
+
+                //- Return the cell occupancy addressing
+                inline const List<DynamicList<ParcelType*> >&
+                    cellOccupancy() const;
+
+                //- Return the sigmaTcRMax field.  non-const access to allow
+                // updating.
+                inline volScalarField& sigmaTcRMax();
+
+                //- Return the collision selection remainder field.  non-const
+                // access to allow updating.
+                inline scalarField& collisionSelectionRemainder();
+
+                //- Return all of the constant properties
+                inline const List<typename ParcelType::constantProperties>&
+                    constProps() const;
+
+                //- Return the constant properties of the given typeId
+                inline const typename ParcelType::constantProperties&
+                    constProps(label typeId) const;
+
+                //- Return refernce to the random object
+                inline Random& rndGen();
+
+
+            // References to the boundary fields for surface data collection
+
+                //- Return non-const heat flux boundary field reference
+                inline volScalarField::GeometricBoundaryField& qBF();
+
+                //- Return non-const force density at boundary field reference
+                inline volVectorField::GeometricBoundaryField& fDBF();
+
+                //- Return non-const number density boundary field reference
+                inline volScalarField::GeometricBoundaryField& rhoNBF();
+
+                //- Return non-const mass density boundary field reference
+                inline volScalarField::GeometricBoundaryField& rhoMBF();
+
+                //- Return non-const linear kinetic energy density boundary
+                //  field reference
+                inline volScalarField::GeometricBoundaryField& linearKEBF();
+
+                //- Return non-const internal energy density boundary field
+                // reference
+                inline volScalarField::GeometricBoundaryField& internalEBF();
+
+                //- Return non-const internal degree of freedom density boundary
+                //  field reference
+                inline volScalarField::GeometricBoundaryField& iDofBF();
+
+                //- Return non-const momentum density boundary field reference
+                inline volVectorField::GeometricBoundaryField& momentumBF();
+
+
+            // References to the macroscopic fields
+
+                //- Return macroscopic temperature
+                inline const volScalarField& boundaryT() const;
+
+                //- Return macroscopic velocity
+                inline const volVectorField& boundaryU() const;
+
+                //- Return heat flux at surface field
+                inline const volScalarField& q() const;
+
+                //- Return force density at surface field
+                inline const volVectorField& fD() const;
+
+                //- Return the real particle number density field
+                inline const volScalarField& rhoN() const;
+
+                //- Return the particle mass density field
+                inline const volScalarField& rhoM() const;
+
+                //- Return the field of number of DSMC particles
+                inline const volScalarField& dsmcRhoN() const;
+
+                //- Return the total linear kinetic energy (translational and
+                // thermal density field
+                inline const volScalarField& linearKE() const;
+
+                //- Return the internal energy density field
+                inline const volScalarField& internalE() const;
+
+                //- Return the average internal degrees of freedom  field
+                inline const volScalarField& iDof() const;
+
+                //- Return the momentum density field
+                inline const volVectorField& momentum() const;
+
+
+            // Kinetic theory helper functions
+
+                //- Generate a random velocity sampled from the Maxwellian speed
+                // distribution
+                vector equipartitionLinearVelocity
+                (
+                    scalar temperature,
+                    scalar mass
+                );
+
+                //- Generate a random internal energy, sampled from the
+                // equilibrium distribution (Bird eqn 11.22 and 11.23 and
+                // adapting code from DSMC3.FOR)
+                scalar equipartitionInternalEnergy
+                (
+                    scalar temperature,
+                    scalar internalDegreesOfFreedom
+                );
+
+
+                // From the Maxwellian distribution:
+                //- Average particle speed
+                inline scalar maxwellianAverageSpeed
+                (
+                    scalar temperature,
+                    scalar mass
+                ) const;
+
+                inline scalarField maxwellianAverageSpeed
+                (
+                    scalarField temperature,
+                    scalar mass
+                ) const;
+
+                //- RMS particle speed
+                inline scalar maxwellianRMSSpeed
+                (
+                    scalar temperature,
+                    scalar mass
+                ) const;
+
+                inline scalarField maxwellianRMSSpeed
+                (
+                    scalarField temperature,
+                    scalar mass
+                ) const;
+
+                //- Most probable speed
+                inline scalar maxwellianMostProbableSpeed
+                (
+                    scalar temperature,
+                    scalar mass
+                ) const;
+
+                inline scalarField maxwellianMostProbableSpeed
+                (
+                    scalarField temperature,
+                    scalar mass
+                ) const;
+
+
+            // Sub-models
+
+                //- Return reference to binary elastic collision model
+                inline const BinaryCollisionModel<DsmcCloud<ParcelType> >&
+                    binaryCollision() const;
+
+                //- Return non-const reference to binary elastic collision model
+                inline BinaryCollisionModel<DsmcCloud<ParcelType> >&
+                    binaryCollision();
+
+                //- Return reference to wall interaction model
+                inline const WallInteractionModel<DsmcCloud<ParcelType> >&
+                    wallInteraction() const;
+
+                //- Return non-const reference to wall interaction model
+                inline WallInteractionModel<DsmcCloud<ParcelType> >&
+                    wallInteraction();
+
+                //- Return reference to wall interaction model
+                inline const InflowBoundaryModel<DsmcCloud<ParcelType> >&
+                    inflowBoundary() const;
+
+                //- Return non-const reference to wall interaction model
+                inline InflowBoundaryModel<DsmcCloud<ParcelType> >&
+                    inflowBoundary();
+
+
+        // Check
+
+            //- Total mass injected
+            inline scalar massInjected() const;
+
+            //- Total mass in system
+            inline scalar massInSystem() const;
+
+            //- Total linear momentum of the system
+            inline vector linearMomentumOfSystem() const;
+
+            //- Total linear kinetic energy in the system
+            inline scalar linearKineticEnergyOfSystem() const;
+
+            //- Total internal energy in the system
+            inline scalar internalEnergyOfSystem() const;
+
+            //- Print cloud information
+            void info() const;
+
+            //- Dump particle positions to .obj file
+            void dumpParticlePositions() const;
+
+
+
+
+        // Cloud evolution functions
+
+            //- Add new parcel
+            void addNewParcel
+            (
+                const vector& position,
+                const vector& U,
+                const scalar Ei,
+                const label cellId,
+                const label typeId
+            );
+
+            //- Evolve the cloud (move, collide)
+            void evolve();
+
+            //- Clear the Cloud
+            inline void clear();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "DsmcCloudI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "DsmcCloud.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
new file mode 100644
index 000000000..dabfcbe69
--- /dev/null
+++ b/src/lagrangian/dsmc/clouds/Templates/DsmcCloud/DsmcCloudI.H
@@ -0,0 +1,477 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParcelType>
+inline const Foam::word& Foam::DsmcCloud<ParcelType>::cloudName() const
+{
+    return cloudName_;
+}
+
+
+template<class ParcelType>
+inline const Foam::fvMesh& Foam::DsmcCloud<ParcelType>::mesh() const
+{
+    return mesh_;
+}
+
+
+template<class ParcelType>
+inline const Foam::IOdictionary&
+Foam::DsmcCloud<ParcelType>::particleProperties() const
+{
+    return particleProperties_;
+}
+
+
+template<class ParcelType>
+inline const Foam::List<Foam::word>&
+Foam::DsmcCloud<ParcelType>::typeIdList() const
+{
+    return typeIdList_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar Foam::DsmcCloud<ParcelType>::nParticle() const
+{
+    return nParticle_;
+}
+
+
+template<class ParcelType>
+inline const Foam::List<Foam::DynamicList<ParcelType*> >&
+Foam::DsmcCloud<ParcelType>::cellOccupancy() const
+{
+    return cellOccupancy_;
+}
+
+
+template<class ParcelType>
+inline Foam::volScalarField& Foam::DsmcCloud<ParcelType>::sigmaTcRMax()
+{
+    return sigmaTcRMax_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField&
+Foam::DsmcCloud<ParcelType>::collisionSelectionRemainder()
+{
+    return collisionSelectionRemainder_;
+}
+
+
+template<class ParcelType>
+inline const Foam::List<typename ParcelType::constantProperties>&
+Foam::DsmcCloud<ParcelType>::constProps() const
+{
+    return constProps_;
+}
+
+
+template<class ParcelType>
+inline const typename ParcelType::constantProperties&
+Foam::DsmcCloud<ParcelType>::constProps
+(
+    label typeId
+) const
+{
+    if (typeId < 0 || typeId >= constProps_.size())
+    {
+        FatalErrorIn("Foam::DsmcCloud<ParcelType>::constProps(label typeId)")
+            << "constantProperties for requested typeId index "
+            << typeId << " do not exist" << nl
+            << abort(FatalError);
+    }
+
+    return constProps_[typeId];
+}
+
+
+template<class ParcelType>
+inline Foam::Random& Foam::DsmcCloud<ParcelType>::rndGen()
+{
+    return rndGen_;
+}
+
+
+template<class ParcelType>
+inline Foam::volScalarField::GeometricBoundaryField&
+Foam::DsmcCloud<ParcelType>::qBF()
+{
+    return q_.boundaryField();
+}
+
+
+template<class ParcelType>
+inline Foam::volVectorField::GeometricBoundaryField&
+Foam::DsmcCloud<ParcelType>::fDBF()
+{
+    return fD_.boundaryField();
+}
+
+
+template<class ParcelType>
+inline Foam::volScalarField::GeometricBoundaryField&
+Foam::DsmcCloud<ParcelType>::rhoNBF()
+{
+    return rhoN_.boundaryField();
+}
+
+
+template<class ParcelType>
+inline Foam::volScalarField::GeometricBoundaryField&
+Foam::DsmcCloud<ParcelType>::rhoMBF()
+{
+    return rhoM_.boundaryField();
+}
+
+
+template<class ParcelType>
+inline Foam::volScalarField::GeometricBoundaryField&
+Foam::DsmcCloud<ParcelType>::linearKEBF()
+{
+    return linearKE_.boundaryField();
+}
+
+
+template<class ParcelType>
+inline Foam::volScalarField::GeometricBoundaryField&
+Foam::DsmcCloud<ParcelType>::internalEBF()
+{
+    return internalE_.boundaryField();
+}
+
+
+template<class ParcelType>
+inline Foam::volScalarField::GeometricBoundaryField&
+Foam::DsmcCloud<ParcelType>::iDofBF()
+{
+    return iDof_.boundaryField();
+}
+
+
+template<class ParcelType>
+inline Foam::volVectorField::GeometricBoundaryField&
+Foam::DsmcCloud<ParcelType>::momentumBF()
+{
+    return momentum_.boundaryField();
+}
+
+
+template<class ParcelType>
+inline const Foam::volScalarField&
+Foam::DsmcCloud<ParcelType>::boundaryT() const
+{
+    return boundaryT_;
+}
+
+
+template<class ParcelType>
+inline const Foam::volVectorField&
+Foam::DsmcCloud<ParcelType>::boundaryU() const
+{
+    return boundaryU_;
+}
+
+
+template<class ParcelType>
+inline const Foam::BinaryCollisionModel<Foam::DsmcCloud<ParcelType> >&
+Foam::DsmcCloud<ParcelType>::binaryCollision() const
+{
+    return binaryCollisionModel_;
+}
+
+
+template<class ParcelType>
+inline Foam::BinaryCollisionModel<Foam::DsmcCloud<ParcelType> >&
+Foam::DsmcCloud<ParcelType>::binaryCollision()
+{
+    return binaryCollisionModel_();
+}
+
+
+template<class ParcelType>
+inline const Foam::WallInteractionModel<Foam::DsmcCloud<ParcelType> >&
+Foam::DsmcCloud<ParcelType>::wallInteraction() const
+{
+    return wallInteractionModel_;
+}
+
+
+template<class ParcelType>
+inline Foam::WallInteractionModel<Foam::DsmcCloud<ParcelType> >&
+Foam::DsmcCloud<ParcelType>::wallInteraction()
+{
+    return wallInteractionModel_();
+}
+
+
+template<class ParcelType>
+inline const Foam::InflowBoundaryModel<Foam::DsmcCloud<ParcelType> >&
+Foam::DsmcCloud<ParcelType>::inflowBoundary() const
+{
+    return inflowBoundaryModel_;
+}
+
+
+template<class ParcelType>
+inline Foam::InflowBoundaryModel<Foam::DsmcCloud<ParcelType> >&
+Foam::DsmcCloud<ParcelType>::inflowBoundary()
+{
+    return inflowBoundaryModel_();
+}
+
+
+template<class ParcelType>
+inline Foam::scalar Foam::DsmcCloud<ParcelType>::massInSystem() const
+{
+    scalar sysMass = 0.0;
+
+    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+
+        const typename ParcelType::constantProperties& cP = constProps
+        (
+            p.typeId()
+        );
+
+        sysMass += cP.mass();
+    }
+
+    return nParticle_*sysMass;
+}
+
+
+template<class ParcelType>
+inline Foam::vector Foam::DsmcCloud<ParcelType>::linearMomentumOfSystem() const
+{
+    vector linearMomentum(vector::zero);
+
+    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+
+        const typename ParcelType::constantProperties& cP = constProps
+        (
+            p.typeId()
+        );
+
+        linearMomentum += cP.mass()*p.U();
+    }
+
+    return nParticle_*linearMomentum;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::DsmcCloud<ParcelType>::linearKineticEnergyOfSystem() const
+{
+    scalar linearKineticEnergy = 0.0;
+
+    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+
+        const typename ParcelType::constantProperties& cP = constProps
+        (
+            p.typeId()
+        );
+
+        linearKineticEnergy += 0.5*cP.mass()*(p.U() & p.U());
+    }
+
+    return nParticle_*linearKineticEnergy;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::DsmcCloud<ParcelType>::internalEnergyOfSystem() const
+{
+    scalar internalEnergy = 0.0;
+
+    forAllConstIter(typename DsmcCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+
+        internalEnergy += p.Ei();
+    }
+
+    return nParticle_*internalEnergy;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar Foam::DsmcCloud<ParcelType>::maxwellianAverageSpeed
+(
+    scalar temperature,
+    scalar mass
+) const
+{
+    return
+        2.0*sqrt(2.0*kb*temperature/(mathematicalConstant::pi*mass));
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField Foam::DsmcCloud<ParcelType>::maxwellianAverageSpeed
+(
+    scalarField temperature,
+    scalar mass
+) const
+{
+    return
+        2.0*sqrt(2.0*kb*temperature/(mathematicalConstant::pi*mass));
+}
+
+
+template<class ParcelType>
+inline Foam::scalar Foam::DsmcCloud<ParcelType>::maxwellianRMSSpeed
+(
+    scalar temperature,
+    scalar mass
+) const
+{
+    return sqrt(3.0*kb*temperature/mass);
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField Foam::DsmcCloud<ParcelType>::maxwellianRMSSpeed
+(
+    scalarField temperature,
+    scalar mass
+) const
+{
+    return sqrt(3.0*kb*temperature/mass);
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::DsmcCloud<ParcelType>::maxwellianMostProbableSpeed
+(
+    scalar temperature,
+    scalar mass
+) const
+{
+    return sqrt(2.0*kb*temperature/mass);
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField
+Foam::DsmcCloud<ParcelType>::maxwellianMostProbableSpeed
+(
+    scalarField temperature,
+    scalar mass
+) const
+{
+    return sqrt(2.0*kb*temperature/mass);
+}
+
+
+template<class ParcelType>
+inline const Foam::volScalarField& Foam::DsmcCloud<ParcelType>::q() const
+{
+    return q_;
+}
+
+
+template<class ParcelType>
+inline const Foam::volVectorField& Foam::DsmcCloud<ParcelType>::fD() const
+{
+    return fD_;
+}
+
+
+template<class ParcelType>
+inline const Foam::volScalarField&
+Foam::DsmcCloud<ParcelType>::rhoN() const
+{
+    return rhoN_;
+}
+
+
+template<class ParcelType>
+inline const Foam::volScalarField& Foam::DsmcCloud<ParcelType>::rhoM() const
+{
+    return rhoM_;
+}
+
+
+template<class ParcelType>
+inline const Foam::volScalarField&
+Foam::DsmcCloud<ParcelType>::dsmcRhoN() const
+{
+    return dsmcRhoN_;
+}
+
+
+template<class ParcelType>
+inline const Foam::volScalarField&
+Foam::DsmcCloud<ParcelType>::linearKE() const
+{
+    return linearKE_;
+}
+
+
+template<class ParcelType>
+inline const Foam::volScalarField&
+Foam::DsmcCloud<ParcelType>::internalE() const
+{
+    return internalE_;
+}
+
+
+template<class ParcelType>
+inline const Foam::volScalarField&
+Foam::DsmcCloud<ParcelType>::iDof() const
+{
+    return iDof_;
+}
+
+
+template<class ParcelType>
+inline const Foam::volVectorField& Foam::DsmcCloud<ParcelType>::momentum() const
+{
+    return momentum_;
+}
+
+
+template<class ParcelType>
+inline void Foam::DsmcCloud<ParcelType>::clear()
+{
+    return IDLList<ParcelType>::clear();
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/tmpField/tmpFieldTest.C b/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
similarity index 77%
rename from applications/test/tmpField/tmpFieldTest.C
rename to src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
index 39812c135..7c377c0f2 100644
--- a/applications/test/tmpField/tmpFieldTest.C
+++ b/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.C
@@ -22,34 +22,28 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Application
-    
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "primitiveFields.H"
+#include "DsmcBaseCloud.H"
 
-using namespace Foam;
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main()
+namespace Foam
 {
-    scalarField f1(1000000, 1.0), f2(1000000, 2.0), f3(1000000, 3.0);
-
-    for (;;)
-    {
-        f1 = f2 + f3 + f2 + f3;
-    }
-
-//    Info<< f1 << endl;
-
-
-    Info<< "end" << endl;
+    defineTypeNameAndDebug(DsmcBaseCloud, 0);
 }
 
 
-// ************************************************************************* //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+Foam::DsmcBaseCloud::DsmcBaseCloud()
+{}
+
+
+// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
+
+Foam::DsmcBaseCloud::~DsmcBaseCloud()
+{}
+
+
+// ************************************************************************* //
diff --git a/applications/test/dictionary/calcEntry/calcEntry.H b/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H
similarity index 77%
rename from applications/test/dictionary/calcEntry/calcEntry.H
rename to src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H
index fd8543302..700abfbb9 100644
--- a/applications/test/dictionary/calcEntry/calcEntry.H
+++ b/src/lagrangian/dsmc/clouds/baseClasses/DsmcBaseCloud/DsmcBaseCloud.H
@@ -23,65 +23,58 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::functionEntries::calcEntry
+    Foam::DsmcBaseCloud
 
 Description
+    Virtual abstract base class for templated DsmcCloud
 
 SourceFiles
-    calcEntry.C
+    DsmcBaseCloud.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef calcEntry_H
-#define calcEntry_H
+#ifndef DsmcBaseCloud_H
+#define DsmcBaseCloud_H
 
-#include "functionEntry.H"
+#include "volFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-namespace functionEntries
-{
 
 /*---------------------------------------------------------------------------*\
-                           Class calcEntry Declaration
+                       Class DsmcBaseCloud Declaration
 \*---------------------------------------------------------------------------*/
 
-class calcEntry
-:
-    public functionEntry
+class DsmcBaseCloud
 {
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        calcEntry(const calcEntry&);
+        DsmcBaseCloud(const DsmcBaseCloud&);
 
         //- Disallow default bitwise assignment
-        void operator=(const calcEntry&);
+        void operator=(const DsmcBaseCloud&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("calc");
+    TypeName("DsmcBaseCloud");
 
+    // Constructors
 
-    // Member Functions
-
-        static bool execute
-        (
-            const dictionary& parentDict,
-            primitiveEntry& entry,
-            Istream& is
-        );
+        //- Null constructor
+        DsmcBaseCloud();
 
+    //- Destructor
+    virtual ~DsmcBaseCloud();
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace functionEntries
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/Tuple2/Tuple2Test.C b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
similarity index 80%
rename from applications/test/Tuple2/Tuple2Test.C
rename to src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
index b2ba60337..d360b8a50 100644
--- a/applications/test/Tuple2/Tuple2Test.C
+++ b/src/lagrangian/dsmc/clouds/derived/dsmcCloud/dsmcCloud.H
@@ -22,32 +22,32 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Application
-    Tuple2Test
+Class
+    Foam::dsmcCloud
 
 Description
+    Cloud class to simulate dsmc parcels
+
+SourceFiles
+    dsmcCloud.C
 
 \*---------------------------------------------------------------------------*/
 
-#include "Tuple2.H"
-#include "label.H"
-#include "scalar.H"
+#ifndef dsmcCloud_H
+#define dsmcCloud_H
 
-using namespace Foam;
+#include "DsmcCloud.H"
+#include "dsmcParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main()
+namespace Foam
 {
-    Tuple2<label, scalar> t2(1, 3.2);
-
-    Info<< t2 << " " << t2.first() << " " << t2.second() << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
+    typedef DsmcCloud<dsmcParcel> dsmcCloud;
 }
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
 
 // ************************************************************************* //
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
new file mode 100644
index 000000000..23eecea57
--- /dev/null
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.C
@@ -0,0 +1,274 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "DsmcParcel.H"
+#include "meshTools.H"
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParcelType>
+template<class TrackData>
+bool Foam::DsmcParcel<ParcelType>::move
+(
+    TrackData& td
+)
+{
+    ParcelType& p = static_cast<ParcelType&>(*this);
+
+    td.switchProcessor = false;
+    td.keepParticle = true;
+
+    const polyMesh& mesh = td.cloud().pMesh();
+    const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
+
+    const scalar deltaT = mesh.time().deltaTValue();
+    scalar tEnd = (1.0 - p.stepFraction())*deltaT;
+    const scalar dtMax = tEnd;
+
+    // For reduced-D cases, the velocity used to track needs to be
+    // constrained, but the actual U_ of the parcel must not be
+    // altered or used, as it is altered by patch interactions an
+    // needs to retain its 3D value for collision purposes.
+    vector Utracking = U_;
+
+    while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
+    {
+        // Apply correction to position for reduced-D cases
+        meshTools::constrainToMeshCentre(mesh, p.position());
+
+        Utracking = U_;
+
+        // Apply correction to velocity to constrain tracking for
+        // reduced-D cases
+        meshTools::constrainDirection(mesh, mesh.solutionD(), Utracking);
+
+        // Set the Lagrangian time-step
+        scalar dt = min(dtMax, tEnd);
+
+        dt *= p.trackToFace(p.position() + dt*Utracking, td);
+
+        tEnd -= dt;
+
+        p.stepFraction() = 1.0 - tEnd/deltaT;
+
+        if (p.onBoundary() && td.keepParticle)
+        {
+            if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
+            {
+                td.switchProcessor = true;
+            }
+        }
+    }
+
+    return td.keepParticle;
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+bool Foam::DsmcParcel<ParcelType>::hitPatch
+(
+    const polyPatch&,
+    TrackData& td,
+    const label patchI
+)
+{
+    return false;
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::DsmcParcel<ParcelType>::hitProcessorPatch
+(
+    const processorPolyPatch&,
+    TrackData& td
+)
+{
+    td.switchProcessor = true;
+}
+
+
+template<class ParcelType>
+void Foam::DsmcParcel<ParcelType>::hitProcessorPatch
+(
+    const processorPolyPatch&,
+    int&
+)
+{}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::DsmcParcel<ParcelType>::hitWallPatch
+(
+    const wallPolyPatch& wpp,
+    TrackData& td
+)
+{
+    label wppIndex = wpp.index();
+
+    label wppLocalFace = wpp.whichFace(this->face());
+
+    const scalar fA = mag(wpp.faceAreas()[wppLocalFace]);
+
+    const scalar deltaT = td.cloud().pMesh().time().deltaTValue();
+
+    const constantProperties& constProps(td.cloud().constProps(typeId_));
+
+    scalar m = constProps.mass();
+
+    vector nw = wpp.faceAreas()[wppLocalFace];
+    nw /= mag(nw);
+
+    scalar U_dot_nw = U_ & nw;
+
+    vector Ut = U_ - U_dot_nw*nw;
+
+    scalar invMagUnfA = 1/max(mag(U_dot_nw)*fA, VSMALL);
+
+    td.cloud().rhoNBF()[wppIndex][wppLocalFace] += invMagUnfA;
+
+    td.cloud().rhoMBF()[wppIndex][wppLocalFace] += m*invMagUnfA;
+
+    td.cloud().linearKEBF()[wppIndex][wppLocalFace] +=
+        0.5*m*(U_ & U_)*invMagUnfA;
+
+    td.cloud().internalEBF()[wppIndex][wppLocalFace] += Ei_*invMagUnfA;
+
+    td.cloud().iDofBF()[wppIndex][wppLocalFace] +=
+        constProps.internalDegreesOfFreedom()*invMagUnfA;
+
+    td.cloud().momentumBF()[wppIndex][wppLocalFace] += m*Ut*invMagUnfA;
+
+    // pre-interaction energy
+    scalar preIE = 0.5*m*(U_ & U_) + Ei_;
+
+    // pre-interaction momentum
+    vector preIMom = m*U_;
+
+    td.cloud().wallInteraction().correct
+    (
+        wpp,
+        this->face(),
+        U_,
+        Ei_,
+        typeId_
+    );
+
+    U_dot_nw = U_ & nw;
+
+    Ut = U_ - U_dot_nw*nw;
+
+    invMagUnfA = 1/max(mag(U_dot_nw)*fA, VSMALL);
+
+    td.cloud().rhoNBF()[wppIndex][wppLocalFace] += invMagUnfA;
+
+    td.cloud().rhoMBF()[wppIndex][wppLocalFace] += m*invMagUnfA;
+
+    td.cloud().linearKEBF()[wppIndex][wppLocalFace] +=
+        0.5*m*(U_ & U_)*invMagUnfA;
+
+    td.cloud().internalEBF()[wppIndex][wppLocalFace] += Ei_*invMagUnfA;
+
+    td.cloud().iDofBF()[wppIndex][wppLocalFace] +=
+        constProps.internalDegreesOfFreedom()*invMagUnfA;
+
+    td.cloud().momentumBF()[wppIndex][wppLocalFace] += m*Ut*invMagUnfA;
+
+    // post-interaction energy
+    scalar postIE = 0.5*m*(U_ & U_) + Ei_;
+
+    // post-interaction momentum
+    vector postIMom = m*U_;
+
+    scalar deltaQ = td.cloud().nParticle()*(preIE - postIE)/(deltaT*fA);
+
+    vector deltaFD = td.cloud().nParticle()*(preIMom - postIMom)/(deltaT*fA);
+
+    td.cloud().qBF()[wppIndex][wppLocalFace] += deltaQ;
+
+    td.cloud().fDBF()[wppIndex][wppLocalFace] += deltaFD;
+
+}
+
+
+template<class ParcelType>
+void Foam::DsmcParcel<ParcelType>::hitWallPatch
+(
+    const wallPolyPatch&,
+    int&
+)
+{}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::DsmcParcel<ParcelType>::hitPatch
+(
+    const polyPatch&,
+    TrackData& td
+)
+{
+    td.keepParticle = false;
+}
+
+
+template<class ParcelType>
+void Foam::DsmcParcel<ParcelType>::hitPatch
+(
+    const polyPatch&,
+    int&
+)
+{}
+
+
+template<class ParcelType>
+void Foam::DsmcParcel<ParcelType>::transformProperties
+(
+    const tensor& T
+)
+{
+    Particle<ParcelType>::transformProperties(T);
+    U_ = transform(T, U_);
+}
+
+
+template<class ParcelType>
+void Foam::DsmcParcel<ParcelType>::transformProperties
+(
+    const vector& separation
+)
+{
+    Particle<ParcelType>::transformProperties(separation);
+}
+
+
+// * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
+
+#include "DsmcParcelIO.C"
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
new file mode 100644
index 000000000..bc53bef2c
--- /dev/null
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcel.H
@@ -0,0 +1,356 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::DsmcParcel
+
+Description
+    DSMC parcel class
+
+SourceFiles
+    DsmcParcelI.H
+    DsmcParcel.C
+    DsmcParcelIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef DsmcParcel_H
+#define DsmcParcel_H
+
+#include "Particle.H"
+#include "IOstream.H"
+#include "autoPtr.H"
+#include "contiguous.H"
+
+#include "DsmcCloud.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class ParcelType>
+class DsmcParcel;
+
+// Forward declaration of friend functions
+
+template<class ParcelType>
+Ostream& operator<<
+(
+    Ostream&,
+    const DsmcParcel<ParcelType>&
+);
+
+/*---------------------------------------------------------------------------*\
+                         Class DsmcParcel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ParcelType>
+class DsmcParcel
+:
+    public Particle<ParcelType>
+{
+public:
+
+    //- Class to hold DSMC particle constant properties
+    class constantProperties
+    {
+        // Private data
+
+            //- Particle mass [kg] (constant)
+            scalar mass_;
+
+            //- Particle hard sphere diameter [m] (constant)
+            scalar d_;
+
+            //- Internal degrees of freedom
+            scalar internalDegreesOfFreedom_;
+
+            //- Viscosity index
+            scalar omega_;
+
+
+    public:
+
+        // Constrcutors
+
+            //- Null constructor, allows List of constantProperties to be
+            //  created before the contents is initialised
+            inline constantProperties();
+
+            //- Constructor from dictionary
+            inline constantProperties(const dictionary& dict);
+
+
+        // Member functions
+
+            //- Return const access to the particle density
+            inline scalar mass() const;
+
+            //- Return const access to the minimum particle mass
+            inline scalar d() const;
+
+            //- Return the reference total collision cross section
+            inline scalar sigmaT() const;
+
+            //- Return the internalDegreesOfFreedom
+            inline scalar internalDegreesOfFreedom() const;
+
+            //- Return the viscosity index
+            inline scalar omega() const;
+
+    };
+
+
+    //- Class used to pass kinematic tracking data to the trackToFace function
+    class trackData
+    :
+        public Particle<ParcelType>::trackData
+    {
+        // Private data
+
+            //- Reference to the cloud containing this particle
+            DsmcCloud<ParcelType>& cloud_;
+
+
+    public:
+
+        // Constructors
+
+            //- Construct from components
+            inline trackData
+            (
+                DsmcCloud<ParcelType>& cloud
+            );
+
+
+        // Member functions
+
+            //- Return access to the owner cloud
+            inline DsmcCloud<ParcelType>& cloud();
+    };
+
+
+protected:
+
+    // Protected member data
+
+        // Parcel properties
+
+            //- Velocity of Parcel [m/s]
+            vector U_;
+
+            //- Internal energy of the Parcel, covering all non-translational
+            // degrees of freedom [J]
+            scalar Ei_;
+
+            //- Parcel type id
+            label typeId_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("DsmcParcel");
+
+    friend class Cloud<ParcelType>;
+
+
+    // Constructors
+
+        //- Construct from components
+        inline DsmcParcel
+        (
+            DsmcCloud<ParcelType>& owner,
+            const vector& position,
+            const vector& U,
+            const scalar Ei,
+            const label celli,
+            const label typeId
+        );
+
+        //- Construct from Istream
+        DsmcParcel
+        (
+            const Cloud<ParcelType>& c,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Construct and return a clone
+        autoPtr<ParcelType> clone() const
+        {
+            return autoPtr<ParcelType>(new DsmcParcel<ParcelType>(*this));
+        }
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return type id
+            inline label typeId() const;
+
+            //- Return const access to velocity
+            inline const vector& U() const;
+
+            //- Return const access to internal energy
+            inline scalar Ei() const;
+
+        // Edit
+
+            //- Return access to velocity
+            inline vector& U();
+
+            //- Return access to internal energy
+            inline scalar& Ei();
+
+
+        // Main calculation loop
+
+            // Tracking
+
+                //- Move the parcel
+                template<class TrackData>
+                bool move(TrackData& td);
+
+
+        // Patch interactions
+
+            //- Overridable function to handle the particle hitting a patch
+            //  Executed before other patch-hitting functions
+            template<class TrackData>
+            bool hitPatch
+            (
+                const polyPatch&,
+                TrackData& td,
+                const label patchI
+            );
+
+            //- Overridable function to handle the particle hitting a
+            //  processorPatch
+            template<class TrackData>
+            void hitProcessorPatch
+            (
+                const processorPolyPatch&,
+                TrackData& td
+            );
+
+            //- Overridable function to handle the particle hitting a
+            //  processorPatch without trackData
+            void hitProcessorPatch
+            (
+                const processorPolyPatch&,
+                int&
+            );
+
+            //- Overridable function to handle the particle hitting a wallPatch
+            template<class TrackData>
+            void hitWallPatch
+            (
+                const wallPolyPatch&,
+                TrackData& td
+            );
+
+            //- Overridable function to handle the particle hitting a wallPatch
+            //  without trackData
+            void hitWallPatch
+            (
+                const wallPolyPatch&,
+                int&
+            );
+
+            //- Overridable function to handle the particle hitting a polyPatch
+            template<class TrackData>
+            void hitPatch
+            (
+                const polyPatch&,
+                TrackData& td
+            );
+
+            //- Overridable function to handle the particle hitting a polyPatch
+            //- without trackData
+            void hitPatch
+            (
+                const polyPatch&,
+                int&
+            );
+
+            //- Transform the physical properties of the particle
+            //  according to the given transformation tensor
+            void transformProperties(const tensor& T);
+
+            //- Transform the physical properties of the particle
+            //  according to the given separation vector
+            void transformProperties(const vector& separation);
+
+
+        // I-O
+
+            static void readFields(Cloud<ParcelType>& c);
+
+            static void writeFields(const Cloud<ParcelType>& c);
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<< <ParcelType>
+        (
+            Ostream&,
+            const DsmcParcel<ParcelType>&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "DsmcParcelI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define defineParcelTypeNameAndDebug(Type, DebugSwitch)                       \
+    template<>                                                                \
+    const Foam::word DsmcParcel<Type>::typeName(#Type);                       \
+    template<>                                                                \
+    int DsmcParcel<Type>::debug                                               \
+    (                                                                         \
+        Foam::debug::debugSwitch(#Type, DebugSwitch)                          \
+    );
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "DsmcParcel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H
new file mode 100644
index 000000000..786a77bc8
--- /dev/null
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelI.H
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class ParcelType>
+inline Foam::DsmcParcel<ParcelType>::constantProperties::constantProperties()
+:
+    mass_(0),
+    d_(0)
+{}
+
+
+template <class ParcelType>
+inline Foam::DsmcParcel<ParcelType>::constantProperties::constantProperties
+(
+    const dictionary& dict
+)
+:
+    mass_(readScalar(dict.lookup("mass"))),
+    d_(readScalar(dict.lookup("diameter"))),
+    internalDegreesOfFreedom_
+    (
+        readScalar(dict.lookup("internalDegreesOfFreedom"))
+    ),
+    omega_(readScalar(dict.lookup("omega")))
+{}
+
+
+template <class ParcelType>
+inline Foam::DsmcParcel<ParcelType>::trackData::trackData
+(
+    DsmcCloud<ParcelType>& cloud
+)
+:
+    Particle<ParcelType>::trackData(cloud),
+    cloud_(cloud)
+{}
+
+
+template <class ParcelType>
+inline Foam::DsmcParcel<ParcelType>::DsmcParcel
+(
+    DsmcCloud<ParcelType>& owner,
+    const vector& position,
+    const vector& U,
+    const scalar Ei,
+    const label celli,
+    const label typeId
+)
+:
+    Particle<ParcelType>(owner, position, celli),
+    U_(U),
+    Ei_(Ei),
+    typeId_(typeId)
+{}
+
+
+// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::DsmcParcel<ParcelType>::constantProperties::mass() const
+{
+    return mass_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::DsmcParcel<ParcelType>::constantProperties::d() const
+{
+    return d_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::DsmcParcel<ParcelType>::constantProperties::sigmaT() const
+{
+    return mathematicalConstant::pi*d_*d_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::DsmcParcel<ParcelType>::constantProperties::internalDegreesOfFreedom()
+const
+{
+    return internalDegreesOfFreedom_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::DsmcParcel<ParcelType>::constantProperties::omega() const
+{
+    return omega_;
+}
+
+
+// * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
+
+template <class ParcelType>
+inline Foam::DsmcCloud<ParcelType>&
+Foam::DsmcParcel<ParcelType>::trackData::cloud()
+{
+    return cloud_;
+}
+
+
+// * * * * * * * * * * DsmcParcel Member Functions  * * * * * * * * * * //
+
+template <class ParcelType>
+inline Foam::label Foam::DsmcParcel<ParcelType>::typeId() const
+{
+    return typeId_;
+}
+
+
+template <class ParcelType>
+inline const Foam::vector& Foam::DsmcParcel<ParcelType>::U() const
+{
+    return U_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar Foam::DsmcParcel<ParcelType>::Ei() const
+{
+    return Ei_;
+}
+
+
+template <class ParcelType>
+inline Foam::vector& Foam::DsmcParcel<ParcelType>::U()
+{
+    return U_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar& Foam::DsmcParcel<ParcelType>::Ei()
+{
+    return Ei_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
new file mode 100644
index 000000000..5c03ddfbe
--- /dev/null
+++ b/src/lagrangian/dsmc/parcels/Templates/DsmcParcel/DsmcParcelIO.C
@@ -0,0 +1,174 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "DsmcParcel.H"
+#include "IOstreams.H"
+#include "IOField.H"
+#include "Cloud.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::DsmcParcel<ParcelType>::DsmcParcel
+(
+    const Cloud<ParcelType>& cloud,
+    Istream& is,
+    bool readFields
+)
+:
+    Particle<ParcelType>(cloud, is, readFields),
+    U_(vector::zero),
+    Ei_(0.0),
+    typeId_(-1)
+{
+    if (readFields)
+    {
+        if (is.format() == IOstream::ASCII)
+        {
+            is >> U_;
+            Ei_ = readScalar(is);
+            typeId_ = readLabel(is);
+        }
+        else
+        {
+            is.read
+            (
+                reinterpret_cast<char*>(&U_),
+                sizeof(U_)
+              + sizeof(Ei_)
+              + sizeof(typeId_)
+            );
+        }
+    }
+
+    // Check state of Istream
+    is.check
+    (
+        "DsmcParcel<ParcelType>::DsmcParcel"
+        "(const Cloud<ParcelType>&, Istream&, bool)"
+    );
+}
+
+
+template<class ParcelType>
+void Foam::DsmcParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
+{
+    if (!c.size())
+    {
+        return;
+    }
+
+    Particle<ParcelType>::readFields(c);
+
+    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, U);
+
+    IOField<scalar> Ei(c.fieldIOobject("Ei", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, Ei);
+
+    IOField<label> typeId(c.fieldIOobject("typeId", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, typeId);
+
+    label i = 0;
+    forAllIter(typename Cloud<ParcelType>, c, iter)
+    {
+        ParcelType& p = iter();
+
+        p.U_ = U[i];
+        p.Ei_ = Ei[i];
+        p.typeId_ = typeId[i];
+        i++;
+    }
+}
+
+
+template<class ParcelType>
+void Foam::DsmcParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
+{
+    Particle<ParcelType>::writeFields(c);
+
+    label np =  c.size();
+
+    IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
+    IOField<scalar> Ei(c.fieldIOobject("Ei", IOobject::NO_READ), np);
+    IOField<label> typeId(c.fieldIOobject("typeId", IOobject::NO_READ), np);
+
+    label i = 0;
+    forAllConstIter(typename Cloud<ParcelType>, c, iter)
+    {
+        const DsmcParcel<ParcelType>& p = iter();
+
+        U[i] = p.U();
+        Ei[i] = p.Ei();
+        typeId[i] = p.typeId();
+        i++;
+    }
+
+    U.write();
+    Ei.write();
+    typeId.write();
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const DsmcParcel<ParcelType>& p
+)
+{
+    if (os.format() == IOstream::ASCII)
+    {
+        os  << static_cast<const Particle<ParcelType>& >(p)
+            << token::SPACE << p.U()
+            << token::SPACE << p.Ei()
+            << token::SPACE << p.typeId();
+    }
+    else
+    {
+        os  << static_cast<const Particle<ParcelType>& >(p);
+        os.write
+        (
+            reinterpret_cast<const char*>(&p.U_),
+            sizeof(p.U())
+          + sizeof(p.Ei())
+          + sizeof(p.typeId())
+        );
+    }
+
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const DsmcParcel<ParcelType>&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C
new file mode 100644
index 000000000..2a1a0e44e
--- /dev/null
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/defineDsmcParcel.C
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "dsmcParcel.H"
+#include "DsmcCloud.H"
+
+namespace Foam
+{
+    defineTemplateTypeNameAndDebug(Cloud<dsmcParcel>, 0);
+
+    defineParcelTypeNameAndDebug(DsmcCloud<dsmcParcel>, 0);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
new file mode 100644
index 000000000..d4d3dad15
--- /dev/null
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.C
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "dsmcParcel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(dsmcParcel, 0);
+    defineParticleTypeNameAndDebug(dsmcParcel, 0);
+    defineParcelTypeNameAndDebug(dsmcParcel, 0);
+};
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::dsmcParcel::dsmcParcel
+(
+    DsmcCloud<dsmcParcel>& owner,
+    const vector& position,
+    const vector& U,
+    const scalar Ei,
+    const label celli,
+    const label typeId
+)
+:
+    DsmcParcel<dsmcParcel>
+    (
+        owner,
+        position,
+        U,
+        Ei,
+        celli,
+        typeId
+    )
+{}
+
+
+Foam::dsmcParcel::dsmcParcel
+(
+    const Cloud<dsmcParcel>& cloud,
+    Istream& is,
+    bool readFields
+)
+:
+    DsmcParcel<dsmcParcel>(cloud, is, readFields)
+{}
+
+
+// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
+
+Foam::dsmcParcel::~dsmcParcel()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H
new file mode 100644
index 000000000..d8d8efdde
--- /dev/null
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/dsmcParcel.H
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::dsmcParcel
+
+Description
+
+
+SourceFiles
+    dsmcParcel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef dsmcParcel_H
+#define dsmcParcel_H
+
+#include "DsmcParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class dsmcParcel Declaration
+\*---------------------------------------------------------------------------*/
+
+class dsmcParcel
+:
+    public DsmcParcel<dsmcParcel>
+{
+
+public:
+
+    //- Run-time type information
+    TypeName("dsmcParcel");
+
+
+    // Constructors
+
+        //- Construct from components
+        dsmcParcel
+        (
+            DsmcCloud<dsmcParcel>& owner,
+            const vector& position,
+            const vector& U,
+            const scalar Ei,
+            const label celli,
+            const label typeId
+        );
+
+        //- Construct from Istream
+        dsmcParcel
+        (
+            const Cloud<dsmcParcel>& c,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Construct and return a clone
+        autoPtr<dsmcParcel> clone() const
+        {
+            return autoPtr<dsmcParcel>(new dsmcParcel(*this));
+        }
+
+
+    //- Destructor
+    virtual ~dsmcParcel();
+};
+
+
+template<>
+inline bool contiguous<dsmcParcel>()
+{
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
similarity index 75%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C
rename to src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
index 0d54a57bb..137b06d0e 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelBinaryCollisionModels.C
@@ -24,27 +24,27 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicReactingParcel.H"
-#include "ThermoCloud.H"
-#include "NoHeatTransfer.H"
-#include "RanzMarshall.H"
+#include "dsmcParcel.H"
+#include "DsmcCloud.H"
+#include "VariableHardSphere.H"
+#include "LarsenBorgnakkeVariableHardSphere.H"
 
 namespace Foam
 {
-    makeHeatTransferModel(ThermoCloud<basicReactingParcel>);
+    makeBinaryCollisionModel(DsmcCloud<dsmcParcel>);
 
-    // Add instances of heat transfer model to the table
-    makeHeatTransferModelType
+    // Add instances of collision model to the table
+    makeBinaryCollisionModelType
     (
-        NoHeatTransfer,
-        ThermoCloud,
-        basicReactingParcel
+        VariableHardSphere,
+        DsmcCloud,
+        dsmcParcel
     );
-    makeHeatTransferModelType
+    makeBinaryCollisionModelType
     (
-        RanzMarshall,
-        ThermoCloud,
-        basicReactingParcel
+        LarsenBorgnakkeVariableHardSphere,
+        DsmcCloud,
+        dsmcParcel
     );
 };
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
similarity index 77%
rename from src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
rename to src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
index 0eaabb79e..3fef90987 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelInflowBoundaryModels.C
@@ -24,20 +24,27 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicReactingParcel.H"
-#include "ReactingCloud.H"
-#include "NoSurfaceReaction.H"
+#include "dsmcParcel.H"
+#include "DsmcCloud.H"
+#include "FreeStream.H"
+#include "NoInflow.H"
 
 namespace Foam
 {
-    makeSurfaceReactionModel(ReactingCloud<basicReactingParcel>);
+    makeInflowBoundaryModel(DsmcCloud<dsmcParcel>);
 
-    // Add instances of surface reaction model to the table
-    makeSurfaceReactionModelType
+    // Add instances of inflow boundary model to the table
+    makeInflowBoundaryModelType
     (
-        NoSurfaceReaction,
-        ReactingCloud,
-        basicReactingParcel
+        FreeStream,
+        DsmcCloud,
+        dsmcParcel
+    );
+    makeInflowBoundaryModelType
+    (
+        NoInflow,
+        DsmcCloud,
+        dsmcParcel
     );
 };
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelWallInteractionModels.C b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
similarity index 76%
rename from src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelWallInteractionModels.C
rename to src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
index f193f7016..52db02d48 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelWallInteractionModels.C
+++ b/src/lagrangian/dsmc/parcels/derived/dsmcParcel/makeDsmcParcelWallInteractionModels.C
@@ -24,27 +24,34 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicThermoParcel.H"
-#include "KinematicCloud.H"
-#include "Rebound.H"
-#include "StandardWallInteraction.H"
+#include "dsmcParcel.H"
+#include "DsmcCloud.H"
+#include "MaxwellianThermal.H"
+#include "SpecularReflection.H"
+#include "MixedDiffuseSpecular.H"
 
 namespace Foam
 {
-    makeWallInteractionModel(KinematicCloud<basicThermoParcel>);
+    makeWallInteractionModel(DsmcCloud<dsmcParcel>);
 
     // Add instances of wall interaction model to the table
     makeWallInteractionModelType
     (
-        Rebound,
-        KinematicCloud,
-        basicThermoParcel
+        MaxwellianThermal,
+        DsmcCloud,
+        dsmcParcel
     );
     makeWallInteractionModelType
     (
-        StandardWallInteraction,
-        KinematicCloud,
-        basicThermoParcel
+        SpecularReflection,
+        DsmcCloud,
+        dsmcParcel
+    );
+    makeWallInteractionModelType
+    (
+        MixedDiffuseSpecular,
+        DsmcCloud,
+        dsmcParcel
     );
 };
 
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
new file mode 100644
index 000000000..bab730a8b
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.C
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "BinaryCollisionModel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::BinaryCollisionModel<CloudType>::BinaryCollisionModel
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& type
+)
+:
+    dict_(dict),
+    owner_(owner),
+    coeffDict_(dict.subDict(type + "Coeffs"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::BinaryCollisionModel<CloudType>::~BinaryCollisionModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+const CloudType&
+Foam::BinaryCollisionModel<CloudType>::owner() const
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+CloudType&
+Foam::BinaryCollisionModel<CloudType>::owner()
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary&
+Foam::BinaryCollisionModel<CloudType>::dict() const
+{
+    return dict_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary&
+Foam::BinaryCollisionModel<CloudType>::coeffDict() const
+{
+    return coeffDict_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "NewBinaryCollisionModel.C"
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
new file mode 100644
index 000000000..d4430d08d
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/BinaryCollisionModel.H
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::BinaryCollisionModel
+
+Description
+    Templated DSMC particle collision class
+
+SourceFiles
+    BinaryCollisionModel.C
+    NewBinaryCollisionModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef BinaryCollisionModel_H
+#define BinaryCollisionModel_H
+
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class BinaryCollisionModel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class BinaryCollisionModel
+{
+    // Private data
+
+        //- The cloud dictionary
+        const dictionary& dict_;
+
+        // reference to the owner cloud class
+        CloudType& owner_;
+
+        //- The coefficients dictionary
+        const dictionary coeffDict_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("BinaryCollisionModel");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        BinaryCollisionModel,
+        dictionary,
+        (
+            const dictionary& dict,
+            CloudType& owner
+        ),
+        (dict, owner)
+    );
+
+
+    // Constructors
+
+        //- Construct from components
+        BinaryCollisionModel
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& type
+        );
+
+
+    // Destructor
+    virtual ~BinaryCollisionModel();
+
+
+    //- Selector
+    static autoPtr<BinaryCollisionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
+
+
+    // Access
+
+        //- Return the owner cloud object
+        const CloudType& owner() const;
+
+        //- Return non-const access to the owner cloud object
+        CloudType& owner();
+
+        //- Return the dictionary
+        const dictionary& dict() const;
+
+        //- Return the coefficients dictionary
+        const dictionary& coeffDict() const;
+
+
+    // Member Functions
+
+        //- Return the collision cross section * relative velocity product
+        virtual scalar sigmaTcR
+        (
+            label typeIdP,
+            label typeIdQ,
+            const vector& UP,
+            const vector& UQ
+        ) const = 0;
+
+        //- Apply collision
+        virtual void collide
+        (
+            label typeIdP,
+            label typeIdQ,
+            vector& UP,
+            vector& UQ,
+            scalar& EiP,
+            scalar& EiQ
+        ) = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeBinaryCollisionModel(CloudType)                                   \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        BinaryCollisionModel<CloudType>,                                      \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    defineTemplateRunTimeSelectionTable                                       \
+    (                                                                         \
+        BinaryCollisionModel<CloudType>,                                      \
+        dictionary                                                            \
+    );
+
+
+#define makeBinaryCollisionModelType(SS, CloudType, ParcelType)               \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+                                                                              \
+    BinaryCollisionModel<CloudType<ParcelType> >::                            \
+        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
+            add##SS##CloudType##ParcelType##ConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "BinaryCollisionModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C
new file mode 100644
index 000000000..a5d760963
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/BinaryCollisionModel/NewBinaryCollisionModel.C
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "BinaryCollisionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::autoPtr<Foam::BinaryCollisionModel<CloudType> >
+Foam::BinaryCollisionModel<CloudType>::New
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+{
+    word BinaryCollisionModelType(dict.lookup("BinaryCollisionModel"));
+
+    Info<< "Selecting BinaryCollisionModel "
+        << BinaryCollisionModelType
+        << endl;
+
+    typename dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(BinaryCollisionModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "BinaryCollisionModel<CloudType>::New"
+            "(const dictionary&, CloudType&)"
+        )
+            << "Unknown BinaryCollisionModelType type "
+            << BinaryCollisionModelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid BinaryCollisionModel types are:" << nl
+            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+    }
+
+    return autoPtr<BinaryCollisionModel<CloudType> >
+    (
+        cstrIter()(dict, owner)
+    );
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
new file mode 100644
index 000000000..9e7467f47
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
@@ -0,0 +1,272 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "LarsenBorgnakkeVariableHardSphere.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio
+(
+    scalar ChiA,
+    scalar ChiB
+)
+{
+    CloudType& cloud(this->owner());
+
+    Random& rndGen(cloud.rndGen());
+
+    scalar ChiAMinusOne = ChiA - 1;
+
+    scalar ChiBMinusOne = ChiB - 1;
+
+    if (ChiAMinusOne < SMALL && ChiBMinusOne < SMALL)
+    {
+        return rndGen.scalar01();
+    }
+
+    scalar energyRatio;
+
+    scalar P;
+
+    do
+    {
+        P = 0;
+
+        energyRatio = rndGen.scalar01();
+
+        if (ChiAMinusOne < SMALL)
+        {
+            P = 1.0 - pow(energyRatio, ChiB);
+        }
+        else if (ChiBMinusOne < SMALL)
+        {
+            P = 1.0 - pow(energyRatio, ChiA);
+        }
+        else
+        {
+            P =
+                pow
+                (
+                    (ChiAMinusOne + ChiBMinusOne)*energyRatio/ChiAMinusOne,
+                    ChiAMinusOne
+                )
+               *pow
+                (
+                    (ChiAMinusOne + ChiBMinusOne)*(1 - energyRatio)
+                    /ChiBMinusOne,
+                    ChiBMinusOne
+                );
+        }
+    } while (P < rndGen.scalar01());
+
+    return energyRatio;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::LarsenBorgnakkeVariableHardSphere
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    BinaryCollisionModel<CloudType>(dict, cloud, typeName),
+    Tref_(readScalar(this->coeffDict().lookup("Tref"))),
+    relaxationCollisionNumber_
+    (
+        readScalar(this->coeffDict().lookup("relaxationCollisionNumber"))
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::
+~LarsenBorgnakkeVariableHardSphere()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+template <class CloudType>
+Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::sigmaTcR
+(
+    label typeIdP,
+    label typeIdQ,
+    const vector& UP,
+    const vector& UQ
+) const
+{
+    const CloudType& cloud(this->owner());
+
+    scalar dPQ =
+        0.5
+       *(
+            cloud.constProps(typeIdP).d()
+          + cloud.constProps(typeIdQ).d()
+        );
+
+    scalar omegaPQ =
+        0.5
+       *(
+            cloud.constProps(typeIdP).omega()
+          + cloud.constProps(typeIdQ).omega()
+        );
+
+    scalar cR = mag(UP - UQ);
+
+    if (cR < VSMALL)
+    {
+        return 0;
+    }
+
+    scalar mP = cloud.constProps(typeIdP).mass();
+
+    scalar mQ = cloud.constProps(typeIdQ).mass();
+
+    scalar mR = mP*mQ/(mP + mQ);
+
+    // calculating cross section = pi*dPQ^2, where dPQ is from Bird, eq. 4.79
+    scalar sigmaTPQ =
+        mathematicalConstant::pi*dPQ*dPQ
+       *pow(2.0*CloudType::kb*Tref_/(mR*cR*cR), omegaPQ - 0.5)
+       /exp(Foam::lgamma(2.5 - omegaPQ));
+
+    return sigmaTPQ*cR;
+}
+
+
+template <class CloudType>
+void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
+(
+    label typeIdP,
+    label typeIdQ,
+    vector& UP,
+    vector& UQ,
+    scalar& EiP,
+    scalar& EiQ
+)
+{
+    CloudType& cloud(this->owner());
+
+    Random& rndGen(cloud.rndGen());
+
+    scalar inverseCollisionNumber = 1/relaxationCollisionNumber_;
+
+    // Larsen Borgnakke internal energy redistribution part.  Using the serial
+    // application of the LB method, as per the INELRS subroutine in Bird's
+    // DSMC0R.FOR
+
+    scalar preCollisionEiP = EiP;
+
+    scalar preCollisionEiQ = EiQ;
+
+    scalar iDofP = cloud.constProps(typeIdP).internalDegreesOfFreedom();
+
+    scalar iDofQ = cloud.constProps(typeIdQ).internalDegreesOfFreedom();
+
+    scalar omegaPQ =
+        0.5
+       *(
+            cloud.constProps(typeIdP).omega()
+          + cloud.constProps(typeIdQ).omega()
+        );
+
+    scalar mP = cloud.constProps(typeIdP).mass();
+
+    scalar mQ = cloud.constProps(typeIdQ).mass();
+
+    scalar mR = mP*mQ/(mP + mQ);
+
+    vector Ucm = (mP*UP + mQ*UQ)/(mP + mQ);
+
+    scalar cRsqr = magSqr(UP - UQ);
+
+    scalar availableEnergy = 0.5*mR*cRsqr;
+
+    scalar ChiB = 2.5 - omegaPQ;
+
+    if (iDofP > 0)
+    {
+        if (inverseCollisionNumber > rndGen.scalar01())
+        {
+            availableEnergy += preCollisionEiP;
+
+            scalar ChiA = 0.5*iDofP;
+
+            EiP = energyRatio(ChiA, ChiB)*availableEnergy;
+
+            availableEnergy -= EiP;
+        }
+    }
+
+    if (iDofQ > 0)
+    {
+        if (inverseCollisionNumber > rndGen.scalar01())
+        {
+            availableEnergy += preCollisionEiQ;
+
+            // Change to general LB ratio calculation
+            scalar energyRatio = 1.0 - pow(rndGen.scalar01(),(1.0/ChiB));
+
+            EiQ = energyRatio*availableEnergy;
+
+            availableEnergy -= EiQ;
+        }
+    }
+
+    // Rescale the translational energy
+    scalar cR = sqrt(2.0*availableEnergy/mR);
+
+    // Variable Hard Sphere collision part
+
+    scalar cosTheta = 2.0*rndGen.scalar01() - 1.0;
+
+    scalar sinTheta = sqrt(1.0 - cosTheta*cosTheta);
+
+    scalar phi = 2.0*mathematicalConstant::pi*rndGen.scalar01();
+
+    vector postCollisionRelU =
+        cR
+       *vector
+        (
+            cosTheta,
+            sinTheta*cos(phi),
+            sinTheta*sin(phi)
+        );
+
+    UP = Ucm + postCollisionRelU*mQ/(mP + mQ);
+
+    UQ = Ucm - postCollisionRelU*mP/(mP + mQ);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
new file mode 100644
index 000000000..c86df3425
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.H
@@ -0,0 +1,129 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Class
+    Foam::LarsenBorgnakkeVariableHardSphere
+
+Description
+    Variable Hard Sphere BinaryCollision Model with Larsen Borgnakke internal
+    energy redistribution.  Based on the INELRS subroutine in Bird's DSMC0R.FOR
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef LarsenBorgnakkeVariableHardSphere_H
+#define LarsenBorgnakkeVariableHardSphere_H
+
+#include "BinaryCollisionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                      Class LarsenBorgnakkeVariableHardSphere Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class LarsenBorgnakkeVariableHardSphere
+:
+    public BinaryCollisionModel<CloudType>
+{
+    // Private data
+
+        //- Reference temperature
+        const scalar Tref_;
+
+        //- Relaxation collision number
+        const scalar relaxationCollisionNumber_;
+
+
+    // Private Member Functions
+
+        //- Calculate the energy ratio for distribution to internal degrees of
+        // freedom
+        scalar energyRatio
+        (
+            scalar ChiA,
+            scalar ChiB
+        );
+
+
+public:
+
+    //- Runtime type information
+    TypeName("LarsenBorgnakkeVariableHardSphere");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        LarsenBorgnakkeVariableHardSphere
+        (
+            const dictionary& dict,
+            CloudType& cloud
+        );
+
+
+    // Destructor
+    virtual ~LarsenBorgnakkeVariableHardSphere();
+
+
+    // Member Functions
+
+        //- Return the collision cross section * relative velocity product
+        virtual scalar sigmaTcR
+        (
+            label typeIdP,
+            label typeIdQ,
+            const vector& UP,
+            const vector& UQ
+        ) const;
+
+        //- Apply collision
+        virtual void collide
+        (
+            label typeIdP,
+            label typeIdQ,
+            vector& UP,
+            vector& UQ,
+            scalar& EiP,
+            scalar& EiQ
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "LarsenBorgnakkeVariableHardSphere.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
new file mode 100644
index 000000000..701ac8f3d
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
@@ -0,0 +1,145 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "VariableHardSphere.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::VariableHardSphere<CloudType>::VariableHardSphere
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    BinaryCollisionModel<CloudType>(dict, cloud, typeName),
+    Tref_(readScalar(this->coeffDict().lookup("Tref")))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::VariableHardSphere<CloudType>::~VariableHardSphere()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+template <class CloudType>
+Foam::scalar Foam::VariableHardSphere<CloudType>::sigmaTcR
+(
+    label typeIdP,
+    label typeIdQ,
+    const vector& UP,
+    const vector& UQ
+) const
+{
+    const CloudType& cloud(this->owner());
+
+    scalar dPQ =
+        0.5
+       *(
+            cloud.constProps(typeIdP).d()
+          + cloud.constProps(typeIdQ).d()
+        );
+
+    scalar omegaPQ =
+        0.5
+       *(
+            cloud.constProps(typeIdP).omega()
+          + cloud.constProps(typeIdQ).omega()
+        );
+
+    scalar cR = mag(UP - UQ);
+
+    if (cR < VSMALL)
+    {
+        return 0;
+    }
+
+    scalar mP = cloud.constProps(typeIdP).mass();
+
+    scalar mQ = cloud.constProps(typeIdQ).mass();
+
+    scalar mR = mP*mQ/(mP + mQ);
+
+    // calculating cross section = pi*dPQ^2, where dPQ is from Bird, eq. 4.79
+    scalar sigmaTPQ =
+        mathematicalConstant::pi*dPQ*dPQ
+       *pow(2.0*CloudType::kb*Tref_/(mR*cR*cR), omegaPQ - 0.5)
+       /exp(Foam::lgamma(2.5 - omegaPQ));
+
+    return sigmaTPQ*cR;
+}
+
+
+template <class CloudType>
+void Foam::VariableHardSphere<CloudType>::collide
+(
+    label typeIdP,
+    label typeIdQ,
+    vector& UP,
+    vector& UQ,
+    scalar& EiP,
+    scalar& EiQ
+)
+{
+    CloudType& cloud(this->owner());
+
+    Random& rndGen(cloud.rndGen());
+
+    scalar mP = cloud.constProps(typeIdP).mass();
+
+    scalar mQ = cloud.constProps(typeIdQ).mass();
+
+    vector Ucm = (mP*UP + mQ*UQ)/(mP + mQ);
+
+    scalar cR = mag(UP - UQ);
+
+    scalar cosTheta = 2.0*rndGen.scalar01() - 1.0;
+
+    scalar sinTheta = sqrt(1.0 - cosTheta*cosTheta);
+
+    scalar phi = 2.0*mathematicalConstant::pi*rndGen.scalar01();
+
+    vector postCollisionRelU =
+        cR
+       *vector
+        (
+            cosTheta,
+            sinTheta*cos(phi),
+            sinTheta*sin(phi)
+        );
+
+    UP = Ucm + postCollisionRelU*mQ/(mP + mQ);
+
+    UQ = Ucm - postCollisionRelU*mP/(mP + mQ);
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
new file mode 100644
index 000000000..656c74fee
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.H
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+Class
+    Foam::VariableHardSphere
+
+Description
+    Variable Hard Sphere BinaryCollision Model
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef VariableHardSphere_H
+#define VariableHardSphere_H
+
+#include "BinaryCollisionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                      Class VariableHardSphere Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class VariableHardSphere
+:
+    public BinaryCollisionModel<CloudType>
+{
+    // Private data
+
+        //- Reference temperature
+        const scalar Tref_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("VariableHardSphere");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        VariableHardSphere
+        (
+            const dictionary& dict,
+            CloudType& cloud
+        );
+
+
+    // Destructor
+    virtual ~VariableHardSphere();
+
+
+    // Member Functions
+
+        //- Return the collision cross section * relative velocity product
+        virtual scalar sigmaTcR
+        (
+            label typeIdP,
+            label typeIdQ,
+            const vector& UP,
+            const vector& UQ
+        ) const;
+
+        //- Apply collision
+        virtual void collide
+        (
+            label typeIdP,
+            label typeIdQ,
+            vector& UP,
+            vector& UQ,
+            scalar& EiP,
+            scalar& EiQ
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "VariableHardSphere.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
new file mode 100644
index 000000000..2fa56b443
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -0,0 +1,411 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "FreeStream.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::FreeStream<CloudType>::FreeStream
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    InflowBoundaryModel<CloudType>(dict, cloud, typeName),
+    patches_(),
+    moleculeTypeIds_(),
+    numberDensities_(),
+    particleFluxAccumulators_()
+{
+    // Identify which patches to use
+
+    DynamicList<label> patches;
+
+    forAll(cloud.mesh().boundaryMesh(), p)
+    {
+        const polyPatch& patch = cloud.mesh().boundaryMesh()[p];
+
+        if (isType<polyPatch>(patch))
+        {
+            patches.append(p);
+        }
+    }
+
+    patches_.transfer(patches);
+
+    const dictionary& numberDensitiesDict
+    (
+        this->coeffDict().subDict("numberDensities")
+    );
+
+    List<word> molecules(numberDensitiesDict.toc());
+
+    // Initialise the particleFluxAccumulators_
+    particleFluxAccumulators_.setSize(patches_.size());
+
+    forAll(patches_, p)
+    {
+        const polyPatch& patch = cloud.mesh().boundaryMesh()[patches_[p]];
+
+        particleFluxAccumulators_[p] = List<Field<scalar> >
+        (
+            molecules.size(),
+            Field<scalar>(patch.size(), 0.0)
+        );
+    }
+
+    moleculeTypeIds_.setSize(molecules.size());
+
+    numberDensities_.setSize(molecules.size());
+
+    forAll(molecules, i)
+    {
+        numberDensities_[i] = readScalar
+        (
+            numberDensitiesDict.lookup(molecules[i])
+        );
+
+        moleculeTypeIds_[i] = findIndex(cloud.typeIdList(), molecules[i]);
+
+        if (moleculeTypeIds_[i] == -1)
+        {
+            FatalErrorIn
+            (
+                "Foam::FreeStream<CloudType>::FreeStream"
+                "("
+                    "const dictionary&, "
+                    "CloudType&"
+                ")"
+            )   << "typeId " << molecules[i] << "not defined in cloud." << nl
+                << abort(FatalError);
+        }
+    }
+
+    numberDensities_ /= cloud.nParticle();
+}
+
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::FreeStream<CloudType>::~FreeStream()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template <class CloudType>
+void Foam::FreeStream<CloudType>::inflow()
+{
+    CloudType& cloud(this->owner());
+
+    const polyMesh& mesh(cloud.mesh());
+
+    const scalar deltaT = mesh.time().deltaTValue();
+
+    Random& rndGen(cloud.rndGen());
+
+    scalar sqrtPi = sqrt(mathematicalConstant::pi);
+
+    label particlesInserted = 0;
+
+    const volScalarField::GeometricBoundaryField& boundaryT
+    (
+        cloud.boundaryT().boundaryField()
+    );
+
+    const volVectorField::GeometricBoundaryField& boundaryU
+    (
+        cloud.boundaryU().boundaryField()
+    );
+
+    forAll(patches_, p)
+    {
+        label patchI = patches_[p];
+
+        const polyPatch& patch = mesh.boundaryMesh()[patchI];
+
+        // Add mass to the accumulators.  negative face area dotted with the
+        // velocity to point flux into the domain.
+
+        // Take a reference to the particleFluxAccumulator for this patch
+        List<Field<scalar> >& pFA = particleFluxAccumulators_[p];
+
+        forAll(pFA, i)
+        {
+            label typeId = moleculeTypeIds_[i];
+
+            scalar mass = cloud.constProps(typeId).mass();
+
+            if (min(boundaryT[patchI]) < SMALL)
+            {
+                FatalErrorIn ("Foam::FreeStream<CloudType>::inflow()")
+                    << "Zero boundary temperature detected, "
+                    << "check boundaryT condition." << nl
+                    << nl << abort(FatalError);
+            }
+
+            scalarField mostProbableSpeed
+            (
+                cloud.maxwellianMostProbableSpeed
+                (
+                    boundaryT[patchI],
+                    mass
+                )
+            );
+
+            // Dotting boundary velocity with the face unit normal (which points
+            // out of the domain, so it must be negated), dividing by the most
+            // probable speed to form molecularSpeedRatio * cosTheta
+
+            scalarField sCosTheta =
+                boundaryU[patchI]
+              & -patch.faceAreas()/mag(patch.faceAreas())
+               /mostProbableSpeed;
+
+            // From Bird eqn 4.22
+
+            pFA[i] +=
+                mag(patch.faceAreas())*numberDensities_[i]*deltaT
+               *mostProbableSpeed
+               *(
+                   exp(-sqr(sCosTheta)) + sqrtPi*sCosTheta*(1 + erf(sCosTheta))
+                )
+               /(2.0*sqrtPi);
+        }
+
+        forAll(patch, f)
+        {
+            // Loop over all faces as the outer loop to avoid calculating
+            // geometrical properties multiple times.
+
+            labelList faceVertices = patch[f];
+
+            label nVertices = faceVertices.size();
+
+            label globalFaceIndex = f + patch.start();
+
+            label cell = mesh.faceOwner()[globalFaceIndex];
+
+            const vector& fC = patch.faceCentres()[f];
+
+            scalar fA = mag(patch.faceAreas()[f]);
+
+            // Cumulative triangle area fractions
+            List<scalar> cTriAFracs(nVertices);
+
+            for (label v = 0; v < nVertices - 1; v++)
+            {
+                const point& vA = mesh.points()[faceVertices[v]];
+
+                const point& vB = mesh.points()[faceVertices[(v + 1)]];
+
+                cTriAFracs[v] =
+                    0.5*mag((vA - fC)^(vB - fC))/fA
+                  + cTriAFracs[max((v - 1), 0)];
+            }
+
+            // Force the last area fraction value to 1.0 to avoid any
+            // rounding/non-flat face errors giving a value < 1.0
+            cTriAFracs[nVertices - 1] = 1.0;
+
+            // Normal unit vector *negative* so normal is pointing into the
+            // domain
+            vector n = patch.faceAreas()[f];
+            n /= -mag(n);
+
+            // Wall tangential unit vector. Use the direction between the
+            // face centre and the first vertex in the list
+            vector t1 = fC - (mesh.points()[faceVertices[0]]);
+            t1 /= mag(t1);
+
+            // Other tangential unit vector.  Rescaling in case face is not
+            // flat and n and t1 aren't perfectly orthogonal
+            vector t2 = n^t1;
+            t2 /= mag(t2);
+
+            scalar faceTemperature = boundaryT[patchI][f];
+
+            const vector& faceVelocity = boundaryU[patchI][f];
+
+            forAll(pFA, i)
+            {
+                scalar& faceAccumulator = pFA[i][f];
+
+                // Number of whole particles to insert
+                label nI = max(label(faceAccumulator), 0);
+
+                // Add another particle with a probability proportional to the
+                // remainder of taking the integer part of faceAccumulator
+                if ((faceAccumulator - nI) > rndGen.scalar01())
+                {
+                    nI++;
+                }
+
+                faceAccumulator -= nI;
+
+                label typeId = moleculeTypeIds_[i];
+
+                scalar mass = cloud.constProps(typeId).mass();
+
+                for (label i = 0; i < nI; i++)
+                {
+                    // Choose a triangle to insert on, based on their relative
+                    // area
+
+                    scalar triSelection = rndGen.scalar01();
+
+                    // Selected triangle
+                    label sTri = -1;
+
+                    forAll(cTriAFracs, tri)
+                    {
+                        sTri = tri;
+
+                        if (cTriAFracs[tri] >= triSelection)
+                        {
+                            break;
+                        }
+                    }
+
+                    // Randomly distribute the points on the triangle, using the
+                    // method from:
+                    // Generating Random Points in Triangles
+                    // by Greg Turk
+                    // from "Graphics Gems", Academic Press, 1990
+                    // http://tog.acm.org/GraphicsGems/gems/TriPoints.c
+
+                    const point& A = fC;
+                    const point& B = mesh.points()[faceVertices[sTri]];
+                    const point& C =
+                    mesh.points()[faceVertices[(sTri + 1) % nVertices]];
+
+                    scalar s = rndGen.scalar01();
+                    scalar t = sqrt(rndGen.scalar01());
+
+                    point p = (1 - t)*A + (1 - s)*t*B + s*t*C;
+
+                    // Velocity generation
+
+                    scalar mostProbableSpeed
+                    (
+                        cloud.maxwellianMostProbableSpeed
+                        (
+                            faceTemperature,
+                            mass
+                        )
+                    );
+
+                    scalar sCosTheta = (faceVelocity & n)/mostProbableSpeed;
+
+                    // Coefficients required for Bird eqn 12.5
+                    scalar uNormProbCoeffA =
+                        sCosTheta + sqrt(sqr(sCosTheta) + 2.0);
+
+                    scalar uNormProbCoeffB =
+                        0.5*
+                        (
+                            1.0
+                          + sCosTheta*(sCosTheta - sqrt(sqr(sCosTheta) + 2.0))
+                        );
+
+                    // Equivalent to the QA value in Bird's DSMC3.FOR
+                    scalar randomScaling = 3.0;
+
+                    if (sCosTheta < -3)
+                    {
+                        randomScaling = mag(sCosTheta) + 1;
+                    }
+
+                    scalar P = -1;
+
+                    // Normalised candidates for the normal direction velocity
+                    // component
+                    scalar uNormal;
+                    scalar uNormalThermal;
+
+                    // Select a velocity using Bird eqn 12.5
+                    do
+                    {
+                        uNormalThermal =
+                            randomScaling*(2.0*rndGen.scalar01() - 1);
+
+                        uNormal = uNormalThermal + sCosTheta;
+
+                        if (uNormal < 0.0)
+                        {
+                            P = -1;
+                        }
+                        else
+                        {
+                            P = 2.0*uNormal/uNormProbCoeffA
+                               *exp(uNormProbCoeffB - sqr(uNormalThermal));
+                        }
+
+                    } while (P < rndGen.scalar01());
+
+                    vector U =
+                        sqrt(CloudType::kb*faceTemperature/mass)
+                       *(
+                            rndGen.GaussNormal()*t1
+                          + rndGen.GaussNormal()*t2
+                        )
+                      + (t1 & faceVelocity)*t1
+                      + (t2 & faceVelocity)*t2
+                      + mostProbableSpeed*uNormal*n;
+
+                    scalar Ei = cloud.equipartitionInternalEnergy
+                    (
+                        faceTemperature,
+                        cloud.constProps(typeId).internalDegreesOfFreedom()
+                    );
+
+                    cloud.addNewParcel
+                    (
+                        p,
+                        U,
+                        Ei,
+                        cell,
+                        typeId
+                    );
+
+                    particlesInserted++;
+                }
+            }
+        }
+    }
+
+    reduce(particlesInserted, sumOp<label>());
+
+    Info<< "    Particles inserted              = "
+        << particlesInserted << endl;
+
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
new file mode 100644
index 000000000..4d508903d
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/FreeStream/FreeStream.H
@@ -0,0 +1,116 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::FreeStream
+
+Description
+    Inserting new particles across the faces of a all patched of type
+    "patch" for a free stream.  Uniform values number density, temperature
+    and velocity sourced face-by-face from the boundaryT and boundaryU fields
+    of the cloud.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef FreeStream_H
+#define FreeStream_H
+
+#include "InflowBoundaryModel.H"
+#include "polyMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                        Class FreeStream Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class FreeStream
+:
+    public InflowBoundaryModel<CloudType>
+{
+    // Private data
+
+        //- The indices of patches to introduce molecules across
+        labelList patches_;
+
+        //- The molecule types to be introduced
+        List<label> moleculeTypeIds_;
+
+        //- The number density of the species in the inflow
+        Field<scalar> numberDensities_;
+
+        //- A List of Lists of Fields specifying carry-over of mass flux from
+        // one timestep to the next
+        // + Outer List - one inner List for each patch
+        // + Inner List - one Field for every species to be introduced
+        // + Each field entry corresponding to a face to be injected across
+        //   with a particular species
+        List<List<Field<scalar> > > particleFluxAccumulators_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("FreeStream");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        FreeStream
+        (
+            const dictionary& dict,
+            CloudType& cloud
+        );
+
+
+    // Destructor
+    virtual ~FreeStream();
+
+
+    // Member Functions
+
+        //- Introduce particles
+        virtual void inflow();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "FreeStream.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
new file mode 100644
index 000000000..39837f06c
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.C
@@ -0,0 +1,87 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "InflowBoundaryModel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::InflowBoundaryModel<CloudType>::InflowBoundaryModel
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& type
+)
+:
+    dict_(dict),
+    owner_(owner),
+    coeffDict_(dict.subDict(type + "Coeffs"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::InflowBoundaryModel<CloudType>::~InflowBoundaryModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+const CloudType& Foam::InflowBoundaryModel<CloudType>::owner() const
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+CloudType& Foam::InflowBoundaryModel<CloudType>::owner()
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::InflowBoundaryModel<CloudType>::dict() const
+{
+    return dict_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::InflowBoundaryModel<CloudType>::coeffDict() const
+{
+    return coeffDict_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "NewInflowBoundaryModel.C"
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
new file mode 100644
index 000000000..609c41989
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/InflowBoundaryModel.H
@@ -0,0 +1,166 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::InflowBoundaryModel
+
+
+Description
+    Templated inflow boundary model class
+
+SourceFiles
+    InflowBoundaryModel.C
+    NewInflowBoundaryModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef InflowBoundaryModel_H
+#define InflowBoundaryModel_H
+
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class InflowBoundaryModel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class InflowBoundaryModel
+{
+    // Private data
+
+        //- The cloud dictionary
+        const dictionary& dict_;
+
+        // Reference to the owner cloud class
+        CloudType& owner_;
+
+        //- The coefficients dictionary
+        const dictionary coeffDict_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("InflowBoundaryModel");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        InflowBoundaryModel,
+        dictionary,
+        (
+            const dictionary& dict,
+            CloudType& owner
+        ),
+        (dict, owner)
+    );
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        InflowBoundaryModel
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& type
+        );
+
+
+    //- Destructor
+    virtual ~InflowBoundaryModel();
+
+
+    //- Selector
+    static autoPtr<InflowBoundaryModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
+
+
+    // Access
+
+        //- Return const access the owner cloud object
+        inline const CloudType& owner() const;
+
+        //- Return non-const access the owner cloud object for manipulation
+        inline CloudType& owner();
+
+        //- Return the owner cloud dictionary
+        inline const dictionary& dict() const;
+
+        //- Return the coefficients dictionary
+        inline const dictionary& coeffDict() const;
+
+    //- Introduce particles
+    virtual void inflow() = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeInflowBoundaryModel(CloudType)                                    \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(InflowBoundaryModel<CloudType>, 0);   \
+                                                                              \
+    defineTemplateRunTimeSelectionTable                                       \
+    (                                                                         \
+        InflowBoundaryModel<CloudType>,                                       \
+        dictionary                                                            \
+    );
+
+
+#define makeInflowBoundaryModelType(SS, CloudType, ParcelType)                \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+                                                                              \
+    InflowBoundaryModel<CloudType<ParcelType> >::                             \
+        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
+            add##SS##CloudType##ParcelType##ConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "InflowBoundaryModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/NewMassTransferModel.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C
similarity index 73%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/NewMassTransferModel.C
rename to src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C
index bad42a543..754962c98 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/NewMassTransferModel.C
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/InflowBoundaryModel/NewInflowBoundaryModel.C
@@ -24,43 +24,39 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "MassTransferModel.H"
+#include "InflowBoundaryModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::autoPtr<Foam::MassTransferModel<CloudType> >
-Foam::MassTransferModel<CloudType>::New
+Foam::autoPtr<Foam::InflowBoundaryModel<CloudType> >
+Foam::InflowBoundaryModel<CloudType>::New
 (
     const dictionary& dict,
     CloudType& owner
 )
 {
-    word MassTransferModelType
-    (
-        dict.lookup("MassTransferModel")
-    );
+    word InflowBoundaryModelType(dict.lookup("InflowBoundaryModel"));
 
-    Info<< "Selecting MassTransferModel " << MassTransferModelType << endl;
+    Info<< "Selecting InflowBoundaryModel " << InflowBoundaryModelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(MassTransferModelType);
+        dictionaryConstructorTablePtr_->find(InflowBoundaryModelType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "MassTransferModel<CloudType>::New"
+            "InflowBoundaryModel<CloudType>::New"
             "(const dictionary&, CloudType&)"
-        )
-            << "Unknown MassTransferModelType type "
-            << MassTransferModelType
+        )   << "Unknown InflowBoundaryModelType type "
+            << InflowBoundaryModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid MassTransferModel types are :" << nl
+            << "    Valid InflowBoundaryModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
-    return autoPtr<MassTransferModel<CloudType> >(cstrIter()(dict, owner));
+    return autoPtr<InflowBoundaryModel<CloudType> >(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
new file mode 100644
index 000000000..e1118c883
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.C
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "NoInflow.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::NoInflow<CloudType>::NoInflow
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    InflowBoundaryModel<CloudType>(dict, cloud, typeName)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::NoInflow<CloudType>::~NoInflow()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template <class CloudType>
+void Foam::NoInflow<CloudType>::inflow()
+{}
+
+
+// ************************************************************************* //
diff --git a/applications/test/router/Gather/Gather.H b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
similarity index 73%
rename from applications/test/router/Gather/Gather.H
rename to src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
index 159fffd2a..24df0ceae 100644
--- a/applications/test/router/Gather/Gather.H
+++ b/src/lagrangian/dsmc/submodels/InflowBoundaryModel/NoInflow/NoInflow.H
@@ -23,60 +23,55 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::Gather
+    Foam::NoInflow
 
 Description
-    Gather data from all processors onto all processors. 
-
-SourceFiles
-    Gather.C
+    Not inserting any particles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef Gather_H
-#define Gather_H
+#ifndef NoInflow_H
+#define NoInflow_H
 
-#include "List.H"
-#include "labelList.H"
-#include "GatherBase.H"
+#include "InflowBoundaryModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
 /*---------------------------------------------------------------------------*\
-                           Class Gather Declaration
+                          Class NoInflow Declaration
 \*---------------------------------------------------------------------------*/
 
-template <class T0>
-class Gather
+template<class CloudType>
+class NoInflow
 :
-    public GatherBase,
-    public List<T0>
+    public InflowBoundaryModel<CloudType>
 {
-    // Private data
-
-        //- Number of processors (1 for sequential)
-        label nProcs_;
-
-        //- Storage of type 0
-        //List<T0> data0_;
-
 public:
 
+    //- Runtime type information
+    TypeName("NoInflow");
+
+
     // Constructors
 
-        //- Construct from containers across processors
-        Gather(const T0&, const bool redistribute=true);
+        //- Construct from dictionary
+        NoInflow
+        (
+            const dictionary& dict,
+            CloudType& cloud
+        );
+
+
+    // Destructor
+    virtual ~NoInflow();
 
 
     // Member Functions
 
-//        const List<T0>& data0() const
-//        {
-//            return data0_;
-//        }
+        //- Introduce particles (none in this case)
+        virtual void inflow();
 };
 
 
@@ -87,7 +82,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "Gather.C"
+#   include "NoInflow.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
new file mode 100644
index 000000000..09d48aead
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
@@ -0,0 +1,124 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "MaxwellianThermal.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::MaxwellianThermal<CloudType>::MaxwellianThermal
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    WallInteractionModel<CloudType>(dict, cloud, typeName)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::MaxwellianThermal<CloudType>::~MaxwellianThermal()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template <class CloudType>
+void Foam::MaxwellianThermal<CloudType>::correct
+(
+    const wallPolyPatch& wpp,
+    const label faceId,
+    vector& U,
+    scalar& Ei,
+    label typeId
+)
+{
+    label wppIndex = wpp.index();
+
+    label wppLocalFace = wpp.whichFace(faceId);
+
+    vector nw = wpp.faceAreas()[wppLocalFace];
+
+    // Normal unit vector
+    nw /= mag(nw);
+
+    // Normal velocity magnitude
+    scalar magUn = U & nw;
+
+    // Wall tangential velocity (flow direction)
+    vector Ut = U - magUn*nw;
+
+    CloudType& cloud(this->owner());
+
+    Random& rndGen(cloud.rndGen());
+
+    while (mag(Ut) < SMALL)
+    {
+        // If the incident velocity is parallel to the face normal, no
+        // tangential direction can be chosen.  Add a perturbation to the
+        // incoming velocity and recalculate.
+
+        U = vector
+        (
+            U.x()*(0.8 + 0.2*rndGen.scalar01()),
+            U.y()*(0.8 + 0.2*rndGen.scalar01()),
+            U.z()*(0.8 + 0.2*rndGen.scalar01())
+        );
+
+        magUn = U & nw;
+
+        Ut = U - magUn*nw;
+    }
+
+    // Wall tangential unit vector
+    vector tw1 = Ut/mag(Ut);
+
+    // Other tangential unit vector
+    vector tw2 = nw^tw1;
+
+    scalar T = cloud.boundaryT().boundaryField()[wppIndex][wppLocalFace];
+
+    scalar mass = cloud.constProps(typeId).mass();
+
+    scalar iDof = cloud.constProps(typeId).internalDegreesOfFreedom();
+
+    U =
+        sqrt(CloudType::kb*T/mass)
+       *(
+            rndGen.GaussNormal()*tw1
+          + rndGen.GaussNormal()*tw2
+          - sqrt(-2.0*log(max(1 - rndGen.scalar01(), VSMALL)))*nw
+        );
+
+    U += cloud.boundaryU().boundaryField()[wppIndex][wppLocalFace];
+
+    Ei = cloud.equipartitionInternalEnergy(T, iDof);
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/router/Gather/GatherBase.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
similarity index 66%
rename from applications/test/router/Gather/GatherBase.H
rename to src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
index b5896d1b4..d1b259d63 100644
--- a/applications/test/router/Gather/GatherBase.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.H
@@ -23,66 +23,63 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::GatherBase
+    Foam::MaxwellianThermal
 
 Description
-
-SourceFiles
-    GatherBase.C
+    Wall interaction setting microscopic velocity to a random one drawn from a
+    Maxwellian distribution corresponding to a specified temperature
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef GatherBase_H
-#define GatherBase_H
+#ifndef MaxwellianThermal_H
+#define MaxwellianThermal_H
 
-#include "List.H"
-#include "labelList.H"
+#include "WallInteractionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
 /*---------------------------------------------------------------------------*\
-                           Class GatherBase Declaration
+                      Class MaxwellianThermal Declaration
 \*---------------------------------------------------------------------------*/
 
-class GatherBase
+template<class CloudType>
+class MaxwellianThermal
+:
+    public WallInteractionModel<CloudType>
 {
-
 public:
 
-        //- Flatten: appends all elements of list into one single list.
-        //  Used to collapse 'Gathered' data.
-        template <class T>
-        static T flatten(const List<T>);
+    //- Runtime type information
+    TypeName("MaxwellianThermal");
 
-        //- Flatten and offset 'Gathered' indices (into value) so they
-        //  remain valid with respect to values (after they have been flattened)
-        template <class DataType, class IndexType, class AddOp>
-        static IndexType offset
+
+    // Constructors
+
+        //- Construct from dictionary
+        MaxwellianThermal
         (
-            const List<DataType>& values,
-            const List<IndexType>& indices,
-            AddOp aop
+            const dictionary& dict,
+            CloudType& cloud
         );
-};
 
 
-template <class T>
-class AddOp
-{
+    // Destructor
+    virtual ~MaxwellianThermal();
 
-public:
 
-    T operator()
-    (
-        const T& x,
-        const label offset
-    ) const
-    {
-        return x + offset;
-    }
+    // Member Functions
+
+        //- Apply wall correction
+        virtual void correct
+        (
+            const wallPolyPatch& wpp,
+            const label faceId,
+            vector& U,
+            scalar& Ei,
+            label typeId
+        );
 };
 
 
@@ -93,7 +90,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "GatherBase.C"
+#   include "MaxwellianThermal.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
new file mode 100644
index 000000000..1625b94ff
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "MixedDiffuseSpecular.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::MixedDiffuseSpecular<CloudType>::MixedDiffuseSpecular
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    WallInteractionModel<CloudType>(dict, cloud, typeName),
+    diffuseFraction_(readScalar(this->coeffDict().lookup("diffuseFraction")))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::MixedDiffuseSpecular<CloudType>::~MixedDiffuseSpecular()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template <class CloudType>
+void Foam::MixedDiffuseSpecular<CloudType>::correct
+(
+    const wallPolyPatch& wpp,
+    const label faceId,
+    vector& U,
+    scalar& Ei,
+    label typeId
+)
+{
+    label wppIndex = wpp.index();
+
+    label wppLocalFace = wpp.whichFace(faceId);
+
+    vector nw = wpp.faceAreas()[wppLocalFace];
+
+    // Normal unit vector
+    nw /= mag(nw);
+
+    // Normal velocity magnitude
+    scalar U_dot_nw = U & nw;
+
+    CloudType& cloud(this->owner());
+
+    Random& rndGen(cloud.rndGen());
+
+    if (diffuseFraction_ > rndGen.scalar01())
+    {
+        // Diffuse reflection
+
+        // Wall tangential velocity (flow direction)
+        vector Ut = U - U_dot_nw*nw;
+
+        while (mag(Ut) < SMALL)
+        {
+            // If the incident velocity is parallel to the face normal, no
+            // tangential direction can be chosen.  Add a perturbation to the
+            // incoming velocity and recalculate.
+
+            U = vector
+            (
+                U.x()*(0.8 + 0.2*rndGen.scalar01()),
+                U.y()*(0.8 + 0.2*rndGen.scalar01()),
+                U.z()*(0.8 + 0.2*rndGen.scalar01())
+            );
+
+            U_dot_nw = U & nw;
+
+            Ut = U - U_dot_nw*nw;
+        }
+
+        // Wall tangential unit vector
+        vector tw1 = Ut/mag(Ut);
+
+        // Other tangential unit vector
+        vector tw2 = nw^tw1;
+
+        scalar T = cloud.boundaryT().boundaryField()[wppIndex][wppLocalFace];
+
+        scalar mass = cloud.constProps(typeId).mass();
+
+        scalar iDof = cloud.constProps(typeId).internalDegreesOfFreedom();
+
+        U =
+            sqrt(CloudType::kb*T/mass)
+           *(
+                rndGen.GaussNormal()*tw1
+              + rndGen.GaussNormal()*tw2
+              - sqrt(-2.0*log(max(1 - rndGen.scalar01(), VSMALL)))*nw
+            );
+
+        U += cloud.boundaryU().boundaryField()[wppIndex][wppLocalFace];
+
+        Ei = cloud.equipartitionInternalEnergy(T, iDof);
+    }
+    else
+    {
+        // Specular reflection
+
+        if (U_dot_nw > 0.0)
+        {
+            U -= 2.0*U_dot_nw*nw;
+        }
+    }
+
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
similarity index 78%
rename from src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.H
rename to src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
index 4832f3863..af4c08956 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.H
@@ -23,15 +23,16 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::StandardWallInteraction
+    Foam::MixedDiffuseSpecular
 
 Description
-    Wall interaction based on restitution and elasticity coefficients
+    Wall interaction setting microscopic velocity to a random one drawn from a
+    Maxwellian distribution corresponding to a specified temperature
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef StandardWallInteraction_H
-#define StandardWallInteraction_H
+#ifndef MixedDiffuseSpecular_H
+#define MixedDiffuseSpecular_H
 
 #include "WallInteractionModel.H"
 
@@ -40,34 +41,30 @@ Description
 namespace Foam
 {
 /*---------------------------------------------------------------------------*\
-                      Class StandardWallInteraction Declaration
+                    Class MixedDiffuseSpecular Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class StandardWallInteraction
+class MixedDiffuseSpecular
 :
     public WallInteractionModel<CloudType>
 {
-
     // Private data
 
-        //- Elasticity
-        const scalar e_;
-
-        //-Restitution coefficient
-        const scalar mu_;
+        //- Fraction of wall interactions that are diffuse
+        scalar diffuseFraction_;
 
 
 public:
 
     //- Runtime type information
-    TypeName("StandardWallInteraction");
+    TypeName("MixedDiffuseSpecular");
 
 
     // Constructors
 
         //- Construct from dictionary
-        StandardWallInteraction
+        MixedDiffuseSpecular
         (
             const dictionary& dict,
             CloudType& cloud
@@ -75,22 +72,20 @@ public:
 
 
     // Destructor
-
-        ~StandardWallInteraction();
+    virtual ~MixedDiffuseSpecular();
 
 
     // Member Functions
 
-        //- Flag to indicate whether model activates heat transfer model
-        bool active() const;
-
         //- Apply wall correction
         virtual void correct
         (
             const wallPolyPatch& wpp,
             const label faceId,
-            vector& U
-        ) const;
+            vector& U,
+            scalar& Ei,
+            label typeId
+        );
 };
 
 
@@ -101,7 +96,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "StandardWallInteraction.C"
+#   include "MixedDiffuseSpecular.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
similarity index 73%
rename from src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.C
rename to src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
index 0856b64ae..04c644878 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/StandardWallInteraction/StandardWallInteraction.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.C
@@ -26,59 +26,49 @@ License
 
 #include "error.H"
 
-#include "StandardWallInteraction.H"
+#include "SpecularReflection.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::StandardWallInteraction<CloudType>::StandardWallInteraction
+Foam::SpecularReflection<CloudType>::SpecularReflection
 (
     const dictionary& dict,
     CloudType& cloud
 )
 :
-    WallInteractionModel<CloudType>(dict, cloud, typeName),
-    e_(dimensionedScalar(this->coeffDict().lookup("e")).value()),
-    mu_(dimensionedScalar(this->coeffDict().lookup("mu")).value())
+    WallInteractionModel<CloudType>(dict, cloud, typeName)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::StandardWallInteraction<CloudType>::~StandardWallInteraction()
+Foam::SpecularReflection<CloudType>::~SpecularReflection()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class CloudType>
-bool Foam::StandardWallInteraction<CloudType>::active() const
-{
-    return true;
-}
-
-
 template <class CloudType>
-void Foam::StandardWallInteraction<CloudType>::correct
+void Foam::SpecularReflection<CloudType>::correct
 (
     const wallPolyPatch& wpp,
     const label faceId,
-    vector& U
-) const
+    vector& U,
+    scalar& Ei,
+    label typeId
+)
 {
     vector nw = wpp.faceAreas()[wpp.whichFace(faceId)];
     nw /= mag(nw);
 
-    scalar Un = U & nw;
-    vector Ut = U - Un*nw;
+    scalar magUn = U & nw;
 
-    if (Un > 0)
+    if (magUn > 0.0)
     {
-        U -= (1.0 + e_)*Un*nw;
+        U -= 2.0*magUn*nw;
     }
-
-    U -= mu_*Ut;
 }
 
 
diff --git a/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
new file mode 100644
index 000000000..03a81b250
--- /dev/null
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/SpecularReflection/SpecularReflection.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::SpecularReflection
+
+Description
+    Reversing the wall-normal component of the particle velocity
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SpecularReflection_H
+#define SpecularReflection_H
+
+#include "WallInteractionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                      Class SpecularReflection Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class SpecularReflection
+:
+    public WallInteractionModel<CloudType>
+{
+public:
+
+    //- Runtime type information
+    TypeName("SpecularReflection");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        SpecularReflection
+        (
+            const dictionary& dict,
+            CloudType& cloud
+        );
+
+
+    // Destructor
+    virtual ~SpecularReflection();
+
+
+    // Member Functions
+
+        //- Apply wall correction
+        virtual void correct
+        (
+            const wallPolyPatch& wpp,
+            const label faceId,
+            vector& U,
+            scalar& Ei,
+            label typeId
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "SpecularReflection.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
similarity index 93%
rename from src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
rename to src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
index 161347f55..e7c14e4fc 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/NewWallInteractionModel.C
@@ -36,10 +36,7 @@ Foam::WallInteractionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word WallInteractionModelType
-    (
-        dict.lookup("WallInteractionModel")
-    );
+    word WallInteractionModelType(dict.lookup("WallInteractionModel"));
 
     Info<< "Selecting WallInteractionModel " << WallInteractionModelType
         << endl;
@@ -57,7 +54,7 @@ Foam::WallInteractionModel<CloudType>::New
             << "Unknown WallInteractionModelType type "
             << WallInteractionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid WallInteractionModel types are :" << nl
+            << "    Valid WallInteractionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
similarity index 92%
rename from src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
rename to src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
index 0350c2439..d3f224b91 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.C
@@ -35,7 +35,8 @@ Foam::WallInteractionModel<CloudType>::WallInteractionModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs"))
 {}
@@ -51,8 +52,14 @@ Foam::WallInteractionModel<CloudType>::~WallInteractionModel()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-const CloudType&
-Foam::WallInteractionModel<CloudType>::owner() const
+const CloudType& Foam::WallInteractionModel<CloudType>::owner() const
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+CloudType& Foam::WallInteractionModel<CloudType>::owner()
 {
     return owner_;
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.H b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
similarity index 93%
rename from src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
rename to src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
index 960096b33..e024ff947 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
+++ b/src/lagrangian/dsmc/submodels/WallInteractionModel/WallInteractionModel/WallInteractionModel.H
@@ -25,7 +25,6 @@ License
 Class
     Foam::WallInteractionModel
 
-
 Description
     Templated wall interaction model class
 
@@ -54,7 +53,6 @@ namespace Foam
 template<class CloudType>
 class WallInteractionModel
 {
-
     // Private data
 
         //- The cloud dictionary
@@ -98,17 +96,15 @@ public:
 
 
     // Destructor
-
-        virtual ~WallInteractionModel();
+    virtual ~WallInteractionModel();
 
 
-    // Selector
-
-        static autoPtr<WallInteractionModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+    //- Selector
+    static autoPtr<WallInteractionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Access
@@ -116,6 +112,9 @@ public:
         //- Return the owner cloud object
         const CloudType& owner() const;
 
+        //- Return non-const access to the owner cloud object
+        CloudType& owner();
+
         //- Return the dictionary
         const dictionary& dict() const;
 
@@ -125,16 +124,15 @@ public:
 
     // Member Functions
 
-        //- Flag to indicate whether model activates heat transfer model
-        virtual bool active() const = 0;
-
         //- Apply wall correction
         virtual void correct
         (
             const wallPolyPatch& wpp,
             const label faceId,
-            vector& U
-        ) const = 0;
+            vector& U,
+            scalar& Ei,
+            label typeId
+        ) = 0;
 };
 
 
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C
index 035629dee..12e4b4219 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.C
@@ -50,7 +50,8 @@ Foam::Analytical<Type>::~Analytical()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type Foam::Analytical<Type>::integrate
+typename Foam::IntegrationScheme<Type>::integrationResult
+Foam::Analytical<Type>::integrate
 (
     const Type phi,
     const scalar dt,
@@ -58,7 +59,11 @@ Type Foam::Analytical<Type>::integrate
     const scalar beta
 ) const
 {
-    return alpha + (phi - alpha)*exp(-beta*dt);
+    typename IntegrationScheme<Type>::integrationResult retValue;
+    retValue.average() = alpha + (phi - alpha)*(1 - exp(-beta*dt))/(beta*dt);
+    retValue.value() =  alpha + (phi - alpha)*exp(-beta*dt);
+
+    return retValue;
 }
 
 
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
index 251db3be7..f1e383f2f 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Analytical/Analytical.H
@@ -49,7 +49,6 @@ class Analytical
 :
     public IntegrationScheme<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -59,22 +58,17 @@ public:
     // Constructors
 
         //- Construct from components
-        Analytical
-        (
-            const word& phiName,
-            const dictionary& dict
-        );
+        Analytical(const word& phiName, const dictionary& dict);
 
 
     //- Destructor
-
-        virtual ~Analytical();
+    virtual ~Analytical();
 
 
     // Member Functions
 
         //- Perform the integration
-        virtual Type integrate
+        virtual typename IntegrationScheme<Type>::integrationResult integrate
         (
             const Type phi,
             const scalar dt,
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C
index 08eb0aa45..d19fc6b28 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C
+++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.C
@@ -50,7 +50,8 @@ Foam::Euler<Type>::~Euler()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type Foam::Euler<Type>::integrate
+typename Foam::IntegrationScheme<Type>::integrationResult
+Foam::Euler<Type>::integrate
 (
     const Type phi,
     const scalar dt,
@@ -58,7 +59,11 @@ Type Foam::Euler<Type>::integrate
     const scalar beta
 ) const
 {
-    return (phi + dt*alpha)/(1.0 + dt/beta);
+    typename IntegrationScheme<Type>::integrationResult retValue;
+    retValue.value() = (phi + beta*dt*alpha)/(1.0 + beta*dt);
+    retValue.average() = 0.5*(phi + retValue.value());
+
+    return retValue;
 }
 
 
diff --git a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
index d230a2bbb..22955c8a2 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/Euler/Euler.H
@@ -49,7 +49,6 @@ class Euler
 :
     public IntegrationScheme<Type>
 {
-
 public:
 
     //- Runtime type information
@@ -59,22 +58,17 @@ public:
     // Constructors
 
         //- Construct from components
-        Euler
-        (
-            const word& phiName,
-            const dictionary& dict
-        );
+        Euler(const word& phiName, const dictionary& dict);
 
 
     //- Destructor
-
-        virtual ~Euler();
+    virtual ~Euler();
 
 
     // Member Functions
 
         //- Perform the integration
-        virtual Type integrate
+        virtual typename IntegrationScheme<Type>::integrationResult integrate
         (
             const Type phi,
             const scalar dt,
diff --git a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
index 5bc7ab218..e5ca14d21 100644
--- a/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
+++ b/src/lagrangian/intermediate/IntegrationScheme/IntegrationScheme/IntegrationScheme.H
@@ -53,6 +53,64 @@ namespace Foam
 template<class Type>
 class IntegrationScheme
 {
+
+public:
+
+    //- Helper class to supply results of integration
+    class integrationResult
+    {
+        //- Integration value
+        Type value_;
+
+        //- Average value across integration step
+        Type average_;
+
+
+    public:
+
+        //- Constructor
+        integrationResult()
+        :
+            value_(pTraits<Type>::zero),
+            average_(pTraits<Type>::zero)
+        {}
+
+
+        // Member functions
+
+            // Access
+
+                //- Return const access to the value
+                Type value() const
+                {
+                    return value_;
+                }
+
+                //- Return const access to the average
+                Type average() const
+                {
+                    return average_;
+                }
+
+
+            // Edit
+
+                //- Return access to the value for changing
+                Type& value()
+                {
+                    return value_;
+                }
+
+                //- Return access to the average for changing
+                Type& average()
+                {
+                    return average_;
+                }
+        };
+
+
+private:
+
     // Private data
 
         //- Name of the Integration variable
@@ -95,11 +153,7 @@ public:
     // Constructors
 
         //- Construct from components
-        IntegrationScheme
-        (
-            const word& phiName,
-            const dictionary& dict
-        );
+        IntegrationScheme(const word& phiName, const dictionary& dict);
 
 
     // Selectors
@@ -113,14 +167,13 @@ public:
 
 
     //- Destructor
-
-        virtual ~IntegrationScheme();
+    virtual ~IntegrationScheme();
 
 
     // Member Functions
 
         //- Perform the Integration
-        virtual Type integrate
+        virtual integrationResult integrate
         (
             const Type phi,
             const scalar dt,
@@ -151,7 +204,7 @@ public:
                                                                               \
     defineNamedTemplateTypeNameAndDebug(SS<Type>, 0);                         \
                                                                               \
-    IntegrationScheme<Type>::adddictionaryConstructorToTable<SS<Type> >          \
+    IntegrationScheme<Type>::adddictionaryConstructorToTable<SS<Type> >       \
         add##SS##Type##ConstructorToTable_;
 
 
diff --git a/src/lagrangian/intermediate/Make/files b/src/lagrangian/intermediate/Make/files
index ab3933d12..2ee3d31c3 100644
--- a/src/lagrangian/intermediate/Make/files
+++ b/src/lagrangian/intermediate/Make/files
@@ -1,55 +1,95 @@
+PARCELS=parcels
+BASEPARCELS=$(PARCELS)/baseClasses
+DERIVEDPARCELS=$(PARCELS)/derived
+
+CLOUDS=clouds
+BASECLOUDS=$(CLOUDS)/baseClasses
+DERIVEDCLOUDS=$(CLOUDS)/derived
+
+
 /* Parcels */
-parcels/derived/basicKinematicParcel/basicKinematicParcel.C
-parcels/derived/basicThermoParcel/basicThermoParcel.C
-parcels/derived/basicReactingParcel/basicReactingParcel.C
+$(BASEPARCELS)/reactingParcel/reactingParcel.C
+
 
 /* Cloud base classes */
-clouds/baseClasses/kinematicCloud/kinematicCloud.C
-clouds/baseClasses/thermoCloud/thermoCloud.C
-clouds/baseClasses/reactingCloud/reactingCloud.C
+$(BASECLOUDS)/kinematicCloud/kinematicCloud.C
+$(BASECLOUDS)/thermoCloud/thermoCloud.C
+$(BASECLOUDS)/reactingCloud/reactingCloud.C
+$(BASECLOUDS)/reactingMultiphaseCloud/reactingMultiphaseCloud.C
 
-/* Injection mechanisms */
-clouds/derived/basicKinematicCloud/basicKinematicCloud.C
-clouds/derived/basicThermoCloud/basicThermoCloud.C
-clouds/derived/basicReactingCloud/basicReactingCloud.C
 
 /* kinematic parcel sub-models */
-parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
-parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C
-parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C
-parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C
-parcels/derived/basicKinematicParcel/makeBasicKinematicParcelHeatTransferModels.C
-parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C
+KINEMATICPARCEL=$(DERIVEDPARCELS)/basicKinematicParcel
+$(KINEMATICPARCEL)/basicKinematicParcel.C
+$(KINEMATICPARCEL)/defineBasicKinematicParcel.C
+$(KINEMATICPARCEL)/makeBasicKinematicParcelSubmodels.C
+
 
 /* thermo parcel sub-models */
-parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
-parcels/derived/basicThermoParcel/makeBasicThermoParcelDispersionModels.C
-parcels/derived/basicThermoParcel/makeBasicThermoParcelDragModels.C
-parcels/derived/basicThermoParcel/makeBasicThermoParcelInjectionModels.C
-parcels/derived/basicThermoParcel/makeBasicThermoParcelHeatTransferModels.C
-parcels/derived/basicThermoParcel/makeBasicThermoParcelWallInteractionModels.C
+THERMOPARCEL=$(DERIVEDPARCELS)/basicThermoParcel
+$(THERMOPARCEL)/basicThermoParcel.C
+$(THERMOPARCEL)/defineBasicThermoParcel.C
+$(THERMOPARCEL)/makeBasicThermoParcelSubmodels.C
+
 
 /* reacting parcel sub-models */
-parcels/derived/basicReactingParcel/defineBasicReactingParcel.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelHeatTransferModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelMassTransferModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelSurfaceReactionModels.C
-parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C
+REACTINGPARCEL=$(DERIVEDPARCELS)/BasicReactingParcel
+$(REACTINGPARCEL)/defineBasicReactingParcel.C
+$(REACTINGPARCEL)/makeBasicReactingParcelSubmodels.C
+
+
+/* reacting multiphase parcel sub-models */
+REACTINGMPPARCEL=$(DERIVEDPARCELS)/BasicReactingMultiphaseParcel
+$(REACTINGMPPARCEL)/defineBasicReactingMultiphaseParcel.C
+$(REACTINGMPPARCEL)/makeBasicReactingMultiphaseParcelSubmodels.C
+
 
 /* bolt-on models */
-submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
-submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
+RADIATION=submodels/addOns/radiation
+$(RADIATION)/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+$(RADIATION)/scatter/cloudScatter/cloudScatter.C
+
+submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
+
+KINEMATICINJECTION=submodels/Kinematic/InjectionModel
+$(KINEMATICINJECTION)/KinematicLookupTableInjection/kinematicParcelInjectionData.C
+$(KINEMATICINJECTION)/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C
+$(KINEMATICINJECTION)/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.C
+
+THERMOINJECTION=submodels/Thermodynamic/InjectionModel
+$(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionData.C
+$(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C
+$(THERMOINJECTION)/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.C
+
+REACTINGINJECTION=submodels/Reacting/InjectionModel
+$(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionData.C
+$(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C
+$(REACTINGINJECTION)/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.C
+
+REACTINGMPINJECTION=submodels/ReactingMultiphase/InjectionModel
+$(REACTINGMPINJECTION)/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionData.C
+$(REACTINGMPINJECTION)/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIO.C
+$(REACTINGMPINJECTION)/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.C
+
+
+/* data entries */
+submodels/IO/DataEntry/makeDataEntries.C
+submodels/IO/DataEntry/polynomial/polynomial.C
+submodels/IO/DataEntry/polynomial/polynomialIO.C
+
 
 /* integration schemes */
 IntegrationScheme/makeIntegrationSchemes.C
 
 
-/* Data entries */
-submodels/IO/DataEntry/makeDataEntries.C
+/* particle forces */
+particleForces/particleForces.C
+
+
+/* phase properties */
+phaseProperties/phaseProperties/phaseProperties.C
+phaseProperties/phaseProperties/phasePropertiesIO.C
+phaseProperties/phasePropertiesList/phasePropertiesList.C
 
 
 LIB = $(FOAM_LIBBIN)/liblagrangianIntermediate
diff --git a/src/lagrangian/intermediate/Make/options b/src/lagrangian/intermediate/Make/options
index 3ba9665f2..f35259728 100644
--- a/src/lagrangian/intermediate/Make/options
+++ b/src/lagrangian/intermediate/Make/options
@@ -1,5 +1,6 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/pdfs/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
@@ -8,13 +9,18 @@ EXE_INC = \
     -I$(LIB_SRC)/thermophysicalModels/liquidMixture/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solids/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/solidMixture/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/radiation/lnInclude \
-    -I$(LIB_SRC)/turbulenceModels/RAS/compressible/lnInclude
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/compressible/turbulenceModel \
+    -I$(LIB_SRC)/turbulenceModels/compressible/RAS/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/compressible/LES/lnInclude
 
 LIB_LIBS = \
-    -llagrangian \
     -lfiniteVolume \
+    -lmeshTools \
+    -llagrangian \
     -lpdf \
     -lliquids \
     -lliquidMixture \
@@ -22,5 +28,6 @@ LIB_LIBS = \
     -lsolidMixture \
     -lspecie \
     -lbasicThermophysicalModels \
-    -lcombustionThermophysicalModels \
-    -lcompressibleRASModels
+    -lreactionThermophysicalModels \
+    -lcompressibleRASModels \
+    -lcompressibleLESModels
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index 94442605d..5f25f60fd 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -25,114 +25,82 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "KinematicCloud.H"
+#include "IntegrationScheme.H"
+#include "interpolation.H"
+
 #include "DispersionModel.H"
 #include "DragModel.H"
 #include "InjectionModel.H"
-#include "WallInteractionModel.H"
+#include "PatchInteractionModel.H"
+#include "PostProcessingModel.H"
 
-#include "IntegrationScheme.H"
-
-#include "interpolationCellPoint.H"
-
-// * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
 template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::setInjectorCellAndPosition
-(
-    label& pCell,
-    vector& pPosition
-)
+void Foam::KinematicCloud<ParcelType>::preEvolve()
 {
-    const vector originalPosition = pPosition;
-
-    bool foundCell = false;
-
-    pCell = mesh_.findCell(pPosition);
-
-    if (pCell >= 0)
-    {
-        const vector& C = mesh_.C()[pCell];
-        pPosition += 1.0e-6*(C - pPosition);
-
-        foundCell = mesh_.pointInCell
-        (
-            pPosition,
-            pCell
-        );
-    }
-    reduce(foundCell, orOp<bool>());
-
-    // Last chance - find nearest cell and try that one
-    // - the point is probably on an edge
-    if (!foundCell)
-    {
-        pCell =  mesh_.findNearestCell(pPosition);
-
-        if (pCell >= 0)
-        {
-            const vector& C = mesh_.C()[pCell];
-            pPosition += 1.0e-6*(C - pPosition);
-
-            foundCell = mesh_.pointInCell
-            (
-                pPosition,
-                pCell
-            );
-        }
-        reduce(foundCell, orOp<bool>());
-    }
-
-    if (!foundCell)
-    {
-        FatalErrorIn
-        (
-            "void KinematicCloud<ParcelType>::findInjectorCell"
-            "(label&, vector&)"
-        )<< "Cannot find parcel injection cell. "
-         << "Parcel position = " << originalPosition << nl
-         << abort(FatalError);
-    }
+    this->dispersion().cacheFields(true);
+    forces_.cacheFields(true);
 }
 
 
 template<class ParcelType>
-Foam::scalar Foam::KinematicCloud<ParcelType>::setNumberOfParticles
-(
-    const label nParcels,
-    const scalar pDiameter,
-    const scalar pVolumeFraction,
-    const scalar pRho,
-    const scalar pVolume
-)
+void Foam::KinematicCloud<ParcelType>::evolveCloud()
 {
-    scalar nP = 0.0;
-    switch (parcelBasis_)
+    autoPtr<interpolation<scalar> > rhoInterpolator =
+        interpolation<scalar>::New
+        (
+            interpolationSchemes_,
+            rho_
+        );
+
+    autoPtr<interpolation<vector> > UInterpolator =
+        interpolation<vector>::New
+        (
+            interpolationSchemes_,
+            U_
+        );
+
+    autoPtr<interpolation<scalar> > muInterpolator =
+        interpolation<scalar>::New
+        (
+            interpolationSchemes_,
+            mu_
+        );
+
+    typename ParcelType::trackData td
+    (
+        *this,
+        constProps_,
+        rhoInterpolator(),
+        UInterpolator(),
+        muInterpolator(),
+        g_.value()
+    );
+
+    this->injection().inject(td);
+
+    if (coupled_)
     {
-        case pbMass:
-        {
-            nP = pVolumeFraction*massTotal_/nParcels
-               /(pRho*mathematicalConstant::pi/6.0*pow(pDiameter, 3));
-            break;
-        }
-        case pbNumber:
-        {
-            nP = pVolumeFraction*massTotal_/(pRho*pVolume);
-            break;
-        }
-        default:
-        {
-            nP = 0.0;
-            FatalErrorIn
-            (
-                "Foam::KinematicCloud<ParcelType>::setNumberOfParticles"
-                "(const label, const scalar, const scalar, const scalar, "
-                "const scalar)"
-            )<< "Unknown parcelBasis type" << nl
-             << exit(FatalError);
-        }
+        resetSourceTerms();
     }
 
-    return nP;
+    Cloud<ParcelType>::move(td);
+}
+
+
+template<class ParcelType>
+void Foam::KinematicCloud<ParcelType>::postEvolve()
+{
+    if (debug)
+    {
+        this->writePositions();
+    }
+
+    this->dispersion().cacheFields(false);
+    forces_.cacheFields(false);
+
+    this->postProcessing().post();
 }
 
 
@@ -141,24 +109,22 @@ Foam::scalar Foam::KinematicCloud<ParcelType>::setNumberOfParticles
 template<class ParcelType>
 Foam::KinematicCloud<ParcelType>::KinematicCloud
 (
-    const word& cloudType,
-    const volPointInterpolation& vpi,
+    const word& cloudName,
     const volScalarField& rho,
     const volVectorField& U,
     const volScalarField& mu,
-    const dimensionedVector& g
+    const dimensionedVector& g,
+    bool readFields
 )
 :
-    Cloud<ParcelType>(rho.mesh(), cloudType, false),
+    Cloud<ParcelType>(rho.mesh(), cloudName, false),
     kinematicCloud(),
-    cloudType_(cloudType),
     mesh_(rho.mesh()),
-    vpi_(vpi),
     particleProperties_
     (
         IOobject
         (
-            cloudType + "Properties",
+            cloudName + "Properties",
             rho.mesh().time().constant(),
             rho.mesh(),
             IOobject::MUST_READ,
@@ -166,21 +132,19 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
         )
     ),
     constProps_(particleProperties_),
+    active_(particleProperties_.lookup("active")),
     parcelTypeId_(readLabel(particleProperties_.lookup("parcelTypeId"))),
     coupled_(particleProperties_.lookup("coupled")),
-    rndGen_(label(0)),
-    time0_(this->db().time().value()),
-    parcelBasisType_(particleProperties_.lookup("parcelBasisType")),
-    parcelBasis_(pbNumber),
-    massTotal_
+    cellValueSourceCorrection_
     (
-        dimensionedScalar(particleProperties_.lookup("massTotal")).value()
+        particleProperties_.lookup("cellValueSourceCorrection")
     ),
-    massInjected_(0.0),
+    rndGen_(label(0)),
     rho_(rho),
     U_(U),
     mu_(mu),
     g_(g),
+    forces_(mesh_, particleProperties_, g_.value()),
     interpolationSchemes_(particleProperties_.subDict("interpolationSchemes")),
     dispersionModel_
     (
@@ -206,14 +170,22 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
             *this
         )
     ),
-    wallInteractionModel_
+    patchInteractionModel_
     (
-        WallInteractionModel<KinematicCloud<ParcelType> >::New
+        PatchInteractionModel<KinematicCloud<ParcelType> >::New
         (
             particleProperties_,
             *this
         )
     ),
+    postProcessingModel_
+    (
+        PostProcessingModel<KinematicCloud<ParcelType> >::New
+        (
+            this->particleProperties_,
+            *this
+        )
+    ),
     UIntegrator_
     (
         vectorIntegrationScheme::New
@@ -222,9 +194,6 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
             particleProperties_.subDict("integrationSchemes")
         )
     ),
-    nInjections_(0),
-    nParcelsAdded_(0),
-    nParcelsAddedTotal_(0),
     UTrans_
     (
         IOobject
@@ -237,41 +206,12 @@ Foam::KinematicCloud<ParcelType>::KinematicCloud
             false
         ),
         mesh_,
-        dimensionedVector("zero", dimensionSet(1, 1, -1, 0, 0), vector::zero)
-    ),
-    UCoeff_
-    (
-        IOobject
-        (
-            this->name() + "UCoeff",
-            this->db().time().timeName(),
-            this->db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        mesh_,
-        dimensionedScalar("zero",  dimensionSet(1, 0, -1, 0, 0), 0.0)
+        dimensionedVector("zero", dimMass*dimVelocity, vector::zero)
     )
 {
-    if (parcelBasisType_ == "mass")
+    if (readFields)
     {
-        parcelBasis_ = pbMass;
-    }
-    else if (parcelBasisType_ == "number")
-    {
-        parcelBasis_ = pbNumber;
-    }
-    else
-    {
-        FatalErrorIn
-        (
-            "Foam::KinematicCloud<ParcelType>::KinematicCloud"
-            "(const word&, const volPointInterpolation&, const volScalarField&"
-            ", const volVectorField&, const volScalarField&, const "
-            "dimensionedVector&)"
-        )<< "parcelBasisType must be either 'number' or 'mass'" << nl
-         << exit(FatalError);
+        ParcelType::readFields(*this);
     }
 }
 
@@ -285,261 +225,60 @@ Foam::KinematicCloud<ParcelType>::~KinematicCloud()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class ParcelType>
+void Foam::KinematicCloud<ParcelType>::checkParcelProperties
+(
+    ParcelType& parcel,
+    const scalar lagrangianDt,
+    const bool fullyDescribed
+)
+{
+    if (!fullyDescribed)
+    {
+        parcel.rho() = constProps_.rho0();
+    }
+
+    scalar carrierDt = this->db().time().deltaTValue();
+    parcel.stepFraction() = (carrierDt - lagrangianDt)/carrierDt;
+}
+
+
 template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::resetSourceTerms()
 {
     UTrans_.field() = vector::zero;
-    UCoeff_.field() = 0.0;
 }
 
 
 template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::evolve()
 {
-    autoPtr<interpolation<scalar> > rhoInterpolator =
-        interpolation<scalar>::New
-        (
-            interpolationSchemes_,
-            vpi_,
-            rho_
-        );
-
-    autoPtr<interpolation<vector> > UInterpolator =
-        interpolation<vector>::New
-        (
-            interpolationSchemes_,
-            vpi_,
-            U_
-        );
-
-    autoPtr<interpolation<scalar> > muInterpolator =
-        interpolation<scalar>::New
-        (
-            interpolationSchemes_,
-            vpi_,
-            mu_
-        );
-
-    typename ParcelType::trackData td
-    (
-        *this,
-        constProps_,
-        rhoInterpolator(),
-        UInterpolator(),
-        muInterpolator(),
-        g_.value()
-    );
-
-    inject(td);
-
-    move(td);
-}
-
-
-template<class ParcelType>
-template<class TrackingData>
-void Foam::KinematicCloud<ParcelType>::move
-(
-    TrackingData& td
-)
-{
-    if (coupled_)
+    if (active_)
     {
-        resetSourceTerms();
+        preEvolve();
+
+        evolveCloud();
+
+        postEvolve();
+
+        info();
+        Info<< endl;
     }
-    Cloud<ParcelType>::move(td);
-}
-
-
-template<class ParcelType>
-template<class TrackingData>
-void Foam::KinematicCloud<ParcelType>::inject
-(
-    TrackingData& td
-)
-{
-    scalar time = this->db().time().value();
-
-    scalar pRho = td.constProps().rho0();
-
-    this->injection().prepareForNextTimeStep(time0_, time);
-
-    // Number of parcels to introduce during this timestep
-    const label nParcels = this->injection().nParcels();
-
-    // Return if no parcels are required
-    if (!nParcels)
-    {
-        this->postInjectCheck();
-        return;
-    }
-
-    // Volume of particles to introduce during this timestep
-    scalar pVolume = this->injection().volume();
-
-    // Volume fraction to introduce during this timestep
-    scalar pVolumeFraction = this->injection().volumeFraction();
-
-    // Duration of injection period during this timestep
-    scalar deltaT = min
-    (
-        this->db().time().deltaT().value(),
-        min
-        (
-            time - this->injection().timeStart(),
-            this->injection().timeEnd() - time0_
-        )
-    );
-
-    // Pad injection time if injection starts during this timestep
-    scalar padTime = max
-    (
-        0.0,
-        this->injection().timeStart() - time0_
-    );
-
-    // Introduce new parcels linearly with time
-    for (label iParcel=0; iParcel<nParcels; iParcel++)
-    {
-        // Calculate the pseudo time of injection for parcel 'iParcel'
-        scalar timeInj = time0_ + padTime + deltaT*iParcel/nParcels;
-
-        // Determine injected parcel properties
-        vector pPosition = this->injection().position
-        (
-            iParcel,
-            timeInj,
-            this->meshInfo()
-        );
-
-        // Diameter of parcels
-        scalar pDiameter = this->injection().d0(iParcel, timeInj);
-
-        // Number of particles per parcel
-        scalar pNumberOfParticles = setNumberOfParticles
-        (
-            nParcels,
-            pDiameter,
-            pVolumeFraction,
-            pRho,
-            pVolume
-        );
-
-        // Velocity of parcels
-        vector pU = this->injection().velocity
-        (
-            iParcel,
-            timeInj,
-            this->meshInfo()
-        );
-
-        // Determine the injection cell
-        label pCell = -1;
-        setInjectorCellAndPosition(pCell, pPosition);
-
-        if (pCell >= 0)
-        {
-            // construct the parcel that is to be injected
-            ParcelType* pPtr = new ParcelType
-            (
-                td.cloud(),
-                parcelTypeId_,
-                pPosition,
-                pCell,
-                pDiameter,
-                pU,
-                pNumberOfParticles,
-                td.constProps()
-            );
-
-            scalar dt = time - timeInj;
-
-            pPtr->stepFraction() = (this->db().time().deltaT().value() - dt)
-                /this->time().deltaT().value();
-
-            this->injectParcel(td, pPtr);
-         }
-    }
-
-    this->postInjectCheck();
-
-    if (debug)
-    {
-        this->dumpParticlePositions();
-    }
-}
-
-
-template<class ParcelType>
-template<class TrackingData>
-void Foam::KinematicCloud<ParcelType>::injectParcel
-(
-    TrackingData& td,
-    ParcelType* p
-)
-{
-    addParticle(p);
-    nParcelsAdded_++;
-    nParcelsAddedTotal_++;
-    massInjected_ += p->mass()*p->nParticle();
-}
-
-
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::postInjectCheck()
-{
-    if (nParcelsAdded_)
-    {
-        Pout<< "\n--> Cloud: " << this->name() << nl
-            << "    Added " << nParcelsAdded_
-            <<  " new parcels" << nl << endl;
-    }
-
-    // Reset parcel counters
-    nParcelsAdded_ = 0;
-
-    // Set time for start of next injection
-    time0_ = this->db().time().value();
-
-    // Increment number of injections
-    nInjections_++;
 }
 
 
 template<class ParcelType>
 void Foam::KinematicCloud<ParcelType>::info() const
 {
-    Info<< "Cloud name: " << this->name() << nl
-        << "    Parcels added during this run   = "
-        << returnReduce(nParcelsAddedTotal_, sumOp<label>()) << nl
-        << "    Mass introduced during this run = "
-        << returnReduce(massInjected_, sumOp<scalar>()) << nl
+    Info<< "Cloud: " << this->name() << nl
+        << "    Total number of parcels added   = "
+        << this->injection().parcelsAddedTotal() << nl
+        << "    Total mass introduced           = "
+        << this->injection().massInjected() << nl
         << "    Current number of parcels       = "
         << returnReduce(this->size(), sumOp<label>()) << nl
         << "    Current mass in system          = "
-        << returnReduce(massInSystem(), sumOp<scalar>()) << nl
-        << endl;
-}
-
-
-template<class ParcelType>
-void Foam::KinematicCloud<ParcelType>::dumpParticlePositions() const
-{
-    OFstream pObj
-    (
-        this->db().time().path()/"parcelPositions_"
-      + this->name() + "_"
-      + name(this->nInjections_) + ".obj"
-    );
-
-    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
-    {
-        const ParcelType& p = iter();
-        pObj<< "v " << p.position().x() << " " << p.position().y() << " "
-            << p.position().z() << nl;
-    }
-
-    pObj.flush();
+        << returnReduce(massInSystem(), sumOp<scalar>()) << nl;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index 77ae415d9..254a223b4 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -50,9 +50,8 @@ SourceFiles
 #include "Random.H"
 #include "fvMesh.H"
 #include "volFields.H"
-#include "volPointInterpolation.H"
 #include "fvMatrices.H"
-#include "fvm.H"
+#include "particleForces.H"
 
 #include "IntegrationSchemesFwd.H"
 
@@ -73,7 +72,10 @@ template<class CloudType>
 class InjectionModel;
 
 template<class CloudType>
-class WallInteractionModel;
+class PostProcessingModel;
+
+template<class CloudType>
+class PatchInteractionModel;
 
 /*---------------------------------------------------------------------------*\
                        Class KinematicCloud Declaration
@@ -85,34 +87,21 @@ class KinematicCloud
     public Cloud<ParcelType>,
     public kinematicCloud
 {
+    // Private Member Functions
 
-public:
+        //- Disallow default bitwise copy construct
+        KinematicCloud(const KinematicCloud&);
 
-    // Enumerations
-
-        //- Parcel basis representation options
-        //  i.e constant number of particles OR constant mass per parcel
-        enum parcelBasis
-        {
-            pbNumber,
-            pbMass
-        };
+        //- Disallow default bitwise assignment
+        void operator=(const KinematicCloud&);
 
 
-private:
+protected:
 
-    // Private data
-
-        //- Cloud type - used to set the name of the parcel properties
-        //  dictionary by appending "Properties"
-        const word cloudType_;
+    // Protected data
 
         //- References to the mesh and time databases
         const fvMesh& mesh_;
-//        const Time& runTime_;
-
-        //- Reference to the interpolation for the carrier phase to the parcels
-        const volPointInterpolation& vpi_;
 
         //- Dictionary of particle properties
         IOdictionary particleProperties_;
@@ -120,33 +109,24 @@ private:
         //- Parcel constant properties
         typename ParcelType::constantProperties constProps_;
 
+        //- Cloud active flag
+        const Switch active_;
+
         //- Parcel type id - used to flag the type of parcels issued by this
         //  cloud
         const label parcelTypeId_;
 
         //- Flag to indicate whether parcels are coupled to the carrier phase
         //  i.e. whether or not to generate source terms for carrier phase
-        Switch coupled_;
+        const Switch coupled_;
+
+        //- Flag to correct cell values with latest transfer information
+        //  during the lagrangian timestep
+        const Switch cellValueSourceCorrection_;
 
         //- Random number generator - used by some injection routines
         Random rndGen_;
 
-        //- Time at beginning of timestep
-        scalar time0_;
-
-
-        // Injection properties
-
-            //- Parcel basis
-            const word parcelBasisType_;
-            parcelBasis parcelBasis_;
-
-            //- Total mass to inject [kg]
-            scalar massTotal_;
-
-            //- Total mass injected to date [kg]
-            scalar massInjected_;
-
 
         // References to the carrier gas fields
 
@@ -166,9 +146,11 @@ private:
             const dimensionedVector& g_;
 
 
-        // Interpolation
+        //- Optional particle forces
+        particleForces forces_;
 
-            dictionary interpolationSchemes_;
+        //- Interpolation schemes dictionary
+        dictionary interpolationSchemes_;
 
 
         // References to the cloud sub-models
@@ -184,9 +166,13 @@ private:
             autoPtr<InjectionModel<KinematicCloud<ParcelType> > >
                 injectionModel_;
 
-            //- Wall interaction model
-            autoPtr<WallInteractionModel<KinematicCloud<ParcelType> > >
-                wallInteractionModel_;
+            //- Patch interaction model
+            autoPtr<PatchInteractionModel<KinematicCloud<ParcelType> > >
+                patchInteractionModel_;
+
+            //- Post-processing model
+            autoPtr<PostProcessingModel<KinematicCloud<ParcelType> > >
+                postProcessingModel_;
 
 
         // Reference to the particle integration schemes
@@ -195,98 +181,46 @@ private:
             autoPtr<vectorIntegrationScheme> UIntegrator_;
 
 
-        // Counters
-
-            //- Number of injections counter
-            label nInjections_;
-
-            //- Running counters describing parcels added during each
-            //  injection
-            label nParcelsAdded_;
-            label nParcelsAddedTotal_;
-
-
         // Sources
 
             //- Momentum
             DimensionedField<vector, volMesh> UTrans_;
 
-            //- Coefficient for carrier phase U equation
-            DimensionedField<scalar, volMesh> UCoeff_;
 
+        // Cloud evolution functions
 
-    // Private Member Functions
+            //- Pre-evolve
+            void preEvolve();
 
-        //- Disallow default bitwise copy construct
-        KinematicCloud(const KinematicCloud&);
+            //- Evolve the cloud
+            void evolveCloud();
 
-        //- Disallow default bitwise assignment
-        void operator=(const KinematicCloud&);
-
-
-protected:
-
-    // Protected member functions
-
-        //- Set parcel position and cell into which parcel is introduced
-        void setInjectorCellAndPosition
-        (
-            label& pCell,
-            vector& pPosition
-        );
-
-        //- Set the number of particles per parcel
-        scalar setNumberOfParticles
-        (
-            const label nParcels,
-            const scalar pDiameter,
-            const scalar pVolumeFraction,
-            const scalar pRho,
-            const scalar pVolume
-        );
-
-        //- Inject more parcels
-        template<class TrackingData>
-        void inject(TrackingData& td);
-
-        //- Inject parcel if it is valid - delete otherwise
-        template<class TrackingData>
-        void injectParcel
-        (
-            TrackingData& td,
-            ParcelType* p
-        );
-
-        //- Move the parcels
-        template<class TrackingData>
-        void move(TrackingData& td);
-
-        //- Post-injection checks
-        void postInjectCheck();
+            //- Post-evolve
+            void postEvolve();
 
 
 public:
 
-    //- Runtime type information
-//    TypeName("KinematicCloud");
-
     // Constructors
 
         //- Construct given carrier gas fields
         KinematicCloud
         (
-            const word& cloudType,
-            const volPointInterpolation& vpi,
+            const word& cloudName,
             const volScalarField& rho,
             const volVectorField& U,
             const volScalarField& mu,
-            const dimensionedVector& g
+            const dimensionedVector& g,
+            bool readFields = true
         );
 
 
-    // Destructor
+    //- Destructor
+    virtual ~KinematicCloud();
 
-        virtual ~KinematicCloud();
+
+    //- Type of parcel the cloud was instantiated for
+    typedef ParcelType parcelType;
 
 
     // Member Functions
@@ -295,32 +229,33 @@ public:
 
             // References to the mesh and databases
 
-                //- Return the cloud type
-                inline const word& cloudType() const;
-
-                //- Return the parcel type id
-                inline label parcelTypeId() const;
-
                 //- Return refernce to the mesh
                 inline const fvMesh& mesh() const;
 
-                //- Retuen reference to the interpolation
-                inline const volPointInterpolation& vpi() const;
-
                 //- Return particle properties dictionary
                 inline const IOdictionary& particleProperties() const;
 
-            //- Return coupled flag
-            inline const Switch coupled() const;
+                //- Return the constant properties
+                inline const typename ParcelType::constantProperties&
+                    constProps() const;
 
-            //- Return refernce to the random object
-            inline Random& rndGen();
 
-            //- Return the start of injection interval time
-            inline scalar time0() const;
+            // Cloud data
 
-            //- Return a reference to the mass of particles to introduce
-            inline scalar massTotal() const;
+                //- Return the active flag
+                inline const Switch active() const;
+
+                //- Return the parcel type id
+                inline label parcelTypeId() const;
+
+                //- Return coupled flag
+                inline const Switch coupled() const;
+
+                //- Return cell value correction flag
+                inline const Switch cellValueSourceCorrection() const;
+
+                //- Return refernce to the random object
+                inline Random& rndGen();
 
 
             // References to the carrier gas fields
@@ -341,6 +276,10 @@ public:
                 inline const dimensionedVector& g() const;
 
 
+            //- Optional particle forces
+            inline const particleForces& forces() const;
+
+
             // Interpolations
 
                 //- Return reference to the interpolation dictionary
@@ -349,27 +288,33 @@ public:
 
             // Sub-models
 
-                //- Return reference to dispersion model
+                //- Return const-access to the dispersion model
                 inline const DispersionModel<KinematicCloud<ParcelType> >&
                     dispersion() const;
 
+                //- Return reference to the dispersion model
                 inline DispersionModel<KinematicCloud<ParcelType> >&
                     dispersion();
 
-                //- Return reference to drag model
+                //- Return const-access to the drag model
                 inline const DragModel<KinematicCloud<ParcelType> >&
                     drag() const;
 
-                //- Return reference to injection model
+                //- Return const access to the injection model
                 inline const InjectionModel<KinematicCloud<ParcelType> >&
                     injection() const;
 
+                //- Return reference to the injection model
                 inline InjectionModel<KinematicCloud<ParcelType> >&
                     injection();
 
-                //- Return reference to wall interaction model
-                inline const WallInteractionModel<KinematicCloud<ParcelType> >&
-                    wallInteraction() const;
+                //- Return const-access to the patch interaction model
+                inline const PatchInteractionModel<KinematicCloud<ParcelType> >&
+                    patchInteraction() const;
+
+                //- Return reference to post-processing model
+                inline PostProcessingModel<KinematicCloud<ParcelType> >&
+                    postProcessing();
 
 
             // Integration schemes
@@ -385,15 +330,8 @@ public:
                     //- Return reference to momentum source
                     inline DimensionedField<vector, volMesh>& UTrans();
 
-                    //- Coefficient for carrier phase U equation
-                    inline DimensionedField<scalar, volMesh>& UCoeff();
-
                     //- Return tmp momentum source term - fully explicit
-                    inline tmp<DimensionedField<vector, volMesh> > SU1() const;
-
-                    //- Return tmp momentum source term - semi-implicit
-                    inline tmp<fvVectorMatrix> SU2(volVectorField& U) const;
-
+                    inline tmp<DimensionedField<vector, volMesh> > SU() const;
 
 
         // Check
@@ -407,18 +345,6 @@ public:
             //- Print cloud information
             void info() const;
 
-            //- Dump particle positions to .obj file
-            void dumpParticlePositions() const;
-
-
-            // Counters
-
-                //- Return the number of injections
-                inline label nInjections() const;
-
-                //- Return the total number parcels added
-                inline label nParcelsAddedTotal() const;
-
 
             // Fields
 
@@ -430,13 +356,25 @@ public:
                 //  Note: for particles belonging to this cloud only
                 inline const tmp<volScalarField> alpha() const;
 
+                //- Return the particle effective density field
+                //  Note: for particles belonging to this cloud only
+                inline const tmp<volScalarField> rhoEff() const;
+
 
         // Cloud evolution functions
 
+            //- Check parcel properties
+            void checkParcelProperties
+            (
+                ParcelType& parcel,
+                const scalar lagrangianDt,
+                const bool fullyDescribed
+            );
+
             //- Reset the spray source terms
             void resetSourceTerms();
 
-            //- Evolve the spray (move, inject)
+            //- Evolve the spray (inject, inject)
             void evolve();
 };
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index afbd353f1..9a2522e80 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -24,15 +24,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "fvmSup.H"
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class ParcelType>
-inline const Foam::word& Foam::KinematicCloud<ParcelType>::cloudType() const
-{
-    return cloudType_;
-}
-
-
 template<class ParcelType>
 inline Foam::label Foam::KinematicCloud<ParcelType>::parcelTypeId() const
 {
@@ -47,14 +42,6 @@ inline const Foam::fvMesh& Foam::KinematicCloud<ParcelType>::mesh() const
 }
 
 
-template<class ParcelType>
-inline const Foam::volPointInterpolation&
-Foam::KinematicCloud<ParcelType>::vpi() const
-{
-    return vpi_;
-}
-
-
 template<class ParcelType>
 inline const Foam::IOdictionary&
 Foam::KinematicCloud<ParcelType>::particleProperties() const
@@ -63,6 +50,21 @@ Foam::KinematicCloud<ParcelType>::particleProperties() const
 }
 
 
+template<class ParcelType>
+inline const typename ParcelType::constantProperties&
+Foam::KinematicCloud<ParcelType>::constProps() const
+{
+    return constProps_;
+}
+
+
+template<class ParcelType>
+inline const Foam::Switch Foam::KinematicCloud<ParcelType>::active() const
+{
+    return active_;
+}
+
+
 template<class ParcelType>
 inline const Foam::Switch Foam::KinematicCloud<ParcelType>::coupled() const
 {
@@ -70,6 +72,14 @@ inline const Foam::Switch Foam::KinematicCloud<ParcelType>::coupled() const
 }
 
 
+template <class ParcelType>
+inline const Foam::Switch
+Foam::KinematicCloud<ParcelType>::cellValueSourceCorrection() const
+{
+    return cellValueSourceCorrection_;
+}
+
+
 template<class ParcelType>
 inline const Foam::volScalarField&
 Foam::KinematicCloud<ParcelType>::rho() const
@@ -99,6 +109,15 @@ Foam::KinematicCloud<ParcelType>::g() const
     return g_;
 }
 
+
+template<class ParcelType>
+inline const Foam::particleForces&
+Foam::KinematicCloud<ParcelType>::forces() const
+{
+    return forces_;
+}
+
+
 template<class ParcelType>
 inline const Foam::dictionary&
 Foam::KinematicCloud<ParcelType>::interpolationSchemes() const
@@ -139,6 +158,14 @@ Foam::KinematicCloud<ParcelType>::injection() const
 }
 
 
+template<class ParcelType>
+inline const Foam::PatchInteractionModel<Foam::KinematicCloud<ParcelType> >&
+Foam::KinematicCloud<ParcelType>::patchInteraction() const
+{
+    return patchInteractionModel_;
+}
+
+
 template<class ParcelType>
 inline Foam::InjectionModel<Foam::KinematicCloud<ParcelType> >&
 Foam::KinematicCloud<ParcelType>::injection()
@@ -148,10 +175,10 @@ Foam::KinematicCloud<ParcelType>::injection()
 
 
 template<class ParcelType>
-inline const Foam::WallInteractionModel<Foam::KinematicCloud<ParcelType> >&
-Foam::KinematicCloud<ParcelType>::wallInteraction() const
+inline Foam::PostProcessingModel<Foam::KinematicCloud<ParcelType> >&
+Foam::KinematicCloud<ParcelType>::postProcessing()
 {
-    return wallInteractionModel_;
+    return postProcessingModel_();
 }
 
 
@@ -163,41 +190,6 @@ Foam::KinematicCloud<ParcelType>::UIntegrator() const
 }
 
 
-template<class ParcelType>
-inline Foam::label Foam::KinematicCloud<ParcelType>::nInjections() const
-{
-    return nInjections_;
-}
-
-
-template<class ParcelType>
-inline Foam::label Foam::KinematicCloud<ParcelType>::nParcelsAddedTotal() const
-{
-    return nParcelsAddedTotal_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar Foam::KinematicCloud<ParcelType>::time0() const
-{
-    return time0_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar Foam::KinematicCloud<ParcelType>::massTotal() const
-{
-    return massTotal_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalar Foam::KinematicCloud<ParcelType>::massInjected() const
-{
-    return massInjected_;
-}
-
-
 template<class ParcelType>
 inline Foam::scalar Foam::KinematicCloud<ParcelType>::massInSystem() const
 {
@@ -227,25 +219,17 @@ Foam::KinematicCloud<ParcelType>::UTrans()
 }
 
 
-template<class ParcelType>
-inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::KinematicCloud<ParcelType>::UCoeff()
-{
-    return UCoeff_;
-}
-
-
 template<class ParcelType>
 inline Foam::tmp<Foam::DimensionedField<Foam::vector, Foam::volMesh> >
-Foam::KinematicCloud<ParcelType>::SU1() const
+Foam::KinematicCloud<ParcelType>::SU() const
 {
-    tmp<DimensionedField<vector, volMesh> > tSU1
+    tmp<DimensionedField<vector, volMesh> > tSU
     (
         new DimensionedField<vector, volMesh>
         (
             IOobject
             (
-                this->name() + "SU1",
+                this->name() + "SU",
                 this->db().time().timeName(),
                 this->mesh(),
                 IOobject::NO_READ,
@@ -255,34 +239,16 @@ Foam::KinematicCloud<ParcelType>::SU1() const
             dimensionedVector
             (
                  "zero",
-                 dimensionSet(1, -2, -2, 0, 0),
+                 dimDensity*dimVelocity/dimTime,
                  vector::zero
             )
         )
     );
 
-    vectorField& SU1 = tSU1().field();
-    SU1 = UTrans_/(mesh_.V()*this->db().time().deltaT());
+    vectorField& SU = tSU().field();
+    SU = UTrans_/(mesh_.V()*this->db().time().deltaT());
 
-    return tSU1;
-}
-
-
-template<class ParcelType>
-inline Foam::tmp<Foam::fvVectorMatrix>
-Foam::KinematicCloud<ParcelType>::SU2(volVectorField& U) const
-{
-    if (debug)
-    {
-        Info<< "UTrans min/max = "
-            << min(UTrans_) << ", " << max(UTrans_) << endl;
-        Info<< "UCoeff min/max = "
-            << min(UCoeff_) << ", " << max(UCoeff_) << endl;
-    }
-
-    return UTrans_/(mesh_.V()*this->db().time().deltaT())
-         - fvm::Sp(UCoeff_/mesh_.V(), U)
-         + UCoeff_/mesh_.V()*U;
+    return tSU;
 }
 
 
@@ -304,7 +270,7 @@ Foam::KinematicCloud<ParcelType>::theta() const
                 false
             ),
             mesh_,
-            dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0.0)
+            dimensionedScalar("zero", dimless, 0.0)
         )
     );
 
@@ -317,7 +283,7 @@ Foam::KinematicCloud<ParcelType>::theta() const
         theta[cellI] += p.nParticle()*p.volume();
     }
 
-    theta /= mesh().cellVolumes();
+    theta /= mesh().V();
 
     return ttheta;
 }
@@ -341,7 +307,7 @@ Foam::KinematicCloud<ParcelType>::alpha() const
                 false
             ),
             mesh_,
-            dimensionedScalar("zero", dimensionSet(0, 0, 0, 0, 0), 0.0)
+            dimensionedScalar("zero", dimless, 0.0)
         )
     );
 
@@ -354,10 +320,47 @@ Foam::KinematicCloud<ParcelType>::alpha() const
         alpha[cellI] += p.nParticle()*p.mass();
     }
 
-    alpha /= (mesh().cellVolumes()*rho_);
+    alpha /= (mesh().V()*rho_);
 
     return talpha;
 }
 
 
+template<class ParcelType>
+inline const Foam::tmp<Foam::volScalarField>
+Foam::KinematicCloud<ParcelType>::rhoEff() const
+{
+    tmp<volScalarField> trhoEff
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                this->name() + "RhoEff",
+                this->db().time().timeName(),
+                this->db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            ),
+            mesh_,
+            dimensionedScalar("zero", dimDensity, 0.0)
+        )
+    );
+
+    scalarField& rhoEff = trhoEff().internalField();
+    forAllConstIter(typename KinematicCloud<ParcelType>, *this, iter)
+    {
+        const ParcelType& p = iter();
+        const label cellI = p.cell();
+
+        rhoEff[cellI] += p.nParticle()*p.mass();
+    }
+
+    rhoEff /= mesh().V();
+
+    return trhoEff;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
index a7fb70318..337b2ab1a 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.C
@@ -25,31 +25,140 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ReactingCloud.H"
-#include "CompositionModel.H"
-#include "MassTransferModel.H"
-#include "SurfaceReactionModel.H"
 
-#include "interpolationCellPoint.H"
+#include "CompositionModel.H"
+#include "PhaseChangeModel.H"
+
+// * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
+
+template<class ParcelType>
+void Foam::ReactingCloud<ParcelType>::checkSuppliedComposition
+(
+    const scalarField& YSupplied,
+    const scalarField& Y,
+    const word& YName
+)
+{
+    if (YSupplied.size() != Y.size())
+    {
+        FatalErrorIn
+        (
+            "ReactingCloud<ParcelType>::checkSuppliedComposition"
+            "("
+                "const scalarField&, "
+                "const scalarField&, "
+                "const word&"
+            ")"
+        )   << YName << " supplied, but size is not compatible with "
+            << "parcel composition: " << nl << "    "
+            << YName << "(" << YSupplied.size() << ") vs required composition "
+            << YName << "(" << Y.size() << ")" << nl
+            << abort(FatalError);
+    }
+}
+
+
+template<class ParcelType>
+void Foam::ReactingCloud<ParcelType>::preEvolve()
+{
+    ThermoCloud<ParcelType>::preEvolve();
+}
+
+
+template<class ParcelType>
+void Foam::ReactingCloud<ParcelType>::evolveCloud()
+{
+    const volScalarField& T = this->carrierThermo().T();
+    const volScalarField cp = this->carrierThermo().Cp();
+    const volScalarField& p = this->carrierThermo().p();
+
+    autoPtr<interpolation<scalar> > rhoInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        this->rho()
+    );
+
+    autoPtr<interpolation<vector> > UInterp = interpolation<vector>::New
+    (
+        this->interpolationSchemes(),
+        this->U()
+    );
+
+    autoPtr<interpolation<scalar> > muInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        this->mu()
+    );
+
+    autoPtr<interpolation<scalar> > TInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        T
+    );
+
+    autoPtr<interpolation<scalar> > cpInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        cp
+    );
+
+    autoPtr<interpolation<scalar> > pInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        p
+    );
+
+    typename ParcelType::trackData td
+    (
+        *this,
+        constProps_,
+        rhoInterp(),
+        UInterp(),
+        muInterp(),
+        TInterp(),
+        cpInterp(),
+        pInterp(),
+        this->g().value()
+    );
+
+    this->injection().inject(td);
+
+    if (this->coupled())
+    {
+        resetSourceTerms();
+    }
+
+    Cloud<ParcelType>::move(td);
+}
+
+
+template<class ParcelType>
+void Foam::ReactingCloud<ParcelType>::postEvolve()
+{
+    ThermoCloud<ParcelType>::postEvolve();
+}
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ParcelType>
 Foam::ReactingCloud<ParcelType>::ReactingCloud
 (
-    const word& cloudType,
-    const volPointInterpolation& vpi,
+    const word& cloudName,
     const volScalarField& rho,
     const volVectorField& U,
     const dimensionedVector& g,
-    hCombustionThermo& thermo,
-    PtrList<specieReactingProperties>& gases
+    basicThermo& thermo,
+    bool readFields
 )
 :
-    ThermoCloud<ParcelType>(cloudType, vpi, rho, U, g, thermo),
+    ThermoCloud<ParcelType>(cloudName, rho, U, g, thermo, false),
     reactingCloud(),
     constProps_(this->particleProperties()),
-    carrierThermo_(thermo),
-    gases_(gases),
+    mcCarrierThermo_
+    (
+        dynamic_cast<multiComponentMixture<thermoType>&>(thermo)
+    ),
     compositionModel_
     (
         CompositionModel<ReactingCloud<ParcelType> >::New
@@ -58,23 +167,16 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
             *this
         )
     ),
-    massTransferModel_
+    phaseChangeModel_
     (
-        MassTransferModel<ReactingCloud<ParcelType> >::New
+        PhaseChangeModel<ReactingCloud<ParcelType> >::New
         (
             this->particleProperties(),
             *this
         )
     ),
-    surfaceReactionModel_
-    (
-        SurfaceReactionModel<ReactingCloud<ParcelType> >::New
-        (
-            this->particleProperties(),
-            *this
-        )
-    ),
-    rhoTrans_(thermo.composition().Y().size())
+    rhoTrans_(mcCarrierThermo_.species().size()),
+    dMassPhaseChange_(0.0)
 {
     // Set storage for mass source fields and initialise to zero
     forAll(rhoTrans_, i)
@@ -86,7 +188,7 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
             (
                 IOobject
                 (
-                    this->name() + "rhoTrans" + Foam::name(i),
+                    this->name() + "rhoTrans_" + mcCarrierThermo_.species()[i],
                     this->db().time().timeName(),
                     this->db(),
                     IOobject::NO_READ,
@@ -98,6 +200,11 @@ Foam::ReactingCloud<ParcelType>::ReactingCloud
             )
         );
     }
+
+    if (readFields)
+    {
+        ParcelType::readFields(*this);
+    }
 }
 
 
@@ -110,6 +217,40 @@ Foam::ReactingCloud<ParcelType>::~ReactingCloud()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class ParcelType>
+void Foam::ReactingCloud<ParcelType>::checkParcelProperties
+(
+    ParcelType& parcel,
+    const scalar lagrangianDt,
+    const bool fullyDescribed
+)
+{
+    ThermoCloud<ParcelType>::checkParcelProperties
+    (
+        parcel,
+        lagrangianDt,
+        fullyDescribed
+    );
+
+    if (!fullyDescribed)
+    {
+        parcel.Y() = composition().YMixture0();
+    }
+    else
+    {
+        checkSuppliedComposition
+        (
+            parcel.Y(),
+            composition().YMixture0(),
+            "YMixture"
+        );
+    }
+
+    // derived information - store initial mass
+    parcel.mass0() = parcel.mass();
+}
+
+
 template<class ParcelType>
 void Foam::ReactingCloud<ParcelType>::resetSourceTerms()
 {
@@ -124,191 +265,34 @@ void Foam::ReactingCloud<ParcelType>::resetSourceTerms()
 template<class ParcelType>
 void Foam::ReactingCloud<ParcelType>::evolve()
 {
-    const volScalarField& T = carrierThermo_.T();
-    const volScalarField cp = carrierThermo_.Cp();
-    const volScalarField& p = carrierThermo_.p();
+    if (this->active())
+    {
+        preEvolve();
 
-    autoPtr<interpolation<scalar> > rhoInterpolator = interpolation<scalar>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        this->rho()
-    );
+        evolveCloud();
 
-    autoPtr<interpolation<vector> > UInterpolator = interpolation<vector>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        this->U()
-    );
+        postEvolve();
 
-    autoPtr<interpolation<scalar> > muInterpolator = interpolation<scalar>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        this->mu()
-    );
-
-    autoPtr<interpolation<scalar> > TInterpolator = interpolation<scalar>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        T
-    );
-
-    autoPtr<interpolation<scalar> > cpInterpolator = interpolation<scalar>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        cp
-    );
-
-    autoPtr<interpolation<scalar> > pInterpolator = interpolation<scalar>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        p
-    );
-
-    typename ParcelType::trackData td
-    (
-        *this,
-        constProps_,
-        rhoInterpolator(),
-        UInterpolator(),
-        muInterpolator(),
-        TInterpolator(),
-        cpInterpolator(),
-        pInterpolator(),
-        this->g().value()
-    );
-
-    inject(td);
-
-    this->move(td);
+        info();
+        Info<< endl;
+    }
 }
 
 
 template<class ParcelType>
-template<class TrackingData>
-void Foam::ReactingCloud<ParcelType>::inject
-(
-    TrackingData& td
-)
+void Foam::ReactingCloud<ParcelType>::info() const
 {
-    scalar time = this->db().time().value();
+    ThermoCloud<ParcelType>::info();
 
-    scalar pRho = td.constProps().rho0();
+    Info<< "    Mass transfer phase change      = "
+        << returnReduce(dMassPhaseChange_, sumOp<scalar>()) << nl;
+}
 
-    this->injection().prepareForNextTimeStep(this->time0(), time);
 
-    // Number of parcels to introduce during this timestep
-    const label nParcels = this->injection().nParcels();
-
-    // Return if no parcels are required
-    if (!nParcels)
-    {
-        this->postInjectCheck();
-        return;
-    }
-
-    // Volume of particles to introduce during this timestep
-    scalar pVolume = this->injection().volume();
-
-    // Volume fraction to introduce during this timestep
-    scalar pVolumeFraction = this->injection().volumeFraction();
-
-    // Duration of injection period during this timestep
-    scalar deltaT = min
-    (
-        this->db().time().deltaT().value(),
-        min
-        (
-            time - this->injection().timeStart(),
-            this->injection().timeEnd() - this->time0()
-        )
-    );
-
-    // Pad injection time if injection starts during this timestep
-    scalar padTime = max
-    (
-        0.0,
-        this->injection().timeStart() - this->time0()
-    );
-
-    // Introduce new parcels linearly with time
-    for (label iParcel=0; iParcel<nParcels; iParcel++)
-    {
-        // Calculate the pseudo time of injection for parcel 'iParcel'
-        scalar timeInj = this->time0() + padTime + deltaT*iParcel/nParcels;
-
-        // Determine injected parcel properties
-        vector pPosition = this->injection().position
-        (
-            iParcel,
-            timeInj,
-            this->meshInfo()
-        );
-
-        // Diameter of parcels
-        scalar pDiameter = this->injection().d0(iParcel, timeInj);
-
-        // Number of particles per parcel
-        scalar pNumberOfParticles = this->setNumberOfParticles
-        (
-            nParcels,
-            pDiameter,
-            pVolumeFraction,
-            pRho,
-            pVolume
-        );
-
-        // Velocity of parcels
-        vector pU = this->injection().velocity
-        (
-            iParcel,
-            timeInj,
-            this->meshInfo()
-        );
-
-        // Determine the injection cell
-        label pCell = -1;
-        this->setInjectorCellAndPosition(pCell, pPosition);
-
-        if (pCell >= 0)
-        {
-            // construct the parcel that is to be injected
-            ParcelType* pPtr = new ParcelType
-            (
-                td.cloud(),
-                this->parcelTypeId(),
-                pPosition,
-                pCell,
-                pDiameter,
-                pU,
-                pNumberOfParticles,
-                composition().YGas0(),
-                composition().YLiquid0(),
-                composition().YSolid0(),
-                composition().YMixture0(),
-                td.constProps()
-            );
-
-            scalar dt = time - timeInj;
-
-            pPtr->stepFraction() = (this->db().time().deltaT().value() - dt)
-                /this->db().time().deltaT().value();
-
-            this->injectParcel(td, pPtr);
-         }
-    }
-
-    this->postInjectCheck();
-
-    if (debug)
-    {
-        this->dumpParticlePositions();
-    }
+template<class ParcelType>
+void Foam::ReactingCloud<ParcelType>::addToMassPhaseChange(const scalar dMass)
+{
+    dMassPhaseChange_ += dMass;
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
index 906e98aef..c3c44f845 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloud.H
@@ -26,9 +26,11 @@ Class
     Foam::ReactingCloud
 
 Description
-    Templated base class for reactive cloud
-    - Adds to kinematic cloud
-      - Heat transfer
+    Templated base class for reacting cloud
+
+    - Adds to thermodynamic cloud
+      - Variable composition (single phase)
+      - Phase change
 
 SourceFiles
     ReactingCloudI.H
@@ -39,13 +41,9 @@ SourceFiles
 #ifndef ReactingCloud_H
 #define ReactingCloud_H
 
-#include "autoPtr.H"
-#include "hCombustionThermo.H"
-
 #include "ThermoCloud.H"
 #include "reactingCloud.H"
-
-#include "ReactingCloudThermoTypes.H"
+#include "multiComponentMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -58,13 +56,10 @@ template<class CloudType>
 class CompositionModel;
 
 template<class CloudType>
-class MassTransferModel;
-
-template<class CloudType>
-class SurfaceReactionModel;
+class PhaseChangeModel;
 
 /*---------------------------------------------------------------------------*\
-                        Class ReactingCloud Declaration
+                      Class ReactingCloud Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ParcelType>
@@ -73,37 +68,13 @@ class ReactingCloud
     public ThermoCloud<ParcelType>,
     public reactingCloud
 {
+public:
 
-    // Private data
+    //- Type of thermodynamics the cloud was instantiated for
+    typedef typename ParcelType::thermoType thermoType;
 
-        //- Parcel constant properties
-        typename ParcelType::constantProperties constProps_;
-
-        //- Thermodynamics package (combustion)
-        hCombustionThermo& carrierThermo_;
-
-        //- Gas phase properties
-        PtrList<specieReactingProperties>& gases_;
-
-        // References to the cloud sub-models
-
-            //- Reacting composition model
-            autoPtr<CompositionModel<ReactingCloud<ParcelType> > >
-                compositionModel_;
-
-            //- Mass transfer model
-            autoPtr<MassTransferModel<ReactingCloud<ParcelType> > >
-                massTransferModel_;
-
-            //- Surface reaction model
-            autoPtr<SurfaceReactionModel<ReactingCloud<ParcelType> > >
-                surfaceReactionModel_;
-
-        // Sources
-
-            //- Mass transfer fields - one per carrier phase specie
-            PtrList<DimensionedField<scalar, volMesh> > rhoTrans_;
 
+private:
 
     // Private Member Functions
 
@@ -116,49 +87,101 @@ class ReactingCloud
 
 protected:
 
-    //- Inject more parcels
-    template<class TrackingData>
-    void inject(TrackingData& td);
+    // Protected data
+
+        //- Parcel constant properties
+        typename ParcelType::constantProperties constProps_;
+
+        //- Multi-component carrier phase thermo
+        multiComponentMixture<thermoType>& mcCarrierThermo_;
+
+
+        // References to the cloud sub-models
+
+            //- Reacting composition model
+            autoPtr<CompositionModel<ReactingCloud<ParcelType> > >
+                compositionModel_;
+
+            //- Reacting phase change model
+            autoPtr<PhaseChangeModel<ReactingCloud<ParcelType> > >
+                phaseChangeModel_;
+
+
+        // Sources
+
+            //- Mass transfer fields - one per carrier phase specie
+            PtrList<DimensionedField<scalar, volMesh> > rhoTrans_;
+
+
+        // Check
+
+            //- Total mass transferred to continuous phase via phase change
+            scalar dMassPhaseChange_;
+
+
+    // Protected Member Functions
+
+        // New parcel helper functions
+
+            //- Check that size of a composition field is valid
+            void checkSuppliedComposition
+            (
+                const scalarField& YSupplied,
+                const scalarField& Y,
+                const word& YName
+            );
+
+
+        // Cloud evolution functions
+
+            //- Pre-evolve
+            void preEvolve();
+
+            //- Evolve the cloud
+            void evolveCloud();
+
+            //- Post-evolve
+            void postEvolve();
 
 
 public:
 
-    //- Runtime type information
-//    TypeName("ReactingCloud");
-
-
     // Constructors
 
         //- Construct given carrier gas fields
         ReactingCloud
         (
-            const word& cloudType,
-            const volPointInterpolation& vpi,
+            const word& cloudName,
             const volScalarField& rho,
             const volVectorField& U,
             const dimensionedVector& g,
-            hCombustionThermo& thermo,
-            PtrList<specieReactingProperties>& gases
+            basicThermo& thermo,
+            bool readFields = true
         );
 
 
-    // Destructor
+    //- Destructor
+    virtual ~ReactingCloud();
 
-        virtual ~ReactingCloud();
+
+    //- Type of parcel the cloud was instantiated for
+    typedef ParcelType parcelType;
 
 
     // Member Functions
 
         // Access
 
-            //- Return const access to carrier phase thermo package
-            inline const hCombustionThermo& carrierThermo() const;
+            //- Return the constant properties
+            inline const typename ParcelType::constantProperties&
+                constProps() const;
 
-            //- Return access to carrier phase thermo package
-            inline hCombustionThermo& carrierThermo();
+            //- Return const access to multi-component carrier phase thermo
+            inline const multiComponentMixture<thermoType>&
+                mcCarrierThermo() const;
 
-            //- Gas phase properties
-            inline const PtrList<specieReactingProperties>& gases() const;
+            //- Return access to multi-component carrier phase thermo
+            inline multiComponentMixture<thermoType>& mcCarrierThermo();
 
 
             // Sub-models
@@ -167,13 +190,9 @@ public:
                 inline const CompositionModel<ReactingCloud<ParcelType> >&
                     composition() const;
 
-                //- Return reference to mass transfer model
-                inline const MassTransferModel<ReactingCloud<ParcelType> >&
-                    massTransfer() const;
-
-                //- Return reference to surface reaction model
-                inline const SurfaceReactionModel<ReactingCloud<ParcelType> >&
-                    surfaceReaction() const;
+                //- Return reference to reacting phase change model
+                inline const PhaseChangeModel<ReactingCloud<ParcelType> >&
+                    phaseChange() const;
 
 
             // Sources
@@ -188,23 +207,38 @@ public:
                     inline PtrList<DimensionedField<scalar, volMesh> >&
                         rhoTrans();
 
-                    //- Return tmp mass source for field i
-                    //  Fully explicit
+                    //- Return tmp mass source for field i - fully explicit
                     inline tmp<DimensionedField<scalar, volMesh> >
-                        Srho1(const label i) const;
+                        Srho(const label i) const;
 
                     //- Return tmp total mass source for carrier phase
-                    //  Fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh> >
-                        Srho1() const;
+                    //  - fully explicit
+                    inline tmp<DimensionedField<scalar, volMesh> > Srho() const;
+
+
+        // Check
+
+            //- Print cloud information
+            void info() const;
+
+            //- Add to cumulative phase change mass transfer
+            void addToMassPhaseChange(const scalar dMass);
 
 
         // Cloud evolution functions
 
+            //- Check parcel properties
+            void checkParcelProperties
+            (
+                ParcelType& parcel,
+                const scalar lagrangianDt,
+                const bool fullyDescribed
+            );
+
             //- Reset the spray source terms
             void resetSourceTerms();
 
-            //- Evolve the spray (move, inject)
+            //- Evolve the spray (inject, move)
             void evolve();
 };
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
index d4e8e6af6..6cd313884 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudI.H
@@ -27,26 +27,26 @@ License
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ParcelType>
-inline const Foam::hCombustionThermo&
-Foam::ReactingCloud<ParcelType>::carrierThermo() const
+inline const typename ParcelType::constantProperties&
+Foam::ReactingCloud<ParcelType>::constProps() const
 {
-    return carrierThermo_;
+    return constProps_;
 }
 
 
 template<class ParcelType>
-inline Foam::hCombustionThermo&
-Foam::ReactingCloud<ParcelType>::carrierThermo()
+inline const Foam::multiComponentMixture<typename ParcelType::thermoType>&
+Foam::ReactingCloud<ParcelType>::mcCarrierThermo() const
 {
-    return carrierThermo_;
+    return mcCarrierThermo_;
 }
 
 
 template<class ParcelType>
-inline const Foam::PtrList<Foam::specieReactingProperties>&
-Foam::ReactingCloud<ParcelType>::gases() const
+inline Foam::multiComponentMixture<typename ParcelType::thermoType>&
+Foam::ReactingCloud<ParcelType>::mcCarrierThermo()
 {
-    return gases_;
+    return mcCarrierThermo_;
 }
 
 
@@ -59,18 +59,10 @@ Foam::ReactingCloud<ParcelType>::composition() const
 
 
 template<class ParcelType>
-inline const Foam::MassTransferModel<Foam::ReactingCloud<ParcelType> >&
-Foam::ReactingCloud<ParcelType>::massTransfer() const
+inline const Foam::PhaseChangeModel<Foam::ReactingCloud<ParcelType> >&
+Foam::ReactingCloud<ParcelType>::phaseChange() const
 {
-    return massTransferModel_;
-}
-
-
-template<class ParcelType>
-inline const Foam::SurfaceReactionModel<Foam::ReactingCloud<ParcelType> >&
-Foam::ReactingCloud<ParcelType>::surfaceReaction() const
-{
-    return surfaceReactionModel_;
+    return phaseChangeModel_;
 }
 
 
@@ -92,7 +84,7 @@ Foam::ReactingCloud<ParcelType>::rhoTrans()
 
 template<class ParcelType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
-Foam::ReactingCloud<ParcelType>::Srho1(const label i) const
+Foam::ReactingCloud<ParcelType>::Srho(const label i) const
 {
     return rhoTrans_[i]/(this->db().time().deltaT()*this->mesh().V());
 }
@@ -100,7 +92,7 @@ Foam::ReactingCloud<ParcelType>::Srho1(const label i) const
 
 template<class ParcelType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
-Foam::ReactingCloud<ParcelType>::Srho1() const
+Foam::ReactingCloud<ParcelType>::Srho() const
 {
     tmp<DimensionedField<scalar, volMesh> > trhoTrans
     (
@@ -129,4 +121,5 @@ Foam::ReactingCloud<ParcelType>::Srho1() const
     return trhoTrans/(this->db().time().deltaT()*this->mesh().V());
 }
 
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
new file mode 100644
index 000000000..ad0c191d0
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.C
@@ -0,0 +1,269 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "ReactingMultiphaseCloud.H"
+
+#include "DevolatilisationModel.H"
+#include "SurfaceReactionModel.H"
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::preEvolve()
+{
+    ReactingCloud<ParcelType>::preEvolve();
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::evolveCloud()
+{
+    const volScalarField& T = this->carrierThermo().T();
+    const volScalarField cp = this->carrierThermo().Cp();
+    const volScalarField& p = this->carrierThermo().p();
+
+    autoPtr<interpolation<scalar> > rhoInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        this->rho()
+    );
+
+    autoPtr<interpolation<vector> > UInterp = interpolation<vector>::New
+    (
+        this->interpolationSchemes(),
+        this->U()
+    );
+
+    autoPtr<interpolation<scalar> > muInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        this->mu()
+    );
+
+    autoPtr<interpolation<scalar> > TInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        T
+    );
+
+    autoPtr<interpolation<scalar> > cpInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        cp
+    );
+
+    autoPtr<interpolation<scalar> > pInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        p
+    );
+
+    typename ParcelType::trackData td
+    (
+        *this,
+        constProps_,
+        rhoInterp(),
+        UInterp(),
+        muInterp(),
+        TInterp(),
+        cpInterp(),
+        pInterp(),
+        this->g().value()
+    );
+
+    this->injection().inject(td);
+
+    if (this->coupled())
+    {
+        resetSourceTerms();
+    }
+
+    Cloud<ParcelType>::move(td);
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::postEvolve()
+{
+    ReactingCloud<ParcelType>::postEvolve();
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::ReactingMultiphaseCloud<ParcelType>::ReactingMultiphaseCloud
+(
+    const word& cloudName,
+    const volScalarField& rho,
+    const volVectorField& U,
+    const dimensionedVector& g,
+    basicThermo& thermo,
+    bool readFields
+)
+:
+    ReactingCloud<ParcelType>(cloudName, rho, U, g, thermo, false),
+    reactingMultiphaseCloud(),
+    constProps_(this->particleProperties()),
+    devolatilisationModel_
+    (
+        DevolatilisationModel<ReactingMultiphaseCloud<ParcelType> >::New
+        (
+            this->particleProperties(),
+            *this
+        )
+    ),
+    surfaceReactionModel_
+    (
+        SurfaceReactionModel<ReactingMultiphaseCloud<ParcelType> >::New
+        (
+            this->particleProperties(),
+            *this
+        )
+    ),
+    dMassDevolatilisation_(0.0)
+{
+    if (readFields)
+    {
+        ParcelType::readFields(*this);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::ReactingMultiphaseCloud<ParcelType>::~ReactingMultiphaseCloud()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::checkParcelProperties
+(
+    ParcelType& parcel,
+    const scalar lagrangianDt,
+    const bool fullyDescribed
+)
+{
+    ReactingCloud<ParcelType>::checkParcelProperties
+    (
+        parcel,
+        lagrangianDt,
+        fullyDescribed
+    );
+
+    label idGas = this->composition().idGas();
+    label idLiquid = this->composition().idLiquid();
+    label idSolid = this->composition().idSolid();
+
+    if (!fullyDescribed)
+    {
+        parcel.YGas() = this->composition().Y0(idGas);
+        parcel.YLiquid() = this->composition().Y0(idLiquid);
+        parcel.YSolid() = this->composition().Y0(idSolid);
+    }
+    else
+    {
+        this->checkSuppliedComposition
+        (
+            parcel.YGas(),
+            this->composition().Y0(idGas),
+            "YGas"
+        );
+        this->checkSuppliedComposition
+        (
+            parcel.YLiquid(),
+            this->composition().Y0(idLiquid),
+            "YLiquid"
+        );
+        this->checkSuppliedComposition
+        (
+            parcel.YSolid(),
+            this->composition().Y0(idSolid),
+            "YSolid"
+        );
+    }
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::resetSourceTerms()
+{
+    ReactingCloud<ParcelType>::resetSourceTerms();
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::evolve()
+{
+    if (this->active())
+    {
+        preEvolve();
+
+        evolveCloud();
+
+        postEvolve();
+
+        info();
+        Info<< endl;
+    }
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::info() const
+{
+    ReactingCloud<ParcelType>::info();
+    Info<< "    Mass transfer devolatilisation  = "
+        << returnReduce(dMassDevolatilisation_, sumOp<scalar>()) << nl;
+    Info<< "    Mass transfer surface reaction  = "
+        << returnReduce(dMassSurfaceReaction_, sumOp<scalar>()) << nl;
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::addToMassDevolatilisation
+(
+    const scalar dMass
+)
+{
+    dMassDevolatilisation_ += dMass;
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseCloud<ParcelType>::addToMassSurfaceReaction
+(
+    const scalar dMass
+)
+{
+    dMassSurfaceReaction_ += dMass;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
new file mode 100644
index 000000000..132f65812
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloud.H
@@ -0,0 +1,227 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::ReactingMultiphaseCloud
+
+Description
+    Templated base class for multiphase reacting cloud
+
+    - Adds to reacting cloud
+      - multiphase composition
+      - devolatilisatsion
+      - surface reactions
+
+SourceFiles
+    ReactingMultiphaseCloudI.H
+    ReactingMultiphaseCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ReactingMultiphaseCloud_H
+#define ReactingMultiphaseCloud_H
+
+#include "ReactingCloud.H"
+#include "reactingMultiphaseCloud.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+
+template<class CloudType>
+class DevolatilisationModel;
+
+template<class CloudType>
+class SurfaceReactionModel;
+
+/*---------------------------------------------------------------------------*\
+                   Class ReactingMultiphaseCloud Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ParcelType>
+class ReactingMultiphaseCloud
+:
+    public ReactingCloud<ParcelType>,
+    public reactingMultiphaseCloud
+{
+    // Private member functions
+
+        //- Disallow default bitwise copy construct
+        ReactingMultiphaseCloud(const ReactingMultiphaseCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const ReactingMultiphaseCloud&);
+
+
+protected:
+
+    // Protected data
+
+        //- Parcel constant properties
+        typename ParcelType::constantProperties constProps_;
+
+
+        // References to the cloud sub-models
+
+            //- Devolatilisation model
+            autoPtr
+            <
+                DevolatilisationModel<ReactingMultiphaseCloud<ParcelType> >
+            >
+            devolatilisationModel_;
+
+            //- Surface reaction model
+            autoPtr
+            <
+                SurfaceReactionModel<ReactingMultiphaseCloud<ParcelType> >
+            >
+            surfaceReactionModel_;
+
+
+        // Check
+
+            //- Total mass transferred to continuous phase via devolatilisation
+            scalar dMassDevolatilisation_;
+
+            //- Total mass transferred to continuous phase via surface
+            //  reactions
+            scalar dMassSurfaceReaction_;
+
+
+    // Protected member functions
+
+        // Cloud evolution functions
+
+            //- Pre-evolve
+            void preEvolve();
+
+            //- Evolve the cloud
+            void evolveCloud();
+
+            //- Post-evolve
+            void postEvolve();
+
+
+public:
+
+    // Constructors
+
+        //- Construct given carrier gas fields
+        ReactingMultiphaseCloud
+        (
+            const word& cloudName,
+            const volScalarField& rho,
+            const volVectorField& U,
+            const dimensionedVector& g,
+            basicThermo& thermo,
+            bool readFields = true
+        );
+
+
+    //- Destructor
+    virtual ~ReactingMultiphaseCloud();
+
+
+    //- Type of parcel the cloud was instantiated for
+    typedef ParcelType parcelType;
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the constant properties
+            inline const typename ParcelType::constantProperties&
+                constProps() const;
+
+
+            // Sub-models
+
+                //- Return reference to devolatilisation model
+                inline const DevolatilisationModel
+                <
+                    ReactingMultiphaseCloud<ParcelType>
+                >&
+                devolatilisation() const;
+
+                //- Return reference to reacting surface reaction model
+                inline const SurfaceReactionModel
+                <
+                    ReactingMultiphaseCloud<ParcelType>
+                >&
+                surfaceReaction() const;
+
+
+        // Check
+
+            //- Print cloud information
+            void info() const;
+
+            //- Add to cumulative volatilisation mass transfer
+            void addToMassDevolatilisation(const scalar dMass);
+
+            //- Add to cumulative surface reaction transfer
+            void addToMassSurfaceReaction(const scalar dMass);
+
+
+        // Cloud evolution functions
+
+            //- Check parcel properties
+            void checkParcelProperties
+            (
+                ParcelType& parcel,
+                const scalar lagrangianDt,
+                const bool fullyDescribed
+            );
+
+            //- Reset the spray source terms
+            void resetSourceTerms();
+
+            //- Evolve the spray (inject, move)
+            void evolve();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "ReactingMultiphaseCloudI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ReactingMultiphaseCloud.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
new file mode 100644
index 000000000..7407cf1ba
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/Templates/ReactingMultiphaseCloud/ReactingMultiphaseCloudI.H
@@ -0,0 +1,59 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class ParcelType>
+inline const typename ParcelType::constantProperties&
+Foam::ReactingMultiphaseCloud<ParcelType>::constProps() const
+{
+    return constProps_;
+}
+
+
+template<class ParcelType>
+inline const Foam::DevolatilisationModel
+<
+    Foam::ReactingMultiphaseCloud<ParcelType>
+>&
+Foam::ReactingMultiphaseCloud<ParcelType>::devolatilisation() const
+{
+    return devolatilisationModel_;
+}
+
+
+template<class ParcelType>
+inline const Foam::SurfaceReactionModel
+<
+    Foam::ReactingMultiphaseCloud<ParcelType>
+>&
+Foam::ReactingMultiphaseCloud<ParcelType>::surfaceReaction() const
+{
+    return surfaceReactionModel_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
index 62d1cf803..0e016a71b 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.C
@@ -25,32 +25,107 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ThermoCloud.H"
-#include "HeatTransferModel.H"
-
 #include "interpolationCellPoint.H"
 #include "ThermoParcel.H"
 
+#include "HeatTransferModel.H"
+
+// * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
+
+template<class ParcelType>
+void Foam::ThermoCloud<ParcelType>::preEvolve()
+{
+    KinematicCloud<ParcelType>::preEvolve();
+}
+
+
+template<class ParcelType>
+void Foam::ThermoCloud<ParcelType>::evolveCloud()
+{
+    const volScalarField& T = carrierThermo_.T();
+    const volScalarField cp = carrierThermo_.Cp();
+
+    autoPtr<interpolation<scalar> > rhoInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        this->rho()
+    );
+
+    autoPtr<interpolation<vector> > UInterp = interpolation<vector>::New
+    (
+        this->interpolationSchemes(),
+        this->U()
+    );
+
+    autoPtr<interpolation<scalar> > muInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        this->mu()
+    );
+
+    autoPtr<interpolation<scalar> > TInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        T
+    );
+
+    autoPtr<interpolation<scalar> > cpInterp = interpolation<scalar>::New
+    (
+        this->interpolationSchemes(),
+        cp
+    );
+
+    typename ParcelType::trackData td
+    (
+        *this,
+        constProps_,
+        rhoInterp(),
+        UInterp(),
+        muInterp(),
+        TInterp(),
+        cpInterp(),
+        this->g().value()
+    );
+
+    this->injection().inject(td);
+
+    if (this->coupled())
+    {
+        resetSourceTerms();
+    }
+
+    Cloud<ParcelType>::move(td);
+}
+
+
+template<class ParcelType>
+void Foam::ThermoCloud<ParcelType>::postEvolve()
+{
+    KinematicCloud<ParcelType>::postEvolve();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ParcelType>
 Foam::ThermoCloud<ParcelType>::ThermoCloud
 (
-    const word& cloudType,
-    const volPointInterpolation& vpi,
+    const word& cloudName,
     const volScalarField& rho,
     const volVectorField& U,
     const dimensionedVector& g,
-    basicThermo& thermo
+    basicThermo& thermo,
+    bool readFields
 )
 :
     KinematicCloud<ParcelType>
     (
-        cloudType,
-        vpi,
+        cloudName,
         rho,
         U,
         thermo.mu(),
-        g
+        g,
+        false
     ),
     thermoCloud(),
     constProps_(this->particleProperties()),
@@ -72,11 +147,11 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
         )
     ),
     radiation_(this->particleProperties().lookup("radiation")),
-    hTrans_
+    hsTrans_
     (
         IOobject
         (
-            this->name() + "hTrans",
+            this->name() + "hsTrans",
             this->db().time().timeName(),
             this->db(),
             IOobject::NO_READ,
@@ -84,23 +159,14 @@ Foam::ThermoCloud<ParcelType>::ThermoCloud
             false
         ),
         this->mesh(),
-        dimensionedScalar("zero", dimensionSet(1, 2, -2, 0, 0), 0.0)
-    ),
-    hCoeff_
-    (
-        IOobject
-        (
-            this->name() + "hCoeff",
-            this->db().time().timeName(),
-            this->db(),
-            IOobject::NO_READ,
-            IOobject::NO_WRITE,
-            false
-        ),
-        this->mesh(),
-        dimensionedScalar("zero", dimensionSet(1, 2, -3, -1, 0), 0.0)
+        dimensionedScalar("zero", dimEnergy, 0.0)
     )
-{}
+{
+    if (readFields)
+    {
+        ParcelType::readFields(*this);
+    }
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -112,83 +178,58 @@ Foam::ThermoCloud<ParcelType>::~ThermoCloud()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class ParcelType>
+void Foam::ThermoCloud<ParcelType>::checkParcelProperties
+(
+    ParcelType& parcel,
+    const scalar lagrangianDt,
+    const bool fullyDescribed
+)
+{
+    KinematicCloud<ParcelType>::checkParcelProperties
+    (
+        parcel,
+        lagrangianDt,
+        fullyDescribed
+    );
+
+    if (!fullyDescribed)
+    {
+        parcel.T() = constProps_.T0();
+        parcel.cp() = constProps_.cp0();
+    }
+}
+
+
 template<class ParcelType>
 void Foam::ThermoCloud<ParcelType>::resetSourceTerms()
 {
     KinematicCloud<ParcelType>::resetSourceTerms();
-    hTrans_.field() = 0.0;
-    hCoeff_.field() = 0.0;
+    hsTrans_.field() = 0.0;
 }
 
 
 template<class ParcelType>
 void Foam::ThermoCloud<ParcelType>::evolve()
 {
-    const volScalarField& T = carrierThermo_.T();
-    const volScalarField cp = carrierThermo_.Cp();
+    if (this->active())
+    {
+        preEvolve();
 
-    autoPtr<interpolation<scalar> > rhoInterpolator = interpolation<scalar>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        this->rho()
-    );
+        evolveCloud();
 
-    autoPtr<interpolation<vector> > UInterpolator = interpolation<vector>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        this->U()
-    );
+        postEvolve();
 
-    autoPtr<interpolation<scalar> > muInterpolator = interpolation<scalar>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        this->mu()
-    );
-
-    autoPtr<interpolation<scalar> > TInterpolator = interpolation<scalar>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        T
-    );
-
-    autoPtr<interpolation<scalar> > cpInterpolator = interpolation<scalar>::New
-    (
-        this->interpolationSchemes(),
-        this->vpi(),
-        cp
-    );
-
-    typename ParcelType::trackData td
-    (
-        *this,
-        constProps_,
-        rhoInterpolator(),
-        UInterpolator(),
-        muInterpolator(),
-        TInterpolator(),
-        cpInterpolator(),
-        this->g().value()
-    );
-
-    inject(td);
-
-    this->move(td);
+        info();
+        Info<< endl;
+    }
 }
 
 
 template<class ParcelType>
-template<class TrackingData>
-void Foam::ThermoCloud<ParcelType>::inject
-(
-    TrackingData& td
-)
+void Foam::ThermoCloud<ParcelType>::info() const
 {
-    // Injection is same as for KinematicCloud<ParcelType>
-    KinematicCloud<ParcelType>::inject(td);
+    KinematicCloud<ParcelType>::info();
 }
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
index a1a9d2c93..c128bef26 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloud.H
@@ -27,6 +27,7 @@ Class
 
 Description
     Templated base class for thermodynamic cloud
+
     - Adds to kinematic cloud
       - Heat transfer
 
@@ -39,12 +40,9 @@ SourceFiles
 #ifndef ThermoCloud_H
 #define ThermoCloud_H
 
-#include "autoPtr.H"
-#include "hCombustionThermo.H"
-
 #include "KinematicCloud.H"
 #include "thermoCloud.H"
-
+#include "basicThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -66,8 +64,18 @@ class ThermoCloud
     public KinematicCloud<ParcelType>,
     public thermoCloud
 {
+    // Private Member Functions
 
-    // Private data
+        //- Disallow default bitwise copy construct
+        ThermoCloud(const ThermoCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const ThermoCloud&);
+
+
+protected:
+
+    // Protected data
 
         //- Thermo parcel constant properties
         typename ParcelType::constantProperties constProps_;
@@ -100,58 +108,56 @@ class ThermoCloud
 
         // Sources
 
-            //- Enthalpy transfer
-            DimensionedField<scalar, volMesh> hTrans_;
-
-            //- Coefficient for carrier phase h equation
-            DimensionedField<scalar, volMesh> hCoeff_;
+            //- Sensible enthalpy transfer [J/kg]
+            DimensionedField<scalar, volMesh> hsTrans_;
 
 
-    // Private Member Functions
+    // Protected member functions
 
-        //- Disallow default bitwise copy construct
-        ThermoCloud(const ThermoCloud&);
+        // Cloud evolution functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const ThermoCloud&);
+            //- Pre-evolve
+            void preEvolve();
 
+            //- Evolve the cloud
+            void evolveCloud();
 
-protected:
-
-    //- Inject more parcels
-    template<class TrackingData>
-    void inject(TrackingData& td);
+            //- Post-evolve
+            void postEvolve();
 
 
 public:
 
-    //- Runtime type information
-//    TypeName("ThermoCloud");
-
-
     // Constructors
 
         //- Construct given carrier gas fields
         ThermoCloud
         (
-            const word& cloudType,
-            const volPointInterpolation& vpi,
+            const word& cloudName,
             const volScalarField& rho,
             const volVectorField& U,
             const dimensionedVector& g,
-            basicThermo& thermo
+            basicThermo& thermo,
+            bool readFields = true
         );
 
 
-    // Destructor
+    //- Destructor
+    virtual ~ThermoCloud();
 
-        virtual ~ThermoCloud();
+
+    //- Type of parcel the cloud was instantiated for
+    typedef ParcelType parcelType;
 
 
     // Member Functions
 
         // Access
 
+            //- Return the constant properties
+            inline const typename ParcelType::constantProperties&
+                constProps() const;
+
             //- Return const access to thermo package
             inline const basicThermo& carrierThermo() const;
 
@@ -174,7 +180,7 @@ public:
 
             // Modelling options
 
-                //- Radiation flag
+                 //- Radiation flag
                 inline bool radiation() const;
 
 
@@ -182,17 +188,11 @@ public:
 
                 // Enthalpy
 
-                    //- Return reference to enthalpy source
-                    inline DimensionedField<scalar, volMesh>& hTrans();
+                    //- Sensible enthalpy transfer [J/kg]
+                    inline DimensionedField<scalar, volMesh>& hsTrans();
 
-                    //- Coefficient for carrier phase h equation
-                    inline DimensionedField<scalar, volMesh>& hCoeff();
-
-                    //- return tmp enthalpy source term - fully explicit
-                    inline tmp<DimensionedField<scalar, volMesh> > Sh1() const;
-
-                    //- Return tmp enthalpy source term - semi-implicit
-                    inline tmp<fvScalarMatrix> Sh2(volScalarField& h) const;
+                    //- Return enthalpy source [J/kg/m3/s]
+                    inline tmp<DimensionedField<scalar, volMesh> > Sh() const;
 
 
                 // Radiation - overrides thermoCloud virtual abstract members
@@ -207,13 +207,27 @@ public:
                     inline tmp<volScalarField> sigmap() const;
 
 
+        // Check
+
+            //- Print cloud information
+            void info() const;
+
+
         // Cloud evolution functions
 
-            //- Evolve the spray (move, inject)
-            void evolve();
+            //- Check parcel properties
+            void checkParcelProperties
+            (
+                ParcelType& parcel,
+                const scalar lagrangianDt,
+                const bool fullyDescribed
+            );
 
             //- Reset the spray source terms
             void resetSourceTerms();
+
+            //- Evolve the spray (inject, move)
+            void evolve();
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
index e98c159ae..77b619183 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/ThermoCloud/ThermoCloudI.H
@@ -28,6 +28,14 @@ License
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+template<class ParcelType>
+inline const typename ParcelType::constantProperties&
+Foam::ThermoCloud<ParcelType>::constProps() const
+{
+    return constProps_;
+}
+
+
 template<class ParcelType>
 inline const Foam::basicThermo&
 Foam::ThermoCloud<ParcelType>::carrierThermo() const
@@ -69,71 +77,34 @@ inline bool Foam::ThermoCloud<ParcelType>::radiation() const
 
 template<class ParcelType>
 inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::ThermoCloud<ParcelType>::hTrans()
+Foam::ThermoCloud<ParcelType>::hsTrans()
 {
-    return hTrans_;
-}
-
-
-template<class ParcelType>
-inline Foam::DimensionedField<Foam::scalar, Foam::volMesh>&
-Foam::ThermoCloud<ParcelType>::hCoeff()
-{
-    return hCoeff_;
+    return hsTrans_;
 }
 
 
 template<class ParcelType>
 inline Foam::tmp<Foam::DimensionedField<Foam::scalar, Foam::volMesh> >
-Foam::ThermoCloud<ParcelType>::Sh1() const
+Foam::ThermoCloud<ParcelType>::Sh() const
 {
-    tmp<DimensionedField<scalar, volMesh> > tSh1
+    tmp<DimensionedField<scalar, volMesh> > tSh
     (
         new DimensionedField<scalar, volMesh>
         (
             IOobject
             (
-                this->name() + "Sh1",
+                this->name() + "Sh",
                 this->db().time().timeName(),
                 this->mesh(),
                 IOobject::NO_READ,
                 IOobject::AUTO_WRITE,
                 false
             ),
-            this->mesh(),
-            dimensionedScalar
-            (
-                "zero",
-                dimMass/dimLength/pow3(dimTime),
-                0.0
-            )
+            hsTrans_/(this->mesh().V()*this->db().time().deltaT())
         )
     );
 
-    scalarField& Sh1 = tSh1().field();
-    Sh1 = hTrans_/(this->mesh().V()*this->db().time().deltaT());
-
-    return tSh1;
-}
-
-
-template<class ParcelType>
-inline Foam::tmp<Foam::fvScalarMatrix>
-Foam::ThermoCloud<ParcelType>::Sh2(volScalarField& h) const
-{
-    const volScalarField cp = carrierThermo_.Cp();
-
-    if (debug)
-    {
-        Info<< "hTrans min/max = "
-            << min(hTrans_) << ", " << max(hTrans_) << endl;
-        Info<< "hCoeff min/max = "
-            << min(hCoeff_) << ", " << max(hCoeff_) << endl;
-    }
-
-    return hTrans_/(this->mesh().V()*this->db().time().deltaT())
-         - fvm::Sp(hCoeff_/(cp*this->mesh().V()), h)
-         + hCoeff_/(cp*this->mesh().V())*h;
+    return tSh;
 }
 
 
@@ -147,7 +118,7 @@ Foam::ThermoCloud<ParcelType>::Ep() const
         (
             IOobject
             (
-                this->name() + "radiationEp",
+                this->name() + "radiation::Ep",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
@@ -190,7 +161,7 @@ Foam::ThermoCloud<ParcelType>::ap() const
         (
             IOobject
             (
-                this->name() + "radiationAp",
+                this->name() + "radiation::ap",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
@@ -233,7 +204,7 @@ Foam::ThermoCloud<ParcelType>::sigmap() const
         (
             IOobject
             (
-                this->name() + "radiationSigmap",
+                this->name() + "radiation::sigmap",
                 this->db().time().timeName(),
                 this->db(),
                 IOobject::NO_READ,
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
index bd159bd4d..a30131e37 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/kinematicCloud/kinematicCloud.H
@@ -29,13 +29,14 @@ Description
     Virtual abstract base class for templated KinematicCloud
 
 SourceFiles
+    kinematicCloud.H
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef kinematicCloud_H
 #define kinematicCloud_H
 
-#include "volFields.H"
+#include "typeInfo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,7 +49,6 @@ namespace Foam
 
 class kinematicCloud
 {
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -69,14 +69,8 @@ public:
         kinematicCloud();
 
 
-    // Destructors
-
-        virtual ~kinematicCloud();
-
-
-    // Member Functions
-
-        // Access
+    //- Destructor
+    virtual ~kinematicCloud();
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
index 6e866738f..1db5e4d6b 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingCloud/reactingCloud.H
@@ -29,13 +29,14 @@ Description
     Virtual abstract base class for templated ReactingCloud
 
 SourceFiles
+    reactingCloud.C
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef reactingCloud_H
 #define reactingCloud_H
 
-#include "volFields.H"
+#include "typeInfo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,7 +49,6 @@ namespace Foam
 
 class reactingCloud
 {
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -69,14 +69,8 @@ public:
         reactingCloud();
 
 
-    // Destructors
-
-        virtual ~reactingCloud();
-
-
-    // Member Functions
-
-        // Access
+    //- Destructor
+    virtual ~reactingCloud();
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
new file mode 100644
index 000000000..2dcfec845
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.C
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "reactingMultiphaseCloud.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(reactingMultiphaseCloud, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::reactingMultiphaseCloud::reactingMultiphaseCloud()
+{}
+
+
+// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
+
+Foam::reactingMultiphaseCloud::~reactingMultiphaseCloud()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
similarity index 67%
rename from src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
rename to src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
index 883d047c8..82d768d12 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/reactingMultiphaseCloud/reactingMultiphaseCloud.H
@@ -23,20 +23,20 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::basicReactingCloud
+    Foam::reactingMultiphaseCloud
 
 Description
+    Virtual abstract base class for templated reactingMultiphaseCloud
 
 SourceFiles
-    basicReactingCloud.C
+    reactingMultiphaseCloud.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef basicReactingCloud_H
-#define basicReactingCloud_H
+#ifndef reactingMultiphaseCloud_H
+#define reactingMultiphaseCloud_H
 
-#include "ReactingCloud.H"
-#include "basicReactingParcel.H"
+#include "typeInfo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,53 +44,33 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                        Class basicReactingCloud Declaration
+                  Class reactingMultiphaseCloud Declaration
 \*---------------------------------------------------------------------------*/
 
-class basicReactingCloud
-:
-    public ReactingCloud<basicReactingParcel>
+class reactingMultiphaseCloud
 {
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        basicReactingCloud(const basicReactingCloud&);
+        reactingMultiphaseCloud(const reactingMultiphaseCloud&);
 
         //- Disallow default bitwise assignment
-        void operator=(const basicReactingCloud&);
+        void operator=(const reactingMultiphaseCloud&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("basicReactingCloud");
-
+    TypeName("reactingMultiphaseCloud");
 
     // Constructors
 
-        //- Construct given carrier gas fields
-        basicReactingCloud
-        (
-            const word& cloudType,
-            const volPointInterpolation& vpi,
-            const volScalarField& rho,
-            const volVectorField& U,
-            const dimensionedVector& g,
-            hCombustionThermo& thermo,
-            PtrList<specieReactingProperties>& gases
-        );
+        //- Null constructor
+        reactingMultiphaseCloud();
 
 
     //- Destructor
-
-        ~basicReactingCloud();
-
-
-    // Member Functions
-
-        //- Write fields
-        void writeFields() const;
+    virtual ~reactingMultiphaseCloud();
 };
 
 
diff --git a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
index c85be88bb..3dcf17a49 100644
--- a/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/baseClasses/thermoCloud/thermoCloud.H
@@ -29,6 +29,7 @@ Description
     Virtual abstract base class for templated ThermoCloud
 
 SourceFiles
+    thermoCloud.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -48,7 +49,6 @@ namespace Foam
 
 class thermoCloud
 {
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -69,9 +69,8 @@ public:
         thermoCloud();
 
 
-    // Destructors
-
-        virtual ~thermoCloud();
+    //- Destructor
+    virtual ~thermoCloud();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H b/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H
new file mode 100644
index 000000000..6347275aa
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/derived/BasicReactingCloud/BasicReactingCloud.H
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::BasicReactingCloud
+
+Description
+    Reacting cloud templated on the type of carrier phase thermodynamics
+
+SourceFiles
+    BasicReactingCloud.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef BasicReactingCloud_H
+#define BasicReactingCloud_H
+
+#include "ReactingCloud.H"
+#include "BasicReactingParcel.H"
+#include "thermoPhysicsTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef ReactingCloud<BasicReactingParcel<constGasThermoPhysics> >
+        constThermoReactingCloud;
+
+    typedef ReactingCloud<BasicReactingParcel<gasThermoPhysics> >
+        thermoReactingCloud;
+
+    typedef ReactingCloud<BasicReactingParcel<icoPoly8ThermoPhysics> >
+        icoPoly8ThermoReactingCloud;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H b/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
new file mode 100644
index 000000000..6ebb76ad0
--- /dev/null
+++ b/src/lagrangian/intermediate/clouds/derived/BasicReactingMultiphaseCloud/BasicReactingMultiphaseCloud.H
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::BasicReactingMultiphaseCloud
+
+Description
+    Reacting multiphase cloud templated on the type of carrier phase
+    thermodynamics
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef BasicReactingMultiphaseCloud_H
+#define BasicReactingMultiphaseCloud_H
+
+#include "ReactingMultiphaseCloud.H"
+#include "BasicReactingMultiphaseParcel.H"
+#include "thermoPhysicsTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef ReactingMultiphaseCloud
+        <
+            BasicReactingMultiphaseParcel
+            <
+                constGasThermoPhysics
+            >
+        >
+        constThermoReactingMultiphaseCloud;
+
+    typedef ReactingMultiphaseCloud
+        <
+            BasicReactingMultiphaseParcel
+            <
+                gasThermoPhysics
+            >
+        >
+        thermoReactingMultiphaseCloud;
+
+    typedef ReactingMultiphaseCloud
+        <
+            BasicReactingMultiphaseParcel
+            <
+                icoPoly8ThermoPhysics
+            >
+        >
+        icoPoly8ThermoReactingMultiphaseCloud;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
index 4519079c2..e13e8e8c3 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.H
@@ -43,59 +43,8 @@ SourceFiles
 
 namespace Foam
 {
-
-/*---------------------------------------------------------------------------*\
-                      Class basicKinematicCloud Declaration
-\*---------------------------------------------------------------------------*/
-
-class basicKinematicCloud
-:
-    public KinematicCloud<basicKinematicParcel>
-{
-
-    // Private member functions
-
-        //- Disallow default bitwise copy construct
-        basicKinematicCloud(const basicKinematicCloud&);
-
-        //- Disallow default bitwise assignment
-        void operator=(const basicKinematicCloud&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("basicKinematicCloud");
-
-
-    // Constructors
-
-        //- Construct from components
-        basicKinematicCloud
-        (
-            const word& cloudType,
-            const volPointInterpolation& vpi,
-            const volScalarField& rho,
-            const volVectorField& U,
-            const volScalarField& mu,
-            const dimensionedVector& g
-        );
-
-
-    //- Destructor
-
-        ~basicKinematicCloud();
-
-
-    // Member functions
-
-        //- Write fields
-        void writeFields() const;
-};
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    typedef KinematicCloud<basicKinematicParcel> basicKinematicCloud;
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
index decf35d86..56c6d8ebc 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
+++ b/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.H
@@ -26,6 +26,7 @@ Class
     Foam::basicThermoCloud
 
 Description
+    Cloud class to introduce thermodynamic parcels
 
 SourceFiles
     basicThermoCloud.C
@@ -42,63 +43,8 @@ SourceFiles
 
 namespace Foam
 {
-
-/*---------------------------------------------------------------------------*\
-                        Class basicThermoCloud Declaration
-\*---------------------------------------------------------------------------*/
-
-class basicThermoCloud
-:
-    public ThermoCloud<basicThermoParcel>
-{
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        basicThermoCloud
-        (
-            const basicThermoCloud&
-        );
-
-        //- Disallow default bitwise assignment
-        void operator=(const basicThermoCloud&);
-
-
-public:
-
-    //- Runtime type information
-    TypeName("basicThermoCloud");
-
-
-    // Constructors
-
-        //- Construct given carrier gas fields
-        basicThermoCloud
-        (
-            const word& cloudType,
-            const volPointInterpolation& vpi,
-            const volScalarField& rho,
-            const volVectorField& U,
-            const dimensionedVector& g,
-            basicThermo& thermo
-        );
-
-
-    //- Destructor
-
-        ~basicThermoCloud();
-
-
-    // Member Functions
-
-        //- Write fields
-        void writeFields() const;
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+    typedef ThermoCloud<basicThermoParcel> basicThermoCloud;
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
index 80856251b..aedbe5f61 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.C
@@ -25,28 +25,44 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "KinematicParcel.H"
-#include "dimensionedConstants.H"
 
 // * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * * //
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::KinematicParcel<ParcelType>::updateCellQuantities
+void Foam::KinematicParcel<ParcelType>::setCellValues
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    rhoc_ = td.rhoInterp().interpolate(this->position(), celli);
-    Uc_ = td.UInterp().interpolate(this->position(), celli);
-    muc_ = td.muInterp().interpolate(this->position(), celli);
+    rhoc_ = td.rhoInterp().interpolate(this->position(), cellI);
+    if (rhoc_ < td.constProps().rhoMin())
+    {
+        WarningIn
+        (
+            "void Foam::KinematicParcel<ParcelType>::setCellValues"
+            "("
+                "TrackData&, "
+                "const scalar, "
+                "const label"
+            ")"
+        )   << "Limiting observed density in cell " << cellI << " to "
+            << td.constProps().rhoMin() <<  nl << endl;
+
+        rhoc_ = td.constProps().rhoMin();
+    }
+
+    Uc_ = td.UInterp().interpolate(this->position(), cellI);
+
+    muc_ = td.muInterp().interpolate(this->position(), cellI);
 
     // Apply dispersion components to carrier phase velocity
     Uc_ = td.cloud().dispersion().update
     (
         dt,
-        celli,
+        cellI,
         U_,
         Uc_,
         UTurb_,
@@ -57,152 +73,150 @@ void Foam::KinematicParcel<ParcelType>::updateCellQuantities
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::KinematicParcel<ParcelType>::calcCoupled
+void Foam::KinematicParcel<ParcelType>::cellValueSourceCorrection
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Define local properties at beginning of timestep
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-//    const scalar mass0 = mass();
-//    const vector U0 = U_;
+    Uc_ += td.cloud().UTrans()[cellI]/massCell(cellI);
+}
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+template<class ParcelType>
+template<class TrackData>
+void Foam::KinematicParcel<ParcelType>::calc
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI
+)
+{
+    // Define local properties at beginning of time step
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    const scalar np0 = nParticle_;
+    const scalar d0 = d_;
+    const vector U0 = U_;
+    const scalar rho0 = rho_;
+    const scalar mass0 = mass();
+
+    // Reynolds number
+    const scalar Re = this->Re(U0, d0, rhoc_, muc_);
+
+
+    // Sources
+    //~~~~~~~~
+
+    // Explicit momentum source for particle
+    vector Su = vector::zero;
 
     // Momentum transfer from the particle to the carrier phase
     vector dUTrans = vector::zero;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
+    // Motion
+    // ~~~~~~
+
+    // Calculate new particle velocity
+    vector U1 =
+        calcVelocity(td, dt, cellI, Re, muc_, d0, U0, rho0, mass0, Su, dUTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Accumulate source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Update momentum transfer
-    td.cloud().UTrans()[celli] += nParticle_*dUTrans;
-
-    // Accumulate coefficient to be applied in carrier phase momentum coupling
-    td.cloud().UCoeff()[celli] += nParticle_*mass()*Cud;
+    // Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    if (td.cloud().coupled())
+    {
+        // Update momentum transfer
+        td.cloud().UTrans()[cellI] += np0*dUTrans;
+    }
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Set new particle properties
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    this->U() = U1;
+    U_ = U1;
 }
 
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::KinematicParcel<ParcelType>::calcUncoupled
+const Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
 (
     TrackData& td,
     const scalar dt,
-    const label
-)
-{
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    this->U() = calcVelocity(td, dt, Cud, dUTrans);
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-Foam::vector Foam::KinematicParcel<ParcelType>::calcVelocity
-(
-    TrackData& td,
-    const scalar dt,
-    scalar& Cud,
+    const label cellI,
+    const scalar Re,
+    const scalar mu,
+    const scalar d,
+    const vector& U,
+    const scalar rho,
+    const scalar mass,
+    const vector& Su,
     vector& dUTrans
-)
+) const
 {
-    // Correct carrier phase velocity for 2-D slab cases
-    const polyMeshInfo& meshInfo = td.cloud().meshInfo();
-    if (meshInfo.caseIs2dSlab())
-    {
-        Uc_.component(meshInfo.emptyComponent()) = 0.0;
-    }
+    const polyMesh& mesh = this->cloud().pMesh();
 
-    // Return linearised term from drag model
-    Cud = td.cloud().drag().Cu(U_ - Uc_, d_, rhoc_, rho_, muc_);
+    // Momentum transfer coefficient
+    const scalar utc = td.cloud().drag().utc(Re, d, mu) + ROOTVSMALL;
+
+    // Momentum source due to particle forces
+    const vector FCoupled =
+        mass*td.cloud().forces().calcCoupled(cellI, dt, rhoc_, rho, Uc_, U);
+    const vector FNonCoupled =
+        mass*td.cloud().forces().calcNonCoupled(cellI, dt, rhoc_, rho, Uc_, U);
 
 
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Set new particle velocity
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    // New particle velocity
+    //~~~~~~~~~~~~~~~~~~~~~~
 
     // Update velocity - treat as 3-D
-    const scalar bp = 1.0/(Cud + VSMALL);
-    const vector ap = Uc_/bp + rhoc_/rho_*td.g();
+    const scalar As = this->areaS(d);
+    const vector ap = Uc_ + (FCoupled + FNonCoupled + Su)/(utc*As);
+    const scalar bp = 6.0*utc/(rho*d);
 
-    vector Unew = td.cloud().UIntegrator().integrate(U_, dt, ap, bp);
+    IntegrationScheme<vector>::integrationResult Ures =
+        td.cloud().UIntegrator().integrate(U, dt, ap, bp);
 
-//    Info<< "U_, Unew = " << U_ << ", " << Unew << endl;
+    vector Unew = Ures.value();
 
-    // Calculate the momentum transfer to the continuous phase
-    dUTrans = -mass()*(Unew - U_);
+    dUTrans += dt*(utc*As*(Ures.average() - Uc_) - FCoupled);
 
-    // Make corrections for 2-D cases
-    if (meshInfo.caseIs2d())
-    {
-        if (meshInfo.caseIs2dSlab())
-        {
-            // Remove the slab normal parcel velocity component
-            Unew.component(meshInfo.emptyComponent()) = 0.0;
-            dUTrans.component(meshInfo.emptyComponent()) = 0.0;
-
-            // Snap parcels to central plane
-            this->position().component(meshInfo.emptyComponent()) =
-                meshInfo.centrePoint().component(meshInfo.emptyComponent());
-        }
-        else if (meshInfo.caseIs2dWedge())
-        {
-            // Snap parcels to central plane
-            this->position().component(meshInfo.emptyComponent()) = 0.0;
-        }
-        else
-        {
-            FatalErrorIn("void Foam::KinematicParcel::calcVelocity")
-                << "Could not determine 2-D case geometry" << nl
-                << abort(FatalError);
-        }
-    }
+    // Apply correction to velocity and dUTrans for reduced-D cases
+    meshTools::constrainDirection(mesh, mesh.solutionD(), Unew);
+    meshTools::constrainDirection(mesh, mesh.solutionD(), dUTrans);
 
     return Unew;
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::KinematicParcel<ParcelType>::KinematicParcel
+(
+    const KinematicParcel<ParcelType>& p
+)
+:
+    Particle<ParcelType>(p),
+    typeId_(p.typeId_),
+    nParticle_(p.nParticle_),
+    d_(p.d_),
+    U_(p.U_),
+    rho_(p.rho_),
+    tTurb_(p.tTurb_),
+    UTurb_(p.UTurb_),
+    rhoc_(p.rhoc_),
+    Uc_(p.Uc_),
+    muc_(p.muc_)
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ParcelType>
 template<class TrackData>
-bool Foam::KinematicParcel<ParcelType>::move
-(
-    TrackData& td
-)
+bool Foam::KinematicParcel<ParcelType>::move(TrackData& td)
 {
     ParcelType& p = static_cast<ParcelType&>(*this);
 
@@ -212,48 +226,46 @@ bool Foam::KinematicParcel<ParcelType>::move
     const polyMesh& mesh = td.cloud().pMesh();
     const polyBoundaryMesh& pbMesh = mesh.boundaryMesh();
 
-    const scalar deltaT = mesh.time().deltaT().value();
+    const scalar deltaT = mesh.time().deltaTValue();
     scalar tEnd = (1.0 - p.stepFraction())*deltaT;
     const scalar dtMax = tEnd;
 
     while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
     {
+        // Apply correction to position for reduced-D cases
+        meshTools::constrainToMeshCentre(mesh, p.position());
+
         // Set the Lagrangian time-step
         scalar dt = min(dtMax, tEnd);
 
-        // Remember which cell the Parcel is in
-        // since this will change if a face is hit
-        label celli = p.cell();
+        // Remember which cell the Parcel is in since this will change if a
+        // face is hit
+        label cellI = p.cell();
 
         dt *= p.trackToFace(p.position() + dt*U_, td);
 
         tEnd -= dt;
         p.stepFraction() = 1.0 - tEnd/deltaT;
 
-        // Update cell based properties
-        p.updateCellQuantities(td, dt, celli);
+        // Avoid problems with extremely small timesteps
+        if (dt > ROOTVSMALL)
+        {
+            // Update cell based properties
+            p.setCellValues(td, dt, cellI);
 
-        if (td.cloud().coupled())
-        {
-            p.calcCoupled(td, dt, celli);
-        }
-        else
-        {
-            p.calcUncoupled(td, dt, celli);
+            if (td.cloud().cellValueSourceCorrection())
+            {
+                p.cellValueSourceCorrection(td, dt, cellI);
+            }
+
+            p.calc(td, dt, cellI);
         }
 
         if (p.onBoundary() && td.keepParticle)
         {
-            if (p.face() > -1)
+            if (isA<processorPolyPatch>(pbMesh[p.patch(p.face())]))
             {
-                if
-                (
-                    isType<processorPolyPatch>
-                        (pbMesh[p.patch(p.face())])
-                )
-                {
-                    td.switchProcessor = true;
-                }
+                td.switchProcessor = true;
             }
         }
     }
@@ -262,6 +274,40 @@ bool Foam::KinematicParcel<ParcelType>::move
 }
 
 
+template<class ParcelType>
+template<class TrackData>
+bool Foam::KinematicParcel<ParcelType>::hitPatch
+(
+    const polyPatch& pp,
+    TrackData& td,
+    const label patchI
+)
+{
+    ParcelType& p = static_cast<ParcelType&>(*this);
+    td.cloud().postProcessing().postPatch(p, patchI);
+
+    return td.cloud().patchInteraction().correct
+    (
+        pp,
+        this->face(),
+        td.keepParticle,
+        U_
+    );
+}
+
+
+template<class ParcelType>
+bool Foam::KinematicParcel<ParcelType>::hitPatch
+(
+    const polyPatch& pp,
+    int& td,
+    const label patchI
+)
+{
+    return false;
+}
+
+
 template<class ParcelType>
 template<class TrackData>
 void Foam::KinematicParcel<ParcelType>::hitProcessorPatch
@@ -291,7 +337,7 @@ void Foam::KinematicParcel<ParcelType>::hitWallPatch
     TrackData& td
 )
 {
-    td.cloud().wallInteraction().correct(wpp, this->face(), U_);
+    // Wall interactions handled by generic hitPatch function
 }
 
 
@@ -317,19 +363,12 @@ void Foam::KinematicParcel<ParcelType>::hitPatch
 
 
 template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::hitPatch
-(
-    const polyPatch&,
-    int&
-)
+void Foam::KinematicParcel<ParcelType>::hitPatch(const polyPatch&, int&)
 {}
 
 
 template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::transformProperties
-(
-    const tensor& T
-)
+void Foam::KinematicParcel<ParcelType>::transformProperties(const tensor& T)
 {
     Particle<ParcelType>::transformProperties(T);
     U_ = transform(T, U_);
@@ -346,7 +385,7 @@ void Foam::KinematicParcel<ParcelType>::transformProperties
 }
 
 
-// * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
 #include "KinematicParcelIO.C"
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
index 0dca582bc..c18d39a0c 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcel.H
@@ -31,7 +31,7 @@ Description
 
     Sub-models include:
     - drag
-    - break-up
+    - turbulent dispersion
     - wall interactions
 
 SourceFiles
@@ -49,7 +49,6 @@ SourceFiles
 #include "autoPtr.H"
 #include "interpolationCellPoint.H"
 #include "contiguous.H"
-#include "mathematicalConstants.H"
 
 #include "KinematicCloud.H"
 
@@ -79,15 +78,19 @@ class KinematicParcel
 :
     public Particle<ParcelType>
 {
-
 public:
 
     //- Class to hold kinematic particle constant properties
     class constantProperties
     {
-
         // Private data
 
+            //- Constant properties dictionary
+            const dictionary dict_;
+
+            //- Minimum density [kg/m3]
+            const scalar rhoMin_;
+
             //- Particle density [kg/m3] (constant)
             const scalar rho0_;
 
@@ -98,10 +101,16 @@ public:
     public:
 
         //- Constructor
-        constantProperties(const dictionary& dict);
+        constantProperties(const dictionary& parentDict);
 
         // Member functions
 
+            //- Return const access to the constant properties dictionary
+            inline const dictionary& dict() const;
+
+            //- Return const access to the minimum density
+            inline scalar rhoMin() const;
+
             //- Return const access to the particle density
             inline scalar rho0() const;
 
@@ -115,7 +124,6 @@ public:
     :
         public Particle<ParcelType>::trackData
     {
-
         // Private data
 
             //- Reference to the cloud containing this particle
@@ -183,22 +191,22 @@ public:
 
 protected:
 
-    // Protected member data
+    // Protected data
 
         // Parcel properties
 
             //- Parcel type id
             label typeId_;
 
+            //- Number of particles in Parcel
+            scalar nParticle_;
+
             //- Diameter [m]
             scalar d_;
 
             //- Velocity of Parcel [m/s]
             vector U_;
 
-            //- Number of particles in Parcel
-            scalar nParticle_;
-
             //- Density [kg/m3]
             scalar rho_;
 
@@ -211,13 +219,13 @@ protected:
 
         // Cell-based quantities
 
-            // - Density [kg/m3]
+            //- Density [kg/m3]
             scalar rhoc_;
 
-            // - Velocity [m/s]
+            //- Velocity [m/s]
             vector Uc_;
 
-            // - Viscosity [Pa.s]
+            //- Viscosity [Pa.s]
             scalar muc_;
 
 
@@ -225,35 +233,57 @@ protected:
 
         //- Calculate new particle velocity
         template<class TrackData>
-        vector calcVelocity
+        const vector calcVelocity
         (
             TrackData& td,
-            const scalar dt,
-            scalar& Cud,
-            vector& dUTrans
-        );
+            const scalar dt,           // timestep
+            const label cellI,         // owner cell
+            const scalar Re,           // Reynolds number
+            const scalar mu,           // local carrier viscosity
+            const scalar d,            // diameter
+            const vector& U,           // velocity
+            const scalar rho,          // density
+            const scalar mass,         // mass
+            const vector& Su,          // explicit particle momentum source
+            vector& dUTrans            // momentum transfer to carrier
+        ) const;
 
 
 public:
 
-    //- Runtime type information
-    TypeName("KinematicParcel");
+    // Static data members
+
+        //- String representation of properties
+        static string propHeader;
+
+        //- Runtime type information
+        TypeName("KinematicParcel");
+
 
     friend class Cloud<ParcelType>;
 
 
     // Constructors
 
+        //- Construct from owner, position, and cloud owner
+        //  Other properties initialised as null
+        inline KinematicParcel
+        (
+            KinematicCloud<ParcelType>& owner,
+            const vector& position,
+            const label cellI
+        );
+
         //- Construct from components
         inline KinematicParcel
         (
             KinematicCloud<ParcelType>& owner,
-            const label typeId,
             const vector& position,
-            const label celli,
+            const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector& U0,
-            const scalar nParticle0,
             const constantProperties& constProps
         );
 
@@ -265,10 +295,13 @@ public:
             bool readFields = true
         );
 
+        //- Construct as a copy
+        KinematicParcel(const KinematicParcel& p);
+
         //- Construct and return a clone
-        autoPtr<ParcelType> clone() const
+        autoPtr<KinematicParcel> clone() const
         {
-            return autoPtr<ParcelType>(new KinematicParcel<ParcelType>(*this));
+            return autoPtr<KinematicParcel>(new KinematicParcel(*this));
         }
 
 
@@ -276,21 +309,18 @@ public:
 
         // Access
 
-            //- Return type id
+            //- Return const access to type id
             inline label typeId() const;
 
+            //- Return const access to number of particles
+            inline scalar nParticle() const;
+
             //- Return const access to diameter
             inline scalar d() const;
 
             //- Return const access to velocity
             inline const vector& U() const;
 
-            //- Return const access to relative velocity
-            inline const vector& Ur() const;
-
-            //- Return const access to number of particles
-            inline scalar nParticle() const;
-
             //- Return const access to density
             inline scalar rho() const;
 
@@ -300,25 +330,21 @@ public:
             //- Return const access to turbulent velocity fluctuation
             inline const vector& UTurb() const;
 
-            //- The nearest distance to a wall that
-            //  the particle can be in the n direction
-            inline scalar wallImpactDistance(const vector& n) const;
-
 
         // Edit
 
+            //- Return access to type id
+            inline label typeId();
+
+            //- Return access to number of particles
+            inline scalar& nParticle();
+
             //- Return access to diameter
             inline scalar& d();
 
             //- Return access to velocity
             inline vector& U();
 
-            //- Return access to relative velocity
-            inline vector& Ur();
-
-            //- Return access to number of particles
-            inline scalar& nParticle();
-
             //- Return access to density
             inline scalar& rho();
 
@@ -331,50 +357,75 @@ public:
 
         // Helper functions
 
+            //- The nearest distance to a wall that
+            //  the particle can be in the n direction
+            inline scalar wallImpactDistance(const vector& n) const;
+
             //- Return the index of the face to be used in the interpolation
             //  routine
             inline label faceInterpolation() const;
 
-            //- Particle volume
-            inline scalar volume() const;
+            //- Cell owner mass
+            inline scalar massCell(const label cellI) const;
 
             //- Particle mass
             inline scalar mass() const;
 
+            //- Particle volume
+            inline scalar volume() const;
+
+            //- Particle volume for a given diameter
+            inline scalar volume(const scalar d) const;
+
             //- Particle projected area
             inline scalar areaP() const;
 
+            //- Projected area for given diameter
+            inline scalar areaP(const scalar d) const;
+
             //- Particle surface area
             inline scalar areaS() const;
 
+            //- Surface area for given diameter
+            inline scalar areaS(const scalar d) const;
+
+            //- Reynolds number
+            inline scalar Re
+            (
+                const vector& U,        // particle velocity
+                const scalar d,         // particle diameter
+                const scalar rhoc,      // carrier density
+                const scalar muc        // carrier dynamic viscosity
+            ) const;
+
 
         // Main calculation loop
 
-            //- Update cell based quantities
+            //- Set cell values
             template<class TrackData>
-            void updateCellQuantities
+            void setCellValues
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
+                const label cellI
             );
 
-            //- Coupled calculation with the continuous phase
+            //- Correct cell values using latest transfer information
             template<class TrackData>
-            void calcCoupled
+            void cellValueSourceCorrection
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
+                const label cellI
             );
 
-            //- Uncoupled calculation with the continuous phase
+            //- Update parcel properties over the time interval
             template<class TrackData>
-            void calcUncoupled
+            void calc
             (
                 TrackData& td,
                 const scalar dt,
-                const label
+                const label cellI
             );
 
 
@@ -387,6 +438,27 @@ public:
 
         // Patch interactions
 
+            //- Overridable function to handle the particle hitting a patch
+            //  Executed before other patch-hitting functions
+            template<class TrackData>
+            bool hitPatch
+            (
+                const polyPatch& p,
+                TrackData& td,
+                const label patchI
+            );
+
+
+            //- Overridable function to handle the particle hitting a patch
+            //  Executed before other patch-hitting functions without trackData
+            bool hitPatch
+            (
+                const polyPatch& p,
+                int& td,
+                const label patchI
+            );
+
+
             //- Overridable function to handle the particle hitting a
             //  processorPatch
             template<class TrackData>
@@ -447,9 +519,11 @@ public:
 
         // I-O
 
-            static void readFields(KinematicCloud<ParcelType>& c);
+            //- Read
+            static void readFields(Cloud<ParcelType>& c);
 
-            static void writeFields(const KinematicCloud<ParcelType>& c);
+            //- Write
+            static void writeFields(const Cloud<ParcelType>& c);
 
 
     // Ostream Operator
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
index 1195dc87f..1afaf39c8 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelI.H
@@ -24,16 +24,23 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "mathematicalConstants.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class ParcelType>
 inline Foam::KinematicParcel<ParcelType>::constantProperties::constantProperties
 (
-    const dictionary& dict
+    const dictionary& parentDict
 )
 :
-    rho0_(dimensionedScalar(dict.lookup("rho0")).value()),
-    minParticleMass_(dimensionedScalar(dict.lookup("minParticleMass")).value())
+    dict_(parentDict.subDict("constantProperties")),
+    rhoMin_(dimensionedScalar(dict_.lookup("rhoMin")).value()),
+    rho0_(dimensionedScalar(dict_.lookup("rho0")).value()),
+    minParticleMass_
+    (
+        dimensionedScalar(dict_.lookup("minParticleMass")).value()
+    )
 {}
 
 
@@ -62,20 +69,42 @@ template <class ParcelType>
 inline Foam::KinematicParcel<ParcelType>::KinematicParcel
 (
     KinematicCloud<ParcelType>& owner,
-    const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI
+)
+:
+    Particle<ParcelType>(owner, position, cellI),
+    typeId_(owner.parcelTypeId()),
+    nParticle_(0),
+    d_(0.0),
+    U_(vector::zero),
+    rho_(0.0),
+    tTurb_(0.0),
+    UTurb_(vector::zero),
+    rhoc_(0.0),
+    Uc_(vector::zero),
+    muc_(0.0)
+{}
+
+
+template <class ParcelType>
+inline Foam::KinematicParcel<ParcelType>::KinematicParcel
+(
+    KinematicCloud<ParcelType>& owner,
+    const vector& position,
+    const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
     const constantProperties& constProps
 )
 :
-    Particle<ParcelType>(owner, position, celli),
+    Particle<ParcelType>(owner, position, cellI),
     typeId_(typeId),
+    nParticle_(nParticle0),
     d_(d0),
     U_(U0),
-    nParticle_(nParticle0),
     rho_(constProps.rho0()),
     tTurb_(0.0),
     UTurb_(vector::zero),
@@ -87,6 +116,22 @@ inline Foam::KinematicParcel<ParcelType>::KinematicParcel
 
 // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
 
+template <class ParcelType>
+inline const Foam::dictionary&
+Foam::KinematicParcel<ParcelType>::constantProperties::dict() const
+{
+    return dict_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::constantProperties::rhoMin() const
+{
+    return rhoMin_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar
 Foam::KinematicParcel<ParcelType>::constantProperties::rho0() const
@@ -162,6 +207,13 @@ inline Foam::label Foam::KinematicParcel<ParcelType>::typeId() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::nParticle() const
+{
+    return nParticle_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::d() const
 {
@@ -169,6 +221,48 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::d() const
 }
 
 
+template <class ParcelType>
+inline const Foam::vector& Foam::KinematicParcel<ParcelType>::U() const
+{
+    return U_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::rho() const
+{
+    return rho_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::tTurb() const
+{
+    return tTurb_;
+}
+
+
+template <class ParcelType>
+inline const Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb() const
+{
+    return UTurb_;
+}
+
+
+template <class ParcelType>
+inline Foam::label Foam::KinematicParcel<ParcelType>::typeId()
+{
+    return typeId_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar& Foam::KinematicParcel<ParcelType>::nParticle()
+{
+    return nParticle_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar& Foam::KinematicParcel<ParcelType>::d()
 {
@@ -176,6 +270,34 @@ inline Foam::scalar& Foam::KinematicParcel<ParcelType>::d()
 }
 
 
+template <class ParcelType>
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::U()
+{
+    return U_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar& Foam::KinematicParcel<ParcelType>::rho()
+{
+    return rho_;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar& Foam::KinematicParcel<ParcelType>::tTurb()
+{
+    return tTurb_;
+}
+
+
+template <class ParcelType>
+inline Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb()
+{
+    return UTurb_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::wallImpactDistance
 (
@@ -202,79 +324,12 @@ inline Foam::label Foam::KinematicParcel<ParcelType>::faceInterpolation() const
 
 
 template <class ParcelType>
-inline const Foam::vector& Foam::KinematicParcel<ParcelType>::U() const
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::massCell
+(
+    const label cellI
+) const
 {
-    return U_;
-}
-
-
-template <class ParcelType>
-inline Foam::vector& Foam::KinematicParcel<ParcelType>::U()
-{
-    return U_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::KinematicParcel<ParcelType>::nParticle() const
-{
-    return nParticle_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar& Foam::KinematicParcel<ParcelType>::nParticle()
-{
-    return nParticle_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::KinematicParcel<ParcelType>::rho() const
-{
-    return rho_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar& Foam::KinematicParcel<ParcelType>::rho()
-{
-    return rho_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::KinematicParcel<ParcelType>::tTurb() const
-{
-    return tTurb_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar& Foam::KinematicParcel<ParcelType>::tTurb()
-{
-    return tTurb_;
-}
-
-
-template <class ParcelType>
-inline const Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb() const
-{
-    return UTurb_;
-}
-
-
-template <class ParcelType>
-inline Foam::vector& Foam::KinematicParcel<ParcelType>::UTurb()
-{
-    return UTurb_;
-}
-
-
-template <class ParcelType>
-inline Foam::scalar Foam::KinematicParcel<ParcelType>::volume() const
-{
-    return mathematicalConstant::pi/6.0*pow3(d_);
+    return rhoc_*this->cloud().pMesh().cellVolumes()[cellI];
 }
 
 
@@ -285,17 +340,62 @@ inline Foam::scalar Foam::KinematicParcel<ParcelType>::mass() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar Foam::KinematicParcel<ParcelType>::volume() const
+{
+    return volume(d_);
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::volume(const scalar d) const
+{
+    return mathematicalConstant::pi/6.0*pow3(d);
+}
+
+
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::areaP() const
 {
-    return 0.25*areaS();
+    return areaP(d_);
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::areaP(const scalar d) const
+{
+    return 0.25*areaS(d);
 }
 
 
 template <class ParcelType>
 inline Foam::scalar Foam::KinematicParcel<ParcelType>::areaS() const
 {
-    return mathematicalConstant::pi*d_*d_;
+    return areaS(d_);
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::areaS(const scalar d) const
+{
+    return mathematicalConstant::pi*d*d;
+}
+
+
+template <class ParcelType>
+inline Foam::scalar
+Foam::KinematicParcel<ParcelType>::Re
+(
+    const vector& U,
+    const scalar d,
+    const scalar rhoc,
+    const scalar muc
+) const
+{
+    return rhoc*mag(U - Uc_)*d/muc;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
index 49ea600e7..f8c369747 100644
--- a/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/KinematicParcel/KinematicParcelIO.C
@@ -26,6 +26,22 @@ License
 
 #include "KinematicParcel.H"
 #include "IOstreams.H"
+#include "IOField.H"
+#include "Cloud.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::string Foam::KinematicParcel<ParcelType>::propHeader =
+    Particle<ParcelType>::propHeader
+  + " typeId"
+  + " nParticle"
+  + " d"
+  + " (Ux Uy Uz)"
+  + " rho"
+  + " tTurb"
+  + " (UTurbx UTurby UTurbz)";
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -39,9 +55,9 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
 :
     Particle<ParcelType>(cloud, is, readFields),
     typeId_(0),
+    nParticle_(0.0),
     d_(0.0),
     U_(vector::zero),
-    nParticle_(0.0),
     rho_(0.0),
     tTurb_(0.0),
     UTurb_(vector::zero),
@@ -54,9 +70,9 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
         if (is.format() == IOstream::ASCII)
         {
             typeId_ = readLabel(is);
+            nParticle_ = readScalar(is);
             d_ = readScalar(is);
             is >> U_;
-            nParticle_ = readScalar(is);
             rho_ = readScalar(is);
             tTurb_ = readScalar(is);
             is >> UTurb_;
@@ -67,9 +83,9 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
             (
                 reinterpret_cast<char*>(&typeId_),
                 sizeof(typeId_)
+              + sizeof(nParticle_)
               + sizeof(d_)
               + sizeof(U_)
-              + sizeof(nParticle_)
               + sizeof(rho_)
               + sizeof(tTurb_)
               + sizeof(UTurb_)
@@ -87,35 +103,35 @@ Foam::KinematicParcel<ParcelType>::KinematicParcel
 
 
 template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::readFields
-(
-    KinematicCloud<ParcelType>& c
-)
+void Foam::KinematicParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
 {
     if (!c.size())
     {
         return;
     }
 
-    IOField<label> typeId(c.fieldIOobject("typeId"));
+    Particle<ParcelType>::readFields(c);
+
+    IOField<label> typeId(c.fieldIOobject("typeId", IOobject::MUST_READ));
     c.checkFieldIOobject(c, typeId);
 
-    IOField<scalar> d(c.fieldIOobject("d"));
-    c.checkFieldIOobject(c, d);
-
-    IOField<vector> U(c.fieldIOobject("U"));
-    c.checkFieldIOobject(c, U);
-
-    IOField<scalar> nParticle(c.fieldIOobject("nParticle"));
+    IOField<scalar>
+        nParticle(c.fieldIOobject("nParticle", IOobject::MUST_READ));
     c.checkFieldIOobject(c, nParticle);
 
-    IOField<scalar> rho(c.fieldIOobject("rho"));
+    IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, d);
+
+    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
+    c.checkFieldIOobject(c, U);
+
+    IOField<scalar> rho(c.fieldIOobject("rho", IOobject::MUST_READ));
     c.checkFieldIOobject(c, rho);
 
-    IOField<scalar> tTurb(c.fieldIOobject("tTurb"));
+    IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::MUST_READ));
     c.checkFieldIOobject(c, tTurb);
 
-    IOField<vector> UTurb(c.fieldIOobject("UTurb"));
+    IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::MUST_READ));
     c.checkFieldIOobject(c, UTurb);
 
     label i = 0;
@@ -124,9 +140,9 @@ void Foam::KinematicParcel<ParcelType>::readFields
         ParcelType& p = iter();
 
         p.typeId_ = typeId[i];
+        p.nParticle_ = nParticle[i];
         p.d_ = d[i];
         p.U_ = U[i];
-        p.nParticle_ = nParticle[i];
         p.rho_ = rho[i];
         p.tTurb_ = tTurb[i];
         p.UTurb_ = UTurb[i];
@@ -136,22 +152,23 @@ void Foam::KinematicParcel<ParcelType>::readFields
 
 
 template<class ParcelType>
-void Foam::KinematicParcel<ParcelType>::writeFields
-(
-    const KinematicCloud<ParcelType>& c
-)
+void Foam::KinematicParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
 {
     Particle<ParcelType>::writeFields(c);
 
     label np =  c.size();
 
-    IOField<label> typeId(c.fieldIOobject("typeId"), np);
-    IOField<scalar> d(c.fieldIOobject("d"), np);
-    IOField<vector> U(c.fieldIOobject("U"), np);
-    IOField<scalar> nParticle(c.fieldIOobject("nParticle"), np);
-    IOField<scalar> rho(c.fieldIOobject("rho"), np);
-    IOField<scalar> tTurb(c.fieldIOobject("tTurb"), np);
-    IOField<vector> UTurb(c.fieldIOobject("UTurb"), np);
+    IOField<label> typeId(c.fieldIOobject("typeId", IOobject::NO_READ), np);
+    IOField<scalar> nParticle
+    (
+        c.fieldIOobject("nParticle", IOobject::NO_READ),
+        np
+    );
+    IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
+    IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
+    IOField<scalar> rho(c.fieldIOobject("rho", IOobject::NO_READ), np);
+    IOField<scalar> tTurb(c.fieldIOobject("tTurb", IOobject::NO_READ), np);
+    IOField<vector> UTurb(c.fieldIOobject("UTurb", IOobject::NO_READ), np);
 
     label i = 0;
     forAllConstIter(typename Cloud<ParcelType>, c, iter)
@@ -159,9 +176,9 @@ void Foam::KinematicParcel<ParcelType>::writeFields
         const KinematicParcel<ParcelType>& p = iter();
 
         typeId[i] = p.typeId();
+        nParticle[i] = p.nParticle();
         d[i] = p.d();
         U[i] = p.U();
-        nParticle[i] = p.nParticle();
         rho[i] = p.rho();
         tTurb[i] = p.tTurb();
         UTurb[i] = p.UTurb();
@@ -169,9 +186,9 @@ void Foam::KinematicParcel<ParcelType>::writeFields
     }
 
     typeId.write();
+    nParticle.write();
     d.write();
     U.write();
-    nParticle.write();
     rho.write();
     tTurb.write();
     UTurb.write();
@@ -189,25 +206,25 @@ Foam::Ostream& Foam::operator<<
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const Particle<ParcelType>& >(p)
+        os  << static_cast<const Particle<ParcelType>&>(p)
             << token::SPACE << p.typeId()
+            << token::SPACE << p.nParticle()
             << token::SPACE << p.d()
             << token::SPACE << p.U()
-            << token::SPACE << p.nParticle()
             << token::SPACE << p.rho()
             << token::SPACE << p.tTurb()
             << token::SPACE << p.UTurb();
     }
     else
     {
-        os  << static_cast<const Particle<ParcelType>& >(p);
+        os  << static_cast<const Particle<ParcelType>&>(p);
         os.write
         (
             reinterpret_cast<const char*>(&p.typeId_),
             sizeof(p.typeId())
+          + sizeof(p.nParticle())
           + sizeof(p.d())
           + sizeof(p.U())
-          + sizeof(p.nParticle())
           + sizeof(p.rho())
           + sizeof(p.tTurb())
           + sizeof(p.UTurb())
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
new file mode 100644
index 000000000..6249c422c
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.C
@@ -0,0 +1,651 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "ReactingMultiphaseParcel.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class ParcelType>
+const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::GAS(0);
+
+template<class ParcelType>
+const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::LIQ(1);
+
+template<class ParcelType>
+const Foam::label Foam::ReactingMultiphaseParcel<ParcelType>::SLD(2);
+
+
+// * * * * * * * * * * * *  Private Member Functions * * * * * * * * * * * * //
+
+template<class ParcelType>
+template<class TrackData>
+Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::cpEff
+(
+    TrackData& td,
+    const scalar p,
+    const scalar T,
+    const label idG,
+    const label idL,
+    const label idS
+) const
+{
+    return
+        this->Y_[GAS]*td.cloud().composition().cp(idG, YGas_, p, T)
+      + this->Y_[LIQ]*td.cloud().composition().cp(idL, YLiquid_, p, T)
+      + this->Y_[SLD]*td.cloud().composition().cp(idS, YSolid_, p, T);
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::HEff
+(
+    TrackData& td,
+    const scalar p,
+    const scalar T,
+    const label idG,
+    const label idL,
+    const label idS
+) const
+{
+    return
+        this->Y_[GAS]*td.cloud().composition().H(idG, YGas_, p, T)
+      + this->Y_[LIQ]*td.cloud().composition().H(idL, YLiquid_, p, T)
+      + this->Y_[SLD]*td.cloud().composition().H(idS, YSolid_, p, T);
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::LEff
+(
+    TrackData& td,
+    const scalar p,
+    const scalar T,
+    const label idG,
+    const label idL,
+    const label idS
+) const
+{
+    return
+        this->Y_[GAS]*td.cloud().composition().L(idG, YGas_, p, T)
+      + this->Y_[LIQ]*td.cloud().composition().L(idL, YLiquid_, p, T)
+      + this->Y_[SLD]*td.cloud().composition().L(idS, YSolid_, p, T);
+}
+
+
+template<class ParcelType>
+Foam::scalar Foam::ReactingMultiphaseParcel<ParcelType>::updateMassFractions
+(
+    const scalar mass0,
+    const scalarField& dMassGas,
+    const scalarField& dMassLiquid,
+    const scalarField& dMassSolid
+)
+{
+    scalarField& YMix = this->Y_;
+
+    scalar massGas =
+        this->updateMassFraction(mass0*YMix[GAS], dMassGas, YGas_);
+    scalar massLiquid =
+        this->updateMassFraction(mass0*YMix[LIQ], dMassLiquid, YLiquid_);
+    scalar massSolid =
+        this->updateMassFraction(mass0*YMix[SLD], dMassSolid, YSolid_);
+
+    scalar massNew = max(massGas + massLiquid + massSolid, ROOTVSMALL);
+
+    YMix[GAS] = massGas/massNew;
+    YMix[LIQ] = massLiquid/massNew;
+    YMix[SLD] = 1.0 - YMix[GAS] - YMix[LIQ];
+
+    return massNew;
+}
+
+
+// * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * * //
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::setCellValues
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI
+)
+{
+    ReactingParcel<ParcelType>::setCellValues(td, dt, cellI);
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::cellValueSourceCorrection
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI
+)
+{
+    scalar massCell = this->massCell(cellI);
+
+    scalar addedMass = 0.0;
+    forAll(td.cloud().rhoTrans(), i)
+    {
+        addedMass += td.cloud().rhoTrans(i)[cellI];
+    }
+
+    this->rhoc_ += addedMass/td.cloud().pMesh().cellVolumes()[cellI];
+
+    scalar massCellNew = massCell + addedMass;
+    this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew;
+
+    scalar cpEff = 0;
+    if (addedMass > ROOTVSMALL)
+    {
+        forAll(td.cloud().rhoTrans(), i)
+        {
+            scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
+            cpEff +=
+                Y*td.cloud().mcCarrierThermo().speciesData()[i].Cp(this->Tc_);
+        }
+    }
+    const scalar cpc = td.cpInterp().psi()[cellI];
+    this->cpc_ = (massCell*cpc + addedMass*cpEff)/massCellNew;
+
+    this->Tc_ += td.cloud().hsTrans()[cellI]/(this->cpc_*massCellNew);
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::calc
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI
+)
+{
+    // Define local properties at beginning of timestep
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    const scalar np0 = this->nParticle_;
+    const scalar d0 = this->d_;
+    const vector& U0 = this->U_;
+    const scalar rho0 = this->rho_;
+    const scalar T0 = this->T_;
+    const scalar cp0 = this->cp_;
+    const scalar mass0 = this->mass();
+
+    const scalar pc = this->pc_;
+
+    const scalarField& YMix = this->Y_;
+    const label idG = td.cloud().composition().idGas();
+    const label idL = td.cloud().composition().idLiquid();
+    const label idS = td.cloud().composition().idSolid();
+
+
+    // Calc surface values
+    // ~~~~~~~~~~~~~~~~~~~
+    scalar Ts, rhos, mus, Pr, kappa;
+    ThermoParcel<ParcelType>::
+        calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Pr, kappa);
+
+    // Reynolds number
+    scalar Re = this->Re(U0, d0, rhos, mus);
+
+
+    // Sources
+    //~~~~~~~~
+
+    // Explicit momentum source for particle
+    vector Su = vector::zero;
+
+    // Momentum transfer from the particle to the carrier phase
+    vector dUTrans = vector::zero;
+
+    // Explicit enthalpy source for particle
+    scalar Sh = 0.0;
+
+    // Sensible enthalpy transfer from the particle to the carrier phase
+    scalar dhsTrans = 0.0;
+
+
+    // Phase change in liquid phase
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Mass transfer due to phase change
+    scalarField dMassPC(YLiquid_.size(), 0.0);
+
+    // Molar flux of species emitted from the particle (kmol/m^2/s)
+    scalar Ne = 0.0;
+
+    // Sum Ni*Cpi*Wi of emission species
+    scalar NCpW = 0.0;
+
+    // Surface concentrations of emitted species
+    scalarField Cs(td.cloud().mcCarrierThermo().species().size(), 0.0);
+
+    // Calc mass and enthalpy transfer due to phase change
+    calcPhaseChange
+    (
+        td,
+        dt,
+        cellI,
+        Re,
+        Ts,
+        mus/rhos,
+        d0,
+        T0,
+        mass0,
+        idL,
+        YMix[LIQ],
+        YLiquid_,
+        dMassPC,
+        Sh,
+        Ne,
+        NCpW,
+        Cs
+    );
+
+
+    // Devolatilisation
+    // ~~~~~~~~~~~~~~~~
+
+    // Mass transfer due to devolatilisation
+    scalarField dMassDV(YGas_.size(), 0.0);
+
+    // Calc mass and enthalpy transfer due to devolatilisation
+    calcDevolatilisation
+    (
+        td,
+        dt,
+        Ts,
+        d0,
+        T0,
+        mass0,
+        this->mass0_,
+        idG,
+        YMix[GAS],
+        YGas_,
+        canCombust_,
+        dMassDV,
+        Sh,
+        Ne,
+        NCpW,
+        Cs
+    );
+
+    // Correct surface values due to emitted species
+    correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Pr, kappa);
+
+
+    // Surface reactions
+    // ~~~~~~~~~~~~~~~~~
+
+    // Change in carrier phase composition due to surface reactions
+    scalarField dMassSRGas(YGas_.size(), 0.0);
+    scalarField dMassSRLiquid(YLiquid_.size(), 0.0);
+    scalarField dMassSRSolid(YSolid_.size(), 0.0);
+    scalarField
+        dMassSRCarrier
+        (
+            td.cloud().mcCarrierThermo().species().size(),
+            0.0
+        );
+
+    // Clac mass and enthalpy transfer due to surface reactions
+    calcSurfaceReactions
+    (
+        td,
+        dt,
+        cellI,
+        d0,
+        T0,
+        mass0,
+        canCombust_,
+        Ne,
+        YMix,
+        YGas_,
+        YLiquid_,
+        YSolid_,
+        dMassSRGas,
+        dMassSRLiquid,
+        dMassSRSolid,
+        dMassSRCarrier,
+        Sh,
+        dhsTrans
+    );
+
+
+    // Update component mass fractions
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    scalarField dMassGas = dMassDV + dMassSRGas;
+    scalarField dMassLiquid = dMassPC + dMassSRLiquid;
+    scalarField dMassSolid = dMassSRSolid;
+
+    scalar mass1 =
+        updateMassFractions(mass0, dMassGas, dMassLiquid, dMassSolid);
+
+
+    // Heat transfer
+    // ~~~~~~~~~~~~~
+
+    // Calculate new particle temperature
+    scalar T1 =
+        calcHeatTransfer
+        (
+            td,
+            dt,
+            cellI,
+            Re,
+            Pr,
+            kappa,
+            d0,
+            rho0,
+            T0,
+            cp0,
+            NCpW,
+            Sh,
+            dhsTrans
+        );
+
+
+    // Motion
+    // ~~~~~~
+
+    // Calculate new particle velocity
+    vector U1 =
+        calcVelocity(td, dt, cellI, Re, mus, d0, U0, rho0, mass0, Su, dUTrans);
+
+    dUTrans += 0.5*(mass0 - mass1)*(U0 + U1);
+
+
+    // Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    if (td.cloud().coupled())
+    {
+        // Transfer mass lost from particle to carrier mass source
+        forAll(YGas_, i)
+        {
+            label gid = td.cloud().composition().localToGlobalCarrierId(GAS, i);
+            td.cloud().rhoTrans(gid)[cellI] += np0*dMassGas[i];
+        }
+        forAll(YLiquid_, i)
+        {
+            label gid = td.cloud().composition().localToGlobalCarrierId(LIQ, i);
+            td.cloud().rhoTrans(gid)[cellI] += np0*dMassLiquid[i];
+        }
+/*
+        // No mapping between solid components and carrier phase
+        forAll(YSolid_, i)
+        {
+            label gid = td.cloud().composition().localToGlobalCarrierId(SLD, i);
+            td.cloud().rhoTrans(gid)[cellI] += np0*dMassSolid[i];
+        }
+*/
+        forAll(dMassSRCarrier, i)
+        {
+            td.cloud().rhoTrans(i)[cellI] += np0*dMassSRCarrier[i];
+        }
+
+        // Update momentum transfer
+        td.cloud().UTrans()[cellI] += np0*dUTrans;
+
+        // Update sensible enthalpy transfer
+        td.cloud().hsTrans()[cellI] += np0*dhsTrans;
+    }
+
+
+    // Remove the particle when mass falls below minimum threshold
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    if (mass1 < td.constProps().minParticleMass())
+    {
+        td.keepParticle = false;
+
+        if (td.cloud().coupled())
+        {
+            // Absorb parcel into carrier phase
+            forAll(YGas_, i)
+            {
+                label gid =
+                    td.cloud().composition().localToGlobalCarrierId(GAS, i);
+                td.cloud().rhoTrans(gid)[cellI] += np0*mass1*YMix[GAS]*YGas_[i];
+            }
+            forAll(YLiquid_, i)
+            {
+                label gid =
+                    td.cloud().composition().localToGlobalCarrierId(LIQ, i);
+                td.cloud().rhoTrans(gid)[cellI] +=
+                    np0*mass1*YMix[LIQ]*YLiquid_[i];
+            }
+/*
+            // No mapping between solid components and carrier phase
+            forAll(YSolid_, i)
+            {
+                label gid =
+                    td.cloud().composition().localToGlobalCarrierId(SLD, i);
+                td.cloud().rhoTrans(gid)[cellI] +=
+                    np0*mass1*YMix[SLD]*YSolid_[i];
+            }
+*/
+            td.cloud().UTrans()[cellI] += np0*mass1*U1;
+            td.cloud().hsTrans()[cellI] +=
+                np0*mass1*HEff(td, pc, T1, idG, idL, idS); // using total h
+        }
+    }
+
+
+    // Set new particle properties
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    else
+    {
+        this->cp_ = cpEff(td, pc, T1, idG, idL, idS);
+        this->T_ = T1;
+        this->U_ = U1;
+
+        // Update particle density or diameter
+        if (td.constProps().constantVolume())
+        {
+            this->rho_ = mass1/this->volume();
+        }
+        else
+        {
+            this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi);
+        }
+    }
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::calcDevolatilisation
+(
+    TrackData& td,
+    const scalar dt,
+    const scalar Ts,
+    const scalar d,
+    const scalar T,
+    const scalar mass,
+    const scalar mass0,
+    const label idVolatile,
+    const scalar YVolatileTot,
+    const scalarField& YVolatile,
+    bool& canCombust,
+    scalarField& dMassDV,
+    scalar& Sh,
+    scalar& N,
+    scalar& NCpW,
+    scalarField& Cs
+) const
+{
+    // Check that model is active, and that the parcel temperature is
+    // within necessary limits for devolatilisation to occur
+    if
+    (
+        !td.cloud().devolatilisation().active()
+     || T < td.constProps().Tvap()
+    )
+    {
+        return;
+    }
+
+    // Total mass of volatiles evolved
+    const scalar dMassTot = td.cloud().devolatilisation().calculate
+    (
+        dt,
+        mass0,
+        mass,
+        T,
+        td.cloud().composition().YMixture0()[idVolatile],
+        YVolatileTot,
+        canCombust
+    );
+
+    // Volatile mass transfer - equal components of each volatile specie
+    dMassDV = YVolatile*dMassTot;
+
+    td.cloud().addToMassDevolatilisation(this->nParticle_*dMassTot);
+
+    Sh -= dMassTot*td.constProps().LDevol()/dt;
+
+    // Molar average molecular weight of carrier mix
+    const scalar Wc = this->rhoc_*specie::RR*this->Tc_/this->pc_;
+
+    // Update molar emissions
+    forAll(dMassDV, i)
+    {
+        // Note: hardcoded gaseous diffusivities for now
+        // TODO: add to carrier thermo
+        const scalar beta = sqr(cbrt(15.0) + cbrt(15.0));
+        const label id =
+            td.cloud().composition().localToGlobalCarrierId(GAS, i);
+        const scalar Cp = td.cloud().mcCarrierThermo().speciesData()[id].Cp(Ts);
+        const scalar W = td.cloud().mcCarrierThermo().speciesData()[id].W();
+        const scalar Ni = dMassDV[i]/(this->areaS(d)*dt*W);
+
+        // Dab calc'd using API vapour mass diffusivity function
+        const scalar Dab =
+            3.6059e-3*(pow(1.8*Ts, 1.75))*sqrt(1.0/W + 1.0/Wc)/(this->pc_*beta);
+
+        N += Ni;
+        NCpW += Ni*Cp*W;
+        Cs[id] += Ni*d/(2.0*Dab);
+     }
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingMultiphaseParcel<ParcelType>::calcSurfaceReactions
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI,
+    const scalar d,
+    const scalar T,
+    const scalar mass,
+    const bool canCombust,
+    const scalar N,
+    const scalarField& YMix,
+    const scalarField& YGas,
+    const scalarField& YLiquid,
+    const scalarField& YSolid,
+    scalarField& dMassSRGas,
+    scalarField& dMassSRLiquid,
+    scalarField& dMassSRSolid,
+    scalarField& dMassSRCarrier,
+    scalar& Sh,
+    scalar& dhsTrans
+) const
+{
+    // Check that model is active
+    if (!td.cloud().surfaceReaction().active() || !canCombust)
+    {
+        return;
+    }
+
+    // Update surface reactions
+    const scalar hReaction = td.cloud().surfaceReaction().calculate
+    (
+        dt,
+        cellI,
+        d,
+        T,
+        this->Tc_,
+        this->pc_,
+        this->rhoc_,
+        mass,
+        YGas,
+        YLiquid,
+        YSolid,
+        YMix,
+        N,
+        dMassSRGas,
+        dMassSRLiquid,
+        dMassSRSolid,
+        dMassSRCarrier
+    );
+
+    td.cloud().addToMassSurfaceReaction
+    (
+        this->nParticle_
+       *(sum(dMassSRGas) + sum(dMassSRLiquid) + sum(dMassSRSolid))
+    );
+
+    const scalar xsi = min(T/5000.0, 1.0);
+    const scalar hRetentionCoeffMod =
+        (1.0 - xsi*xsi)*td.constProps().hRetentionCoeff();
+
+    Sh += hRetentionCoeffMod*hReaction/dt;
+
+    dhsTrans += (1.0 - hRetentionCoeffMod)*hReaction;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
+(
+    const ReactingMultiphaseParcel<ParcelType>& p
+)
+:
+    ReactingParcel<ParcelType>(p),
+    YGas_(p.YGas_),
+    YLiquid_(p.YLiquid_),
+    YSolid_(p.YSolid_)
+{}
+
+
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
+
+#include "ReactingMultiphaseParcelIO.C"
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
new file mode 100644
index 000000000..515eb7d12
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcel.H
@@ -0,0 +1,435 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::ReactingMultiphaseParcel
+
+Description
+    Multiphase variant of the reacting parcel class with one/two-way coupling
+    with the continuous phase.
+
+SourceFiles
+    ReactingMultiphaseParcelI.H
+    ReactingMultiphaseParcel.C
+    ReactingMultiphaseParcelIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ReactingMultiphaseParcel_H
+#define ReactingMultiphaseParcel_H
+
+#include "ReactingParcel.H"
+#include "ReactingMultiphaseCloud.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class ParcelType>
+class ReactingMultiphaseParcel;
+
+template<class ParcelType>
+Ostream& operator<<
+(
+    Ostream&,
+    const ReactingMultiphaseParcel<ParcelType>&
+);
+
+/*---------------------------------------------------------------------------*\
+                 Class ReactingMultiphaseParcel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ParcelType>
+class ReactingMultiphaseParcel
+:
+    public ReactingParcel<ParcelType>
+{
+public:
+
+    // IDs of phases in ReacingParcel phase list (Y)
+
+        static const label GAS;
+        static const label LIQ;
+        static const label SLD;
+
+
+    //- Class to hold reacting multiphase particle constant properties
+    class constantProperties
+    :
+        public ReactingParcel<ParcelType>::constantProperties
+    {
+        // Private data
+
+            //- Latent heat of devolatilisation [J/kg]
+            const scalar LDevol_;
+
+            //- Fraction of enthalpy retained by parcel due to surface
+            //  reactions
+            scalar hRetentionCoeff_;
+
+
+    public:
+
+        //- Constructor
+        constantProperties(const dictionary& parentDict);
+
+        // Access
+
+            //- Return const access to the latent heat of devolatilisation
+            inline scalar LDevol() const;
+
+            //- Return const access to the fraction of enthalpy retained by
+            //  parcel due to surface reactions
+            inline scalar hRetentionCoeff() const;
+    };
+
+
+    //- Class used to pass reacting tracking data to the trackToFace function
+    class trackData
+    :
+        public ReactingParcel<ParcelType>::trackData
+    {
+        // Private data
+
+            //- Reference to the cloud containing this particle
+            ReactingMultiphaseCloud<ParcelType>& cloud_;
+
+            //- Particle constant properties
+            const constantProperties& constProps_;
+
+
+    public:
+
+        // Constructors
+
+            //- Construct from components
+            inline trackData
+            (
+                ReactingMultiphaseCloud<ParcelType>& cloud,
+                const constantProperties& constProps,
+                const interpolation<scalar>& rhoInterp,
+                const interpolation<vector>& UInterp,
+                const interpolation<scalar>& muInterp,
+                const interpolation<scalar>& TInterp,
+                const interpolation<scalar>& CpInterp,
+                const interpolation<scalar>& pInterp,
+                const vector& g
+            );
+
+
+        // Member functions
+
+            //- Return access to the owner cloud
+            inline ReactingMultiphaseCloud<ParcelType>& cloud();
+
+            //- Return const access to the constant properties
+            inline const constantProperties& constProps() const;
+    };
+
+
+private:
+
+    // Private member functions
+
+        //- Return the mixture effective specific heat capacity
+        template<class TrackData>
+        scalar cpEff
+        (
+            TrackData& td,
+            const scalar p,
+            const scalar T,
+            const label idG,
+            const label idL,
+            const label idS
+        ) const;
+
+        //- Return the mixture effective enthalpy
+        template<class TrackData>
+        scalar HEff
+        (
+            TrackData& td,
+            const scalar p,
+            const scalar T,
+            const label idG,
+            const label idL,
+            const label idS
+        ) const;
+
+        //- Return the mixture effective latent heat
+        template<class TrackData>
+        scalar LEff
+        (
+            TrackData& td,
+            const scalar p,
+            const scalar T,
+            const label idG,
+            const label idL,
+            const label idS
+        ) const;
+
+        //- Update the mass fractions (Y, YGas, YLiquid, YSolid)
+        scalar updateMassFractions
+        (
+            const scalar mass0,
+            const scalarField& dMassGas,
+            const scalarField& dMassLiquid,
+            const scalarField& dMassSolid
+        );
+
+
+protected:
+
+    // Protected data
+
+        // Parcel properties
+
+            //- Mass fractions of gases []
+            scalarField YGas_;
+
+            //- Mass fractions of liquids []
+            scalarField YLiquid_;
+
+            //- Mass fractions of solids []
+            scalarField YSolid_;
+
+            //- Flag to say that the particle is allowed to combust
+            //  Only true after volatile content falls below threshold value
+            bool canCombust_;
+
+
+    // Protected member functions
+
+        //- Calculate Devolatilisation
+        template<class TrackData>
+        void calcDevolatilisation
+        (
+            TrackData& td,
+            const scalar dt,           // timestep
+            const scalar Ts,           // Surface temperature
+            const scalar d,            // diameter
+            const scalar T,            // temperature
+            const scalar mass,         // mass
+            const scalar mass0,        // mass (initial on injection)
+            const label idVolatile,    // id of volatile phase
+            const scalar YVolatileTot, // total volatile mass fraction
+            const scalarField& YVolatile, // volatile component mass fractions
+            bool& canCombust,          // 'can combust' flag
+            scalarField& dMassDV,      // mass transfer - local to particle
+            scalar& Sh,                // explicit particle enthalpy source
+            scalar& N,                 // flux of species emitted from particle
+            scalar& NCpW,              // sum of N*Cp*W of emission species
+            scalarField& Cs            // carrier conc. of emission species
+        ) const;
+
+        //- Calculate surface reactions
+        template<class TrackData>
+        void calcSurfaceReactions
+        (
+            TrackData& td,
+            const scalar dt,           // timestep
+            const label cellI,         // owner cell
+            const scalar d,            // diameter
+            const scalar T,            // temperature
+            const scalar mass,         // mass
+            const bool canCombust,     // 'can combust' flag
+            const scalar N,            // flux of species emitted from particle
+            const scalarField& YMix,   // mixture mass fractions
+            const scalarField& YGas,   // gas-phase mass fractions
+            const scalarField& YLiquid,// liquid-phase mass fractions
+            const scalarField& YSolid, // solid-phase mass fractions
+            scalarField& dMassSRGas,   // gas-phase mass transfer - local
+            scalarField& dMassSRLiquid,// liquid-phase mass transfer - local
+            scalarField& dMassSRSolid, // solid-phase mass transfer - local
+            scalarField& dMassSRCarrier, // carrier phase mass transfer
+            scalar& Sh,                // explicit particle enthalpy source
+            scalar& dhsTrans           // sensible enthalpy transfer to carrier
+        ) const;
+
+
+public:
+
+    // Static data members
+
+        //- String representation of properties
+        static string propHeader;
+
+        //- Runtime type information
+        TypeName("ReactingMultiphaseParcel");
+
+
+    friend class Cloud<ParcelType>;
+
+
+    // Constructors
+
+        //- Construct from owner, position, and cloud owner
+        //  Other properties initialised as null
+        inline ReactingMultiphaseParcel
+        (
+            ReactingMultiphaseCloud<ParcelType>& owner,
+            const vector& position,
+            const label cellI
+        );
+
+
+        //- Construct from components
+        inline ReactingMultiphaseParcel
+        (
+            ReactingMultiphaseCloud<ParcelType>& owner,
+            const vector& position,
+            const label cellI,
+            const label typeId,
+            const scalar nParticle0,
+            const scalar d0,
+            const vector& U0,
+            const scalarField& Y0,
+            const scalarField& YGas0,
+            const scalarField& YLiquid0,
+            const scalarField& YSolid0,
+            const constantProperties& constProps
+        );
+
+        //- Construct from Istream
+        ReactingMultiphaseParcel
+        (
+            const Cloud<ParcelType>& c,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Construct as a copy
+        ReactingMultiphaseParcel(const ReactingMultiphaseParcel& p);
+
+        //- Construct and return a clone
+        autoPtr<ReactingMultiphaseParcel> clone() const
+        {
+            return
+                autoPtr<ReactingMultiphaseParcel>
+                (
+                    new ReactingMultiphaseParcel(*this)
+                );
+        }
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const access to mass fractions of gases
+            inline const scalarField& YGas() const;
+
+            //- Return const access to mass fractions of liquids
+            inline const scalarField& YLiquid() const;
+
+            //- Return const access to mass fractions of solids
+            inline const scalarField& YSolid() const;
+
+            //- Return const access to the canCombust flag
+            inline bool canCombust() const;
+
+
+        // Edit
+
+            //- Return access to mass fractions of gases
+            inline scalarField& YGas();
+
+            //- Return access to mass fractions of liquids
+            inline scalarField& YLiquid();
+
+            //- Return access to mass fractions of solids
+            inline scalarField& YSolid();
+
+            //- Return access to the canCombust flag
+            inline bool& canCombust();
+
+
+        // Main calculation loop
+
+            //- Set cell values
+            template<class TrackData>
+            void setCellValues
+            (
+                TrackData& td,
+                const scalar dt,
+                const label cellI
+            );
+
+            //- Correct cell values using latest transfer information
+            template<class TrackData>
+            void cellValueSourceCorrection
+            (
+                TrackData& td,
+                const scalar dt,
+                const label cellI
+            );
+
+            //- Update parcel properties over the time interval
+            template<class TrackData>
+            void calc
+            (
+                TrackData& td,
+                const scalar dt,
+                const label cellI
+            );
+
+
+        // I-O
+
+            //- Read
+            static void readFields(Cloud<ParcelType>& c);
+
+            //- Write
+            static void writeFields(const Cloud<ParcelType>& c);
+
+
+    // Ostream Operator
+
+        friend Ostream& operator<< <ParcelType>
+        (
+            Ostream&,
+            const ReactingMultiphaseParcel<ParcelType>&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "ReactingMultiphaseParcelI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "ReactingMultiphaseParcel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
new file mode 100644
index 000000000..758807e4f
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelI.H
@@ -0,0 +1,238 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+inline Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
+constantProperties
+(
+    const dictionary& parentDict
+)
+:
+    ReactingParcel<ParcelType>::constantProperties(parentDict),
+    LDevol_(dimensionedScalar(this->dict().lookup("LDevol")).value()),
+    hRetentionCoeff_
+    (
+        dimensionedScalar(this->dict().lookup("hRetentionCoeff")).value()
+    )
+{
+    if ((hRetentionCoeff_ < 0) || (hRetentionCoeff_ > 1))
+    {
+        FatalErrorIn
+        (
+            "ReactingMultiphaseParcel<ParcelType>::constantProperties::"
+            "constantProperties"
+        )   << "hRetentionCoeff must be in the range 0 to 1" << nl
+            << exit(FatalError) << endl;
+    }
+
+    hRetentionCoeff_ = max(1e-06, hRetentionCoeff_);
+}
+
+
+template<class ParcelType>
+inline Foam::ReactingMultiphaseParcel<ParcelType>::trackData::trackData
+(
+    ReactingMultiphaseCloud<ParcelType>& cloud,
+    const constantProperties& constProps,
+    const interpolation<scalar>& rhoInterp,
+    const interpolation<vector>& UInterp,
+    const interpolation<scalar>& muInterp,
+    const interpolation<scalar>& TInterp,
+    const interpolation<scalar>& CpInterp,
+    const interpolation<scalar>& pInterp,
+    const vector& g
+)
+:
+    ReactingParcel<ParcelType>::trackData
+    (
+        cloud,
+        constProps,
+        rhoInterp,
+        UInterp,
+        muInterp,
+        TInterp,
+        CpInterp,
+        pInterp,
+        g
+    ),
+    cloud_(cloud),
+    constProps_(constProps)
+{}
+
+
+template <class ParcelType>
+inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
+(
+    ReactingMultiphaseCloud<ParcelType>& owner,
+    const vector& position,
+    const label cellI
+)
+:
+    ReactingParcel<ParcelType>(owner, position, cellI),
+    YGas_(0),
+    YLiquid_(0),
+    YSolid_(0),
+    canCombust_(false)
+{}
+
+
+template<class ParcelType>
+inline Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
+(
+    ReactingMultiphaseCloud<ParcelType>& owner,
+    const vector& position,
+    const label cellI,
+    const label typeId,
+    const scalar nParticle0,
+    const scalar d0,
+    const vector& U0,
+    const scalarField& Y0,
+    const scalarField& YGas0,
+    const scalarField& YLiquid0,
+    const scalarField& YSolid0,
+    const constantProperties& constProps
+)
+:
+    ReactingParcel<ParcelType>
+    (
+        owner,
+        position,
+        cellI,
+        typeId,
+        nParticle0,
+        d0,
+        U0,
+        Y0,
+        constProps
+    ),
+    YGas_(YGas0),
+    YLiquid_(YLiquid0),
+    YSolid_(YSolid0),
+    canCombust_(false)
+{}
+
+
+// * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::LDevol() const
+{
+    return LDevol_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingMultiphaseParcel<ParcelType>::constantProperties::
+hRetentionCoeff() const
+{
+    return hRetentionCoeff_;
+}
+
+
+// * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
+
+template<class ParcelType>
+inline Foam::ReactingMultiphaseCloud<ParcelType>&
+Foam::ReactingMultiphaseParcel<ParcelType>::trackData::cloud()
+{
+    return cloud_;
+}
+
+
+template<class ParcelType>
+inline const typename Foam::ReactingMultiphaseParcel<ParcelType>::
+constantProperties&
+Foam::ReactingMultiphaseParcel<ParcelType>::trackData::constProps() const
+{
+    return constProps_;
+}
+
+
+// * * * * * * * * * * ThermoParcel Member Functions * * * * * * * * * * * * //
+
+template<class ParcelType>
+inline const Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::
+YGas() const
+{
+    return YGas_;
+}
+
+
+template<class ParcelType>
+inline const Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::
+YLiquid() const
+{
+    return YLiquid_;
+}
+
+
+template<class ParcelType>
+inline const Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::
+YSolid() const
+{
+    return YSolid_;
+}
+
+
+template<class ParcelType>
+inline bool Foam::ReactingMultiphaseParcel<ParcelType>::canCombust() const
+{
+    return canCombust_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YGas()
+{
+    return YGas_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YLiquid()
+{
+    return YLiquid_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalarField& Foam::ReactingMultiphaseParcel<ParcelType>::YSolid()
+{
+    return YSolid_;
+}
+
+
+template<class ParcelType>
+inline bool& Foam::ReactingMultiphaseParcel<ParcelType>::canCombust()
+{
+    return canCombust_;
+}
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
new file mode 100644
index 000000000..4c67253bd
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingMultiphaseParcel/ReactingMultiphaseParcelIO.C
@@ -0,0 +1,320 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "ReactingMultiphaseParcel.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::string Foam::ReactingMultiphaseParcel<ParcelType>::propHeader =
+    ReactingParcel<ParcelType>::propHeader
+  + " nGas(Y1..YN)"
+  + " nLiquid(Y1..YN)"
+  + " nSolid(Y1..YN)";
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel
+(
+    const Cloud<ParcelType>& cloud,
+    Istream& is,
+    bool readFields
+)
+:
+    ReactingParcel<ParcelType>(cloud, is, readFields),
+    YGas_(0),
+    YLiquid_(0),
+    YSolid_(0),
+    canCombust_(false)
+{
+    if (readFields)
+    {
+        const ReactingMultiphaseCloud<ParcelType>& cR =
+            dynamic_cast<const ReactingMultiphaseCloud<ParcelType>&>(cloud);
+
+        const label idGas = cR.composition().idGas();
+        const label nGas = cR.composition().componentNames(idGas).size();
+        const label idLiquid = cR.composition().idLiquid();
+        const label nLiquid = cR.composition().componentNames(idLiquid).size();
+        const label idSolid = cR.composition().idGas();
+        const label nSolid = cR.composition().componentNames(idSolid).size();
+
+        YGas_.setSize(nGas);
+        YLiquid_.setSize(nLiquid);
+        YSolid_.setSize(nSolid);
+
+        is >> YGas_ >> YLiquid_ >> YSolid_;
+
+        // scale the mass fractions
+        const scalarField& YMix = this->Y_;
+        YGas_ /= YMix[GAS] + ROOTVSMALL;
+        YLiquid_ /= YMix[LIQ] + ROOTVSMALL;
+        YSolid_ /= YMix[SLD] + ROOTVSMALL;
+    }
+
+    // Check state of Istream
+    is.check
+    (
+        "ReactingMultiphaseParcel<ParcelType>::ReactingMultiphaseParcel"
+        "("
+            "const Cloud<ParcelType>&, "
+            "Istream&, "
+            "bool"
+        ")"
+    );
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseParcel<ParcelType>::readFields
+(
+    Cloud<ParcelType>& cIn
+)
+{
+    if (!cIn.size())
+    {
+        return;
+    }
+
+    ReactingMultiphaseCloud<ParcelType>& c =
+        dynamic_cast<ReactingMultiphaseCloud<ParcelType>&>(cIn);
+
+    ReactingParcel<ParcelType>::readFields(c);
+
+    // Get names and sizes for each Y...
+    const label idGas = c.composition().idGas();
+    const wordList& gasNames = c.composition().componentNames(idGas);
+    const label idLiquid = c.composition().idLiquid();
+    const wordList& liquidNames = c.composition().componentNames(idLiquid);
+    const label idSolid = c.composition().idSolid();
+    const wordList& solidNames = c.composition().componentNames(idSolid);
+    const wordList& stateLabels = c.composition().stateLabels();
+
+    // Set storage for each Y... for each parcel
+    forAllIter(typename Cloud<ParcelType>, c, iter)
+    {
+        ReactingMultiphaseParcel<ParcelType>& p = iter();
+        p.YGas_.setSize(gasNames.size(), 0.0);
+        p.YLiquid_.setSize(liquidNames.size(), 0.0);
+        p.YSolid_.setSize(solidNames.size(), 0.0);
+    }
+
+    // Populate YGas for each parcel
+    forAll(gasNames, j)
+    {
+        IOField<scalar> YGas
+        (
+            c.fieldIOobject
+            (
+                "Y" + gasNames[j] + stateLabels[idGas],
+                IOobject::MUST_READ
+            )
+        );
+
+        label i = 0;
+        forAllIter(typename Cloud<ParcelType>, c, iter)
+        {
+            ReactingMultiphaseParcel<ParcelType>& p = iter();
+            p.YGas_[j] = YGas[i++]/(p.Y()[GAS] + ROOTVSMALL);
+        }
+    }
+    // Populate YLiquid for each parcel
+    forAll(liquidNames, j)
+    {
+        IOField<scalar> YLiquid
+        (
+            c.fieldIOobject
+            (
+                "Y" + liquidNames[j] + stateLabels[idLiquid],
+                 IOobject::MUST_READ
+            )
+        );
+
+        label i = 0;
+        forAllIter(typename Cloud<ParcelType>, c, iter)
+        {
+            ReactingMultiphaseParcel<ParcelType>& p = iter();
+            p.YLiquid_[j] = YLiquid[i++]/(p.Y()[LIQ] + ROOTVSMALL);
+        }
+    }
+    // Populate YSolid for each parcel
+    forAll(solidNames, j)
+    {
+        IOField<scalar> YSolid
+        (
+            c.fieldIOobject
+            (
+                "Y" + solidNames[j] + stateLabels[idSolid],
+                IOobject::MUST_READ
+            )
+        );
+
+        label i = 0;
+        forAllIter(typename Cloud<ParcelType>, c, iter)
+        {
+            ReactingMultiphaseParcel<ParcelType>& p = iter();
+            p.YSolid_[j] = YSolid[i++]/(p.Y()[SLD] + ROOTVSMALL);
+        }
+    }
+}
+
+
+template<class ParcelType>
+void Foam::ReactingMultiphaseParcel<ParcelType>::writeFields
+(
+    const Cloud<ParcelType>& cIn
+)
+{
+    const ReactingMultiphaseCloud<ParcelType>& c =
+        dynamic_cast<const ReactingMultiphaseCloud<ParcelType>&>(cIn);
+
+    ReactingParcel<ParcelType>::writeFields(c);
+
+    label np =  c.size();
+
+    // Write the composition fractions
+    if (np > 0)
+    {
+        const wordList& stateLabels = c.composition().stateLabels();
+
+        const label idGas = c.composition().idGas();
+        const wordList& gasNames = c.composition().componentNames(idGas);
+        forAll(gasNames, j)
+        {
+            IOField<scalar> YGas
+            (
+                c.fieldIOobject
+                (
+                    "Y" + gasNames[j] + stateLabels[idGas],
+                    IOobject::NO_READ
+                ),
+                np
+            );
+
+            label i = 0;
+            forAllConstIter(typename Cloud<ParcelType>, c, iter)
+            {
+                const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
+                YGas[i++] = p0.YGas()[j]*p0.Y()[GAS];
+            }
+
+            YGas.write();
+        }
+
+        const label idLiquid = c.composition().idLiquid();
+        const wordList& liquidNames = c.composition().componentNames(idLiquid);
+        forAll(liquidNames, j)
+        {
+            IOField<scalar> YLiquid
+            (
+                c.fieldIOobject
+                (
+                    "Y" + liquidNames[j] + stateLabels[idLiquid],
+                    IOobject::NO_READ
+                ),
+                np
+            );
+
+            label i = 0;
+            forAllConstIter(typename Cloud<ParcelType>, c, iter)
+            {
+                const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
+                YLiquid[i++] = p0.YLiquid()[j]*p0.Y()[LIQ];
+            }
+
+            YLiquid.write();
+        }
+
+        const label idSolid = c.composition().idSolid();
+        const wordList& solidNames = c.composition().componentNames(idSolid);
+        forAll(solidNames, j)
+        {
+            IOField<scalar> YSolid
+            (
+                c.fieldIOobject
+                (
+                    "Y" + solidNames[j] + stateLabels[idSolid],
+                    IOobject::NO_READ
+                ),
+                np
+            );
+
+            label i = 0;
+            forAllConstIter(typename Cloud<ParcelType>, c, iter)
+            {
+                const ReactingMultiphaseParcel<ParcelType>& p0 = iter();
+                YSolid[i++] = p0.YSolid()[j]*p0.Y()[SLD];
+            }
+
+            YSolid.write();
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class ParcelType>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const ReactingMultiphaseParcel<ParcelType>& p
+)
+{
+    scalarField YGasLoc = p.YGas()*p.Y()[0];
+    scalarField YLiquidLoc = p.YLiquid()*p.Y()[1];
+    scalarField YSolidLoc = p.YSolid()*p.Y()[2];
+    if (os.format() == IOstream::ASCII)
+    {
+        os  << static_cast<const ReactingParcel<ParcelType>&>(p)
+            << token::SPACE << YGasLoc
+            << token::SPACE << YLiquidLoc
+            << token::SPACE << YSolidLoc;
+    }
+    else
+    {
+        os  << static_cast<const ReactingParcel<ParcelType>&>(p);
+        os  << YGasLoc << YLiquidLoc << YSolidLoc;
+    }
+
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<"
+        "("
+            "Ostream&, "
+            "const ReactingMultiphaseParcel<ParcelType>&"
+        ")"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
index 064c4fc24..ae37db90d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.C
@@ -25,293 +25,368 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ReactingParcel.H"
+#include "mathematicalConstants.H"
+#include "specie.H"
 
 // * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * * //
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::updateCellQuantities
+void Foam::ReactingParcel<ParcelType>::setCellValues
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    ThermoParcel<ParcelType>::updateCellQuantities(td, dt, celli);
+    ThermoParcel<ParcelType>::setCellValues(td, dt, cellI);
 
-    pc_ = td.pInterp().interpolate(this->position(), celli);
+    pc_ = td.pInterp().interpolate(this->position(), cellI);
+    if (pc_ < td.constProps().pMin())
+    {
+        WarningIn
+        (
+            "void Foam::ReactingParcel<ParcelType>::setCellValues"
+            "("
+                "TrackData&, "
+                "const scalar, "
+                "const label"
+            ")"
+        )   << "Limiting observed pressure in cell " << cellI << " to "
+            << td.constProps().pMin() <<  nl << endl;
+
+        pc_ = td.constProps().pMin();
+    }
 }
 
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::calcCoupled
+void Foam::ReactingParcel<ParcelType>::cellValueSourceCorrection
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Define local properties at beginning of timestep
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const vector U0 = this->U_;
-    const scalar mass0 = this->mass();
+    scalar massCell = this->massCell(cellI);
+
+    scalar addedMass = 0.0;
+    forAll(td.cloud().rhoTrans(), i)
+    {
+        addedMass += td.cloud().rhoTrans(i)[cellI];
+    }
+
+    this->rhoc_ += addedMass/td.cloud().pMesh().cellVolumes()[cellI];
+
+    scalar massCellNew = massCell + addedMass;
+    this->Uc_ += td.cloud().UTrans()[cellI]/massCellNew;
+
+    scalar cpEff = 0;
+    if (addedMass > ROOTVSMALL)
+    {
+        forAll(td.cloud().rhoTrans(), i)
+        {
+            scalar Y = td.cloud().rhoTrans(i)[cellI]/addedMass;
+            cpEff +=
+                Y*td.cloud().mcCarrierThermo().speciesData()[i].Cp(this->Tc_);
+        }
+    }
+    const scalar cpc = td.cpInterp().psi()[cellI];
+    this->cpc_ = (massCell*cpc + addedMass*cpEff)/massCellNew;
+
+    this->Tc_ += td.cloud().hsTrans()[cellI]/(this->cpc_*massCellNew);
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingParcel<ParcelType>::correctSurfaceValues
+(
+    TrackData& td,
+    const label cellI,
+    const scalar T,
+    const scalarField& Cs,
+    scalar& rhos,
+    scalar& mus,
+    scalar& Pr,
+    scalar& kappa
+)
+{
+    // No correction if total concentration of emitted species is small
+    if (sum(Cs) < SMALL)
+    {
+        return;
+    }
+
+    // Far field carrier  molar fractions
+    scalarField Xinf(td.cloud().mcCarrierThermo().speciesData().size());
+
+    forAll(Xinf, i)
+    {
+        Xinf[i] =
+            td.cloud().mcCarrierThermo().Y(i)[cellI]
+           /td.cloud().mcCarrierThermo().speciesData()[i].W();
+    }
+    Xinf /= sum(Xinf);
+
+    // Molar fraction of far field species at particle surface
+    const scalar Xsff = 1.0 - min(sum(Cs)*specie::RR*this->T_/pc_, 1.0);
+
+    // Surface carrier total molar concentration
+    const scalar CsTot = pc_/(specie::RR*this->T_);
+
+    // Surface carrier composition (molar fraction)
+    scalarField Xs(Xinf.size());
+
+    // Surface carrier composition (mass fraction)
+    scalarField Ys(Xinf.size());
+
+    forAll(Xs, i)
+    {
+        // Molar concentration of species at particle surface
+        const scalar Csi = Cs[i] + Xsff*Xinf[i]*CsTot;
+
+        Xs[i] = (2.0*Csi + Xinf[i]*CsTot)/3.0;
+        Ys[i] = Xs[i]*td.cloud().mcCarrierThermo().speciesData()[i].W();
+    }
+    Xs /= sum(Xs);
+    Ys /= sum(Ys);
+
+
+    rhos = 0;
+    mus = 0;
+    kappa = 0;
+    scalar cps = 0;
+    scalar sumYiSqrtW = 0;
+    scalar sumYiCbrtW = 0;
+
+    forAll(Ys, i)
+    {
+        const scalar sqrtW =
+            sqrt(td.cloud().mcCarrierThermo().speciesData()[i].W());
+        const scalar cbrtW =
+            cbrt(td.cloud().mcCarrierThermo().speciesData()[i].W());
+
+        rhos += Xs[i]*td.cloud().mcCarrierThermo().speciesData()[i].W();
+        mus += Ys[i]*sqrtW*td.cloud().mcCarrierThermo().speciesData()[i].mu(T);
+        kappa +=
+            Ys[i]*cbrtW*td.cloud().mcCarrierThermo().speciesData()[i].kappa(T);
+        cps += Xs[i]*td.cloud().mcCarrierThermo().speciesData()[i].Cp(T);
+
+        sumYiSqrtW += Ys[i]*sqrtW;
+        sumYiCbrtW += Ys[i]*cbrtW;
+    }
+
+    rhos *= pc_/(specie::RR*T);
+    mus /= sumYiSqrtW;
+    kappa /= sumYiCbrtW;
+    Pr = cps*mus/kappa;
+}
+
+
+template<class ParcelType>
+Foam::scalar Foam::ReactingParcel<ParcelType>::updateMassFraction
+(
+    const scalar mass0,
+    const scalarField& dMass,
+    scalarField& Y
+) const
+{
+    scalar mass1 = mass0 - sum(dMass);
+
+    // only update the mass fractions if the new particle mass is finite
+    if (mass1 > ROOTVSMALL)
+    {
+        forAll(Y, i)
+        {
+            Y[i] = (Y[i]*mass0 - dMass[i])/mass1;
+        }
+    }
+
+    return mass1;
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ReactingParcel<ParcelType>::calc
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI
+)
+{
+    // Define local properties at beginning of time step
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const scalar np0 = this->nParticle_;
+    const scalar d0 = this->d_;
+    const vector& U0 = this->U_;
+    const scalar rho0 = this->rho_;
     const scalar T0 = this->T_;
     const scalar cp0 = this->cp_;
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-    // Enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = 0.0;
-
-    // Mass transfer from particle to carrier phase
-    // - components exist in particle already
-    scalarList dMassMT(td.cloud().gases().size(), 0.0);
-
-    // Mass transfer due to surface reactions from particle to carrier phase
-    // - components do not necessarily exist in particle already
-    scalarList dMassSR(td.cloud().gases().size(), 0.0);
-
-    // Total mass lost from particle due to surface reactions
-    // - sub-model will adjust component mass fractions
-    scalar dMassMTSR = 0.0;
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate mass transfer
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    calcMassTransfer(td, dt, T0, T1, dMassMT);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate surface reactions
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    calcSurfaceReactions(td, dt, celli, T0, T1, dMassMTSR, dMassSR);
-
-    // New total mass
-    const scalar mass1 = mass0 - sum(dMassMT) - dMassMTSR;
-
-    // Ratio of mass devolatilised to the total volatile mass of the particle
-    const scalar fVol = 1 -
-        (YMixture_[0]*mass1)
-       /(td.cloud().composition().YMixture0()[0]*mass0_);
-
-    // Specific heat capacity of non-volatile components
-    const scalar cpNonVolatile =
-        (
-            YMixture_[1]*td.cloud().composition().cpLiquid(YLiquid_, pc_, this->Tc_)
-          + YMixture_[2]*td.cloud().composition().cpSolid(YSolid_)
-        )/(YMixture_[1] + YMixture_[2]);
-
-    // New specific heat capacity - linear variation until volatiles
-    // have evolved
-    const scalar cp1 = (cpNonVolatile - td.constProps().cp0())*fVol
-       + td.constProps().cp0();
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Accumulate source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Transfer mass lost from particle to carrier mass source
-    forAll(dMassMT, i)
-    {
-        td.cloud().rhoTrans(i)[celli] += np0*(dMassMT[i] + dMassSR[i]);
-    }
-
-    // Update momentum transfer
-    td.cloud().UTrans()[celli] += np0*dUTrans;
-
-    // Accumulate coefficient to be applied in carrier phase momentum coupling
-    td.cloud().UCoeff()[celli] += np0*mass0*Cud;
-
-    // Update enthalpy transfer
-//    td.cloud().hTrans()[celli] += np0*(mass0*cp0*T0 - mass1*cp1*T1);
-    td.cloud().hTrans()[celli] += np0*((mass0*cp0 - mass1*cp1)*T0 + dhTrans);
-
-    // Accumulate coefficient to be applied in carrier phase enthalpy coupling
-    td.cloud().hCoeff()[celli] += np0*htc*this->areaS();
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Remove the particle when mass falls below minimum threshold
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    if (mass1 < td.constProps().minParticleMass())
-    {
-        td.keepParticle = false;
-
-        // Absorb particle(s) into carrier phase
-        forAll(dMassMT, i)
-        {
-            td.cloud().rhoTrans(i)[celli] += np0*dMassMT[i];
-        }
-        td.cloud().hTrans()[celli] += np0*mass1*cp1*T1;
-        td.cloud().UTrans()[celli] += np0*mass1*U1;
-    }
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Set new particle properties
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    else
-    {
-        this->U_ = U1;
-        this->T_ = T1;
-        this->cp_ = cp1;
-
-        // Update particle density or diameter
-        if (td.cloud().massTransfer().changesVolume())
-        {
-            this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi);
-        }
-        else
-        {
-            this->rho_ = mass1/this->volume();
-        }
-    }
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::calcUncoupled
-(
-    TrackData& td,
-    const scalar dt,
-    const label celli
-)
-{
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Define local properties at beginning of timestep
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const scalar T0 = this->T_;
     const scalar mass0 = this->mass();
-//    const scalar cp0 = this->cp();
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    // Calc surface values
+    // ~~~~~~~~~~~~~~~~~~~
+    scalar Ts, rhos, mus, Pr, kappa;
+    this->calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Pr, kappa);
+
+    // Reynolds number
+    scalar Re = this->Re(U0, d0, rhos, mus);
+
+
+    // Sources
+    //~~~~~~~~
+
+    // Explicit momentum source for particle
+    vector Su = vector::zero;
 
     // Momentum transfer from the particle to the carrier phase
     vector dUTrans = vector::zero;
 
-    // Enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = 0.0;
+    // Explicit enthalpy source for particle
+    scalar Sh = 0.0;
 
-    // Mass transfer from particle to carrier phase
-    // - components exist in particle already
-    scalarList dMassMT(td.cloud().gases().size(), 0.0);
-
-    // Mass transfer due to surface reactions from particle to carrier phase
-    // - components do not necessarily exist in particle already
-    scalarList dMassSR(td.cloud().gases().size(), 0.0);
-
-    // Total mass lost from particle due to surface reactions
-    // - sub-model will adjust component mass fractions
-    scalar dMassMTSR = 0.0;
+    // Sensible enthalpy transfer from the particle to the carrier phase
+    scalar dhsTrans = 0.0;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
-    scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
+    // Phase change
+    // ~~~~~~~~~~~~
 
-    // Limit new temp max by vapourisarion temperature
-    T1 = min(td.constProps().Tvap(), T1);
+    // Mass transfer due to phase change
+    scalarField dMassPC(Y_.size(), 0.0);
 
+    // Molar flux of species emitted from the particle (kmol/m^2/s)
+    scalar Ne = 0.0;
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
+    // Sum Ni*Cpi*Wi of emission species
+    scalar NCpW = 0.0;
 
+    // Surface concentrations of emitted species
+    scalarField Cs(td.cloud().mcCarrierThermo().species().size(), 0.0);
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate mass transfer
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    calcMassTransfer(td, dt, T0, T1, dMassMT);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate surface reactions
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    calcSurfaceReactions
+    // Calc mass and enthalpy transfer due to phase change
+    calcPhaseChange
     (
         td,
         dt,
-        celli,
+        cellI,
+        Re,
+        Ts,
+        mus/rhos,
+        d0,
         T0,
-        T1,
-        dMassMTSR,
-        dMassSR
+        mass0,
+        0,
+        1.0,
+        Y_,
+        dMassPC,
+        Sh,
+        Ne,
+        NCpW,
+        Cs
     );
 
-    // New total mass
-    const scalar mass1 = mass0 - sum(dMassMT) - dMassMTSR;
+    // Correct surface values due to emitted species
+    correctSurfaceValues(td, cellI, Ts, Cs, rhos, mus, Pr, kappa);
 
-    // Ratio of mass devolatilised to the total volatile mass of the particle
-    const scalar fVol = 1 -
-        (YMixture_[0]*mass1)
-       /(td.cloud().composition().YMixture0()[0]*mass0_);
+    // Update particle component mass and mass fractions
+    scalar mass1 = updateMassFraction(mass0, dMassPC, Y_);
 
-    // Specific heat capacity of non-volatile components
-    const scalar cpNonVolatile =
+
+    // Heat transfer
+    // ~~~~~~~~~~~~~
+
+    // Calculate new particle temperature
+    scalar T1 =
+        calcHeatTransfer
         (
-            YMixture_[1]*td.cloud().composition().cpLiquid(YLiquid_, pc_, this->Tc_)
-          + YMixture_[2]*td.cloud().composition().cpSolid(YSolid_)
-        )/(YMixture_[1] + YMixture_[2]);
-
-    // New specific heat capacity - linear variation until volatiles
-    // have evolved
-    const scalar cp1 = (cpNonVolatile - td.constProps().cp0())*fVol
-       + td.constProps().cp0();
+            td,
+            dt,
+            cellI,
+            Re,
+            Pr,
+            kappa,
+            d0,
+            rho0,
+            T0,
+            cp0,
+            NCpW,
+            Sh,
+            dhsTrans
+        );
+
+
+    // Motion
+    // ~~~~~~
+
+    // Calculate new particle velocity
+    vector U1 =
+        calcVelocity(td, dt, cellI, Re, mus, d0, U0, rho0, mass0, Su, dUTrans);
+
+    dUTrans += 0.5*(mass0 - mass1)*(U0 + U1);
+
+    // Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    if (td.cloud().coupled())
+    {
+        // Transfer mass lost from particle to carrier mass source
+        forAll(dMassPC, i)
+        {
+            label gid = td.cloud().composition().localToGlobalCarrierId(0, i);
+            td.cloud().rhoTrans(gid)[cellI] += np0*dMassPC[i];
+        }
+
+        // Update momentum transfer
+        td.cloud().UTrans()[cellI] += np0*dUTrans;
+
+        // Update sensible enthalpy transfer
+        td.cloud().hsTrans()[cellI] += np0*dhsTrans;
+    }
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Remove the particle when mass falls below minimum threshold
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     if (mass1 < td.constProps().minParticleMass())
     {
         td.keepParticle = false;
+
+        if (td.cloud().coupled())
+        {
+            // Absorb parcel into carrier phase
+            forAll(Y_, i)
+            {
+                label gid =
+                    td.cloud().composition().localToGlobalCarrierId(0, i);
+                td.cloud().rhoTrans(gid)[cellI] += np0*mass1*Y_[i];
+            }
+            td.cloud().UTrans()[cellI] += np0*mass1*U1;
+            td.cloud().hsTrans()[cellI] +=
+                np0*mass1*td.cloud().composition().H(0, Y_, pc_, T1);
+        }
     }
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+
     // Set new particle properties
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
     else
     {
-        this->U_ = U1;
+        this->cp_ = td.cloud().composition().cp(0, Y_, pc_, T1);
         this->T_ = T1;
-        this->cp_ = cp1;
+        this->U_ = U1;
 
         // Update particle density or diameter
-        if (td.cloud().massTransfer().changesVolume())
+        if (td.constProps().constantVolume())
         {
-            this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi);
+            this->rho_ = mass1/this->volume();
         }
         else
         {
-            this->rho_ = mass1/this->volume();
+            this->d_ = cbrt(mass1/this->rho_*6.0/mathematicalConstant::pi);
         }
     }
 }
@@ -319,112 +394,132 @@ void Foam::ReactingParcel<ParcelType>::calcUncoupled
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::calcMassTransfer
+void Foam::ReactingParcel<ParcelType>::calcPhaseChange
 (
     TrackData& td,
     const scalar dt,
-    const scalar T0,
-    const scalar T1,
-    scalarList& dMassMT
+    const label cellI,
+    const scalar Re,
+    const scalar Ts,
+    const scalar nus,
+    const scalar d,
+    const scalar T,
+    const scalar mass,
+    const label idPhase,
+    const scalar YPhase,
+    const scalarField& YComponents,
+    scalarField& dMassPC,
+    scalar& Sh,
+    scalar& N,
+    scalar& NCpW,
+    scalarField& Cs
 )
 {
-    if (td.cloud().composition().YMixture0()[1]>SMALL)
-    {
-        notImplemented
-        (
-            "void Foam::ReactingParcel<ParcelType>::"
-            "calcMassTransfer(...): no treatment currently "
-            "available for particles containing liquid species"
-        )
-    }
+    typedef PhaseChangeModel
+    <
+        typename ReactingParcel<ParcelType>::trackData::cloudType
+    > phaseChangeModelType;
 
-    // Check that model is active, and that the parcel temperature is
-    // within necessary limits for mass transfer to occur
     if
     (
-        !td.cloud().massTransfer().active()
-     || this->T_<td.constProps().Tvap()
-     || this->T_<td.constProps().Tbp()
+        !td.cloud().phaseChange().active()
+     || T < td.constProps().Tvap()
+     || YPhase < SMALL
     )
     {
         return;
     }
 
-    // Determine mass to add to carrier phase
-    const scalar mass = this->mass();
-    const scalar dMassTot = td.cloud().massTransfer().calculate
+    // Calculate mass transfer due to phase change
+    td.cloud().phaseChange().calculate
     (
         dt,
-        mass0_,
-        mass,
-        td.cloud().composition().YMixture0(),
-        YMixture_,
-        T0,
-        canCombust_
+        cellI,
+        Re,
+        d,
+        nus,
+        T,
+        Ts,
+        pc_,
+        dMassPC
     );
 
-    // Update (total) mass fractions
-    YMixture_[0] = (YMixture_[0]*mass - dMassTot)/(mass - dMassTot);
-    YMixture_[1] = YMixture_[1]*mass/(mass - dMassTot);
-    YMixture_[2] = 1.0 - YMixture_[0] - YMixture_[1];
+    // Limit phase change mass by availability of each specie
+    dMassPC = min(mass*YPhase*YComponents, dMassPC);
 
-    // Add to cummulative mass transfer
-    forAll (YGas_, i)
+    scalar dMassTot = sum(dMassPC);
+
+    // Add to cumulative phase change mass
+    td.cloud().addToMassPhaseChange(this->nParticle_*dMassTot);
+
+    // Average molecular weight of carrier mix - assumes perfect gas
+    scalar Wc = this->rhoc_*specie::RR*this->Tc_/this->pc_;
+
+    forAll(YComponents, i)
     {
-        label id = td.cloud().composition().gasGlobalIds()[i];
+        const label idc =
+            td.cloud().composition().localToGlobalCarrierId(idPhase, i);
+        const label idl = td.cloud().composition().globalIds(idPhase)[i];
 
-        // Mass transfer
-        scalar volatileMass = YGas_[i]*dMassTot;
-        dMassMT[id] += volatileMass;
+        // Calculate enthalpy transfer
+        if
+        (
+            td.cloud().phaseChange().enthalpyTransfer()
+         == phaseChangeModelType::etLatentHeat
+        )
+        {
+            scalar hlp =
+                td.cloud().composition().liquids().properties()[idl].hl(pc_, T);
+
+            Sh -= dMassPC[i]*hlp/dt;
+        }
+        else
+        {
+            // Note: enthalpies of both phases must use the same reference
+            scalar hc = td.cloud().mcCarrierThermo().speciesData()[idc].H(T);
+            scalar hp =
+                td.cloud().composition().liquids().properties()[idl].h(pc_, T);
+
+            Sh -= dMassPC[i]*(hc - hp)/dt;
+        }
+
+        // Update particle surface thermo properties
+        const scalar Dab =
+            td.cloud().composition().liquids().properties()[idl].D(pc_, Ts, Wc);
+
+        const scalar Cp =
+            td.cloud().mcCarrierThermo().speciesData()[idc].Cp(Ts);
+        const scalar W = td.cloud().mcCarrierThermo().speciesData()[idc].W();
+        const scalar Ni = dMassPC[i]/(this->areaS(d)*dt*W);
+
+        // Molar flux of species coming from the particle (kmol/m^2/s)
+        N += Ni;
+
+        // Sum of Ni*Cpi*Wi of emission species
+        NCpW += Ni*Cp*W;
+
+        // Concentrations of emission species
+        Cs[idc] += Ni*d/(2.0*Dab);
     }
 }
 
 
-template<class ParcelType>
-template<class TrackData>
-void Foam::ReactingParcel<ParcelType>::calcSurfaceReactions
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::ReactingParcel<ParcelType>::ReactingParcel
 (
-    TrackData& td,
-    const scalar dt,
-    const label celli,
-    const scalar T0,
-    const scalar T1,
-    scalar& dMassMTSR,
-    scalarList& dMassMT
+    const ReactingParcel<ParcelType>& p
 )
-{
-    // Check that model is active
-    if (!td.cloud().surfaceReaction().active() || !canCombust_)
-    {
-        return;
-    }
-
-    // Update mass transfer(s)
-    // - Also updates Y()'s
-    td.cloud().surfaceReaction().calculate
-    (
-        dt,
-        celli,
-        this->d_,
-        T0,
-        T1,
-        this->Tc_,
-        this->rhoc_,
-        this->mass(),
-        YGas_,
-        YLiquid_,
-        YSolid_,
-        YMixture_,
-        dMassMTSR,
-        dMassMT
-    );
-}
+:
+    ThermoParcel<ParcelType>(p),
+    mass0_(p.mass0_),
+    Y_(p.Y_),
+    pc_(p.pc_)
+{}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-
-// * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
 #include "ReactingParcelIO.C"
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
index 91a5687d4..62b23243f 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcel.H
@@ -26,9 +26,8 @@ Class
     Foam::ReactingParcel
 
 Description
-    Reactinf parcel class with one/two-way coupling with the continuous
-    phase. Includes thermo parcel sub-models, plus:
-    - combustion
+    Reacting parcel class with one/two-way coupling with the continuous
+    phase.
 
 SourceFiles
     ReactingParcelI.H
@@ -47,6 +46,7 @@ SourceFiles
 
 #include "ThermoParcel.H"
 #include "ReactingCloud.H"
+#include "reactingParcel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -70,9 +70,9 @@ Ostream& operator<<
 template<class ParcelType>
 class ReactingParcel
 :
+    public reactingParcel,
     public ThermoParcel<ParcelType>
 {
-
 public:
 
     //- Class to hold reacting particle constant properties
@@ -80,10 +80,15 @@ public:
     :
         public ThermoParcel<ParcelType>::constantProperties
     {
-
         // Private data
 
-            //- Vapourisation temperature [K]
+            //- Minimum pressure [Pa]
+            const scalar pMin_;
+
+            //- Constant volume flag - e.g. during mass transfer
+            Switch constantVolume_;
+
+            //- Vaporisation temperature [K]
             const scalar Tvap_;
 
             //- Boiling point [K]
@@ -93,16 +98,22 @@ public:
     public:
 
         //- Constructor
-        constantProperties(const dictionary& dict);
+        constantProperties(const dictionary& parentDict);
 
         // Access
 
-            //- Return const access to the vapourisation temperature
+            //- Return const access to the minimum pressure
+            inline scalar pMin() const;
+
+            //- Return const access to the constant volume flag
+            inline Switch constantVolume() const;
+
+            //- Return const access to the vaporisation temperature
             inline scalar Tvap() const;
 
             //- Return const access to the boiling point
             inline scalar Tbp() const;
-    };
+   };
 
 
     //- Class used to pass reacting tracking data to the trackToFace function
@@ -125,6 +136,9 @@ public:
 
     public:
 
+        typedef ReactingCloud<ParcelType> cloudType;
+
+
         // Constructors
 
             //- Construct from components
@@ -150,7 +164,7 @@ public:
             //- Return const access to the constant properties
             inline const constantProperties& constProps() const;
 
-            //- Return conat access to the interpolator for continuous
+            //- Return const access to the interpolator for continuous
             //  phase pressure field
             inline const interpolation<scalar>& pInterp() const;
     };
@@ -166,20 +180,7 @@ protected:
             scalar mass0_;
 
             //- Mass fractions of mixture []
-            scalarField YMixture_;
-
-            //- Mass fractions of gases []
-            scalarField YGas_;
-
-            //- Mass fractions of liquids []
-            scalarField YLiquid_;
-
-            //- Mass fractions of solids []
-            scalarField YSolid_;
-
-            //- Flag to say that the particle is allowed to combust
-            //  Only true after volatile content falls below threshold value
-            bool canCombust_;
+            scalarField Y_;
 
 
         // Cell-based quantities
@@ -190,55 +191,74 @@ protected:
 
     // Protected member functions
 
-        //- Calculate mass transfer
+        //- Calculate Phase change
         template<class TrackData>
-        void calcMassTransfer
+        void calcPhaseChange
         (
             TrackData& td,
-            const scalar dt,
-            const scalar T0,
-            const scalar T1,
-            scalarList& dMassMT
+            const scalar dt,           // timestep
+            const label cellI,         // owner cell
+            const scalar Re,           // Reynolds number
+            const scalar Ts,           // Surface temperature
+            const scalar nus,          // Surface kinematic viscosity
+            const scalar d,            // diameter
+            const scalar T,            // temperature
+            const scalar mass,         // mass
+            const label idPhase,       // id of phase involved in phase change
+            const scalar YPhase,       // total mass fraction
+            const scalarField& YComponents, // component mass fractions
+            scalarField& dMassPC,      // mass transfer - local to particle
+            scalar& Sh,                // explicit particle enthalpy source
+            scalar& N,                 // flux of species emitted from particle
+            scalar& NCpW,              // sum of N*Cp*W of emission species
+            scalarField& Cs            // carrier conc. of emission species
         );
 
-        //- Calculate surface reactions
-        template<class TrackData>
-        void calcSurfaceReactions
+        //- Update mass fraction
+        scalar updateMassFraction
         (
-            TrackData& td,
-            const scalar dt,
-            const label celli,
-            const scalar T0,
-            const scalar T1,
-            scalar& dMassMTSR,
-            scalarList& dMassMT
-        );
+            const scalar mass0,
+            const scalarField& dMass,
+            scalarField& Y
+        ) const;
 
 
 public:
 
-    //- Runtime type information
-    TypeName("ReactingParcel");
+    // Static data members
+
+        //- String representation of properties
+        static string propHeader;
+
+        //- Runtime type information
+        TypeName("ReactingParcel");
+
 
     friend class Cloud<ParcelType>;
 
 
     // Constructors
 
+        //- Construct from owner, position, and cloud owner
+        //  Other properties initialised as null
+        inline ReactingParcel
+        (
+            ReactingCloud<ParcelType>& owner,
+            const vector& position,
+            const label cellI
+        );
+
         //- Construct from components
         inline ReactingParcel
         (
             ReactingCloud<ParcelType>& owner,
-            const label typeId,
             const vector& position,
-            const label celli,
+            const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector& U0,
-            const scalar nParticle0,
-            const scalarField& YGas0,
-            const scalarField& YLiquid0,
-            const scalarField& YSolid0,
-            const scalarField& YMixture0,
+            const scalarField& Y0,
             const constantProperties& constProps
         );
 
@@ -250,10 +270,13 @@ public:
             bool readFields = true
         );
 
+        //- Construct as a copy
+        ReactingParcel(const ReactingParcel& p);
+
         //- Construct and return a clone
-        autoPtr<ParcelType> clone() const
+        autoPtr<ReactingParcel> clone() const
         {
-            return autoPtr<ParcelType>(new ReactingParcel<ParcelType>(*this));
+            return autoPtr<ReactingParcel>(new ReactingParcel(*this));
         }
 
 
@@ -261,75 +284,76 @@ public:
 
         // Access
 
-            //- Return const access to mass fractions of gases
-            inline const scalarField& YGas() const;
-
-            //- Return const access to mass fractions of liquids
-            inline const scalarField& YLiquid() const;
-
-            //- Return const access to mass fractions of solids
-            inline const scalarField& YSolid() const;
-
-            //- Return const access to mass fractions of mixture
-            inline const scalarField& YMixture() const;
-
             //- Return const access to initial mass
             inline scalar mass0() const;
 
+            //- Return const access to mass fractions of mixture
+            inline const scalarField& Y() const;
+
+            //- Return the owner cell pressure
+            inline scalar pc() const;
+
 
         // Edit
 
-            //- Return access to mass fractions of gases
-            inline scalarField& YGas();
-
-            //- Return access to mass fractions of liquids
-            inline scalarField& YLiquid();
-
-            //- Return access to mass fractions of solids
-            inline scalarField& YSolid();
-
-            //- Return access to mass fractions of mixture
-            inline scalarField& YMixture();
-
             //- Return access to initial mass
             inline scalar& mass0();
 
+            //- Return access to mass fractions of mixture
+            inline scalarField& Y();
+
 
         // Main calculation loop
 
-            //- Update cell based quantities
+            //- Set cell values
             template<class TrackData>
-            void updateCellQuantities
+            void setCellValues
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
+                const label cellI
             );
 
-            //- Coupled calculation with the continuous phase
+            //- Correct cell values using latest transfer information
             template<class TrackData>
-            void calcCoupled
+            void cellValueSourceCorrection
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
+                const label cellI
             );
 
-            //- Uncoupled calculation with the continuous phase
+            //- Correct surface values due to emitted species
             template<class TrackData>
-            void calcUncoupled
+            void correctSurfaceValues
+            (
+                TrackData& td,
+                const label cellI,
+                const scalar T,
+                const scalarField& Cs,
+                scalar& rhos,
+                scalar& mus,
+                scalar& Pr,
+                scalar& kappa
+            );
+
+            //- Update parcel properties over the time interval
+            template<class TrackData>
+            void calc
             (
                 TrackData& td,
                 const scalar dt,
-                const label
+                const label cellI
             );
 
 
         // I-O
 
-            static void readFields(ReactingCloud<ParcelType>& c);
+            //- Read
+            static void readFields(Cloud<ParcelType>& c);
 
-            static void writeFields(const ReactingCloud<ParcelType>& c);
+            //- Write
+            static void writeFields(const Cloud<ParcelType>& c);
 
 
     // Ostream Operator
@@ -361,4 +385,3 @@ public:
 #endif
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
index f2a61f7ff..87388c1cd 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelI.H
@@ -29,12 +29,14 @@ License
 template<class ParcelType>
 inline Foam::ReactingParcel<ParcelType>::constantProperties::constantProperties
 (
-    const dictionary& dict
+    const dictionary& parentDict
 )
 :
-    ThermoParcel<ParcelType>::constantProperties(dict),
-    Tvap_(dimensionedScalar(dict.lookup("Tvap")).value()),
-    Tbp_(dimensionedScalar(dict.lookup("Tbp")).value())
+    ThermoParcel<ParcelType>::constantProperties(parentDict),
+    pMin_(dimensionedScalar(this->dict().lookup("pMin")).value()),
+    constantVolume_(this->dict().lookup("constantVolume")),
+    Tvap_(dimensionedScalar(this->dict().lookup("Tvap")).value()),
+    Tbp_(dimensionedScalar(this->dict().lookup("Tbp")).value())
 {}
 
 
@@ -73,35 +75,44 @@ template<class ParcelType>
 inline Foam::ReactingParcel<ParcelType>::ReactingParcel
 (
     ReactingCloud<ParcelType>& owner,
-    const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI
+)
+:
+    ThermoParcel<ParcelType>(owner, position, cellI),
+    mass0_(0.0),
+    Y_(0),
+    pc_(0.0)
+{}
+
+
+template<class ParcelType>
+inline Foam::ReactingParcel<ParcelType>::ReactingParcel
+(
+    ReactingCloud<ParcelType>& owner,
+    const vector& position,
+    const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
-    const scalarField& YGas0,
-    const scalarField& YLiquid0,
-    const scalarField& YSolid0,
-    const scalarField& YMixture0,
+    const scalarField& Y0,
     const constantProperties& constProps
 )
 :
     ThermoParcel<ParcelType>
     (
         owner,
-        typeId,
         position,
-        celli,
+        cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         constProps
     ),
     mass0_(0.0),
-    YMixture_(YMixture0),
-    YGas_(YGas0),
-    YLiquid_(YLiquid0),
-    YSolid_(YSolid0),
+    Y_(Y0),
     pc_(0.0)
 {
     // Set initial parcel mass
@@ -111,6 +122,22 @@ inline Foam::ReactingParcel<ParcelType>::ReactingParcel
 
 // * * * * * * * * * constantProperties Member Functions * * * * * * * * * * //
 
+template<class ParcelType>
+inline Foam::scalar
+Foam::ReactingParcel<ParcelType>::constantProperties::pMin() const
+{
+    return pMin_;
+}
+
+
+template<class ParcelType>
+inline Foam::Switch
+Foam::ReactingParcel<ParcelType>::constantProperties::constantVolume() const
+{
+    return constantVolume_;
+}
+
+
 template<class ParcelType>
 inline Foam::scalar
 Foam::ReactingParcel<ParcelType>::constantProperties::Tvap() const
@@ -155,62 +182,6 @@ Foam::ReactingParcel<ParcelType>::trackData::pInterp() const
 
 // * * * * * * * * * * ThermoParcel Member Functions * * * * * * * * * * * * //
 
-template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::YGas() const
-{
-    return YGas_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YGas()
-{
-    return YGas_;
-}
-
-
-template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::YLiquid() const
-{
-    return YLiquid_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YLiquid()
-{
-    return YLiquid_;
-}
-
-
-template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::YSolid() const
-{
-    return YSolid_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YSolid()
-{
-    return YSolid_;
-}
-
-
-template<class ParcelType>
-inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::YMixture() const
-{
-    return YMixture_;
-}
-
-
-template<class ParcelType>
-inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::YMixture()
-{
-    return YMixture_;
-}
-
-
 template<class ParcelType>
 inline Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
 {
@@ -218,6 +189,20 @@ inline Foam::scalar Foam::ReactingParcel<ParcelType>::mass0() const
 }
 
 
+template<class ParcelType>
+inline const Foam::scalarField& Foam::ReactingParcel<ParcelType>::Y() const
+{
+    return Y_;
+}
+
+
+template<class ParcelType>
+inline Foam::scalar Foam::ReactingParcel<ParcelType>::pc() const
+{
+    return pc_;
+}
+
+
 template<class ParcelType>
 inline Foam::scalar& Foam::ReactingParcel<ParcelType>::mass0()
 {
@@ -225,4 +210,11 @@ inline Foam::scalar& Foam::ReactingParcel<ParcelType>::mass0()
 }
 
 
+template<class ParcelType>
+inline Foam::scalarField& Foam::ReactingParcel<ParcelType>::Y()
+{
+    return Y_;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
index 90814d884..911d0973a 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ReactingParcel/ReactingParcelIO.C
@@ -27,6 +27,15 @@ License
 #include "ReactingParcel.H"
 #include "IOstreams.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::string Foam::ReactingParcel<ParcelType>::propHeader =
+    ThermoParcel<ParcelType>::propHeader
+  + " mass0"
+  + " nPhases(Y1..YN)";
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ParcelType>
@@ -39,33 +48,20 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
 :
     ThermoParcel<ParcelType>(cloud, is, readFields),
     mass0_(0.0),
-    YMixture_(0),
-    YGas_(0),
-    YLiquid_(0),
-    YSolid_(0),
+    Y_(0),
     pc_(0.0)
 {
     if (readFields)
     {
         const ReactingCloud<ParcelType>& cR =
-            dynamic_cast<const ReactingCloud<ParcelType>& >(cloud);
+            dynamic_cast<const ReactingCloud<ParcelType>&>(cloud);
 
-        const label nMixture = cR.composition().compositionNames().size();
-        const label nGas = cR.composition().gasNames().size();
-        const label nLiquid = cR.composition().liquidNames().size();
-        const label nSolid = cR.composition().solidNames().size();
-
-        YMixture_.setSize(nMixture);
-        YGas_.setSize(nGas);
-        YLiquid_.setSize(nLiquid);
-        YSolid_.setSize(nSolid);
+        const label nMixture = cR.composition().phaseTypes().size();
+        Y_.setSize(nMixture);
 
         if (is.format() == IOstream::ASCII)
         {
-            is >> mass0_ >> YMixture_ >> YGas_ >> YLiquid_ >> YSolid_;
-            YGas_ /= YMixture_[0] + VSMALL;
-            YLiquid_ /= YMixture_[1] + VSMALL;
-            YSolid_ /= YMixture_[2] + VSMALL;
+            is >> mass0_ >> Y_;
         }
         else
         {
@@ -74,10 +70,7 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
                 reinterpret_cast<char*>(&mass0_),
               + sizeof(mass0_)
             );
-            is >> YMixture_ >> YGas_ >> YLiquid_ >> YSolid_;
-            YGas_ /= YMixture_[0] + VSMALL;
-            YLiquid_ /= YMixture_[1] + VSMALL;
-            YSolid_ /= YMixture_[2] + VSMALL;
+            is >> Y_;
         }
     }
 
@@ -85,25 +78,29 @@ Foam::ReactingParcel<ParcelType>::ReactingParcel
     is.check
     (
         "ReactingParcel<ParcelType>::ReactingParcel"
-        "(const Cloud<ParcelType>&, Istream&, bool)"
+        "("
+            "const Cloud<ParcelType>&, "
+            "Istream&, "
+            "bool"
+        ")"
     );
 }
 
 
 template<class ParcelType>
-void Foam::ReactingParcel<ParcelType>::readFields
-(
-    ReactingCloud<ParcelType>& c
-)
+void Foam::ReactingParcel<ParcelType>::readFields(Cloud<ParcelType>& cIn)
 {
-    if (!c.size())
+    if (!cIn.size())
     {
         return;
     }
 
+    ReactingCloud<ParcelType>& c =
+        dynamic_cast<ReactingCloud<ParcelType>&>(cIn);
+
     ThermoParcel<ParcelType>::readFields(c);
 
-    IOField<scalar> mass0(c.fieldIOobject("mass0"));
+    IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::MUST_READ));
     c.checkFieldIOobject(c, mass0);
 
     label i = 0;
@@ -114,71 +111,39 @@ void Foam::ReactingParcel<ParcelType>::readFields
     }
 
     // Get names and sizes for each Y...
-    const wordList compositionNames = c.composition().compositionNames();
-    const wordList gasNames = c.composition().gasNames();
-    const wordList liquidNames = c.composition().liquidNames();
-    const wordList solidNames = c.composition().solidNames();
-    const label nComposition = compositionNames.size();
-    const label nGas = gasNames.size();
-    const label nLiquid = liquidNames.size();
-    const label nSolid = solidNames.size();
+    const wordList& phaseTypes = c.composition().phaseTypes();
+    const label nPhases = phaseTypes.size();
+    wordList stateLabels(nPhases, "");
+    if (c.composition().nPhase() == 1)
+    {
+        stateLabels = c.composition().stateLabels();
+    }
+
 
     // Set storage for each Y... for each parcel
     forAllIter(typename Cloud<ParcelType>, c, iter)
     {
         ReactingParcel<ParcelType>& p = iter();
-        p.YMixture_.setSize(nComposition, 0.0);
-        p.YGas_.setSize(nGas, 0.0);
-        p.YLiquid_.setSize(nLiquid, 0.0);
-        p.YSolid_.setSize(nSolid, 0.0);
+        p.Y_.setSize(nPhases, 0.0);
     }
 
-    // Populate YMixture for each parcel
-    forAll(compositionNames, j)
+    // Populate Y for each parcel
+    forAll(phaseTypes, j)
     {
-        IOField<scalar> YMixture(c.fieldIOobject("Y" + compositionNames[j]));
+        IOField<scalar> Y
+        (
+            c.fieldIOobject
+            (
+                "Y" + phaseTypes[j] + stateLabels[j],
+                 IOobject::MUST_READ
+            )
+        );
 
         label i = 0;
         forAllIter(typename Cloud<ParcelType>, c, iter)
         {
             ReactingParcel<ParcelType>& p = iter();
-            p.YMixture_[j] = YMixture[i++];
-        }
-    }
-    // Populate YGas for each parcel
-    forAll(gasNames, j)
-    {
-        IOField<scalar> YGas(c.fieldIOobject("Y" + gasNames[j]));
-
-        label i = 0;
-        forAllIter(typename Cloud<ParcelType>, c, iter)
-        {
-            ReactingParcel<ParcelType>& p = iter();
-            p.YGas_[j] = YGas[i++]/p.YMixture_[0];
-        }
-    }
-    // Populate YLiquid for each parcel
-    forAll(liquidNames, j)
-    {
-        IOField<scalar> YLiquid(c.fieldIOobject("Y" + liquidNames[j]));
-
-        label i = 0;
-        forAllIter(typename Cloud<ParcelType>, c, iter)
-        {
-            ReactingParcel<ParcelType>& p = iter();
-            p.YLiquid_[j] = YLiquid[i++]/p.YMixture_[1];
-        }
-    }
-    // Populate YSolid for each parcel
-    forAll(solidNames, j)
-    {
-        IOField<scalar> YSolid(c.fieldIOobject("Y" + solidNames[j]));
-
-        label i = 0;
-        forAllIter(typename Cloud<ParcelType>, c, iter)
-        {
-            ReactingParcel<ParcelType>& p = iter();
-            p.YSolid_[j] = YSolid[i++]/p.YMixture_[2];
+            p.Y_[j] = Y[i++];
         }
     }
 }
@@ -187,85 +152,56 @@ void Foam::ReactingParcel<ParcelType>::readFields
 template<class ParcelType>
 void Foam::ReactingParcel<ParcelType>::writeFields
 (
-    const ReactingCloud<ParcelType>& c
+    const Cloud<ParcelType>& cIn
 )
 {
+    const ReactingCloud<ParcelType>& c =
+        dynamic_cast<const ReactingCloud<ParcelType>&>(cIn);
+
     ThermoParcel<ParcelType>::writeFields(c);
 
-    label np =  c.size();
+    const label np = c.size();
 
-    IOField<scalar> mass0(c.fieldIOobject("mass0"), np);
-
-    label i = 0;
-    forAllConstIter(typename Cloud<ParcelType>, c, iter)
-    {
-        const ReactingParcel<ParcelType>& p = iter();
-        mass0[i++] = p.mass0_;
-    }
-
-    mass0.write();
-
-    // Write the composition fractions
     if (np > 0)
     {
-        const wordList compositionNames = c.composition().compositionNames();
-        forAll(compositionNames, j)
+        IOField<scalar> mass0(c.fieldIOobject("mass0", IOobject::NO_READ), np);
+
+        label i = 0;
+        forAllConstIter(typename Cloud<ParcelType>, c, iter)
         {
-            IOField<scalar> YMixture
+            const ReactingParcel<ParcelType>& p = iter();
+            mass0[i++] = p.mass0_;
+        }
+        mass0.write();
+
+        // Write the composition fractions
+        const wordList& phaseTypes = c.composition().phaseTypes();
+        wordList stateLabels(phaseTypes.size(), "");
+        if (c.composition().nPhase() == 1)
+        {
+            stateLabels = c.composition().stateLabels();
+        }
+
+        forAll(phaseTypes, j)
+        {
+            IOField<scalar> Y
             (
-                c.fieldIOobject("Y" + compositionNames[j]), np
+                c.fieldIOobject
+                (
+                    "Y" + phaseTypes[j] + stateLabels[j],
+                    IOobject::NO_READ
+                ),
+                np
             );
 
             label i = 0;
             forAllConstIter(typename Cloud<ParcelType>, c, iter)
             {
                 const ReactingParcel<ParcelType>& p0 = iter();
-                YMixture[i++] = p0.YMixture()[j];
+                Y[i++] = p0.Y()[j];
             }
 
-            YMixture.write();
-        }
-        const wordList& gasNames = c.composition().gasNames();
-        forAll(gasNames, j)
-        {
-            IOField<scalar> YGas(c.fieldIOobject("Y" + gasNames[j]), np);
-
-            label i = 0;
-            forAllConstIter(typename Cloud<ParcelType>, c, iter)
-            {
-                const ReactingParcel<ParcelType>& p0 = iter();
-                YGas[i++] = p0.YGas()[j]*p0.YMixture()[0];
-            }
-
-            YGas.write();
-        }
-        const wordList& liquidNames = c.composition().liquidNames();
-        forAll(liquidNames, j)
-        {
-            IOField<scalar> YLiquid(c.fieldIOobject("Y" + liquidNames[j]), np);
-
-            label i = 0;
-            forAllConstIter(typename Cloud<ParcelType>, c, iter)
-            {
-                const ReactingParcel<ParcelType>& p0 = iter();
-                YLiquid[i++] = p0.YLiquid()[j]*p0.YMixture()[1];
-            }
-
-            YLiquid.write();
-        }
-        const wordList& solidNames = c.composition().solidNames();
-        forAll(solidNames, j)
-        {
-            IOField<scalar> YSolid(c.fieldIOobject("Y" + solidNames[j]), np);
-
-            label i = 0;
-            forAllConstIter(typename Cloud<ParcelType>, c, iter)
-            {
-                const ReactingParcel<ParcelType>& p0 = iter();
-                YSolid[i++] = p0.YSolid()[j]*p0.YMixture()[2];
-            }
-
-            YSolid.write();
+            Y.write();
         }
     }
 }
@@ -280,30 +216,21 @@ Foam::Ostream& Foam::operator<<
     const ReactingParcel<ParcelType>& p
 )
 {
-    scalarField YGasLoc = p.YGas()*p.YMixture()[0];
-    scalarField YLiquidLoc = p.YLiquid()*p.YMixture()[1];
-    scalarField YSolidLoc = p.YSolid()*p.YMixture()[2];
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const ThermoParcel<ParcelType>& >(p)
+        os  << static_cast<const ThermoParcel<ParcelType>&>(p)
             << token::SPACE << p.mass0()
-            << token::SPACE << p.YMixture()
-            << token::SPACE << YGasLoc
-            << token::SPACE << YLiquidLoc
-            << token::SPACE << YSolidLoc;
+            << token::SPACE << p.Y();
     }
     else
     {
-        os  << static_cast<const ThermoParcel<ParcelType>& >(p);
+        os  << static_cast<const ThermoParcel<ParcelType>&>(p);
         os.write
         (
-            reinterpret_cast<const char*>
-            (
-                &const_cast<ReactingParcel<ParcelType>&>(p).mass0()
-            ),
+            reinterpret_cast<const char*>(&p.mass0_),
             sizeof(p.mass0())
         );
-        os << p.YMixture() << YGasLoc << YLiquidLoc << YSolidLoc;
+        os  << p.Y();
     }
 
     // Check state of Ostream
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
index efcea2b3c..002f89083 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.C
@@ -25,126 +25,180 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ThermoParcel.H"
+#include "radiationConstants.H"
 
 // * * * * * * * * * * *  Protected Member Functions * * * * * * * * * * * * //
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ThermoParcel<ParcelType>::updateCellQuantities
+void Foam::ThermoParcel<ParcelType>::setCellValues
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    KinematicParcel<ParcelType>::updateCellQuantities(td, dt, celli);
+    KinematicParcel<ParcelType>::setCellValues(td, dt, cellI);
 
-    Tc_ = td.TInterp().interpolate(this->position(), celli);
-    cpc_ = td.cpInterp().interpolate(this->position(), celli);
+    cpc_ = td.cpInterp().interpolate(this->position(), cellI);
+
+    Tc_ = td.TInterp().interpolate(this->position(), cellI);
+
+    if (Tc_ < td.constProps().TMin())
+    {
+        WarningIn
+        (
+            "void Foam::ThermoParcel<ParcelType>::setCellValues"
+            "("
+                "TrackData&, "
+                "const scalar, "
+                "const label"
+            ")"
+        )   << "Limiting observed temperature in cell " << cellI << " to "
+            << td.constProps().TMin() <<  nl << endl;
+
+        Tc_ = td.constProps().TMin();
+    }
 }
 
 
 template<class ParcelType>
 template<class TrackData>
-void Foam::ThermoParcel<ParcelType>::calcCoupled
+void Foam::ThermoParcel<ParcelType>::cellValueSourceCorrection
 (
     TrackData& td,
     const scalar dt,
-    const label celli
+    const label cellI
 )
 {
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Define local properties at beginning of timestep
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    const vector U0 = this->U_;
-    const scalar mass0 = this->mass();
+    this->Uc_ += td.cloud().UTrans()[cellI]/this->massCell(cellI);
+
+    scalar cpMean = td.cpInterp().psi()[cellI];
+    Tc_ += td.cloud().hsTrans()[cellI]/(cpMean*this->massCell(cellI));
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ThermoParcel<ParcelType>::calcSurfaceValues
+(
+    TrackData& td,
+    const label cellI,
+    const scalar T,
+    scalar& Ts,
+    scalar& rhos,
+    scalar& mus,
+    scalar& Pr,
+    scalar& kappa
+) const
+{
+    // Surface temperature using two thirds rule
+    Ts = (2.0*T + Tc_)/3.0;
+
+    // Assuming thermo props vary linearly with T for small dT
+    scalar factor = td.TInterp().interpolate(this->position(), cellI)/Ts;
+    rhos = this->rhoc_*factor;
+    mus = td.muInterp().interpolate(this->position(), cellI)/factor;
+
+    Pr = td.constProps().Pr();
+    kappa = cpc_*mus/Pr;
+}
+
+
+template<class ParcelType>
+template<class TrackData>
+void Foam::ThermoParcel<ParcelType>::calc
+(
+    TrackData& td,
+    const scalar dt,
+    const label cellI
+)
+{
+    // Define local properties at beginning of time step
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     const scalar np0 = this->nParticle_;
-//    const scalar T0 = T_;
-//    const scalar cp0 = cp_;
+    const scalar d0 = this->d_;
+    const vector U0 = this->U_;
+    const scalar rho0 = this->rho_;
+    const scalar T0 = this->T_;
+    const scalar cp0 = this->cp_;
+    const scalar mass0 = this->mass();
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
+    // Calc surface values
+    // ~~~~~~~~~~~~~~~~~~~
+    scalar Ts, rhos, mus, Pr, kappa;
+    calcSurfaceValues(td, cellI, T0, Ts, rhos, mus, Pr, kappa);
+
+    // Reynolds number
+    scalar Re = this->Re(U0, d0, rhos, mus);
+
+
+    // Sources
+    // ~~~~~~~
+
+    // Explicit momentum source for particle
+    vector Su = vector::zero;
 
     // Momentum transfer from the particle to the carrier phase
     vector dUTrans = vector::zero;
 
-    // Enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = 0.0;
+    // Explicit enthalpy source for particle
+    scalar Sh = 0.0;
+
+    // Sensible enthalpy transfer from the particle to the carrier phase
+    scalar dhsTrans = 0.0;
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    const vector U1 = calcVelocity(td, dt, Cud, dUTrans);
+    // Heat transfer
+    // ~~~~~~~~~~~~~
+
+    // Sum Ni*Cpi*Wi of emission species
+    scalar NCpW = 0.0;
+
+    // Calculate new particle velocity
+    scalar T1 =
+        calcHeatTransfer
+        (
+            td,
+            dt,
+            cellI,
+            Re,
+            Pr,
+            kappa,
+            d0,
+            rho0,
+            T0,
+            cp0,
+            NCpW,
+            Sh,
+            dhsTrans
+        );
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
-    const scalar T1 = calcHeatTransfer(td, dt, celli, htc, dhTrans);
+    // Motion
+    // ~~~~~~
+
+    // Calculate new particle velocity
+    vector U1 =
+        calcVelocity(td, dt, cellI, Re, mus, d0, U0, rho0, mass0, Su, dUTrans);
 
 
-    // ~~~~~~~~~~~~~~~~~~~~~~~
-    // Accumulate source terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~
+    //  Accumulate carrier phase source terms
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    if (td.cloud().coupled())
+    {
+        // Update momentum transfer
+        td.cloud().UTrans()[cellI] += np0*dUTrans;
 
-    // Update momentum transfer
-    td.cloud().UTrans()[celli] += np0*dUTrans;
+        // Update sensible enthalpy transfer
+        td.cloud().hsTrans()[cellI] += np0*dhsTrans;
+    }
 
-    // Accumulate coefficient to be applied in carrier phase momentum coupling
-    td.cloud().UCoeff()[celli] += np0*mass0*Cud;
-
-    // Update enthalpy transfer
-    td.cloud().hTrans()[celli] += np0*dhTrans;
-
-    // Accumulate coefficient to be applied in carrier phase enthalpy coupling
-    td.cloud().hCoeff()[celli] += np0*htc*this->areaS();
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
     // Set new particle properties
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    this->U() = U1;
-    this->T() = T1;
-}
-
-
-template<class ParcelType>
-template<class TrackData>
-void Foam::ThermoParcel<ParcelType>::calcUncoupled
-(
-    TrackData& td,
-    const scalar dt,
-    const label celli
-)
-{
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Initialise transfer terms
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    // Momentum transfer from the particle to the carrier phase
-    vector dUTrans = vector::zero;
-
-    // Enthalpy transfer from the particle to the carrier phase
-    scalar dhTrans = 0.0;
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate velocity - update U
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar Cud = 0.0;
-    this->U_ = calcVelocity(td, dt, Cud, dUTrans);
-
-
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Calculate heat transfer - update T
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    scalar htc = 0.0;
-    T_ = calcHeatTransfer(td, dt, celli, htc, dhTrans);
+    this->U_ = U1;
+    T_ = T1;
 }
 
 
@@ -154,69 +208,78 @@ Foam::scalar Foam::ThermoParcel<ParcelType>::calcHeatTransfer
 (
     TrackData& td,
     const scalar dt,
-    const label celli,
-    scalar& htc,
-    scalar& dhTrans
+    const label cellI,
+    const scalar Re,
+    const scalar Pr,
+    const scalar kappa,
+    const scalar d,
+    const scalar rho,
+    const scalar T,
+    const scalar cp,
+    const scalar NCpW,
+    const scalar Sh,
+    scalar& dhsTrans
 )
 {
     if (!td.cloud().heatTransfer().active())
     {
-        htc = 0.0;
-        dhTrans = 0.0;
-        return T_;
+        return T;
     }
 
     // Calc heat transfer coefficient
-    htc = td.cloud().heatTransfer().h
-    (
-        this->d_,
-        this->U_ - this->Uc_,
-        this->rhoc_,
-        this->rho_,
-        cpc_,
-        cp_,
-        this->muc_
-    );
+    scalar htc = td.cloud().heatTransfer().htc(d, Re, Pr, kappa, NCpW);
 
-    // Determine ap and bp coefficients
-    scalar ap = Tc_;
-    scalar bp = htc;
+    if (mag(htc) < ROOTVSMALL && !td.cloud().radiation())
+    {
+        return max(T + dt*Sh/(this->volume(d)*rho*cp), td.constProps().TMin());
+    }
+
+    const scalar As = this->areaS(d);
+    scalar ap = Tc_ + Sh/As/htc;
+    scalar bp = 6.0*(Sh/As + htc*(Tc_ - T));
     if (td.cloud().radiation())
     {
-        // Carrier phase incident radiation field
-        // - The G field is not interpolated to the parcel position
-        //   Instead, the cell centre value is applied directly
-        const scalarField& G = td.cloud().mesh().objectRegistry
-            ::lookupObject<volScalarField>("G");
-
-        // Helper variables
+        const scalarField& G =
+            td.cloud().mesh().objectRegistry::lookupObject<volScalarField>("G");
+        const scalar Gc = G[cellI];
         const scalar sigma = radiation::sigmaSB.value();
         const scalar epsilon = td.constProps().epsilon0();
-        const scalar epsilonSigmaT3 = epsilon*sigma*pow3(T_);
-        ap = (htc*Tc_ + 0.25*epsilon*G[celli])/(htc + epsilonSigmaT3);
-        bp += epsilonSigmaT3;
+
+        ap = (ap + epsilon*Gc/(4.0*htc))/(1.0 + epsilon*sigma*pow3(T)/htc);
+        bp += 6.0*(epsilon*(Gc/4.0 - sigma*pow4(T)));
     }
-    bp *= 6.0/(this->rho_*this->d_*cp_);
+    bp /= rho*d*cp*(ap - T);
 
+    // Integrate to find the new parcel temperature
+    IntegrationScheme<scalar>::integrationResult Tres =
+        td.cloud().TIntegrator().integrate(T, dt, ap, bp);
 
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-    // Set new particle temperature
-    //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    scalar Tnew = max(Tres.value(), td.constProps().TMin());
 
-    scalar Tnew = td.cloud().TIntegrator().integrate(T_, dt, ap, bp);
-
-    dhTrans = -this->mass()*cp_*(Tnew - T_);
+    dhsTrans += dt*htc*As*(0.5*(T + Tnew) - Tc_);
 
     return Tnew;
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::ThermoParcel<ParcelType>::ThermoParcel
+(
+    const ThermoParcel<ParcelType>& p
+)
+:
+    KinematicParcel<ParcelType>(p),
+    T_(p.T_),
+    cp_(p.cp_),
+    Tc_(p.Tc_),
+    cpc_(p.cpc_)
+{}
 
 
-// * * * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * //
+// * * * * * * * * * * * * * * IOStream operators  * * * * * * * * * * * * * //
 
 #include "ThermoParcelIO.C"
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
index ec15d75ac..56baeeed4 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcel.H
@@ -72,7 +72,6 @@ class ThermoParcel
 :
     public KinematicParcel<ParcelType>
 {
-
 public:
 
     //- Class to hold thermo particle constant properties
@@ -86,6 +85,9 @@ public:
             //- Particle initial temperature [K]
             const scalar T0_;
 
+            //- Minimum temperature [K]
+            const scalar TMin_;
+
             //- Particle specific heat capacity [J/(kg.K)]
             const scalar cp0_;
 
@@ -95,29 +97,39 @@ public:
             //- Particle scattering factor [] (radiation)
             const scalar f0_;
 
+            //- Default carrier Prandtl number []
+            const scalar Pr_;
+
 
     public:
 
         // Constructors
-        constantProperties(const dictionary& dict);
+        constantProperties(const dictionary& parentDict);
 
         // Member functions
 
             // Access
 
-                //- Return const access to particle initial temperature [K]
+                //- Return const access to the particle initial temperature [K]
                 inline scalar T0() const;
 
-                //- Return const access to particle specific heat capacity
+                //- Return const access to minimum temperature [K]
+                inline scalar TMin() const;
+
+                //- Return const access to the particle specific heat capacity
                 //  [J/(kg.K)]
                 inline scalar cp0() const;
 
-                //- Return const access to Particle emissivity [] (radiation)
+                //- Return const access to the particle emissivity []
+                //  Active for radiation only
                 inline scalar epsilon0() const;
 
-                //- Return const access to Particle scattering factor []
-                //  (radiation)
+                //- Return const access to the particle scattering factor []
+                //  Active for radiation only
                 inline scalar f0() const;
+
+                //- Return const access to the default carrier Prandtl number []
+                inline scalar Pr() const;
     };
 
 
@@ -140,7 +152,7 @@ public:
                 //- Temperature field interpolator
                 const interpolation<scalar>& TInterp_;
 
-                //- Scpecific heat capacity field interpolator
+                //- Specific heat capacity field interpolator
                 const interpolation<scalar>& cpInterp_;
 
 
@@ -170,11 +182,11 @@ public:
             //- Return const access to the owner cloud
             inline const constantProperties& constProps() const;
 
-            //- Return conat access to the interpolator for continuous
+            //- Return const access to the interpolator for continuous
             //  phase temperature field
             inline const interpolation<scalar>& TInterp() const;
 
-            //- Return conat access to the interpolator for continuous
+            //- Return const access to the interpolator for continuous
             //  phase specific heat capacity field
             inline const interpolation<scalar>& cpInterp() const;
     };
@@ -193,7 +205,7 @@ protected:
             scalar cp_;
 
 
-        // Call-based quantities
+        // Cell-based quantities
 
             //- Temperature [K]
             scalar Tc_;
@@ -209,33 +221,56 @@ protected:
         scalar calcHeatTransfer
         (
             TrackData& td,
-            const scalar dt,
-            const label celli,
-            scalar& htc,
-            scalar& dhTrans
+            const scalar dt,           // timestep
+            const label cellI,         // owner cell
+            const scalar Re,           // Reynolds number
+            const scalar Pr,           // Prandtl number - surface
+            const scalar kappa,        // Thermal conductivity - surface
+            const scalar d,            // diameter
+            const scalar rho,          // density
+            const scalar T,            // temperature
+            const scalar cp,           // specific heat capacity
+            const scalar NCpW,         // Sum of N*Cp*W of emission species
+            const scalar Sh,           // explicit particle enthalpy source
+            scalar& dhsTrans           // sensible enthalpy transfer to carrier
         );
 
 
 public:
 
-    //- Runtime type information
-    TypeName("ThermoParcel");
+    // Static data members
+
+        //- String representation of properties
+        static string propHeader;
+
+        //- Runtime type information
+        TypeName("ThermoParcel");
+
 
     friend class Cloud<ParcelType>;
 
 
     // Constructors
 
+        //- Construct from owner, position, and cloud owner
+        //  Other properties initialised as null
+        inline ThermoParcel
+        (
+            ThermoCloud<ParcelType>& owner,
+            const vector& position,
+            const label cellI
+        );
+
         //- Construct from components
         inline ThermoParcel
         (
             ThermoCloud<ParcelType>& owner,
-            const label typeId,
             const vector& position,
-            const label celli,
+            const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector& U0,
-            const scalar nParticle0,
             const constantProperties& constProps
         );
 
@@ -247,10 +282,13 @@ public:
             bool readFields = true
         );
 
+        //- Construct as a copy
+        ThermoParcel(const ThermoParcel& p);
+
         //- Construct and return a clone
-        autoPtr<ParcelType> clone() const
+        autoPtr<ThermoParcel> clone() const
         {
-            return autoPtr<ParcelType>(new ThermoParcel<ParcelType>(*this));
+            return autoPtr<ThermoParcel>(new ThermoParcel(*this));
         }
 
 
@@ -276,39 +314,55 @@ public:
 
         // Main calculation loop
 
-            //- Update cell based quantities
+            //- Set cell values
             template<class TrackData>
-            void updateCellQuantities
+            void setCellValues
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
+                const label cellI
             );
 
-            //- Coupled calculation with the continuous phase
+            //- Correct cell values using latest transfer information
             template<class TrackData>
-            void calcCoupled
+            void cellValueSourceCorrection
             (
                 TrackData& td,
                 const scalar dt,
-                const label celli
+                const label cellI
             );
 
-            //- Uncoupled calculation with the continuous phase
+            //- Calculate surface thermo properties
             template<class TrackData>
-            void calcUncoupled
+            void calcSurfaceValues
+            (
+                TrackData& td,
+                const label cellI,
+                const scalar T,
+                scalar& Ts,
+                scalar& rhos,
+                scalar& mus,
+                scalar& Pr,
+                scalar& kappa
+            ) const;
+
+            //- Update parcel properties over the time interval
+            template<class TrackData>
+            void calc
             (
                 TrackData& td,
                 const scalar dt,
-                const label
+                const label cellI
             );
 
 
         // I-O
 
-            static void readFields(ThermoCloud<ParcelType>& c);
+            //- Read
+            static void readFields(Cloud<ParcelType>& c);
 
-            static void writeFields(const ThermoCloud<ParcelType>& c);
+            //- Write
+            static void writeFields(const Cloud<ParcelType>& c);
 
 
     // Ostream Operator
@@ -340,4 +394,3 @@ public:
 #endif
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
index 507a2d0ec..dd90c995e 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelI.H
@@ -29,14 +29,16 @@ License
 template<class ParcelType>
 inline Foam::ThermoParcel<ParcelType>::constantProperties::constantProperties
 (
-    const dictionary& dict
+    const dictionary& parentDict
 )
 :
-    KinematicParcel<ParcelType>::constantProperties(dict),
-    T0_(dimensionedScalar(dict.lookup("T0")).value()),
-    cp0_(dimensionedScalar(dict.lookup("cp0")).value()),
-    epsilon0_(dimensionedScalar(dict.lookup("epsilon0")).value()),
-    f0_(dimensionedScalar(dict.lookup("f0")).value())
+    KinematicParcel<ParcelType>::constantProperties(parentDict),
+    T0_(dimensionedScalar(this->dict().lookup("T0")).value()),
+    TMin_(dimensionedScalar(this->dict().lookup("TMin")).value()),
+    cp0_(dimensionedScalar(this->dict().lookup("cp0")).value()),
+    epsilon0_(dimensionedScalar(this->dict().lookup("epsilon0")).value()),
+    f0_(dimensionedScalar(this->dict().lookup("f0")).value()),
+    Pr_(dimensionedScalar(this->dict().lookup("Pr")).value())
 {}
 
 
@@ -73,24 +75,40 @@ template<class ParcelType>
 inline Foam::ThermoParcel<ParcelType>::ThermoParcel
 (
     ThermoCloud<ParcelType>& owner,
-    const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI
+)
+:
+    KinematicParcel<ParcelType>(owner, position, cellI),
+    T_(0.0),
+    cp_(0.0),
+    Tc_(0.0),
+    cpc_(0.0)
+{}
+
+
+template<class ParcelType>
+inline Foam::ThermoParcel<ParcelType>::ThermoParcel
+(
+    ThermoCloud<ParcelType>& owner,
+    const vector& position,
+    const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
     const constantProperties& constProps
 )
 :
     KinematicParcel<ParcelType>
     (
         owner,
-        typeId,
         position,
-        celli,
+        cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         constProps
     ),
     T_(constProps.T0()),
@@ -110,6 +128,14 @@ Foam::ThermoParcel<ParcelType>::constantProperties::T0() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar
+Foam::ThermoParcel<ParcelType>::constantProperties::TMin() const
+{
+    return TMin_;
+}
+
+
 template <class ParcelType>
 inline Foam::scalar
 Foam::ThermoParcel<ParcelType>::constantProperties::cp0() const
@@ -134,6 +160,14 @@ Foam::ThermoParcel<ParcelType>::constantProperties::f0() const
 }
 
 
+template <class ParcelType>
+inline Foam::scalar
+Foam::ThermoParcel<ParcelType>::constantProperties::Pr() const
+{
+    return Pr_;
+}
+
+
 // * * * * * * * * * * * trackData Member Functions  * * * * * * * * * * * * //
 
 template<class ParcelType>
@@ -178,16 +212,16 @@ inline Foam::scalar Foam::ThermoParcel<ParcelType>::T() const
 
 
 template<class ParcelType>
-inline Foam::scalar& Foam::ThermoParcel<ParcelType>::T()
+inline Foam::scalar Foam::ThermoParcel<ParcelType>::cp() const
 {
-    return T_;
+    return cp_;
 }
 
 
 template<class ParcelType>
-inline Foam::scalar Foam::ThermoParcel<ParcelType>::cp() const
+inline Foam::scalar& Foam::ThermoParcel<ParcelType>::T()
 {
-    return cp_;
+    return T_;
 }
 
 
diff --git a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
index ae3ae6152..69eb90f2d 100644
--- a/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
+++ b/src/lagrangian/intermediate/parcels/Templates/ThermoParcel/ThermoParcelIO.C
@@ -27,6 +27,15 @@ License
 #include "ThermoParcel.H"
 #include "IOstreams.H"
 
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template <class ParcelType>
+Foam::string Foam::ThermoParcel<ParcelType>::propHeader =
+    KinematicParcel<ParcelType>::propHeader
+  + " T"
+  + " cp";
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ParcelType>
@@ -70,10 +79,7 @@ Foam::ThermoParcel<ParcelType>::ThermoParcel
 
 
 template<class ParcelType>
-void Foam::ThermoParcel<ParcelType>::readFields
-(
-    ThermoCloud<ParcelType>& c
-)
+void Foam::ThermoParcel<ParcelType>::readFields(Cloud<ParcelType>& c)
 {
     if (!c.size())
     {
@@ -82,10 +88,10 @@ void Foam::ThermoParcel<ParcelType>::readFields
 
     KinematicParcel<ParcelType>::readFields(c);
 
-    IOField<scalar> T(c.fieldIOobject("T"));
+    IOField<scalar> T(c.fieldIOobject("T", IOobject::MUST_READ));
     c.checkFieldIOobject(c, T);
 
-    IOField<scalar> cp(c.fieldIOobject("cp"));
+    IOField<scalar> cp(c.fieldIOobject("cp", IOobject::MUST_READ));
     c.checkFieldIOobject(c, cp);
 
 
@@ -102,17 +108,14 @@ void Foam::ThermoParcel<ParcelType>::readFields
 
 
 template<class ParcelType>
-void Foam::ThermoParcel<ParcelType>::writeFields
-(
-    const ThermoCloud<ParcelType>& c
-)
+void Foam::ThermoParcel<ParcelType>::writeFields(const Cloud<ParcelType>& c)
 {
     KinematicParcel<ParcelType>::writeFields(c);
 
     label np =  c.size();
 
-    IOField<scalar> T(c.fieldIOobject("T"), np);
-    IOField<scalar> cp(c.fieldIOobject("cp"), np);
+    IOField<scalar> T(c.fieldIOobject("T", IOobject::NO_READ), np);
+    IOField<scalar> cp(c.fieldIOobject("cp", IOobject::NO_READ), np);
 
     label i = 0;
     forAllConstIter(typename Cloud<ParcelType>, c, iter)
@@ -140,19 +143,16 @@ Foam::Ostream& Foam::operator<<
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << static_cast<const KinematicParcel<ParcelType>& >(p)
+        os  << static_cast<const KinematicParcel<ParcelType>&>(p)
             << token::SPACE << p.T()
             << token::SPACE << p.cp();
     }
     else
     {
-        os  << static_cast<const KinematicParcel<ParcelType>& >(p);
+        os  << static_cast<const KinematicParcel<ParcelType>&>(p);
         os.write
         (
-            reinterpret_cast<const char*>
-            (
-                &const_cast<ThermoParcel<ParcelType>&>(p).T()
-            ),
+            reinterpret_cast<const char*>(&p.T_),
             sizeof(p.T()) + sizeof(p.cp())
         );
     }
diff --git a/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C
new file mode 100644
index 000000000..b6bb1e3ee
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.C
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "reactingParcel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(reactingParcel, 0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::reactingParcel::reactingParcel()
+{}
+
+
+// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
+
+Foam::reactingParcel::~reactingParcel()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/newFilter.C b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
similarity index 66%
rename from src/turbulenceModels/LES/LESfilters/LESfilter/newFilter.C
rename to src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
index 9daa4084c..487c857ee 100644
--- a/src/turbulenceModels/LES/LESfilters/LESfilter/newFilter.C
+++ b/src/lagrangian/intermediate/parcels/baseClasses/reactingParcel/reactingParcel.H
@@ -22,43 +22,51 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
+Class
+    Foam::basicReactingParcel
+
+Description
+    Base class for reacting parcel - simply used to set the contiguous flag
+
+SourceFiles
+    reactingParcel.C
+
 \*---------------------------------------------------------------------------*/
 
-#include "LESfilter.H"
+#ifndef reactingParcel_H
+#define reactingParcel_H
+
+#include "typeInfo.H"
+#include "contiguous.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+/*---------------------------------------------------------------------------*\
+                       Class reactingParcel Declaration
+\*---------------------------------------------------------------------------*/
 
-autoPtr<LESfilter> LESfilter::New
-(
-    const fvMesh& mesh,
-    const dictionary& LESfilterDict
-)
+class reactingParcel
 {
-    word LESfilterType
-    (
-        LESfilterDict.lookup("filter")
-    );
+public:
 
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(LESfilterType);
+    //- Run-time type information
+    TypeName("reactingParcel");
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESfilter::New(const fvMesh& mesh, dictionary LESfilterDict)"
-        )   << "Unknown LESfilter type " << LESfilterType << endl << endl
-            << "Valid LESfilter types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
+    //- Construct null
+    reactingParcel();
 
-    return autoPtr<LESfilter>(cstrIter()(mesh, LESfilterDict));
+    //- Destructor
+    virtual ~reactingParcel();
+};
+
+
+template<>
+inline bool contiguous<reactingParcel>()
+{
+    return false; // Derived classes include scalar lists/fields
 }
 
 
@@ -66,4 +74,8 @@ autoPtr<LESfilter> LESfilter::New
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
new file mode 100644
index 000000000..866e8b5bc
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.C
@@ -0,0 +1,120 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "BasicReactingMultiphaseParcel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ThermoType>
+Foam::BasicReactingMultiphaseParcel<ThermoType>::BasicReactingMultiphaseParcel
+(
+    ReactingMultiphaseCloud<BasicReactingMultiphaseParcel<ThermoType> >& owner,
+    const vector& position,
+    const label cellI
+)
+:
+    ReactingMultiphaseParcel<BasicReactingMultiphaseParcel<ThermoType> >
+    (
+        owner,
+        position,
+        cellI
+    )
+{}
+
+
+template<class ThermoType>
+Foam::BasicReactingMultiphaseParcel<ThermoType>::BasicReactingMultiphaseParcel
+(
+    ReactingMultiphaseCloud<BasicReactingMultiphaseParcel<ThermoType> >& owner,
+    const vector& position,
+    const label cellI,
+    const label typeId,
+    const scalar nParticle0,
+    const scalar d0,
+    const vector& U0,
+    const scalarField& YGas0,
+    const scalarField& YLiquid0,
+    const scalarField& YSolid0,
+    const scalarField& Y0,
+    const typename
+        ReactingMultiphaseParcel<BasicReactingMultiphaseParcel>::
+        constantProperties& constProps
+)
+:
+    ReactingMultiphaseParcel<BasicReactingMultiphaseParcel<ThermoType> >
+    (
+        owner,
+        position,
+        cellI,
+        typeId,
+        nParticle0,
+        d0,
+        U0,
+        YGas0,
+        YLiquid0,
+        YSolid0,
+        Y0,
+        constProps
+    )
+{}
+
+
+template<class ThermoType>
+Foam::BasicReactingMultiphaseParcel<ThermoType>::BasicReactingMultiphaseParcel
+(
+    const Cloud<BasicReactingMultiphaseParcel<ThermoType> >& cloud,
+    Istream& is,
+    bool readFields
+)
+:
+    ReactingMultiphaseParcel<BasicReactingMultiphaseParcel<ThermoType> >
+    (
+        cloud,
+        is,
+        readFields
+    )
+{}
+
+
+template<class ThermoType>
+Foam::BasicReactingMultiphaseParcel<ThermoType>::BasicReactingMultiphaseParcel
+(
+    const BasicReactingMultiphaseParcel<ThermoType>& p
+)
+:
+    ReactingMultiphaseParcel<BasicReactingMultiphaseParcel<ThermoType> >(p)
+{}
+
+
+// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
+
+template<class ThermoType>
+Foam::BasicReactingMultiphaseParcel<ThermoType>::
+~BasicReactingMultiphaseParcel()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
new file mode 100644
index 000000000..76d3edce3
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/BasicReactingMultiphaseParcel.H
@@ -0,0 +1,141 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::BasicReactingMultiphaseParcel
+
+Description
+
+
+SourceFiles
+    BasicReactingMultiphaseParcel.C
+    BasicReactingMultiphaseParcelIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef BasicReactingMultiphaseParcel_H
+#define BasicReactingMultiphaseParcel_H
+
+#include "ReactingMultiphaseParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+namespace Foam
+{
+
+// Forward declaration of classes
+template<class ThermoType>
+class BasicReactingMultiphaseParcel;
+
+/*---------------------------------------------------------------------------*\
+               Class BasicReactingMultiphaseParcel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ThermoType>
+class BasicReactingMultiphaseParcel
+:
+    public ReactingMultiphaseParcel<BasicReactingMultiphaseParcel<ThermoType> >
+{
+
+public:
+
+    //- The type of thermodynamics this parcel was instantiated for
+    typedef ThermoType thermoType;
+
+    //- Run-time type information
+    TypeName("BasicReactingMultiphaseParcel");
+
+    // Constructors
+
+        //- Construct from owner, position, and cloud owner
+        //  Other properties initialised as null
+        BasicReactingMultiphaseParcel
+        (
+             ReactingMultiphaseCloud<BasicReactingMultiphaseParcel>& owner,
+             const vector& position,
+             const label cellI
+        );
+
+        //- Construct from components
+        BasicReactingMultiphaseParcel
+        (
+             ReactingMultiphaseCloud<BasicReactingMultiphaseParcel>& owner,
+             const vector& position,
+             const label cellI,
+             const label typeId,
+             const scalar nParticle0,
+             const scalar d0,
+             const vector& U0,
+             const scalarField& YGas0,
+             const scalarField& YLiquid0,
+             const scalarField& YSolid0,
+             const scalarField& Y0,
+             const typename
+                ReactingMultiphaseParcel<BasicReactingMultiphaseParcel>::
+                constantProperties& constProps
+        );
+
+        //- Construct from Istream
+        BasicReactingMultiphaseParcel
+        (
+            const Cloud<BasicReactingMultiphaseParcel>& c,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Construct as a copy
+        BasicReactingMultiphaseParcel(const BasicReactingMultiphaseParcel& p);
+
+        //- Construct and return a clone
+        autoPtr<BasicReactingMultiphaseParcel> clone() const
+        {
+            return
+                autoPtr<BasicReactingMultiphaseParcel>
+                (
+                    new BasicReactingMultiphaseParcel(*this)
+                );
+        }
+
+
+    //- Destructor
+    virtual ~BasicReactingMultiphaseParcel();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "BasicReactingMultiphaseParcel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
new file mode 100644
index 000000000..24b7488d0
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/defineBasicReactingMultiphaseParcel.C
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "createReactingMultiphaseParcelTypes.H"
+#include "BasicReactingMultiphaseParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    createReactingMultiphaseParcelType(BasicReactingMultiphaseParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
new file mode 100644
index 000000000..524983c7a
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingMultiphaseParcel/makeBasicReactingMultiphaseParcelSubmodels.C
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "BasicReactingMultiphaseParcel.H"
+
+// Kinematic
+#include "makeReactingParcelDispersionModels.H"
+#include "makeReactingParcelDragModels.H"
+#include "makeReactingMultiphaseParcelInjectionModels.H" // MP variant
+#include "makeReactingParcelPatchInteractionModels.H"
+#include "makeReactingParcelPostProcessingModels.H"
+
+// Thermodynamic
+#include "makeReactingParcelHeatTransferModels.H"
+
+// Reacting
+#include "makeReactingMultiphaseParcelCompositionModels.H" // MP variant
+#include "makeReactingParcelPhaseChangeModels.H"
+
+// Reacting multiphase
+#include "makeReactingMultiphaseParcelDevolatilisationModels.H"
+#include "makeReactingMultiphaseParcelSurfaceReactionModels.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    // Kinematic sub-models
+    makeReactingDispersionModels(BasicReactingMultiphaseParcel);
+    makeReactingDragModels(BasicReactingMultiphaseParcel);
+    makeReactingMultiphaseInjectionModels(BasicReactingMultiphaseParcel);
+    makeReactingPatchInteractionModels(BasicReactingMultiphaseParcel);
+    makeReactingPostProcessingModels(BasicReactingMultiphaseParcel);
+
+    // Thermo sub-models
+    makeReactingHeatTransferModels(BasicReactingMultiphaseParcel);
+
+    // Reacting sub-models
+    makeReactingMultiphaseCompositionModels(BasicReactingMultiphaseParcel);
+    makeReactingPhaseChangeModels(BasicReactingMultiphaseParcel);
+
+    // Reacting multiphase sub-models
+    makeReactingMultiphaseDevolatilisationModels
+    (
+        BasicReactingMultiphaseParcel
+    );
+    makeReactingMultiphaseSurfaceReactionModels
+    (
+        BasicReactingMultiphaseParcel
+    );
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
new file mode 100644
index 000000000..fb05a0080
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.C
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "BasicReactingParcel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class ThermoType>
+Foam::BasicReactingParcel<ThermoType>::BasicReactingParcel
+(
+    ReactingCloud<BasicReactingParcel<ThermoType> >& owner,
+    const vector& position,
+    const label cellI
+)
+:
+    ReactingParcel<BasicReactingParcel<ThermoType> >(owner, position, cellI)
+{}
+
+
+template<class ThermoType>
+Foam::BasicReactingParcel<ThermoType>::BasicReactingParcel
+(
+    ReactingCloud<BasicReactingParcel<ThermoType> >& owner,
+    const vector& position,
+    const label cellI,
+    const label typeId,
+    const scalar nParticle0,
+    const scalar d0,
+    const vector& U0,
+    const scalarField& Y0,
+    const typename ReactingParcel<BasicReactingParcel<ThermoType> >::
+        constantProperties& constProps
+)
+:
+    ReactingParcel<BasicReactingParcel<ThermoType> >
+    (
+        owner,
+        position,
+        cellI,
+        typeId,
+        nParticle0,
+        d0,
+        U0,
+        Y0,
+        constProps
+    )
+{}
+
+
+template<class ThermoType>
+Foam::BasicReactingParcel<ThermoType>::BasicReactingParcel
+(
+    const Cloud<BasicReactingParcel<ThermoType> >& cloud,
+    Istream& is,
+    bool readFields
+)
+:
+    ReactingParcel<BasicReactingParcel<ThermoType> >(cloud, is, readFields)
+{}
+
+
+template<class ThermoType>
+Foam::BasicReactingParcel<ThermoType>::BasicReactingParcel
+(
+    const BasicReactingParcel<ThermoType>& p
+)
+:
+    ReactingParcel<BasicReactingParcel>(p)
+{}
+
+
+// * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
+
+template<class ThermoType>
+Foam::BasicReactingParcel<ThermoType>::~BasicReactingParcel()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
new file mode 100644
index 000000000..192d1cc1c
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/BasicReactingParcel.H
@@ -0,0 +1,136 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::BasicReactingParcel
+
+Description
+
+
+SourceFiles
+    BasicReactingParcel.C
+    BasicReactingParcelIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef BasicReactingParcel_H
+#define BasicReactingParcel_H
+
+#include "ReactingParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+template<class ThermoType>
+class BasicReactingParcel;
+
+/*---------------------------------------------------------------------------*\
+                    Class BasicReactingParcel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class ThermoType>
+class BasicReactingParcel
+:
+    public ReactingParcel<BasicReactingParcel<ThermoType> >
+{
+
+public:
+
+    //- The type of thermodynamics this parcel was instantiated for
+    typedef ThermoType thermoType;
+
+    //- Run-time type information
+    TypeName("BasicReactingParcel");
+
+    // Constructors
+
+        //- Construct from owner, position, and cloud owner
+        //  Other properties initialised as null
+        BasicReactingParcel
+        (
+            ReactingCloud<BasicReactingParcel>& owner,
+            const vector& position,
+            const label cellI
+        );
+
+        //- Construct from components
+        BasicReactingParcel
+        (
+            ReactingCloud<BasicReactingParcel>& owner,
+            const vector& position,
+            const label cellI,
+            const label typeId,
+            const scalar nParticle0,
+            const scalar d0,
+            const vector& U0,
+            const scalarField& Y0,
+            const typename ReactingParcel<BasicReactingParcel>::
+                constantProperties& constProps
+        );
+
+        //- Construct from Istream
+        BasicReactingParcel
+        (
+            const Cloud<BasicReactingParcel>& c,
+            Istream& is,
+            bool readFields = true
+        );
+
+        //- Construct as a copy
+        BasicReactingParcel(const BasicReactingParcel& p);
+
+        //- Construct and return a clone
+        autoPtr<BasicReactingParcel> clone() const
+        {
+            return
+                autoPtr<BasicReactingParcel>
+                (
+                    new BasicReactingParcel(*this)
+                );
+        }
+
+
+    //- Destructor
+    virtual ~BasicReactingParcel();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+    #include "BasicReactingParcel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/defineBasicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/defineBasicReactingParcel.C
new file mode 100644
index 000000000..5990df2d3
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/defineBasicReactingParcel.C
@@ -0,0 +1,38 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "createReactingParcelTypes.H"
+#include "BasicReactingParcel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    createReactingParcelType(BasicReactingParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C
new file mode 100644
index 000000000..8cdfe8e62
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/BasicReactingParcel/makeBasicReactingParcelSubmodels.C
@@ -0,0 +1,63 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "BasicReactingParcel.H"
+
+// Kinematic
+#include "makeReactingParcelDispersionModels.H"
+#include "makeReactingParcelDragModels.H"
+#include "makeReactingParcelInjectionModels.H"
+#include "makeReactingParcelPatchInteractionModels.H"
+#include "makeReactingParcelPostProcessingModels.H"
+
+// Thermodynamic
+#include "makeReactingParcelHeatTransferModels.H"
+
+// Reacting
+#include "makeReactingParcelCompositionModels.H"
+#include "makeReactingParcelPhaseChangeModels.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    // Kinematic sub-models
+    makeReactingDispersionModels(BasicReactingParcel);
+    makeReactingDragModels(BasicReactingParcel);
+    makeReactingInjectionModels(BasicReactingParcel);
+    makeReactingPatchInteractionModels(BasicReactingParcel);
+    makeReactingPostProcessingModels(BasicReactingParcel);
+
+    // Thermo sub-models
+    makeReactingHeatTransferModels(BasicReactingParcel);
+
+    // Reacting sub-models
+    makeReactingCompositionModels(BasicReactingParcel);
+    makeReactingPhaseChangeModels(BasicReactingParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
index ead08f7d6..49939f7c5 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.C
@@ -41,24 +41,35 @@ namespace Foam
 Foam::basicKinematicParcel::basicKinematicParcel
 (
     KinematicCloud<basicKinematicParcel>& owner,
-    const label typeId,
     const vector& position,
-    const label celli,
+    const label cellI
+)
+:
+    KinematicParcel<basicKinematicParcel>(owner, position, cellI)
+{}
+
+
+Foam::basicKinematicParcel::basicKinematicParcel
+(
+    KinematicCloud<basicKinematicParcel>& owner,
+    const vector& position,
+    const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector& U0,
-    const scalar nParticle0,
     const constantProperties& constProps
 )
 :
     KinematicParcel<basicKinematicParcel>
     (
         owner,
-        typeId,
         position,
-        celli,
+        cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         constProps
     )
 {}
@@ -75,6 +86,15 @@ Foam::basicKinematicParcel::basicKinematicParcel
 {}
 
 
+Foam::basicKinematicParcel::basicKinematicParcel
+(
+    const basicKinematicParcel& p
+)
+:
+    KinematicParcel<basicKinematicParcel>(p)
+{}
+
+
 // * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
 
 Foam::basicKinematicParcel::~basicKinematicParcel()
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
index 310ef2408..33f32b132 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/basicKinematicParcel.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class basicKinematicParcel Declaration
+                   Class basicKinematicParcel Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicKinematicParcel
@@ -60,16 +60,25 @@ public:
 
     // Constructors
 
+        //- Construct from owner, position, and cloud owner
+        //  Other properties initialised as null
+        basicKinematicParcel
+        (
+            KinematicCloud<basicKinematicParcel>& owner,
+            const vector& position,
+            const label cellI
+        );
+
         //- Construct from components
         basicKinematicParcel
         (
             KinematicCloud<basicKinematicParcel>& owner,
-            const label typeId,
             const vector& position,
-            const label celli,
+            const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector& U0,
-            const scalar nParticle0,
             const constantProperties& constProps
         );
 
@@ -81,17 +90,22 @@ public:
             bool readFields = true
         );
 
+        //- Construct as a copy
+        basicKinematicParcel(const basicKinematicParcel& p);
+
         //- Construct and return a clone
         autoPtr<basicKinematicParcel> clone() const
         {
-            return autoPtr<basicKinematicParcel>
-                (new basicKinematicParcel(*this));
+            return
+                autoPtr<basicKinematicParcel>
+                (
+                    new basicKinematicParcel(*this)
+                );
         }
 
 
     //- Destructor
-
-        virtual ~basicKinematicParcel();
+    virtual ~basicKinematicParcel();
 };
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
index 71fbe042a..1792245b0 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/defineBasicKinematicParcel.C
@@ -27,14 +27,13 @@ License
 #include "basicKinematicParcel.H"
 #include "KinematicCloud.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
-//    defineTemplateTypeNameAndDebug(IOPosition<basicKinematicParcel>, 0);
-
     defineTemplateTypeNameAndDebug(Cloud<basicKinematicParcel>, 0);
 
     defineParcelTypeNameAndDebug(KinematicCloud<basicKinematicParcel>, 0);
-//    defineTemplateTypeNameAndDebug(KinematicCloud<basicKinematicParcel>, 0);
 };
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C
deleted file mode 100644
index 105eae891..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDispersionModels.C
+++ /dev/null
@@ -1,65 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicKinematicParcel.H"
-#include "KinematicCloud.H"
-#include "NoDispersion.H"
-#include "GradientDispersionRAS.H"
-#include "StochasticDispersionRAS.H"
-
-namespace Foam
-{
-    makeDispersionModel(KinematicCloud<basicKinematicParcel>);
-
-    defineNamedTemplateTypeNameAndDebug
-    (
-        DispersionRASModel<KinematicCloud<basicKinematicParcel> >,
-        0
-    );
-
-    // Add instances of dispersion model to the table
-    makeDispersionModelType
-    (
-        NoDispersion,
-        KinematicCloud,
-        basicKinematicParcel
-    );
-    makeDispersionModelType
-    (
-        GradientDispersionRAS,
-        KinematicCloud,
-        basicKinematicParcel
-    );
-    makeDispersionModelType
-    (
-        StochasticDispersionRAS,
-        KinematicCloud,
-        basicKinematicParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C
deleted file mode 100644
index 3a7018513..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelDragModels.C
+++ /dev/null
@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicKinematicParcel.H"
-#include "KinematicCloud.H"
-#include "NoDrag.H"
-#include "SphereDrag.H"
-
-namespace Foam
-{
-    makeDragModel(KinematicCloud<basicKinematicParcel>);
-
-    // Add instances of drag model to the table
-    makeDragModelType(NoDrag, KinematicCloud, basicKinematicParcel);
-    makeDragModelType(SphereDrag, KinematicCloud, basicKinematicParcel);
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelHeatTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelHeatTransferModels.C
deleted file mode 100644
index 4a35cb609..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelHeatTransferModels.C
+++ /dev/null
@@ -1,45 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicKinematicParcel.H"
-#include "KinematicCloud.H"
-#include "NoHeatTransfer.H"
-
-namespace Foam
-{
-    makeHeatTransferModel(KinematicCloud<basicKinematicParcel>);
-
-    // Add instances of heat transfer model to the table
-    makeHeatTransferModelType
-    (
-        NoHeatTransfer,
-        KinematicCloud,
-        basicKinematicParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C
deleted file mode 100644
index 00d1595c6..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelInjectionModels.C
+++ /dev/null
@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicKinematicParcel.H"
-#include "KinematicCloud.H"
-#include "NoInjection.H"
-#include "ManualInjection.H"
-#include "ConeInjection.H"
-
-namespace Foam
-{
-    makeInjectionModel(KinematicCloud<basicKinematicParcel>);
-
-    // Add instances of injection model to the table
-    makeInjectionModelType
-    (
-        NoInjection,
-        KinematicCloud,
-        basicKinematicParcel
-    );
-    makeInjectionModelType
-    (
-        ManualInjection,
-        KinematicCloud,
-        basicKinematicParcel
-    );
-    makeInjectionModelType
-    (
-        ConeInjection,
-        KinematicCloud,
-        basicKinematicParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
new file mode 100644
index 000000000..7fad1d953
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelSubmodels.C
@@ -0,0 +1,49 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "basicKinematicParcel.H"
+
+// Kinematic
+#include "makeParcelDispersionModels.H"
+#include "makeParcelDragModels.H"
+#include "makeParcelInjectionModels.H"
+#include "makeParcelPatchInteractionModels.H"
+#include "makeParcelPostProcessingModels.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    // Kinematic sub-models
+    makeParcelDispersionModels(basicKinematicParcel);
+    makeParcelDragModels(basicKinematicParcel);
+    makeParcelInjectionModels(basicKinematicParcel);
+    makeParcelPatchInteractionModels(basicKinematicParcel);
+    makeParcelPostProcessingModels(basicKinematicParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C b/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C
deleted file mode 100644
index f0961e0f2..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicKinematicParcel/makeBasicKinematicParcelWallInteractionModels.C
+++ /dev/null
@@ -1,52 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicKinematicParcel.H"
-#include "KinematicCloud.H"
-#include "Rebound.H"
-#include "StandardWallInteraction.H"
-
-namespace Foam
-{
-    makeWallInteractionModel(KinematicCloud<basicKinematicParcel>);
-
-    // Add instances of wall interaction model to the table
-    makeWallInteractionModelType
-    (
-        Rebound,
-        KinematicCloud,
-        basicKinematicParcel
-    );
-    makeWallInteractionModelType
-    (
-        StandardWallInteraction,
-        KinematicCloud,
-        basicKinematicParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/defineBasicReactingParcel.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/defineBasicReactingParcel.C
deleted file mode 100644
index d2462dd12..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/defineBasicReactingParcel.C
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicReactingParcel.H"
-#include "ReactingCloud.H"
-
-namespace Foam
-{
-    defineTemplateTypeNameAndDebug(Cloud<basicReactingParcel>, 0);
-
-    defineParcelTypeNameAndDebug(KinematicParcel<basicReactingParcel>, 0);
-//    defineTemplateTypeNameAndDebug(KinematicParcel<basicReactingParcel>, 0);
-    defineParcelTypeNameAndDebug(ThermoParcel<basicReactingParcel>, 0);
-    defineTemplateTypeNameAndDebug(ThermoParcel<basicReactingParcel>, 0);
-    defineParcelTypeNameAndDebug(ReactingParcel<basicReactingParcel>, 0);
-    defineTemplateTypeNameAndDebug(ReactingParcel<basicReactingParcel>, 0);
-
-    defineParcelTypeNameAndDebug(KinematicCloud<basicReactingParcel>, 0);
-//    defineTemplateTypeNameAndDebug(KinematicCloud<basicReactingParcel>, 0);
-
-    defineParcelTypeNameAndDebug(ThermoCloud<basicReactingParcel>, 0);
-//    defineTemplateTypeNameAndDebug(ThermoCloud<basicReactingParcel>, 0);
-
-    defineParcelTypeNameAndDebug(ReactingCloud<basicReactingParcel>, 0);
-//    defineTemplateTypeNameAndDebug(ReactingCloud<basicReactingParcel>, 0);
-
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
deleted file mode 100644
index 99dea38ab..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelCompositionModels.C
+++ /dev/null
@@ -1,45 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicReactingParcel.H"
-#include "ReactingCloud.H"
-#include "SingleMixtureFraction.H"
-
-namespace Foam
-{
-    makeCompositionModel(ReactingCloud<basicReactingParcel>);
-
-    // Add instances of composition model to the table
-    makeCompositionModelType
-    (
-        SingleMixtureFraction,
-        ReactingCloud,
-        basicReactingParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C
deleted file mode 100644
index 3de5849ce..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDispersionModels.C
+++ /dev/null
@@ -1,65 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicReactingParcel.H"
-#include "KinematicCloud.H"
-#include "NoDispersion.H"
-#include "GradientDispersionRAS.H"
-#include "StochasticDispersionRAS.H"
-
-namespace Foam
-{
-    makeDispersionModel(KinematicCloud<basicReactingParcel>);
-
-    defineNamedTemplateTypeNameAndDebug
-    (
-        DispersionRASModel<KinematicCloud<basicReactingParcel> >,
-        0
-    );
-
-    // Add instances of dispersion model to the table
-    makeDispersionModelType
-    (
-        NoDispersion,
-        KinematicCloud,
-        basicReactingParcel
-    );
-    makeDispersionModelType
-    (
-        GradientDispersionRAS,
-        KinematicCloud,
-        basicReactingParcel
-    );
-    makeDispersionModelType
-    (
-        StochasticDispersionRAS,
-        KinematicCloud,
-        basicReactingParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C
deleted file mode 100644
index 69b6a443d..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelDragModels.C
+++ /dev/null
@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicReactingParcel.H"
-#include "KinematicCloud.H"
-#include "NoDrag.H"
-#include "SphereDrag.H"
-
-namespace Foam
-{
-    makeDragModel(KinematicCloud<basicReactingParcel>);
-
-    // Add instances of drag model to the table
-    makeDragModelType(NoDrag, KinematicCloud, basicReactingParcel);
-    makeDragModelType(SphereDrag, KinematicCloud, basicReactingParcel);
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C
deleted file mode 100644
index 33eb8b9dd..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelInjectionModels.C
+++ /dev/null
@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicReactingParcel.H"
-#include "ReactingCloud.H"
-#include "NoInjection.H"
-#include "ManualInjection.H"
-#include "ConeInjection.H"
-
-namespace Foam
-{
-    makeInjectionModel(KinematicCloud<basicReactingParcel>);
-
-    // Add instances of injection model to the table
-    makeInjectionModelType
-    (
-        NoInjection,
-        KinematicCloud,
-        basicReactingParcel
-    );
-    makeInjectionModelType
-    (
-        ManualInjection,
-        KinematicCloud,
-        basicReactingParcel
-    );
-    makeInjectionModelType
-    (
-        ConeInjection,
-        KinematicCloud,
-        basicReactingParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelMassTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelMassTransferModels.C
deleted file mode 100644
index 05ede86f6..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelMassTransferModels.C
+++ /dev/null
@@ -1,59 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicReactingParcel.H"
-#include "ThermoCloud.H"
-#include "NoMassTransfer.H"
-#include "ConstantRateDevolatilisation.H"
-#include "SingleKineticRateDevolatilisation.H"
-
-namespace Foam
-{
-    makeMassTransferModel(ReactingCloud<basicReactingParcel>);
-
-    // Add instances of mass transfer model to the table
-    makeMassTransferModelType
-    (
-        NoMassTransfer,
-        ReactingCloud,
-        basicReactingParcel
-    );
-    makeMassTransferModelType
-    (
-        ConstantRateDevolatilisation,
-        ReactingCloud,
-        basicReactingParcel
-    );
-    makeMassTransferModelType
-    (
-        SingleKineticRateDevolatilisation,
-        ReactingCloud,
-        basicReactingParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C b/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C
deleted file mode 100644
index ec8c9c2f3..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicReactingParcel/makeBasicReactingParcelWallInteractionModels.C
+++ /dev/null
@@ -1,53 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicReactingParcel.H"
-#include "KinematicCloud.H"
-#include "Rebound.H"
-#include "StandardWallInteraction.H"
-
-namespace Foam
-{
-    makeWallInteractionModel(KinematicCloud<basicReactingParcel>);
-//    makeWallInteractionModel(ReactingCloud<basicReactingParcel>);
-
-    // Add instances of wall interaction model to the table
-    makeWallInteractionModelType
-    (
-        Rebound,
-        KinematicCloud,
-        basicReactingParcel
-    );
-    makeWallInteractionModelType
-    (
-        StandardWallInteraction,
-        KinematicCloud,
-        basicReactingParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
index e6c620acc..eb6754198 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.C
@@ -41,24 +41,35 @@ namespace Foam
 Foam::basicThermoParcel::basicThermoParcel
 (
     ThermoCloud<basicThermoParcel>& owner,
-    const label typeId,
     const vector position,
-    const label celli,
+    const label cellI
+)
+:
+    ThermoParcel<basicThermoParcel>(owner, position, cellI)
+{}
+
+
+Foam::basicThermoParcel::basicThermoParcel
+(
+    ThermoCloud<basicThermoParcel>& owner,
+    const vector position,
+    const label cellI,
+    const label typeId,
+    const scalar nParticle0,
     const scalar d0,
     const vector U0,
-    const scalar nParticle0,
     const constantProperties& constProps
 )
 :
     ThermoParcel<basicThermoParcel>
     (
         owner,
-        typeId,
         position,
-        celli,
+        cellI,
+        typeId,
+        nParticle0,
         d0,
         U0,
-        nParticle0,
         constProps
     )
 {}
@@ -75,6 +86,15 @@ Foam::basicThermoParcel::basicThermoParcel
 {}
 
 
+Foam::basicThermoParcel::basicThermoParcel
+(
+    const basicThermoParcel& p
+)
+:
+    ThermoParcel<basicThermoParcel>(p)
+{}
+
+
 // * * * * * * * * * * * * * * * *  Destructors  * * * * * * * * * * * * * * //
 
 Foam::basicThermoParcel::~basicThermoParcel()
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
index bbad7573f..f51859002 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/basicThermoParcel.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                         Class basicThermoParcel Declaration
+                      Class basicThermoParcel Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicThermoParcel
@@ -59,16 +59,25 @@ public:
 
     // Constructors
 
+       //- Construct from owner, position, and cloud owner
+       //  Other properties initialised as null
+       basicThermoParcel
+       (
+            ThermoCloud<basicThermoParcel>& owner,
+            const vector position,
+            const label cellI
+       );
+
        //- Construct from components
        basicThermoParcel
        (
             ThermoCloud<basicThermoParcel>& owner,
-            const label typeId,
             const vector position,
-            const label celli,
+            const label cellI,
+            const label typeId,
+            const scalar nParticle0,
             const scalar d0,
             const vector U0,
-            const scalar nParticle0,
             const constantProperties& constProps
         );
 
@@ -80,16 +89,22 @@ public:
             bool readFields = true
         );
 
+        //- Construct as a copy
+        basicThermoParcel(const basicThermoParcel& p);
+
         //- Construct and return a clone
         autoPtr<basicThermoParcel> clone() const
         {
-            return autoPtr<basicThermoParcel>(new basicThermoParcel(*this));
+            return
+                autoPtr<basicThermoParcel>
+                (
+                    new basicThermoParcel(*this)
+                );
         }
 
 
-    // Destructors
-
-        virtual ~basicThermoParcel();
+    //- Destructor
+    virtual ~basicThermoParcel();
 };
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
index a6ee459d8..624b02047 100644
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/defineBasicThermoParcel.C
@@ -27,20 +27,19 @@ License
 #include "basicThermoParcel.H"
 #include "ThermoCloud.H"
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 namespace Foam
 {
     defineTemplateTypeNameAndDebug(Cloud<basicThermoParcel>, 0);
 
     defineParcelTypeNameAndDebug(KinematicParcel<basicThermoParcel>, 0);
-//    defineTemplateTypeNameAndDebug(KinematicParcel<basicThermoParcel>, 0);
     defineParcelTypeNameAndDebug(ThermoParcel<basicThermoParcel>, 0);
     defineTemplateTypeNameAndDebug(ThermoParcel<basicThermoParcel>, 0);
 
     defineParcelTypeNameAndDebug(KinematicCloud<basicThermoParcel>, 0);
-//    defineTemplateTypeNameAndDebug(KinematicCloud<basicThermoParcel>, 0);
 
     defineParcelTypeNameAndDebug(ThermoCloud<basicThermoParcel>, 0);
-//    defineTemplateTypeNameAndDebug(ThermoCloud<basicThermoParcel>, 0);
 };
 
 
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDispersionModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDispersionModels.C
deleted file mode 100644
index 0bdfff748..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDispersionModels.C
+++ /dev/null
@@ -1,65 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicThermoParcel.H"
-#include "KinematicCloud.H"
-#include "NoDispersion.H"
-#include "GradientDispersionRAS.H"
-#include "StochasticDispersionRAS.H"
-
-namespace Foam
-{
-    makeDispersionModel(KinematicCloud<basicThermoParcel>);
-
-    defineNamedTemplateTypeNameAndDebug
-    (
-        DispersionRASModel<KinematicCloud<basicThermoParcel> >,
-        0
-    );
-
-    // Add instances of dispersion model to the table
-    makeDispersionModelType
-    (
-        NoDispersion,
-        KinematicCloud,
-        basicThermoParcel
-    );
-    makeDispersionModelType
-    (
-        GradientDispersionRAS,
-        KinematicCloud,
-        basicThermoParcel
-    );
-    makeDispersionModelType
-    (
-        StochasticDispersionRAS,
-        KinematicCloud,
-        basicThermoParcel
-    );
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDragModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDragModels.C
deleted file mode 100644
index 1cd627b72..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelDragModels.C
+++ /dev/null
@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicThermoParcel.H"
-#include "KinematicCloud.H"
-#include "NoDrag.H"
-#include "SphereDrag.H"
-
-namespace Foam
-{
-    makeDragModel(KinematicCloud<basicThermoParcel>);
-
-    // Add instances of drag model to the table
-    makeDragModelType(NoDrag, KinematicCloud, basicThermoParcel);
-    makeDragModelType(SphereDrag, KinematicCloud, basicThermoParcel);
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelHeatTransferModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelHeatTransferModels.C
deleted file mode 100644
index 4ea344133..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelHeatTransferModels.C
+++ /dev/null
@@ -1,42 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicThermoParcel.H"
-#include "ThermoCloud.H"
-#include "NoHeatTransfer.H"
-#include "RanzMarshall.H"
-
-namespace Foam
-{
-    makeHeatTransferModel(ThermoCloud<basicThermoParcel>);
-
-    // Add instances of heat transfer model to the table
-    makeHeatTransferModelType(NoHeatTransfer, ThermoCloud, basicThermoParcel);
-    makeHeatTransferModelType(RanzMarshall, ThermoCloud, basicThermoParcel);
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelInjectionModels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelInjectionModels.C
deleted file mode 100644
index 2ae4dc3ee..000000000
--- a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelInjectionModels.C
+++ /dev/null
@@ -1,46 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "basicThermoParcel.H"
-#include "ThermoCloud.H"
-#include "NoInjection.H"
-#include "ManualInjection.H"
-#include "ConeInjection.H"
-
-namespace Foam
-{
-    makeInjectionModel(KinematicCloud<basicThermoParcel>);
-
-    // Add instances of injection model to the table
-    makeInjectionModelType(NoInjection, KinematicCloud, basicThermoParcel);
-
-    makeInjectionModelType(ManualInjection, KinematicCloud, basicThermoParcel);
-
-    makeInjectionModelType(ConeInjection, KinematicCloud, basicThermoParcel);
-};
-
-
-// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
new file mode 100644
index 000000000..1412c5430
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/derived/basicThermoParcel/makeBasicThermoParcelSubmodels.C
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "basicThermoParcel.H"
+
+// Kinematic
+#include "makeParcelDispersionModels.H"
+#include "makeParcelDragModels.H"
+#include "makeParcelInjectionModels.H"
+#include "makeParcelPatchInteractionModels.H"
+#include "makeParcelPostProcessingModels.H"
+
+// Thermodynamic
+#include "makeParcelHeatTransferModels.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    // Kinematic sub-models
+    makeParcelDispersionModels(basicThermoParcel);
+    makeParcelDragModels(basicThermoParcel);
+    makeParcelInjectionModels(basicThermoParcel);
+    makeParcelPatchInteractionModels(basicThermoParcel);
+    makeParcelPostProcessingModels(basicThermoParcel);
+
+    // Thermo sub-models
+    makeParcelHeatTransferModels(basicThermoParcel);
+};
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H b/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H
new file mode 100644
index 000000000..36ac87cea
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/createReactingMultiphaseParcelTypes.H
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef createReactingMultiphaseParcelTypes_H
+#define createReactingMultiphaseParcelTypes_H
+
+#include "thermoPhysicsTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define createReactingMultiphaseParcelType(ParcelType)                        \
+                                                                              \
+    createReactingMultiphaseParcelThermoType                                  \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+    createReactingMultiphaseParcelThermoType                                  \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+    createReactingMultiphaseParcelThermoType                                  \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define createReactingMultiphaseParcelThermoType(ParcelType, ThermoType)      \
+                                                                              \
+    typedef ParcelType<ThermoType> ParcelType##ThermoType;                    \
+                                                                              \
+    defineTemplateTypeNameAndDebug(ParcelType##ThermoType, 0);                \
+    defineTemplateTypeNameAndDebug(Particle<ParcelType##ThermoType>, 0);      \
+    defineTemplateTypeNameAndDebug(Cloud<ParcelType##ThermoType>, 0);         \
+                                                                              \
+    defineParcelTypeNameAndDebug(KinematicParcel<ParcelType##ThermoType>, 0); \
+    defineTemplateTypeNameAndDebug                                            \
+    (                                                                         \
+        KinematicParcel<ParcelType##ThermoType>,                              \
+        0                                                                     \
+    );                                                                        \
+    defineParcelTypeNameAndDebug(ThermoParcel<ParcelType##ThermoType>, 0);    \
+    defineTemplateTypeNameAndDebug(ThermoParcel<ParcelType##ThermoType>, 0);  \
+    defineParcelTypeNameAndDebug(ReactingParcel<ParcelType##ThermoType>, 0);  \
+    defineTemplateTypeNameAndDebug(ReactingParcel<ParcelType##ThermoType>, 0);\
+    defineParcelTypeNameAndDebug                                              \
+    (                                                                         \
+        ReactingMultiphaseParcel<ParcelType##ThermoType>,                     \
+        0                                                                     \
+    );                                                                        \
+    defineTemplateTypeNameAndDebug                                            \
+    (                                                                         \
+        ReactingMultiphaseParcel<ParcelType##ThermoType>,                     \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    defineParcelTypeNameAndDebug(KinematicCloud<ParcelType##ThermoType>, 0);  \
+    defineParcelTypeNameAndDebug(ThermoCloud<ParcelType##ThermoType>, 0);     \
+    defineParcelTypeNameAndDebug(ReactingCloud<ParcelType##ThermoType>, 0);   \
+    defineParcelTypeNameAndDebug                                              \
+    (                                                                         \
+        ReactingMultiphaseCloud<ParcelType##ThermoType>,                      \
+        0                                                                     \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H b/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H
new file mode 100644
index 000000000..e90d3d8cc
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/createReactingParcelTypes.H
@@ -0,0 +1,69 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef createReactingParcelTypes_H
+#define createReactingParcelTypes_H
+
+#include "thermoPhysicsTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define createReactingParcelType(ParcelType)                                  \
+                                                                              \
+    createReactingParcelThermoType(ParcelType, constGasThermoPhysics);        \
+    createReactingParcelThermoType(ParcelType, gasThermoPhysics);             \
+    createReactingParcelThermoType(ParcelType, icoPoly8ThermoPhysics);
+
+
+#define createReactingParcelThermoType(ParcelType, ThermoType)                \
+                                                                              \
+    typedef ParcelType<ThermoType> ParcelType##ThermoType;                    \
+                                                                              \
+    defineTemplateTypeNameAndDebug(ParcelType##ThermoType, 0);                \
+    defineTemplateTypeNameAndDebug(Particle<ParcelType##ThermoType>, 0);      \
+    defineTemplateTypeNameAndDebug(Cloud<ParcelType##ThermoType>, 0);         \
+                                                                              \
+    defineParcelTypeNameAndDebug(KinematicParcel<ParcelType##ThermoType>, 0); \
+    defineTemplateTypeNameAndDebug                                            \
+    (                                                                         \
+        KinematicParcel<ParcelType##ThermoType>,                              \
+        0                                                                     \
+    );                                                                        \
+    defineParcelTypeNameAndDebug(ThermoParcel<ParcelType##ThermoType>, 0);    \
+    defineTemplateTypeNameAndDebug(ThermoParcel<ParcelType##ThermoType>, 0);  \
+    defineParcelTypeNameAndDebug(ReactingParcel<ParcelType##ThermoType>, 0);  \
+    defineTemplateTypeNameAndDebug(ReactingParcel<ParcelType##ThermoType>, 0);\
+                                                                              \
+    defineParcelTypeNameAndDebug(KinematicCloud<ParcelType##ThermoType>, 0);  \
+    defineParcelTypeNameAndDebug(ThermoCloud<ParcelType##ThermoType>, 0);     \
+    defineParcelTypeNameAndDebug(ReactingCloud<ParcelType##ThermoType>, 0);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
new file mode 100644
index 000000000..b5adf8e92
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelDispersionModels.H
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeParcelDispersionModels_h
+#define makeParcelDispersionModels_h
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "KinematicCloud.H"
+
+#include "NoDispersion.H"
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeParcelDispersionModels(ParcelType)                                \
+                                                                              \
+    makeDispersionModel(KinematicCloud<ParcelType>);                          \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        DispersionRASModel<KinematicCloud<ParcelType> >,                      \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    makeDispersionModelType                                                   \
+    (                                                                         \
+        NoDispersion,                                                         \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makeDispersionModelType                                                   \
+    (                                                                         \
+        GradientDispersionRAS,                                                \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makeDispersionModelType                                                   \
+    (                                                                         \
+        StochasticDispersionRAS,                                              \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H
new file mode 100644
index 000000000..ddb1f8c4b
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelDragModels.H
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeParcelDragModels_H
+#define makeParcelDragModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "KinematicCloud.H"
+
+#include "NoDrag.H"
+#include "SphereDrag.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeParcelDragModels(ParcelType)                                     \
+                                                                             \
+    makeDragModel(KinematicCloud<ParcelType>);                               \
+                                                                             \
+    makeDragModelType(NoDrag, KinematicCloud, ParcelType);                   \
+    makeDragModelType(SphereDrag, KinematicCloud, ParcelType);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
new file mode 100644
index 000000000..c86ef180d
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelHeatTransferModels.H
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeParcelHeatTransferModels_H
+#define makeParcelHeatTransferModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "ThermoCloud.H"
+
+#include "NoHeatTransfer.H"
+#include "RanzMarshall.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeParcelHeatTransferModels(ParcelType)                              \
+                                                                              \
+    makeHeatTransferModel(ThermoCloud<ParcelType>);                           \
+                                                                              \
+    makeHeatTransferModelType                                                 \
+    (                                                                         \
+        NoHeatTransfer,                                                       \
+        ThermoCloud,                                                          \
+        ParcelType                                                            \
+    );                                                                        \
+    makeHeatTransferModelType                                                 \
+    (                                                                         \
+        RanzMarshall,                                                         \
+        ThermoCloud,                                                          \
+        ParcelType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
new file mode 100644
index 000000000..61a2d3531
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelInjectionModels.H
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeParcelInjectionModels_H
+#define makeParcelInjectionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "KinematicCloud.H"
+
+#include "ConeInjection.H"
+#include "ConeInjectionMP.H"
+#include "FieldActivatedInjection.H"
+#include "KinematicLookupTableInjection.H"
+#include "ManualInjection.H"
+#include "NoInjection.H"
+#include "PatchInjection.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeParcelInjectionModels(ParcelType)                                 \
+                                                                              \
+    makeInjectionModel(KinematicCloud<ParcelType>);                           \
+                                                                              \
+    makeInjectionModelType                                                    \
+    (                                                                         \
+        ConeInjection,                                                        \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makeInjectionModelType                                                    \
+    (                                                                         \
+        ConeInjectionMP,                                                      \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makeInjectionModelType                                                    \
+    (                                                                         \
+        FieldActivatedInjection,                                              \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makeInjectionModelType                                                    \
+    (                                                                         \
+        KinematicLookupTableInjection,                                        \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makeInjectionModelType                                                    \
+    (                                                                         \
+        ManualInjection,                                                      \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makeInjectionModelType                                                    \
+    (                                                                         \
+        NoInjection,                                                          \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makeInjectionModelType                                                    \
+    (                                                                         \
+        PatchInjection,                                                       \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
new file mode 100644
index 000000000..a37d7c235
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelPatchInteractionModels.H
@@ -0,0 +1,68 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeParcelPatchInteractionModels_H
+#define makeParcelPatchInteractionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "KinematicCloud.H"
+
+#include "LocalInteraction.H"
+#include "Rebound.H"
+#include "StandardWallInteraction.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeParcelPatchInteractionModels(ParcelType)                          \
+                                                                              \
+    makePatchInteractionModel(KinematicCloud<ParcelType>);                    \
+                                                                              \
+    makePatchInteractionModelType                                             \
+    (                                                                         \
+        LocalInteraction,                                                     \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makePatchInteractionModelType                                             \
+    (                                                                         \
+        Rebound,                                                              \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makePatchInteractionModelType                                             \
+    (                                                                         \
+        StandardWallInteraction,                                              \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H b/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
new file mode 100644
index 000000000..d561c57bd
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeParcelPostProcessingModels.H
@@ -0,0 +1,61 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeParcelPostProcessingModels_H
+#define makeParcelPostProcessingModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "KinematicCloud.H"
+
+#include "NoPostProcessing.H"
+#include "PatchPostProcessing.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeParcelPostProcessingModels(ParcelType)                            \
+                                                                              \
+    makePostProcessingModel(KinematicCloud<ParcelType>);                      \
+                                                                              \
+    makePostProcessingModelType                                               \
+    (                                                                         \
+        NoPostProcessing,                                                     \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );                                                                        \
+    makePostProcessingModelType                                               \
+    (                                                                         \
+        PatchPostProcessing,                                                  \
+        KinematicCloud,                                                       \
+        ParcelType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
new file mode 100644
index 000000000..044a7d302
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelCompositionModels.H
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingMultiphaseParcelCompositionModels_H
+#define makeReactingMultiphaseParcelCompositionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "ReactingCloud.H"
+
+#include "SingleMixtureFraction.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingMultiphaseCompositionModels(ParcelType)                   \
+                                                                              \
+    makeReactingMultiphaseCompositionModelThermoType                          \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+    makeReactingMultiphaseCompositionModelThermoType                          \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+    makeReactingMultiphaseCompositionModelThermoType                          \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingMultiphaseCompositionModelThermoType(ParcelType, ThermoType)\
+                                                                              \
+    makeCompositionModel(ReactingCloud<ParcelType<ThermoType> >);             \
+                                                                              \
+    makeCompositionModelThermoType                                            \
+    (                                                                         \
+        SingleMixtureFraction,                                                \
+        ReactingCloud,                                                        \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
new file mode 100644
index 000000000..45e7e8c9b
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelDevolatilisationModels.H
@@ -0,0 +1,94 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingMultiphaseParcelDevolatilisationModels_H
+#define makeReactingMultiphaseParcelDevolatilisationModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "ReactingMultiphaseCloud.H"
+
+#include "ConstantRateDevolatilisation.H"
+#include "NoDevolatilisation.H"
+#include "SingleKineticRateDevolatilisation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingMultiphaseDevolatilisationModels(ParcelType)              \
+                                                                              \
+    makeReactingMultiphaseDevolatilisationModelThermoType                     \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+    makeReactingMultiphaseDevolatilisationModelThermoType                     \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+    makeReactingMultiphaseDevolatilisationModelThermoType                     \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingMultiphaseDevolatilisationModelThermoType(ParcelType, ThermoType)\
+                                                                              \
+    makeDevolatilisationModel                                                 \
+    (                                                                         \
+        ReactingMultiphaseCloud<ParcelType<ThermoType> >                      \
+    );                                                                        \
+                                                                              \
+    makeDevolatilisationModelThermoType                                       \
+    (                                                                         \
+        ConstantRateDevolatilisation,                                         \
+        ReactingMultiphaseCloud,                                              \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeDevolatilisationModelThermoType                                       \
+    (                                                                         \
+        NoDevolatilisation,                                                   \
+        ReactingMultiphaseCloud,                                              \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeDevolatilisationModelThermoType                                       \
+    (                                                                         \
+        SingleKineticRateDevolatilisation,                                    \
+        ReactingMultiphaseCloud,                                              \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
new file mode 100644
index 000000000..43624d170
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelInjectionModels.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingMultiphaseParcelInjectionModels_H
+#define makeReactingMultiphaseParcelInjectionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "KinematicCloud.H"
+
+#include "ConeInjection.H"
+#include "ConeInjectionMP.H"
+#include "FieldActivatedInjection.H"
+#include "ManualInjection.H"
+#include "NoInjection.H"
+#include "PatchInjection.H"
+#include "ReactingMultiphaseLookupTableInjection.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingMultiphaseInjectionModels(ParcelType)                     \
+                                                                              \
+    makeReactingMultiphaseInjectionModelThermoType                            \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+                                                                              \
+    makeReactingMultiphaseInjectionModelThermoType                            \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+                                                                              \
+    makeReactingMultiphaseInjectionModelThermoType                            \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingMultiphaseInjectionModelThermoType(ParcelType, ThermoType)\
+                                                                              \
+    makeInjectionModel(KinematicCloud<ParcelType<ThermoType> >);              \
+                                                                              \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        ConeInjection,                                                        \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        ConeInjectionMP,                                                      \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        FieldActivatedInjection,                                              \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        ManualInjection,                                                      \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        NoInjection,                                                          \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        PatchInjection,                                                       \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        ReactingMultiphaseLookupTableInjection,                               \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
new file mode 100644
index 000000000..d9d7500f5
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingMultiphaseParcelSurfaceReactionModels.H
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingMultiphaseParcelSurfaceReactionModels_H
+#define makeReactingMultiphaseParcelSurfaceReactionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "ReactingMultiphaseCloud.H"
+
+#include "NoSurfaceReaction.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingMultiphaseSurfaceReactionModels(ParcelType)               \
+                                                                              \
+    makeReactingMultiphaseSurfaceReactionModelThermoType                      \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+    makeReactingMultiphaseSurfaceReactionModelThermoType                      \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+    makeReactingMultiphaseSurfaceReactionModelThermoType                      \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingMultiphaseSurfaceReactionModelThermoType(ParcelType, ThermoType)\
+                                                                              \
+    makeSurfaceReactionModel                                                  \
+    (                                                                         \
+        ReactingMultiphaseCloud<ParcelType<ThermoType> >                      \
+    );                                                                        \
+                                                                              \
+    makeSurfaceReactionModelThermoType                                        \
+    (                                                                         \
+        NoSurfaceReaction,                                                    \
+        ReactingMultiphaseCloud,                                              \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
new file mode 100644
index 000000000..70b30bc89
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelCompositionModels.H
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingParcelCompositionModels_H
+#define makeReactingParcelCompositionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "ReactingCloud.H"
+
+#include "SinglePhaseMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingCompositionModels(ParcelType)                             \
+                                                                              \
+    makeReactingCompositionModelThermoType                                    \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+    makeReactingCompositionModelThermoType                                    \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+    makeReactingCompositionModelThermoType                                    \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingCompositionModelThermoType(ParcelType, ThermoType)        \
+                                                                              \
+    makeCompositionModel(ReactingCloud<ParcelType<ThermoType> >);             \
+                                                                              \
+    makeCompositionModelThermoType                                            \
+    (                                                                         \
+        SinglePhaseMixture,                                                   \
+        ReactingCloud,                                                        \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H
new file mode 100644
index 000000000..24023bf3e
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDispersionModels.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingParcelDispersionModels_H
+#define makeReactingParcelDispersionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "KinematicCloud.H"
+
+#include "NoDispersion.H"
+#include "GradientDispersionRAS.H"
+#include "StochasticDispersionRAS.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingDispersionModels(ParcelType)                              \
+                                                                              \
+    makeReactingDispersionModelThermoType                                     \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+                                                                              \
+    makeReactingDispersionModelThermoType                                     \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+                                                                              \
+    makeReactingDispersionModelThermoType                                     \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingDispersionModelThermoType(ParcelType, ThermoType)         \
+                                                                              \
+    makeDispersionModel(KinematicCloud<ParcelType<ThermoType> >);             \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        DispersionRASModel<KinematicCloud<ParcelType<ThermoType> > >,         \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    makeDispersionModelThermoType                                             \
+    (                                                                         \
+        NoDispersion,                                                         \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeDispersionModelThermoType                                             \
+    (                                                                         \
+        GradientDispersionRAS,                                                \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeDispersionModelThermoType                                             \
+    (                                                                         \
+        StochasticDispersionRAS,                                              \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H
new file mode 100644
index 000000000..0cb0b978e
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelDragModels.H
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingParcelDragModels_H
+#define makeReactingParcelDragModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "KinematicCloud.H"
+
+#include "NoDrag.H"
+#include "SphereDrag.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingDragModels(ParcelType)                                    \
+                                                                              \
+    makeReactingDragModelThermoType                                           \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+    makeReactingDragModelThermoType                                           \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+    makeReactingDragModelThermoType                                           \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingDragModelThermoType(ParcelType, ThermoType)               \
+                                                                              \
+    makeDragModel(KinematicCloud<ParcelType<ThermoType> >);                   \
+                                                                              \
+    makeDragModelThermoType                                                   \
+    (                                                                         \
+        NoDrag,                                                               \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeDragModelThermoType                                                   \
+    (                                                                         \
+        SphereDrag,                                                           \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H
new file mode 100644
index 000000000..e2ac98b49
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelHeatTransferModels.H
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingParcelHeatTransferModels_H
+#define makeReactingParcelHeatTransferModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "ThermoCloud.H"
+
+#include "NoHeatTransfer.H"
+#include "RanzMarshall.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingHeatTransferModels(ParcelType)                            \
+                                                                              \
+    makeReactingHeatTransferModelThermoType                                   \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+    makeReactingHeatTransferModelThermoType                                   \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+    makeReactingHeatTransferModelThermoType                                   \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingHeatTransferModelThermoType(ParcelType, ThermoType)       \
+                                                                              \
+    makeHeatTransferModel(ThermoCloud<ParcelType<ThermoType> >);              \
+                                                                              \
+    makeHeatTransferModelThermoType                                           \
+    (                                                                         \
+        NoHeatTransfer,                                                       \
+        ThermoCloud,                                                          \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeHeatTransferModelThermoType                                           \
+    (                                                                         \
+        RanzMarshall,                                                         \
+        ThermoCloud,                                                          \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
new file mode 100644
index 000000000..80a0f8aff
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelInjectionModels.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingParcelInjectionModels_H
+#define makeReactingParcelInjectionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "KinematicCloud.H"
+
+#include "ConeInjection.H"
+#include "ConeInjectionMP.H"
+#include "FieldActivatedInjection.H"
+#include "ManualInjection.H"
+#include "NoInjection.H"
+#include "PatchInjection.H"
+#include "ReactingLookupTableInjection.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingInjectionModels(ParcelType)                               \
+                                                                              \
+    makeReactingInjectionModelThermoType                                      \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+                                                                              \
+    makeReactingInjectionModelThermoType                                      \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+                                                                              \
+    makeReactingInjectionModelThermoType                                      \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingInjectionModelThermoType(ParcelType, ThermoType)          \
+                                                                              \
+    makeInjectionModel(KinematicCloud<ParcelType<ThermoType> >);              \
+                                                                              \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        ConeInjection,                                                        \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        ConeInjectionMP,                                                      \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        FieldActivatedInjection,                                              \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        ManualInjection,                                                      \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        NoInjection,                                                          \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        PatchInjection,                                                       \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makeInjectionModelThermoType                                              \
+    (                                                                         \
+        ReactingLookupTableInjection,                                         \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H
new file mode 100644
index 000000000..069cabbb0
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPatchInteractionModels.H
@@ -0,0 +1,93 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingParcelPatchInteractionModels_H
+#define makeReactingParcelPatchInteractionModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "KinematicCloud.H"
+
+#include "LocalInteraction.H"
+#include "Rebound.H"
+#include "StandardWallInteraction.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingPatchInteractionModels(ParcelType)                        \
+                                                                              \
+    makeReactingPatchInteractionModelThermoType                               \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+                                                                              \
+    makeReactingPatchInteractionModelThermoType                               \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+                                                                              \
+    makeReactingPatchInteractionModelThermoType                               \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingPatchInteractionModelThermoType(ParcelType, ThermoType)   \
+                                                                              \
+    makePatchInteractionModel(KinematicCloud<ParcelType<ThermoType> >);       \
+                                                                              \
+    makePatchInteractionModelThermoType                                       \
+    (                                                                         \
+        LocalInteraction,                                                     \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makePatchInteractionModelThermoType                                       \
+    (                                                                         \
+        Rebound,                                                     \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makePatchInteractionModelThermoType                                       \
+    (                                                                         \
+        StandardWallInteraction,                                              \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
new file mode 100644
index 000000000..544033914
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPhaseChangeModels.H
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingParcelPhaseChangeModels_H
+#define makeReactingParcelPhaseChangeModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "ReactingCloud.H"
+
+#include "NoPhaseChange.H"
+#include "LiquidEvaporation.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingPhaseChangeModels(ParcelType)                             \
+                                                                              \
+    makeReactingPhaseChangeModelThermoType                                    \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+                                                                              \
+    makeReactingPhaseChangeModelThermoType                                    \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+                                                                              \
+    makeReactingPhaseChangeModelThermoType                                    \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingPhaseChangeModelThermoType(ParcelType, ThermoType)        \
+                                                                              \
+    makePhaseChangeModel(ReactingCloud<ParcelType<ThermoType> >);             \
+                                                                              \
+    makePhaseChangeModelThermoType                                            \
+    (                                                                         \
+        NoPhaseChange,                                                        \
+        ReactingCloud,                                                        \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makePhaseChangeModelThermoType                                            \
+    (                                                                         \
+        LiquidEvaporation,                                                    \
+        ReactingCloud,                                                        \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H
new file mode 100644
index 000000000..cd6b50b70
--- /dev/null
+++ b/src/lagrangian/intermediate/parcels/include/makeReactingParcelPostProcessingModels.H
@@ -0,0 +1,85 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactingParcelPostProcessingModels_H
+#define makeReactingParcelPostProcessingModels_H
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoPhysicsTypes.H"
+#include "KinematicCloud.H"
+
+#include "NoPostProcessing.H"
+#include "PatchPostProcessing.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactingPostProcessingModels(ParcelType)                          \
+                                                                              \
+    makeReactingPostProcessingModelThermoType                                 \
+    (                                                                         \
+        ParcelType,                                                           \
+        constGasThermoPhysics                                                 \
+    );                                                                        \
+                                                                              \
+    makeReactingPostProcessingModelThermoType                                 \
+    (                                                                         \
+        ParcelType,                                                           \
+        gasThermoPhysics                                                      \
+    );                                                                        \
+                                                                              \
+    makeReactingPostProcessingModelThermoType                                 \
+    (                                                                         \
+        ParcelType,                                                           \
+        icoPoly8ThermoPhysics                                                 \
+    );
+
+
+#define makeReactingPostProcessingModelThermoType(ParcelType, ThermoType)     \
+                                                                              \
+    makePostProcessingModel(KinematicCloud<ParcelType<ThermoType> >);         \
+                                                                              \
+    makePostProcessingModelThermoType                                         \
+    (                                                                         \
+        NoPostProcessing,                                                     \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );                                                                        \
+    makePostProcessingModelThermoType                                         \
+    (                                                                         \
+        PatchPostProcessing,                                                  \
+        KinematicCloud,                                                       \
+        ParcelType,                                                           \
+        ThermoType                                                            \
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.C b/src/lagrangian/intermediate/particleForces/particleForces.C
new file mode 100644
index 000000000..74c656d09
--- /dev/null
+++ b/src/lagrangian/intermediate/particleForces/particleForces.C
@@ -0,0 +1,192 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "particleForces.H"
+#include "fvMesh.H"
+#include "volFields.H"
+#include "fvcGrad.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::particleForces::particleForces
+(
+    const fvMesh& mesh,
+    const dictionary& dict,
+    const vector& g
+)
+:
+    mesh_(mesh),
+    dict_(dict.subDict("particleForces")),
+    g_(g),
+    gradUPtr_(NULL),
+    gravity_(dict_.lookup("gravity")),
+    virtualMass_(dict_.lookup("virtualMass")),
+    Cvm_(0.0),
+    pressureGradient_(dict_.lookup("pressureGradient")),
+    UName_(dict_.lookupOrDefault<word>("U", "U"))
+{
+    if (virtualMass_)
+    {
+        dict_.lookup("Cvm") >> Cvm_;
+    }
+}
+
+
+Foam::particleForces::particleForces(const particleForces& f)
+:
+    mesh_(f.mesh_),
+    dict_(f.dict_),
+    g_(f.g_),
+    gradUPtr_(f.gradUPtr_),
+    gravity_(f.gravity_),
+    virtualMass_(f.virtualMass_),
+    Cvm_(f.Cvm_),
+    pressureGradient_(f.pressureGradient_),
+    UName_(f.UName_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::particleForces::~particleForces()
+{
+    cacheFields(false);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::dictionary& Foam::particleForces::dict() const
+{
+    return dict_;
+}
+
+
+const Foam::vector& Foam::particleForces::g() const
+{
+    return g_;
+}
+
+
+Foam::Switch Foam::particleForces::gravity() const
+{
+    return gravity_;
+}
+
+
+Foam::Switch Foam::particleForces::virtualMass() const
+{
+    return virtualMass_;
+}
+
+
+Foam::Switch Foam::particleForces::pressureGradient() const
+{
+    return pressureGradient_;
+}
+
+
+const Foam::word& Foam::particleForces::UName() const
+{
+    return UName_;
+}
+
+
+void Foam::particleForces::cacheFields(const bool store)
+{
+    if (store && pressureGradient_)
+    {
+        const volVectorField U = mesh_.lookupObject<volVectorField>(UName_);
+        gradUPtr_ = fvc::grad(U).ptr();
+    }
+    else
+    {
+        if (gradUPtr_)
+        {
+            delete gradUPtr_;
+            gradUPtr_ = NULL;
+        }
+    }
+}
+
+
+Foam::vector Foam::particleForces::calcCoupled
+(
+    const label cellI,
+    const scalar dt,
+    const scalar rhoc,
+    const scalar rho,
+    const vector& Uc,
+    const vector& U
+) const
+{
+    vector Ftot = vector::zero;
+
+    // Virtual mass force
+    if (virtualMass_)
+    {
+        notImplemented
+        (
+            "Foam::particleForces::calcCoupled(...) - virtual mass force"
+        );
+//        Ftot += Cvm_*rhoc/rho*d(Uc - U)/dt;
+    }
+
+    // Pressure gradient force
+    if (pressureGradient_)
+    {
+        const volTensorField& gradU = *gradUPtr_;
+        Ftot += rhoc/rho*(U & gradU[cellI]);
+    }
+
+    return Ftot;
+}
+
+
+Foam::vector Foam::particleForces::calcNonCoupled
+(
+    const label cellI,
+    const scalar dt,
+    const scalar rhoc,
+    const scalar rho,
+    const vector& Uc,
+    const vector& U
+) const
+{
+    vector Ftot = vector::zero;
+
+    // Gravity force
+    if (gravity_)
+    {
+        Ftot += g_*(1.0 - rhoc/rho);
+    }
+
+    return Ftot;
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/particleForces/particleForces.H b/src/lagrangian/intermediate/particleForces/particleForces.H
new file mode 100644
index 000000000..58f92d173
--- /dev/null
+++ b/src/lagrangian/intermediate/particleForces/particleForces.H
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::particleForces
+
+Description
+    Provides a mechanism to calculate particle forces
+    Note: forces are force per unit mass (accelerations)
+
+SourceFiles
+    particleForces.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef particleForces_H
+#define particleForces_H
+
+#include "dictionary.H"
+#include "Switch.H"
+#include "vector.H"
+#include "volFieldsFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward class declarations
+class fvMesh;
+
+/*---------------------------------------------------------------------------*\
+                      Class particleForces Declaration
+\*---------------------------------------------------------------------------*/
+
+class particleForces
+{
+    // Private data
+
+        //- Reference to the mesh database
+        const fvMesh& mesh_;
+
+        //- The particleForces dictionary
+        const dictionary& dict_;
+
+        //- Gravity
+        const vector g_;
+
+        //- Velocity gradient field
+        const volTensorField* gradUPtr_;
+
+
+        // Forces to include in particle motion evaluation
+
+            //- Gravity
+            Switch gravity_;
+
+            //- Virtual mass
+            Switch virtualMass_;
+
+            //- Virtual mass force coefficient
+            scalar Cvm_;
+
+            //- Pressure gradient
+            Switch pressureGradient_;
+
+
+        // Additional info
+
+            //- Name of velucity field - default = "U"
+            const word UName_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from mesh, dictionary and gravity
+        particleForces
+        (
+            const fvMesh& mesh,
+            const dictionary& dict,
+            const vector& g
+        );
+
+        //- Construct copy
+        particleForces(const particleForces& f);
+
+
+    //- Destructor
+    ~particleForces();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the particleForces dictionary
+            const dictionary& dict() const;
+
+            //- Return the gravity vector
+            const vector& g() const;
+
+            //- Return gravity force activate switch
+            Switch gravity() const;
+
+            //- Return virtual mass force activate switch
+            Switch virtualMass() const;
+
+            //- Return virtual mass force coefficient
+            Switch Cvm() const;
+
+            //- Return pressure gradient force activate switch
+            Switch pressureGradient() const;
+
+            //- Return name of velocity field
+            const word& UName() const;
+
+
+       // Evaluation
+
+            //- Cache carrier fields
+            void cacheFields(const bool store);
+
+            //- Calculate action/reaction forces between carrier and particles
+            vector calcCoupled
+            (
+                const label cellI,
+                const scalar dt,
+                const scalar rhoc,
+                const scalar rho,
+                const vector& Uc,
+                const vector& U
+            ) const;
+
+            //- Calculate external forces applied to the particles
+            vector calcNonCoupled
+            (
+                const label cellI,
+                const scalar dt,
+                const scalar rhoc,
+                const scalar rho,
+                const vector& Uc,
+                const vector& U
+            ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
new file mode 100644
index 000000000..11e4b6950
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.C
@@ -0,0 +1,360 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "phaseProperties.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char* Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>::names[] =
+{
+    "gas",
+    "liquid",
+    "solid",
+    "unknown"
+};
+
+
+const Foam::NamedEnum<Foam::phaseProperties::phaseType, 4>
+    Foam::phaseProperties::phaseTypeNames_;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::phaseProperties::setGlobalIds(const wordList& globalNames)
+{
+    forAll(names_, i)
+    {
+        forAll(globalNames, j)
+        {
+            if (globalNames[j] == names_[i])
+            {
+                globalIds_[i] = j;
+                break;
+            }
+        }
+        if (globalIds_[i] == -1)
+        {
+            FatalErrorIn
+            (
+                "void Foam::phaseProperties::setGlobalIds(const wordList&)"
+            )   << "Could not find specie " << names_[i]
+                << " in species list" <<  nl
+                << "Available species are: " << nl << globalNames << nl
+                << exit(FatalError);
+        }
+    }
+}
+
+
+void Foam::phaseProperties::setGlobalCarrierIds
+(
+    const wordList& carrierNames
+)
+{
+    globalCarrierIds_ = -1;
+
+    forAll(names_, i)
+    {
+        forAll (carrierNames, j)
+        {
+            if (carrierNames[j] == names_[i])
+            {
+                globalCarrierIds_[i] = j;
+                break;
+            }
+        }
+        if (globalCarrierIds_[i] == -1)
+        {
+            FatalErrorIn
+            (
+                "void Foam::phaseProperties::setGlobalCarrierIds"
+                "("
+                    "const wordList&"
+                ")"
+            )   << "Could not find carrier specie " << names_[i]
+                << " in species list" <<  nl
+                << "Available species are: " << nl << carrierNames << nl
+                << exit(FatalError);
+        }
+    }
+}
+
+
+void Foam::phaseProperties::checkTotalMassFraction() const
+{
+    scalar total = 0.0;
+    forAll(Y_, cmptI)
+    {
+        total += Y_[cmptI];
+    }
+
+    if (Y_.size() != 0 && mag(total - 1.0) > SMALL)
+    {
+        FatalErrorIn
+        (
+            "void Foam::phaseProperties::checkTotalMassFraction() const"
+        )   << "Component fractions must total to unity for phase "
+            << phaseTypeNames_[phase_] << nl
+            << "Components: " << nl << names_ << nl << exit(FatalError);
+    }
+}
+
+
+Foam::word Foam::phaseProperties::phaseToStateLabel(const phaseType pt) const
+{
+    word state = "(unknown)";
+    switch (pt)
+    {
+        case GAS:
+        {
+            state = "(g)";
+            break;
+        }
+        case LIQUID:
+        {
+            state = "(l)";
+            break;
+        }
+        case SOLID:
+        {
+            state = "(s)";
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::phaseProperties::phaseToStateLabel(phaseType pt)"
+            )   << "Invalid phase: " << phaseTypeNames_[pt] << nl
+                << "    phase must be gas, liquid or solid" << nl
+                << exit(FatalError);
+        }
+    }
+
+    return state;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::phaseProperties::phaseProperties()
+:
+    phase_(UNKNOWN),
+    stateLabel_("(unknown)"),
+    names_(0),
+    Y_(0),
+    globalIds_(0),
+    globalCarrierIds_(0)
+{}
+
+
+Foam::phaseProperties::phaseProperties(const phaseProperties& pp)
+:
+    phase_(pp.phase_),
+    stateLabel_(pp.stateLabel_),
+    names_(pp.names_),
+    Y_(pp.Y_),
+    globalIds_(pp.globalIds_),
+    globalCarrierIds_(pp.globalCarrierIds_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::phaseProperties::~phaseProperties()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::phaseProperties::initialiseGlobalIds
+(
+    const wordList& gasNames,
+    const wordList& liquidNames,
+    const wordList& solidNames
+)
+{
+    // determine the addressing to map between components listed in the phase
+    // with those given in the (main) thermo properties
+    switch (phase_)
+    {
+        case GAS:
+        {
+            setGlobalIds(gasNames);
+            forAll(globalCarrierIds_, i)
+            {
+                globalCarrierIds_[i] = globalIds_[i];
+            }
+            break;
+        }
+        case LIQUID:
+        {
+            setGlobalIds(liquidNames);
+            setGlobalCarrierIds(gasNames);
+            break;
+        }
+        case SOLID:
+        {
+            setGlobalIds(solidNames);
+            WarningIn
+            (
+                "phaseProperties::initialiseGlobalIds(...)"
+            )   << "Assuming no mapping between solid and carrier species"
+                << endl;
+//            setGlobalCarrierIds(gasNames);
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::phaseProperties::setGlobalIds"
+                "("
+                    "const PtrList<volScalarField>&, "
+                    "const wordList&, "
+                    "const wordList&"
+                ")"
+            )   << "Invalid phase: " << phaseTypeNames_[phase_] << nl
+                << "    phase must be gas, liquid or solid" << nl
+                << exit(FatalError);
+        }
+    }
+}
+
+
+Foam::phaseProperties::phaseType Foam::phaseProperties::phase() const
+{
+    return phase_;
+}
+
+
+const Foam::word& Foam::phaseProperties::stateLabel() const
+{
+    return stateLabel_;
+}
+
+
+Foam::word Foam::phaseProperties::phaseTypeName() const
+{
+    return phaseTypeNames_[phase_];
+}
+
+
+const Foam::List<Foam::word>& Foam::phaseProperties::names() const
+{
+    return names_;
+}
+
+
+const Foam::word& Foam::phaseProperties::name(const label cmptI) const
+{
+    if (cmptI >= names_.size())
+    {
+        FatalErrorIn
+        (
+            "const Foam::word& Foam::phaseProperties::name"
+            "("
+                "const label"
+            ") const"
+        )   << "Requested component " << cmptI << "out of range" << nl
+            << "Available phase components:" << nl << names_ << nl
+            << exit(FatalError);
+    }
+
+    return names_[cmptI];
+}
+
+
+const Foam::scalarField& Foam::phaseProperties::Y() const
+{
+    return Y_;
+}
+
+
+Foam::scalar& Foam::phaseProperties::Y(const label cmptI)
+{
+    if (cmptI >= Y_.size())
+    {
+        FatalErrorIn
+        (
+            "const Foam::scalar& Foam::phaseProperties::Y"
+            "("
+                "const label"
+            ") const"
+        )   << "Requested component " << cmptI << "out of range" << nl
+            << "Available phase components:" << nl << names_ << nl
+            << exit(FatalError);
+    }
+
+    return Y_[cmptI];
+}
+
+
+Foam::label Foam::phaseProperties::globalId(const word& cmptName) const
+{
+    label id = this->id(cmptName);
+
+    if (id < 0)
+    {
+        return id;
+    }
+    else
+    {
+        return globalIds_[id];
+    }
+
+}
+
+
+const Foam::labelList& Foam::phaseProperties::globalIds() const
+{
+    return globalIds_;
+}
+
+
+const Foam::labelList& Foam::phaseProperties::globalCarrierIds() const
+{
+    return globalCarrierIds_;
+}
+
+
+Foam::label Foam::phaseProperties::id(const word& cmptName) const
+{
+    forAll(names_, cmptI)
+    {
+        if (names_[cmptI] == cmptName)
+        {
+            return cmptI;
+        }
+    }
+
+    return -1;
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
new file mode 100644
index 000000000..dfdd764c3
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phaseProperties.H
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::phaseProperties
+
+Description
+    Helper class to manage multi-component phase properties
+
+SourceFiles
+    phaseProperties.C
+    phasePropertiesIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phaseProperties_H
+#define phaseProperties_H
+
+#include "NamedEnum.H"
+#include "Tuple2.H"
+#include "PtrList.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class phaseProperties Declaration
+\*---------------------------------------------------------------------------*/
+
+class phaseProperties
+{
+public:
+
+    // Public data
+
+        //- Phase type enumeration
+        enum phaseType
+        {
+            GAS,
+            LIQUID,
+            SOLID,
+            UNKNOWN
+        };
+
+        //- Corresponding word representations for phase type enumerations
+        static const NamedEnum<phaseType, 4> phaseTypeNames_;
+
+
+private:
+
+   // Private data
+
+        //- Phase type
+        phaseType phase_;
+
+        //- State label (s), (l), (g) etc.
+        word stateLabel_;
+
+        //- List of component names
+        List<word> names_;
+
+        //- List of component mass fractions
+        scalarField Y_;
+
+        //- Global ids
+        labelList globalIds_;
+
+        //- Map to carrier global id
+        labelList globalCarrierIds_;
+
+
+    // Private member functions
+
+        //- Set global ids
+        void setGlobalIds(const wordList& globalNames);
+
+        //- Set global carrier ids - attempts to map component names to global
+        //  carrier species
+        void setGlobalCarrierIds(const wordList& carrierNames);
+
+        //- Check the total mass fraction
+        void checkTotalMassFraction() const;
+
+        //- Set the state label
+        word phaseToStateLabel(const phaseType pt) const;
+
+
+public:
+
+    // Constructors
+
+        //- Null constructor
+        phaseProperties();
+
+        //- Construct from Istream
+        phaseProperties(Istream&);
+
+        //- Construct as copy
+        phaseProperties(const phaseProperties&);
+
+
+    //- Destructor
+    ~phaseProperties();
+
+
+    // Public member functions
+
+        //- Initialise the global ids
+        void initialiseGlobalIds
+        (
+            const wordList& gasNames,
+            const wordList& liquidNames,
+            const wordList& solidNames
+        );
+
+
+        // Access
+
+            //- Return const access to the phase type
+            phaseType phase() const;
+
+            //- Return const access to the phase state label
+            const word& stateLabel() const;
+
+            //- Return word representation of the phase type
+            word phaseTypeName() const;
+
+            //- Return the list of component names
+            const List<word>& names() const;
+
+            //- Return const access to a component name
+            const word& name(const label cmptI) const;
+
+            //- Return const access to all component mass fractions
+            const scalarField& Y() const;
+
+            //- Return non-const access to a component mass fraction
+            scalar& Y(const label cmptI);
+
+            //- Return const access to the global ids
+            const labelList& globalIds() const;
+
+            //- Return const access to the map to the carrier global ids
+            const labelList& globalCarrierIds() const;
+
+            //- Return the global id of a component in the local list by name
+            //  Returns -1 if not found
+            label globalId(const word& cmptName) const;
+
+            //- Return the id of a component in the local list by name
+            //  Returns -1 if not found
+            label id(const word& cmptName) const;
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream&, phaseProperties&);
+        friend Ostream& operator<<(Ostream&, const phaseProperties&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
new file mode 100644
index 000000000..e5acfb4b5
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phaseProperties/phasePropertiesIO.C
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "phaseProperties.H"
+#include "dictionaryEntry.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::phaseProperties::phaseProperties(Istream& is)
+:
+    phase_(UNKNOWN),
+    stateLabel_("(unknown)"),
+    names_(0),
+    Y_(0),
+    globalIds_(0),
+    globalCarrierIds_(0)
+{
+    is.check("Foam::phaseProperties::phaseProperties(Istream& is)");
+
+    dictionaryEntry phaseInfo(dictionary::null, is);
+
+    phase_ = phaseTypeNames_[phaseInfo.keyword()];
+    stateLabel_ = phaseToStateLabel(phase_);
+
+    if (phaseInfo.size() > 0)
+    {
+        label nComponents = phaseInfo.size();
+        names_.setSize(nComponents, "unknownSpecie");
+        Y_.setSize(nComponents, 0.0);
+        globalIds_.setSize(nComponents, -1);
+        globalCarrierIds_.setSize(nComponents, -1);
+
+        label cmptI = 0;
+        forAllConstIter(IDLList<entry>, phaseInfo, iter)
+        {
+            names_[cmptI] = iter().keyword();
+            Y_[cmptI] = readScalar(phaseInfo.lookup(names_[cmptI]));
+            cmptI++;
+        }
+
+        checkTotalMassFraction();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>(Istream& is, phaseProperties& pp)
+{
+    is.check
+    (
+        "Foam::Istream& Foam::operator>>(Istream&, phaseProperties&)"
+    );
+
+    dictionaryEntry phaseInfo(dictionary::null, is);
+
+    pp.phase_ = pp.phaseTypeNames_[phaseInfo.keyword()];
+    pp.stateLabel_ = pp.phaseToStateLabel(pp.phase_);
+
+    if (phaseInfo.size() > 0)
+    {
+        label nComponents = phaseInfo.size();
+
+        pp.names_.setSize(nComponents, "unknownSpecie");
+        pp.Y_.setSize(nComponents, 0.0);
+        pp.globalIds_.setSize(nComponents, -1);
+        pp.globalCarrierIds_.setSize(nComponents, -1);
+
+        label cmptI = 0;
+        forAllConstIter(IDLList<entry>, phaseInfo, iter)
+        {
+            pp.names_[cmptI] = iter().keyword();
+            pp.Y_[cmptI] = readScalar(phaseInfo.lookup(pp.names_[cmptI]));
+            cmptI++;
+        }
+
+        pp.checkTotalMassFraction();
+    }
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const phaseProperties& pp)
+{
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<(Ostream&, const phaseProperties&)"
+    );
+
+    os  << pp.phaseTypeNames_[pp.phase_] << nl << token::BEGIN_BLOCK << nl
+        << incrIndent;
+
+    forAll(pp.names_, cmptI)
+    {
+        os.writeKeyword(pp.names_[cmptI]) << pp.Y_[cmptI]
+            << token::END_STATEMENT << nl;
+    }
+
+    os  << decrIndent << token::END_BLOCK << nl;
+
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<(Ostream&, const phaseProperties&)"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
new file mode 100644
index 000000000..1db2ee2ab
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "phasePropertiesList.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::phasePropertiesList::phasePropertiesList
+(
+    Istream& is,
+    const wordList& gasNames,
+    const wordList& liquidNames,
+    const wordList& solidNames
+)
+:
+    props_(is),
+    phaseTypeNames_(),
+    stateLabels_()
+{
+    forAll(props_, i)
+    {
+        props_[i].initialiseGlobalIds(gasNames, liquidNames, solidNames);
+    }
+
+    phaseTypeNames_.setSize(props_.size());
+    stateLabels_.setSize(props_.size());
+    forAll(props_, i)
+    {
+        phaseTypeNames_[i] = props_[i].phaseTypeName();
+        stateLabels_[i] = props_[i].stateLabel();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::phasePropertiesList::~phasePropertiesList()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::List<Foam::phaseProperties>&
+Foam::phasePropertiesList::props() const
+{
+    return props_;
+}
+
+
+const Foam::wordList& Foam::phasePropertiesList::phaseTypes() const
+{
+    return phaseTypeNames_;
+}
+
+
+const Foam::wordList& Foam::phasePropertiesList::stateLabels() const
+{
+    return stateLabels_;
+}
+
+
+Foam::label Foam::phasePropertiesList::size() const
+{
+    return props_.size();
+}
+
+
+const Foam::phaseProperties&
+Foam::phasePropertiesList::operator[](const label phaseI) const
+{
+    return props_[phaseI];
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
new file mode 100644
index 000000000..dc0adde7f
--- /dev/null
+++ b/src/lagrangian/intermediate/phaseProperties/phasePropertiesList/phasePropertiesList.H
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::phasePropertiesList
+
+Description
+    Simple container for a list of phase properties
+
+SourceFiles
+    phasePropertiesList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef phasePropertiesList_H
+#define phasePropertiesList_H
+
+#include "Istream.H"
+#include "volFields.H"
+#include "wordList.H"
+#include "phaseProperties.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class phasePropertiesList Declaration
+\*---------------------------------------------------------------------------*/
+
+class phasePropertiesList
+{
+    // Private data
+
+        //- List of phase properties
+        List<phaseProperties> props_;
+
+        //- List of word representation of phase types
+        wordList phaseTypeNames_;
+
+        //- List of state labels
+        wordList stateLabels_;
+
+
+public:
+
+    //- Constructor
+    phasePropertiesList
+    (
+        Istream& is,
+        const wordList& gasNames,
+        const wordList& liquidNames,
+        const wordList& solidNames
+    );
+
+    //- Destructor
+    ~phasePropertiesList();
+
+
+    // Public member functions
+
+        //- Return the list of phase properties
+        const List<phaseProperties>& props() const;
+
+        //- Return the list of word representation of phase types
+        const wordList& phaseTypes() const;
+
+        //- Return the list of state labels
+        const wordList& stateLabels() const;
+
+        //- Return the size (number of phases)
+        label size() const;
+
+
+    // Member operators
+
+        const phaseProperties& operator[](const label) const;
+};
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
index 1f12de59e..1714aeadd 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.C
@@ -29,38 +29,34 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Constant<Type>::Constant
-(
-    const word& entryName,
-    const dictionary& dict
-)
+Foam::Constant<Type>::Constant(const word& entryName, Istream& is)
 :
-    DataEntry<Type>(typeName, entryName, dict),
-    value_(this->dict_.lookup("value"))
+    DataEntry<Type>(entryName),
+    value_(is)
+{}
+
+
+template<class Type>
+Foam::Constant<Type>::Constant(const Constant<Type>& cnst)
+:
+    DataEntry<Type>(cnst),
+    value_(cnst.value_)
 {}
 
 
 template<>
-Foam::Constant<Foam::label>::Constant
-(
-    const word& entryName,
-    const dictionary& dict
-)
+Foam::Constant<Foam::label>::Constant(const word& entryName, Istream& is)
 :
-    DataEntry<label>(typeName, entryName, dict),
-    value_(readLabel(this->dict_.lookup("value")))
+    DataEntry<label>(entryName),
+    value_(readLabel(is))
 {}
 
 
 template<>
-Foam::Constant<Foam::scalar>::Constant
-(
-    const word& entryName,
-    const dictionary& dict
-)
+Foam::Constant<Foam::scalar>::Constant(const word& entryName, Istream& is)
 :
-    DataEntry<scalar>(typeName, entryName, dict),
-    value_(readScalar(this->dict_.lookup("value")))
+    DataEntry<scalar>(entryName),
+    value_(readScalar(is))
 {}
 
 
@@ -87,4 +83,9 @@ Type Foam::Constant<Type>::integrate(const scalar x1, const scalar x2) const
 }
 
 
+// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+
+#include "ConstantIO.C"
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
index 704e022da..7ddda641d 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/Constant.H
@@ -28,12 +28,9 @@ Class
 Description
     Templated basic entry that holds a constant value.
 
+    Usage - for entry <entryName> having the value <value>:
     @verbatim
-        entry                    Constant
-        entryCoeffs
-        {
-            value                100.0; // Constant value
-        }
+        <entryName>    constant  <value>
     @endverbatim
 
 SourceFiles
@@ -51,6 +48,16 @@ SourceFiles
 namespace Foam
 {
 
+template<class Type>
+class Constant;
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const Constant<Type>&
+);
+
 /*---------------------------------------------------------------------------*\
                            Class Constant Declaration
 \*---------------------------------------------------------------------------*/
@@ -62,14 +69,12 @@ class Constant
 {
     // Private data
 
+        //- Constant value
         Type value_;
 
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        Constant(const Constant<Type>&);
-
         //- Disallow default bitwise assignment
         void operator=(const Constant<Type>&);
 
@@ -77,22 +82,20 @@ class Constant
 public:
 
     // Runtime type information
-    TypeName("Constant");
+    TypeName("constant");
 
 
     // Constructors
 
-        //- Construct from dictionary
-        Constant
-        (
-            const word& entryName,
-            const dictionary& dict
-        );
+        //- Construct from entry name and Istream
+        Constant(const word& entryName, Istream& is);
+
+        //- Copy constructor
+        Constant(const Constant<Type>& cnst);
 
 
     //- Destructor
-
-        ~Constant();
+    virtual ~Constant();
 
 
     // Member Functions
@@ -102,16 +105,24 @@ public:
 
         //- Integrate between two values
         Type integrate(const scalar x1, const scalar x2) const;
+
+
+    //- Ostream Operator
+    friend Ostream& operator<< <Type>
+    (
+        Ostream&,
+        const Constant<Type>&
+    );
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 template<>
-Constant<label>::Constant(const word& entryName, const dictionary& dict);
+Constant<label>::Constant(const word& entryName, Istream& is);
 
 template<>
-Constant<scalar>::Constant(const word& entryName, const dictionary& dict);
+Constant<scalar>::Constant(const word& entryName, Istream& is);
 
 
 } // End namespace Foam
diff --git a/applications/test/IndirectList/IndirectListTest.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
similarity index 66%
rename from applications/test/IndirectList/IndirectListTest.C
rename to src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
index dac6f104a..d1bb8eafe 100644
--- a/applications/test/IndirectList/IndirectListTest.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Constant/ConstantIO.C
@@ -22,46 +22,41 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "IndirectList.H"
-#include "IOstreams.H"
+#include "DataEntry.H"
 
-using namespace Foam;
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const Constant<Type>& cnst
+)
 {
-    List<double> completeList(10);
-
-    forAll(completeList, i)
+    if (os.format() == IOstream::ASCII)
     {
-        completeList[i] = 0.1*i;
+        os  << static_cast<const DataEntry<Type>& >(cnst)
+            << token::SPACE << cnst.value_;
+    }
+    else
+    {
+        os  << static_cast<const DataEntry<Type>& >(cnst);
+        os.write
+        (
+            reinterpret_cast<const char*>(&cnst.value_),
+            sizeof(cnst.value_)
+        );
     }
 
-    List<label> addresses(5);
-    addresses[0] = 1;
-    addresses[1] = 0;
-    addresses[2] = 7;
-    addresses[3] = 8;
-    addresses[4] = 5;
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const Constant<Type>&)"
+    );
 
-    IndirectList<double> idl(completeList, addresses);
-
-    forAll(idl, i)
-    {
-        Info<< idl[i] << token::SPACE;
-    }
-
-    Info<< endl;
-
-    Info << "\nEnd\n" << endl;
-
-    return 0;
+    return os;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
index 907625db4..002c3094d 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.C
@@ -29,15 +29,16 @@ License
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::DataEntry<Type>::DataEntry
-(
-    const word& typeName,
-    const word& entryName,
-    const dictionary& dict
-)
+Foam::DataEntry<Type>::DataEntry(const word& entryName)
 :
-    dict_(dict.subDict(entryName + "Coeffs")),
-    entry_(entryName)
+    name_(entryName)
+{}
+
+
+template<class Type>
+Foam::DataEntry<Type>::DataEntry(const DataEntry<Type>& de)
+:
+    name_(de.name_)
 {}
 
 
@@ -51,10 +52,15 @@ Foam::DataEntry<Type>::~DataEntry()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-const Foam::dictionary& Foam::DataEntry<Type>::dict() const
+const Foam::word& Foam::DataEntry<Type>::name() const
 {
-    return dict_;
+    return name_;
 }
 
 
+// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+
+#include "DataEntryIO.C"
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
index 3f50a18c9..2f1dbcf92 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntry.H
@@ -26,6 +26,10 @@ Class
     Foam::DataEntry
 
 Description
+    Top level data entry class for use in dictionaries. Provides a mechanism
+    to specify a variable as a certain type, e.g. constant or table, and
+    provide functions to return the (interpolated) value, and integral between
+    limits.
 
 SourceFiles
     DataEntry.C
@@ -43,8 +47,18 @@ SourceFiles
 namespace Foam
 {
 
+template<class Type>
+class DataEntry;
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const DataEntry<Type>&
+);
+
 /*---------------------------------------------------------------------------*\
-                          Class DataEntry Declaration
+                         Class DataEntry Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class Type>
@@ -52,9 +66,6 @@ class DataEntry
 {
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        DataEntry(const DataEntry<Type>&);
-
         //- Disallow default bitwise assignment
         void operator=(const DataEntry<Type>&);
 
@@ -63,11 +74,8 @@ protected:
 
     // Protected data
 
-        //- Coefficients dictionary
-        const dictionary dict_;
-
         //- Name of entry
-        const word entry_;
+        const word name_;
 
 
 public:
@@ -83,42 +91,39 @@ public:
         dictionary,
         (
             const word& entryName,
-            const dictionary& dict
+            Istream& is
         ),
-        (entryName, dict)
+        (entryName, is)
     );
 
 
     // Constructor
 
-        //- Construct from type name and dictionary
-        DataEntry
-        (
-            const word& TypeName,
-            const word& entryName,
-            const dictionary& dict
-        );
+        //- Construct from entry name
+        DataEntry(const word& entryName);
+
+        //- Copy constructor
+        DataEntry(const DataEntry<Type>& de);
 
 
     //- Selector
-        static autoPtr<DataEntry<Type> > New
-        (
-            const word& entryName,
-            const dictionary& dict
-        );
+    static autoPtr<DataEntry<Type> > New
+    (
+        const word& entryName,
+        const dictionary& dict
+    );
 
 
     //- Destructor
-
-        virtual ~DataEntry();
+    virtual ~DataEntry();
 
 
     // Member Functions
 
         // Access
 
-            //- Return the dictionary
-            const dictionary& dict() const;
+            //- Return the name of the entry
+            const word& name() const;
 
 
         // Evaluation
@@ -128,6 +133,14 @@ public:
 
             //- Integrate between two (scalar) values
             virtual Type integrate(const scalar x1, const scalar x2) const = 0;
+
+
+    //- Ostream Operator
+    friend Ostream& operator<< <Type>
+    (
+        Ostream&,
+        const DataEntry<Type>&
+    );
 };
 
 
diff --git a/applications/test/HashPtrTable/hashPtrTableTest.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
similarity index 80%
rename from applications/test/HashPtrTable/hashPtrTableTest.C
rename to src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
index 69b53d6c0..002bce642 100644
--- a/applications/test/HashPtrTable/hashPtrTableTest.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/DataEntryIO.C
@@ -22,27 +22,26 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
-
 \*---------------------------------------------------------------------------*/
 
-#include <iostream>
-#include "HashPtrTable.H"
+#include "DataEntry.H"
 
-using namespace Foam;
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main()
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const DataEntry<Type>&
+)
 {
-    Foam::HashPtrTable<double> myTable;
-    myTable.insert("hello", new double(42.1));
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, const DataEntry<Type>&)"
+    );
 
-    Info<< myTable << endl;
-
-    return 0;
+    return os;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
index bee226362..535c1fcc2 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/DataEntry/NewDataEntry.C
@@ -35,27 +35,24 @@ Foam::autoPtr<Foam::DataEntry<Type> > Foam::DataEntry<Type>::New
     const dictionary& dict
 )
 {
-    word DataEntryType(dict.lookup(entryName));
+    Istream& is(dict.lookup(entryName));
 
-    //    Info<< "Selecting DataEntry " << DataEntryType << endl;
+    word DataEntryType(is);
 
     typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(DataEntryType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
-        FatalErrorIn
-        (
-            "DataEntry<Type>::New(const dictionary&"
-        )   << "Unknown DataEntry type "
-            << DataEntryType << " for " << entryName
-            << ", constructor not in hash table" << nl << nl
-            << "    Valid DataEntry types are :" << nl
+        FatalErrorIn("DataEntry<Type>::New(Istream&)")
+            << "Unknown DataEntry type " << DataEntryType << " for DataEntry "
+            << entryName << ". Constructor not in hash table" << nl << nl
+            << "    Valid DataEntry types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << nl
             << exit(FatalError);
     }
 
-    return autoPtr<DataEntry<Type> >(cstrIter()(entryName, dict));
+    return autoPtr<DataEntry<Type> >(cstrIter()(entryName, is));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
index d56497824..c94e3cce3 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.C
@@ -29,30 +29,28 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type>
-Foam::Table<Type>::Table
-(
-    const word& entryName,
-    const dictionary& dict
-)
+Foam::Table<Type>::Table(const word& entryName, Istream& is)
 :
-    DataEntry<Type>(typeName, entryName, dict),
-    table_(this->dict_.lookup("table"))
+    DataEntry<Type>(entryName),
+    table_(is)
 {
     if (!table_.size())
     {
-        FatalErrorIn
-        (
-             "Foam::Table<Type>::Table"
-             "("
-                 "const word& entryName,"
-                 "const dictionary& dict"
-             ")"
-        ) << "Table is invalid (empty)" << nl
-          << exit(FatalError);
+        FatalErrorIn("Foam::Table<Type>::Table(const Istream&)")
+            << "Table for entry " << this->name_ << " is invalid (empty)"
+            << nl << exit(FatalError);
     }
 }
 
 
+template<class Type>
+Foam::Table<Type>::Table(const Table<Type>& tbl)
+:
+    DataEntry<Type>(tbl),
+    table_(tbl.table_)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class Type>
@@ -66,7 +64,7 @@ template<class Type>
 Type Foam::Table<Type>::value(const scalar x) const
 {
     // Return zero if out of bounds
-    if ((x > table_[table_.size()-1].first()) || (x < table_[0].first()))
+    if (x < table_[0].first() || x > table_[table_.size()-1].first())
     {
         return pTraits<Type>::zero;
     }
@@ -78,11 +76,14 @@ Type Foam::Table<Type>::value(const scalar x) const
         i++;
     }
 
-    // Linear interpolation to find value
-    return
+    // Linear interpolation to find value. Note constructor needed for
+    // Table<label> to convert intermediate scalar back to label.
+    return Type
+    (
         (x - table_[i].first())/(table_[i+1].first() - table_[i].first())
       * (table_[i+1].second() - table_[i].second())
-      + table_[i].second();
+      + table_[i].second()
+    );
 }
 
 
@@ -98,45 +99,60 @@ Type Foam::Table<Type>::integrate(const scalar x1, const scalar x2) const
         return sum;
     }
 
-    // Find start index
+    // Find next index greater than x1
     label id1 = 0;
     while ((table_[id1].first() < x1) && (id1 < table_.size()))
     {
         id1++;
     }
 
-    // Find end index
+    // Find next index less than x2
     label id2 = table_.size() - 1;
     while ((table_[id2].first() > x2) && (id2 >= 1))
     {
         id2--;
     }
 
-    // Integrate table body
-    for (label i=id1; i<id2; i++)
+    if ((id1 - id2) == 1)
     {
-        sum +=
-            (table_[i].second() + table_[i+1].second())
-          * (table_[i+1].first() - table_[i].first());
+        // x1 and x2 lie within 1 interval
+        sum = 0.5*(value(x1) + value(x2))*(x2 - x1);
     }
-    sum *= 0.5;
+    else
+    {
+        // x1 and x2 cross multiple intervals
 
-    // Add table ends (partial segments)
-    if (id1 > 0)
-    {
-        sum += 0.5
-          * (value(x1) + table_[id1].second())
-          * (table_[id1].first() - x1);
-    }
-    if (id2 < table_.size() - 1)
-    {
-        sum += 0.5
-          * (table_[id2].second() + value(x2))
-          * (x2 - table_[id2].first());
+        // Integrate table body
+        for (label i=id1; i<id2; i++)
+        {
+            sum +=
+                (table_[i].second() + table_[i+1].second())
+              * (table_[i+1].first() - table_[i].first());
+        }
+        sum *= 0.5;
+
+        // Add table ends (partial segments)
+        if (id1 > 0)
+        {
+            sum += 0.5
+              * (value(x1) + table_[id1].second())
+              * (table_[id1].first() - x1);
+        }
+        if (id2 < table_.size() - 1)
+        {
+            sum += 0.5
+              * (table_[id2].second() + value(x2))
+              * (x2 - table_[id2].first());
+        }
     }
 
     return sum;
 }
 
 
+// * * * * * * * * * * * * * *  IOStream operators * * * * * * * * * * * * * //
+
+#include "TableIO.C"
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
index c3c3f00c7..33fb7d908 100644
--- a/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/Table.H
@@ -28,18 +28,14 @@ Class
 Description
     Templated table container data entry. Items are stored in a list of
     Tuple2's. First column is always stored as scalar entries. Data is read
-    in the form, e.g. for (scalar, vector):
+    in the form, e.g. for an entry <entryName> that is (scalar, vector):
 
     @verbatim
-        entry                    Table
-        entryCoeffs
-        {
-            table
-            (
-                0.0 (1 2 3)
-                1.0 (4 5 6)
-            )
-        }
+        <entryName>   table
+        (
+            0.0 (1 2 3)
+            1.0 (4 5 6)
+        );
     @endverbatim
 
 SourceFiles
@@ -58,6 +54,16 @@ SourceFiles
 namespace Foam
 {
 
+template<class Type>
+class Table;
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const Table<Type>&
+);
+
 /*---------------------------------------------------------------------------*\
                            Class Table Declaration
 \*---------------------------------------------------------------------------*/
@@ -69,38 +75,33 @@ class Table
 {
     // Private data
 
-       //- Table data
-       List<Tuple2<scalar, Type> > table_;
+        //- Table data
+        List<Tuple2<scalar, Type> > table_;
 
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
-        Table(const Table<Type>&);
-
         //- Disallow default bitwise assignment
         void operator=(const Table<Type>&);
 
 
 public:
 
-    // Runtime type information
-    TypeName("Table");
+    //- Runtime type information
+    TypeName("table");
 
 
     // Constructors
 
-        //- Construct from dictionary
-        Table
-        (
-            const word& entryName,
-            const dictionary& dict
-        );
+        //- Construct from entry name and Istream
+        Table(const word& entryName, Istream& is);
+
+        //- Copy constructor
+        Table(const Table<Type>& tbl);
 
 
     //- Destructor
-
-        ~Table();
+    virtual ~Table();
 
 
     // Member Functions
@@ -110,6 +111,14 @@ public:
 
         //- Integrate between two (scalar) values
         Type integrate(const scalar x1, const scalar x2) const;
+
+
+    //- Ostream Operator
+    friend Ostream& operator<< <Type>
+    (
+        Ostream&,
+        const Constant<Type>&
+    );
 };
 
 
diff --git a/applications/test/graph/graphTest2.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
similarity index 67%
rename from applications/test/graph/graphTest2.C
rename to src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
index c6f52cd00..4d75b95bf 100644
--- a/applications/test/graph/graphTest2.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/Table/TableIO.C
@@ -22,45 +22,42 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Application
-    graphTest
-
-Description
-    Test program for making graphs
-
 \*---------------------------------------------------------------------------*/
 
-#include "graph.H"
+#include "DataEntry.H"
 
-using namespace Foam;
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-int main()
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const Table<Type>& tbl
+)
 {
-    scalarField eta(200);
-    scalarField C1mR(eta.size());
-
-    forAll(eta, i)
+    if (os.format() == IOstream::ASCII)
     {
-        eta[i] = scalar(i)/10.0;
+        os  << static_cast<const DataEntry<Type>& >(tbl)
+            << token::SPACE << tbl.table_;
+    }
+    else
+    {
+        os  << static_cast<const DataEntry<Type>& >(tbl);
+        os.write
+        (
+            reinterpret_cast<const char*>(&tbl.table_),
+            sizeof(tbl.table_)
+        );
     }
 
-    scalar C1 = 1.42;
-    scalar eta0 = 4.38;
-    scalar beta = 0.012;
-
-    C1mR = C1 - ((eta*(1.0 - eta/eta0))/(1.0 + beta*pow(eta, 3.0)));
-
-    graph("C&1! - R", "C&1! - R", "@h!", eta,  C1mR).write
+    // Check state of Ostream
+    os.check
     (
-        "C1mR",
-        "xmgr"
+        "Ostream& operator<<(Ostream&, const Table<Type>&)"
     );
 
-    Info<< "end" << endl;
+    return os;
 }
 
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
new file mode 100644
index 000000000..a233caefb
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.C
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "polynomial.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(polynomial, 0);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::polynomial::polynomial(const word& entryName, Istream& is)
+:
+    DataEntry<scalar>(entryName),
+    coeffs_(is)
+{
+    if (!coeffs_.size())
+    {
+        FatalErrorIn("Foam::polynomial::polynomial(const word&, Istream&)")
+            << "polynomial coefficients for entry " << this->name_
+            << " is invalid (empty)" << nl << exit(FatalError);
+    }
+}
+
+
+Foam::polynomial::polynomial(const polynomial& poly)
+:
+    DataEntry<scalar>(poly),
+    coeffs_(poly.coeffs_)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::polynomial::~polynomial()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::scalar Foam::polynomial::value(const scalar x) const
+{
+    scalar y = 0.0;
+    forAll(coeffs_, i)
+    {
+        y += coeffs_[i].first()*pow(x, coeffs_[i].second());
+    }
+
+    return y;
+}
+
+
+Foam::scalar Foam::polynomial::integrate(const scalar x1, const scalar x2) const
+{
+    scalar intx = 0.0;
+
+    forAll(coeffs_, i)
+    {
+        intx +=
+            coeffs_[i].first()/(coeffs_[i].second() + 1)
+           *(
+                pow(x2, coeffs_[i].second() + 1)
+              - pow(x1, coeffs_[i].second() + 1)
+            );
+    }
+
+    return intx;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
new file mode 100644
index 000000000..37a25e607
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomial.H
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::polynomial
+
+Description
+    Polynomial container data entry for scalars. Items are stored in a list of
+    Tuple2's. Data is input in the form, e.g. for an entry <entryName> that
+    describes y = x^2 + 2x^3
+
+    @verbatim
+        <entryName>   polynomial
+        (
+            (1    2)
+            (2    3)
+        );
+    @endverbatim
+
+SourceFiles
+    polynomial.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef polynomial_H
+#define polynomial_H
+
+#include "DataEntry.H"
+#include "Tuple2.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class polynomial;
+
+// Forward declaration of friend functions
+Ostream& operator<<
+(
+    Ostream&,
+    const polynomial&
+);
+
+/*---------------------------------------------------------------------------*\
+                        Class polynomial Declaration
+\*---------------------------------------------------------------------------*/
+
+class polynomial
+:
+    public DataEntry<scalar>
+{
+    // Private data
+
+        //- Polynomial coefficients - list of prefactor, exponent
+        List<Tuple2<scalar, scalar> > coeffs_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise assignment
+        void operator=(const polynomial&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("polynomial");
+
+
+    // Constructors
+
+        //- Construct from entry name and Istream
+        polynomial(const word& entryName, Istream& is);
+
+        //- Copy constructor
+        polynomial(const polynomial& poly);
+
+
+    //- Destructor
+    virtual ~polynomial();
+
+
+    // Member Functions
+
+        //- Return polynomial value
+        scalar value(const scalar x) const;
+
+        //- Integrate between two (scalar) values
+        scalar integrate(const scalar x1, const scalar x2) const;
+
+
+    //- Ostream Operator
+    friend Ostream& operator<<
+    (
+        Ostream&,
+        const polynomial&
+    );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/test/ptrList/ptrListTest.C b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
similarity index 67%
rename from applications/test/ptrList/ptrListTest.C
rename to src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
index 4507780f4..120ce7a6d 100644
--- a/applications/test/ptrList/ptrListTest.C
+++ b/src/lagrangian/intermediate/submodels/IO/DataEntry/polynomial/polynomialIO.C
@@ -24,36 +24,38 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "PtrList.H"
-#include "scalar.H"
+#include "polynomial.H"
 
-using namespace Foam;
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
-
-int main(int argc, char *argv[])
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const polynomial& poly
+)
 {
-    PtrList<scalar> list(10);
-
-    forAll(list, i)
+    if (os.format() == IOstream::ASCII)
     {
-        list.set(i, new scalar(i));
+        os  << static_cast<const DataEntry<scalar>& >(poly)
+            << token::SPACE << poly.coeffs_;
+    }
+    else
+    {
+        os  << static_cast<const DataEntry<scalar>& >(poly);
+        os.write
+        (
+            reinterpret_cast<const char*>(&poly.coeffs_),
+            sizeof(poly.coeffs_)
+        );
     }
 
-    for
+    // Check state of Ostream
+    os.check
     (
-        PtrList<scalar>::iterator iter = list.begin();
-        iter != list.end();
-        ++iter
-    )
-    {
-        Info<< *iter << endl;
-    }
+        "Ostream& operator<<(Ostream&, const polynomial&)"
+    );
 
-    Info<< list << endl;
-
-    return 0;
+    return os;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
index 3061922ce..54f57cde0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.C
@@ -22,14 +22,20 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "DispersionModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::DispersionModel<CloudType>::DispersionModel(CloudType& owner)
+:
+    dict_(dictionary::null),
+    owner_(owner)
+{}
+
+
 template<class CloudType>
 Foam::DispersionModel<CloudType>::DispersionModel
 (
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
index 808613ea0..aee2e2c76 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/DispersionModel.H
@@ -42,7 +42,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                          Class DispersionModel Declaration
+                        Class DispersionModel Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -54,7 +54,7 @@ class DispersionModel
         //- Cloud dictionary
         const dictionary& dict_;
 
-        // Reference to the owner cloud class
+        //- Reference to the owner cloud class
         CloudType& owner_;
 
 
@@ -81,6 +81,9 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        DispersionModel(CloudType& owner);
+
         //- Construct from components
         DispersionModel
         (
@@ -89,18 +92,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~DispersionModel();
+    //- Destructor
+    virtual ~DispersionModel();
 
 
-    // Selector
-
-        static autoPtr<DispersionModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+    //- Selector
+    static autoPtr<DispersionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Access
@@ -120,6 +121,9 @@ public:
         //- Flag to indicate whether model activates injection model
         virtual bool active() const = 0;
 
+        //- Cache carrier fields
+        virtual void cacheFields(const bool store) = 0;
+
         //- Update (disperse particles)
         virtual vector update
         (
@@ -159,6 +163,20 @@ public:
             add##SS##CloudType##ParcelType##ConstructorToTable_;
 
 
+#define makeDispersionModelThermoType(SS, CloudType, ParcelType, ThermoType)  \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    DispersionModel<CloudType<ParcelType<ThermoType> > >::                    \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
index 9f987349a..0ac31f81f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionModel/NewDispersionModel.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "DispersionModel.H"
@@ -38,10 +36,7 @@ Foam::DispersionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word DispersionModelType
-    (
-        dict.lookup("DispersionModel")
-    );
+    word DispersionModelType(dict.lookup("DispersionModel"));
 
     Info<< "Selecting DispersionModel " << DispersionModelType << endl;
 
@@ -53,11 +48,14 @@ Foam::DispersionModel<CloudType>::New
         FatalErrorIn
         (
             "DispersionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
         )   << "Unknown DispersionModelType type "
             << DispersionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid DispersionModel types are :" << nl
+            << "    Valid DispersionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
index ca2f3e656..fdafad777 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "DispersionRASModel.H"
@@ -44,7 +42,11 @@ Foam::DispersionRASModel<CloudType>::DispersionRASModel
         (
             "RASProperties"
         )
-    )
+    ),
+    kPtr_(NULL),
+    ownK_(false),
+    epsilonPtr_(NULL),
+    ownEpsilon_(false)
 {}
 
 
@@ -52,7 +54,58 @@ Foam::DispersionRASModel<CloudType>::DispersionRASModel
 
 template<class CloudType>
 Foam::DispersionRASModel<CloudType>::~DispersionRASModel()
-{}
+{
+    cacheFields(false);
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::DispersionRASModel<CloudType>::cacheFields(const bool store)
+{
+    if (store)
+    {
+        tmp<volScalarField> tk = this->turbulence().k();
+        if (tk.isTmp())
+        {
+            kPtr_ = tk.ptr();
+            ownK_ = true;
+        }
+        else
+        {
+            kPtr_ = tk.operator->();
+            ownK_ = false;
+        }
+
+        tmp<volScalarField> tepsilon = this->turbulence().epsilon();
+        if (tepsilon.isTmp())
+        {
+            epsilonPtr_ = tepsilon.ptr();
+            ownEpsilon_ = true;
+        }
+        else
+        {
+            epsilonPtr_ = tepsilon.operator->();
+            ownEpsilon_ = false;
+        }
+    }
+    else
+    {
+        if (ownK_ && kPtr_)
+        {
+            delete kPtr_;
+            kPtr_ = NULL;
+            ownK_ = false;
+        }
+        if (ownEpsilon_ && epsilonPtr_)
+        {
+            delete epsilonPtr_;
+            epsilonPtr_ = NULL;
+            ownEpsilon_ = false;
+        }
+    }
+}
 
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
index c164701aa..106c7a0df 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/DispersionRASModel/DispersionRASModel.H
@@ -50,12 +50,27 @@ class DispersionRASModel
 :
     public DispersionModel<CloudType>
 {
+protected:
 
-    // Private data
+    // Protected data
 
         //- Reference to the compressible turbulence model
         const compressible::RASModel& turbulence_;
 
+        // Locally cached turbulence fields
+
+            //- Turbulence k
+            const volScalarField* kPtr_;
+
+            //- Take ownership of the k field
+            bool ownK_;
+
+            //- Turbulence epsilon
+            const volScalarField* epsilonPtr_;
+
+            //- Take ownership of the epsilon field
+            bool ownEpsilon_;
+
 
 public:
 
@@ -73,13 +88,15 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~DispersionRASModel();
+    //- Destructor
+    virtual ~DispersionRASModel();
 
 
     // Member Functions
 
+        //- Cache carrier fields
+        virtual void cacheFields(const bool store);
+
         //- Return const access to the turbulence model
         const compressible::RASModel& turbulence() const
         {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
index b8f181477..80b9f7c73 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "GradientDispersionRAS.H"
@@ -37,7 +35,8 @@ Foam::GradientDispersionRAS<CloudType>::GradientDispersionRAS
     CloudType& owner
 )
 :
-    DispersionRASModel<CloudType>(dict, owner)
+    DispersionRASModel<CloudType>(dict, owner),
+    gradkPtr_(NULL)
 {}
 
 
@@ -45,7 +44,9 @@ Foam::GradientDispersionRAS<CloudType>::GradientDispersionRAS
 
 template<class CloudType>
 Foam::GradientDispersionRAS<CloudType>::~GradientDispersionRAS()
-{}
+{
+    cacheFields(false);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -57,6 +58,26 @@ bool Foam::GradientDispersionRAS<CloudType>::active() const
 }
 
 
+template<class CloudType>
+void Foam::GradientDispersionRAS<CloudType>::cacheFields(const bool store)
+{
+    DispersionRASModel<CloudType>::cacheFields(store);
+
+    if (store)
+    {
+        gradkPtr_ = fvc::grad(*this->kPtr_).ptr();
+    }
+    else
+    {
+        if (gradkPtr_)
+        {
+            delete gradkPtr_;
+            gradkPtr_ = NULL;
+        }
+    }
+}
+
+
 template<class CloudType>
 Foam::vector Foam::GradientDispersionRAS<CloudType>::update
 (
@@ -70,9 +91,9 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
 {
     const scalar cps = 0.16432;
 
-    const volScalarField& k = this->turbulence().k();
-    const volScalarField& epsilon = this->turbulence().epsilon();
-    const volVectorField gradk = fvc::grad(k);
+    const volScalarField& k = *this->kPtr_;
+    const volScalarField& epsilon = *this->epsilonPtr_;
+    const volVectorField& gradk = *this->gradkPtr_;
 
     const scalar UrelMag = mag(U - Uc - UTurb);
 
@@ -111,7 +132,7 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
             // away from the axis of symmetry
             // This creates a 'hole' in the spray and to
             // prevent this we let x1 be both negative/positive
-            if (this->owner().meshInfo().caseIs2d())
+            if (this->owner().mesh().nSolutionD() == 2)
             {
                 fac *= x1;
             }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
index 5c28d8a58..c010a2d38 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.H
@@ -51,6 +51,13 @@ class GradientDispersionRAS
 :
     public DispersionRASModel<CloudType>
 {
+protected:
+
+    // Locally cached turbulence fields
+
+        //- Gradient of k
+        const volVectorField* gradkPtr_;
+
 
 public:
 
@@ -68,9 +75,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~GradientDispersionRAS();
+    //- Destructor
+    virtual ~GradientDispersionRAS();
 
 
     // Member Functions
@@ -78,8 +84,11 @@ public:
         //- Flag to indicate whether model activates injection model
         bool active() const;
 
+        //- Cache carrier fields
+        virtual void cacheFields(const bool store);
+
         //- Update (disperse particles)
-        vector update
+        virtual vector update
         (
             const scalar dt,
             const label celli,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
index 867b5eeae..e0d405ce0 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "NoDispersion.H"
@@ -33,11 +31,11 @@ Description
 template<class CloudType>
 Foam::NoDispersion<CloudType>::NoDispersion
 (
-    const dictionary& dict,
+    const dictionary&,
     CloudType& owner
 )
 :
-    DispersionModel<CloudType>(dict, owner)
+    DispersionModel<CloudType>(owner)
 {}
 
 
@@ -57,15 +55,22 @@ bool Foam::NoDispersion<CloudType>::active() const
 }
 
 
+template<class CloudType>
+void Foam::NoDispersion<CloudType>::cacheFields(const bool)
+{
+// do nothing
+}
+
+
 template<class CloudType>
 Foam::vector Foam::NoDispersion<CloudType>::update
 (
-    const scalar dt,
-    const label celli,
-    const vector& U,
+    const scalar,
+    const label,
+    const vector&,
     const vector& Uc,
-    vector& UTurb,
-    scalar& tTurb
+    vector&,
+    scalar&
 )
 {
     // Do nothing
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
index d7f53e5da..46566b59e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/NoDispersion/NoDispersion.H
@@ -26,7 +26,7 @@ Class
     Foam::NoDispersion
 
 Description
-    No turbulent dispersion of the parcels
+    Place holder for 'none' option
 
 \*---------------------------------------------------------------------------*/
 
@@ -41,7 +41,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class NoDispersion Declaration
+                       Class NoDispersion Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -49,11 +49,10 @@ class NoDispersion
 :
     public DispersionModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
-    TypeName("NoDispersion");
+    TypeName("none");
 
 
     // Constructors
@@ -66,18 +65,20 @@ public:
         );
 
 
-    // Destructor
-
-        ~NoDispersion();
+    //- Destructor
+    virtual ~NoDispersion();
 
 
     // Member Functions
 
         //- Flag to indicate whether model activates injection model
-        bool active() const;
+        virtual bool active() const;
+
+        //- Cache carrier fields
+        virtual void cacheFields(const bool store);
 
         //- Update (disperse particles)
-        vector update
+        virtual vector update
         (
             const scalar dt,
             const label celli,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index c8ddf713f..a4036f0d1 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "StochasticDispersionRAS.H"
@@ -70,8 +68,8 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
 {
     const scalar cps = 0.16432;
 
-    const volScalarField& k = this->turbulence().k();
-    const volScalarField& epsilon = this->turbulence().epsilon();
+    const volScalarField& k = *this->kPtr_;
+    const volScalarField& epsilon = *this->epsilonPtr_;
 
     const scalar UrelMag = mag(U - Uc - UTurb);
 
@@ -95,7 +93,8 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
             dir /= mag(dir) + SMALL;
 
             // Numerical Recipes... Ch. 7. Random Numbers...
-            scalar x1, x2;
+            scalar x1 = 0.0;
+            scalar x2 = 0.0;
             scalar rsq = 10.0;
             while ((rsq > 1.0) || (rsq == 0.0))
             {
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
index 182833a25..c46256277 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.H
@@ -51,7 +51,6 @@ class StochasticDispersionRAS
 :
     public DispersionRASModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
@@ -68,18 +67,17 @@ public:
         );
 
 
-    // Destructor
-
-        ~StochasticDispersionRAS();
+    //- Destructor
+    virtual ~StochasticDispersionRAS();
 
 
     // Member Functions
 
         //- Flag to indicate whether model activates injection model
-        bool active() const;
+        virtual bool active() const;
 
         //- Update (disperse particles)
-        vector update
+        virtual vector update
         (
             const scalar dt,
             const label celli,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
index 63c48e9bb..3c6d7899d 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.C
@@ -34,7 +34,8 @@ Foam::DragModel<CloudType>::DragModel
     const dictionary& dict,
     CloudType& owner
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner)
 {}
 
@@ -63,22 +64,16 @@ const Foam::dictionary& Foam::DragModel<CloudType>::dict() const
 
 
 template<class CloudType>
-Foam::scalar Foam::DragModel<CloudType>::Cu
+Foam::scalar Foam::DragModel<CloudType>::utc
 (
-    const vector& Ur,
+    const scalar Re,
     const scalar d,
-    const scalar rhoc,
-    const scalar rhop,
     const scalar mu
 ) const
 {
-    const scalar magUr = mag(Ur);
+    const scalar Cd = this->Cd(Re);
 
-    const scalar Re = rhoc*magUr*d/(mu + SMALL);
-
-    const scalar cd = Cd(Re);
-
-    return 3.0*cd*rhoc*magUr/(4.0*d*rhop);
+    return Cd*Re/d*mu/8.0;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
index 0af5c9b24..20b50c7e7 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/DragModel.H
@@ -25,7 +25,6 @@ License
 Class
     Foam::DragModel
 
-
 Description
     Templated drag model class
 
@@ -54,13 +53,12 @@ namespace Foam
 template<class CloudType>
 class DragModel
 {
-
     // Private data
 
         //- The cloud dictionary
         const dictionary& dict_;
 
-        // reference to the owner cloud class
+        //- Reference to the owner cloud class
         CloudType& owner_;
 
 
@@ -93,18 +91,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~DragModel();
+    //- Destructor
+    virtual ~DragModel();
 
 
-    // Selector
-
-        static autoPtr<DragModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+    //- Selector
+    static autoPtr<DragModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& cloud
+    );
 
 
     // Access
@@ -124,16 +120,9 @@ public:
         //- Return drag coefficient
         virtual scalar Cd(const scalar Re) const = 0;
 
-        //- Return linearised coefficient for velocity equation
-        //  Drag force per unit particle mass = Cu(U - Up)
-        scalar Cu
-        (
-            const vector& Ur,
-            const scalar d,
-            const scalar rhoc,
-            const scalar rhop,
-            const scalar mu
-        ) const;
+        //- Return momentum transfer coefficient
+        //  Drag force per unit particle surface area = utc(U - Up)
+        scalar utc(const scalar Re, const scalar d, const scalar mu) const;
 };
 
 
@@ -159,6 +148,20 @@ public:
             add##SS##CloudType##ParcelType##ConstructorToTable_;
 
 
+#define makeDragModelThermoType(SS, CloudType, ParcelType, ThermoType)        \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    DragModel<CloudType<ParcelType<ThermoType> > >::                          \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
index 0c4450a08..14cdd1d56 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/DragModel/NewDragModel.C
@@ -35,10 +35,7 @@ Foam::autoPtr<Foam::DragModel<CloudType> > Foam::DragModel<CloudType>::New
     CloudType& owner
 )
 {
-    word DragModelType
-    (
-        dict.lookup("DragModel")
-    );
+    word DragModelType(dict.lookup("DragModel"));
 
     Info<< "Selecting DragModel " << DragModelType << endl;
 
@@ -50,12 +47,14 @@ Foam::autoPtr<Foam::DragModel<CloudType> > Foam::DragModel<CloudType>::New
         FatalErrorIn
         (
             "DragModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
-            << "Unknown DragModelType type "
+            "("
+                "const dictionary&,"
+                "CloudType&"
+            ")"
+        )   << "Unknown DragModelType type "
             << DragModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid DragModel types are :" << nl
+            << "    Valid DragModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
index 67eb7eba7..72ac438d6 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.C
@@ -29,11 +29,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::NoDrag<CloudType>::NoDrag
-(
-    const dictionary& dict,
-    CloudType& owner
-)
+Foam::NoDrag<CloudType>::NoDrag(const dictionary& dict, CloudType& owner)
 :
     DragModel<CloudType>(dict, owner)
 {}
@@ -56,10 +52,7 @@ bool Foam::NoDrag<CloudType>::active() const
 
 
 template<class CloudType>
-Foam::scalar Foam::NoDrag<CloudType>::Cd
-(
-    const scalar
-) const
+Foam::scalar Foam::NoDrag<CloudType>::Cd(const scalar) const
 {
     return 0.0;
 }
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
index 8ad2a0407..c4c80f90e 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/NoDrag/NoDrag.H
@@ -26,7 +26,7 @@ Class
     Foam::NoDrag
 
 Description
-    Dummy drag model for 'no drag'
+    Dummy drag model for 'none'
 
 \*---------------------------------------------------------------------------*/
 
@@ -48,11 +48,10 @@ class NoDrag
 :
     public DragModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
-    TypeName("NoDrag");
+    TypeName("none");
 
 
     // Constructors
@@ -60,14 +59,13 @@ public:
         //- Construct from dictionary
         NoDrag
         (
-            const dictionary& dict,
-            CloudType& owner
+            const dictionary&,
+            CloudType&
         );
 
 
-    // Destructor
-
-        ~NoDrag();
+    //- Destructor
+    virtual ~NoDrag();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
index ab7103db1..e1c02e21f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.C
@@ -56,10 +56,7 @@ bool Foam::SphereDrag<CloudType>::active() const
 
 
 template <class CloudType>
-Foam::scalar Foam::SphereDrag<CloudType>::Cd
-(
-    const scalar Re
-) const
+Foam::scalar Foam::SphereDrag<CloudType>::Cd(const scalar Re) const
 {
     scalar Cd;
     if (Re < SMALL)
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H
index 4e6a5910b..37c838000 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/DragModel/SphereDrag/SphereDrag.H
@@ -48,7 +48,6 @@ class SphereDrag
 :
     public DragModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
@@ -65,9 +64,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~SphereDrag();
+    //- Destructor
+    virtual ~SphereDrag();
 
 
     // Member Functions
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index bc483b405..c73fc2829 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -26,11 +26,12 @@ License
 
 #include "ConeInjection.H"
 #include "DataEntry.H"
+#include "mathematicalConstants.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::label Foam::ConeInjection<CloudType>::nParcelsToInject
+Foam::label Foam::ConeInjection<CloudType>::parcelsToInject
 (
     const scalar time0,
     const scalar time1
@@ -77,6 +78,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
     InjectionModel<CloudType>(dict, owner, typeName),
     duration_(readScalar(this->coeffDict().lookup("duration"))),
     position_(this->coeffDict().lookup("position")),
+    injectorCell_(-1),
     direction_(this->coeffDict().lookup("direction")),
     parcelsPerSecond_
     (
@@ -145,6 +147,9 @@ Foam::ConeInjection<CloudType>::ConeInjection
 
     // Set total volume to inject
     this->volumeTotal_ = volumeFlowRate_().integrate(0.0, duration_);
+
+    // Set/cache the injector cell
+    this->findCellAtPosition(injectorCell_, position_);
 }
 
 
@@ -172,47 +177,30 @@ Foam::scalar Foam::ConeInjection<CloudType>::timeEnd() const
 
 
 template<class CloudType>
-Foam::vector Foam::ConeInjection<CloudType>::position
+void Foam::ConeInjection<CloudType>::setPositionAndCell
 (
+    const label,
     const label,
     const scalar,
-    const polyMeshInfo& meshInfo
+    vector& position,
+    label& cellOwner
 )
 {
-    vector pos = position_;
-    if (meshInfo.caseIs2d())
-    {
-        if (meshInfo.caseIs2dWedge())
-        {
-            pos.component(meshInfo.emptyComponent()) = 0.0;
-        }
-        else if (meshInfo.caseIs2dSlab())
-        {
-            pos.component(meshInfo.emptyComponent()) =
-                meshInfo.centrePoint().component(meshInfo.emptyComponent());
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "Foam::vector Foam::ConeInjection<CloudType>::position"
-            )   << "Could not determine 2-D case geometry" << nl
-                << abort(FatalError);
-        }
-    }
-
-    return pos;
+    position = position_;
+    cellOwner = injectorCell_;
 }
 
 
 template<class CloudType>
-Foam::vector Foam::ConeInjection<CloudType>::velocity
+void Foam::ConeInjection<CloudType>::setProperties
 (
+    const label parcelI,
     const label,
     const scalar time,
-    const polyMeshInfo& meshInfo
+    typename CloudType::parcelType& parcel
 )
 {
+    // set particle velocity
     const scalar deg2Rad = mathematicalConstant::pi/180.0;
 
     scalar t = time - this->SOI_;
@@ -223,33 +211,31 @@ Foam::vector Foam::ConeInjection<CloudType>::velocity
     coneAngle *= deg2Rad;
     scalar alpha = sin(coneAngle);
     scalar dcorr = cos(coneAngle);
-    scalar beta =
-        2.0*mathematicalConstant::pi*this->owner().rndGen().scalar01();
+    scalar beta = mathematicalConstant::twoPi*this->owner().rndGen().scalar01();
 
     vector normal = alpha*(tanVec1_*cos(beta) + tanVec2_*sin(beta));
     vector dirVec = dcorr*direction_;
     dirVec += normal;
-
-    // Remove empty component of velocity for slab cases
-    if (meshInfo.caseIs2dSlab())
-    {
-        dirVec.component(meshInfo.emptyComponent()) = 0.0;
-    }
-
     dirVec /= mag(dirVec);
 
-    return Umag_().value(t)*dirVec;
+    parcel.U() = Umag_().value(t)*dirVec;
+
+    // set particle diameter
+    parcel.d() = parcelPDF_().sample();
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::ConeInjection<CloudType>::d0
-(
-    const label,
-    const scalar
-) const
+bool Foam::ConeInjection<CloudType>::fullyDescribed() const
 {
-    return parcelPDF_().sample();
+    return false;
+}
+
+
+template<class CloudType>
+bool Foam::ConeInjection<CloudType>::validInjection(const label)
+{
+    return true;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
index 215cdce6d..12b985437 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.H
@@ -53,6 +53,8 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
+
 template<class Type>
 class DataEntry;
 
@@ -65,17 +67,16 @@ class ConeInjection
 :
     public InjectionModel<CloudType>
 {
-
     // Private data
 
-        //- Coefficients dictionary
-        dictionary coeffDict_;
-
         //- Injection duration [s]
         const scalar duration_;
 
         //- Injector position [m]
-        const vector position_;
+        vector position_;
+
+        //- Cell containing injector position []
+        label injectorCell_;
 
         //- Injector direction []
         vector direction_;
@@ -112,14 +113,14 @@ protected:
 
     // Protected member functions
 
-        //- Number of parcels to introduce over the time step
-        label nParcelsToInject
+        //- Number of parcels to introduce over the time step relative to SOI
+        label parcelsToInject
         (
             const scalar time0,
             const scalar time1
         ) const;
 
-        //- Number of parcels to introduce over the time step
+        //- Number of parcels to introduce over the time step relative to SOI
         scalar volumeToInject
         (
             const scalar time0,
@@ -143,9 +144,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~ConeInjection();
+    //- Destructor
+    virtual ~ConeInjection();
 
 
     // Member Functions
@@ -159,28 +159,31 @@ public:
 
         // Injection geometry
 
-            //- Return the injection position
-            vector position
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
+                const label nParcels,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                vector& position,
+                label& cellOwner
             );
 
-            //- Return the velocity of the parcel to introduce at a time
-            vector velocity
+            //- Set the parcel properties
+            virtual void setProperties
             (
-                const label,
+                const label parcelI,
+                const label nParcels,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                typename CloudType::parcelType& parcel
             );
 
-            //- Return the diameter of the parcel to introduce at a time
-            scalar d0
-            (
-                const label,
-                const scalar
-            ) const;
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const;
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
new file mode 100644
index 000000000..4f685c09b
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.C
@@ -0,0 +1,289 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "ConeInjectionMP.H"
+#include "DataEntry.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::ConeInjectionMP<CloudType>::parcelsToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        const scalar targetVolume = volumeFlowRate_().integrate(0, time1);
+
+        const label targetParcels =
+            parcelsPerInjector_*targetVolume/this->volumeTotal_;
+
+        const label nToInject = targetParcels - nInjected_;
+
+        nInjected_ += nToInject;
+
+        return positions_.size()*nToInject;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::ConeInjectionMP<CloudType>::volumeToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        return volumeFlowRate_().integrate(time0, time1);
+    }
+    else
+    {
+        return 0.0;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ConeInjectionMP<CloudType>::ConeInjectionMP
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    InjectionModel<CloudType>(dict, owner, typeName),
+    positionsFile_(this->coeffDict().lookup("positionsFile")),
+    positions_
+    (
+        IOobject
+        (
+            positionsFile_,
+            owner.db().time().constant(),
+            owner.mesh(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    injectorCells_(positions_.size()),
+    axesFile_(this->coeffDict().lookup("axesFile")),
+    axes_
+    (
+        IOobject
+        (
+            axesFile_,
+            owner.db().time().constant(),
+            owner.mesh(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    parcelsPerInjector_
+    (
+        readScalar(this->coeffDict().lookup("parcelsPerInjector"))
+    ),
+    volumeFlowRate_
+    (
+        DataEntry<scalar>::New
+        (
+            "volumeFlowRate",
+            this->coeffDict()
+        )
+    ),
+    Umag_
+    (
+        DataEntry<scalar>::New
+        (
+            "Umag",
+            this->coeffDict()
+        )
+    ),
+    thetaInner_
+    (
+        DataEntry<scalar>::New
+        (
+            "thetaInner",
+            this->coeffDict()
+        )
+    ),
+    thetaOuter_
+    (
+        DataEntry<scalar>::New
+        (
+            "thetaOuter",
+            this->coeffDict()
+        )
+    ),
+    parcelPDF_
+    (
+        pdf::New
+        (
+            this->coeffDict().subDict("parcelPDF"),
+            owner.rndGen()
+        )
+    ),
+    nInjected_(this->parcelsAddedTotal()),
+    tanVec1_(positions_.size()),
+    tanVec2_(positions_.size())
+{
+    // Normalise direction vector and determine direction vectors
+    // tangential to direction
+    forAll(axes_, i)
+    {
+        axes_[i] /= mag(axes_[i]);
+
+        vector tangent = vector::zero;
+        scalar magTangent = 0.0;
+
+        while (magTangent < SMALL)
+        {
+            vector v = this->owner().rndGen().vector01();
+
+            tangent = v - (v & axes_[i])*axes_[i];
+            magTangent = mag(tangent);
+        }
+
+        tanVec1_[i] = tangent/magTangent;
+        tanVec2_[i] = axes_[i]^tanVec1_[i];
+    }
+
+    // Set total volume to inject
+    this->volumeTotal_ = volumeFlowRate_().integrate(0.0, duration_);
+
+    // Set/cache the injector cells
+    forAll(positions_, i)
+    {
+        this->findCellAtPosition
+        (
+            injectorCells_[i],
+            positions_[i]
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ConeInjectionMP<CloudType>::~ConeInjectionMP()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::ConeInjectionMP<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::ConeInjectionMP<CloudType>::timeEnd() const
+{
+    return this->SOI_ + duration_;
+}
+
+
+template<class CloudType>
+void Foam::ConeInjectionMP<CloudType>::setPositionAndCell
+(
+    const label parcelI,
+    const label,
+    const scalar,
+    vector& position,
+    label& cellOwner
+)
+{
+    const label i = parcelI%positions_.size();
+
+    position = positions_[i];
+    cellOwner = injectorCells_[i];
+}
+
+
+template<class CloudType>
+void Foam::ConeInjectionMP<CloudType>::setProperties
+(
+    const label parcelI,
+    const label,
+    const scalar time,
+    typename CloudType::parcelType& parcel
+)
+{
+    // set particle velocity
+    const label i = parcelI%positions_.size();
+
+    const scalar deg2Rad = mathematicalConstant::pi/180.0;
+
+    scalar t = time - this->SOI_;
+    scalar ti = thetaInner_().value(t);
+    scalar to = thetaOuter_().value(t);
+    scalar coneAngle = this->owner().rndGen().scalar01()*(to - ti) + ti;
+
+    coneAngle *= deg2Rad;
+    scalar alpha = sin(coneAngle);
+    scalar dcorr = cos(coneAngle);
+    scalar beta = mathematicalConstant::twoPi*this->owner().rndGen().scalar01();
+
+    vector normal = alpha*(tanVec1_[i]*cos(beta) + tanVec2_[i]*sin(beta));
+    vector dirVec = dcorr*axes_[i];
+    dirVec += normal;
+
+    dirVec /= mag(dirVec);
+
+    parcel.U() = Umag_().value(t)*dirVec;
+
+    // set particle diameter
+    parcel.d() = parcelPDF_().sample();
+}
+
+
+template<class CloudType>
+bool Foam::ConeInjectionMP<CloudType>::fullyDescribed() const
+{
+    return false;
+}
+
+
+template<class CloudType>
+bool Foam::ConeInjectionMP<CloudType>::validInjection(const label)
+{
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
new file mode 100644
index 000000000..7379fcffb
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjectionMP/ConeInjectionMP.H
@@ -0,0 +1,214 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::ConeInjectionMP
+
+Description
+    Cone injection multi-point
+
+    - User specifies
+      - time of start of injection
+      - injector positions
+      - directions (along injection axes)
+      - parcel flow rate
+      - parcel velocities
+      - inner and outer cone angles
+    - Parcel diameters obtained by PDF model
+
+SourceFiles
+    ConeInjectionMP.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ConeInjectionMP_H
+#define ConeInjectionMP_H
+
+#include "InjectionModel.H"
+#include "pdf.H"
+#include "vectorList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+
+template<class Type>
+class DataEntry;
+
+/*---------------------------------------------------------------------------*\
+                       Class ConeInjectionMP Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class ConeInjectionMP
+:
+    public InjectionModel<CloudType>
+{
+    // Private data
+
+        //- Name of file containing positions data
+        const word positionsFile_;
+
+        //- Field of injector positions
+        vectorIOField positions_;
+
+        //- Field of cell labels corresoponding to injector positions
+        labelList injectorCells_;
+
+        //- Name of file containing axes data
+        const word axesFile_;
+
+        //- Field of injector positions
+        vectorIOField axes_;
+
+        //- Injection duration [s]
+        const scalar duration_;
+
+        //- Number of parcels to introduce per injector
+        const label parcelsPerInjector_;
+
+        //- Volume flow rate of parcels to introduce relative to SOI [m^3]
+        const autoPtr<DataEntry<scalar> > volumeFlowRate_;
+
+        //- Parcel velocity magnitude relative to SOI [m/s]
+        const autoPtr<DataEntry<scalar> > Umag_;
+
+        //- Inner cone angle relative to SOI [deg]
+        const autoPtr<DataEntry<scalar> > thetaInner_;
+
+        //- Outer cone angle relative to SOI [deg]
+        const autoPtr<DataEntry<scalar> > thetaOuter_;
+
+        //- Parcel size PDF model
+        const autoPtr<pdf> parcelPDF_;
+
+        //- Number of parcels per injector already injected
+        mutable label nInjected_;
+
+
+        // Tangential vectors to the direction vector
+
+            //- First tangential vector
+            vectorList tanVec1_;
+
+            //- Second tangential vector
+            vectorList tanVec2_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Number of parcels to introduce over the time step
+        label parcelsToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+        //- Number of parcels to introduce over the time step
+        scalar volumeToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("ConeInjectionMP");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        ConeInjectionMP
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~ConeInjectionMP();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates injection model
+        bool active() const;
+
+        //- Return the end-of-injection time
+        scalar timeEnd() const;
+
+
+        // Injection geometry
+
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                vector& position,
+                label& cellOwner
+            );
+
+            //- Set the parcel properties
+            virtual void setProperties
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                typename CloudType::parcelType& parcel
+            );
+
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const;
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ConeInjectionMP.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
new file mode 100644
index 000000000..9bc4b29b3
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.C
@@ -0,0 +1,229 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "FieldActivatedInjection.H"
+#include "volFields.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::FieldActivatedInjection<CloudType>::parcelsToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if (sum(nParcelsInjected_) < nParcelsPerInjector_*positions_.size())
+    {
+        return positions_.size();
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::FieldActivatedInjection<CloudType>::volumeToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if (sum(nParcelsInjected_) < nParcelsPerInjector_*positions_.size())
+    {
+        return this->volumeTotal_/nParcelsPerInjector_;
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::FieldActivatedInjection<CloudType>::FieldActivatedInjection
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    InjectionModel<CloudType>(dict, owner, typeName),
+    factor_(readScalar(this->coeffDict().lookup("factor"))),
+    referenceField_
+    (
+        owner.db().objectRegistry::lookupObject<volScalarField>
+        (
+            this->coeffDict().lookup("referenceField")
+        )
+    ),
+    thresholdField_
+    (
+        owner.db().objectRegistry::lookupObject<volScalarField>
+        (
+            this->coeffDict().lookup("thresholdField")
+        )
+    ),
+    positionsFile_(this->coeffDict().lookup("positionsFile")),
+    positions_
+    (
+        IOobject
+        (
+            positionsFile_,
+            owner.db().time().constant(),
+            owner.mesh(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    injectorCells_(positions_.size()),
+    nParcelsPerInjector_
+    (
+        readLabel(this->coeffDict().lookup("parcelsPerInjector"))
+    ),
+    nParcelsInjected_(positions_.size(), 0),
+    U0_(this->coeffDict().lookup("U0")),
+    diameters_(positions_.size()),
+    parcelPDF_
+    (
+        pdf::New
+        (
+            this->coeffDict().subDict("parcelPDF"),
+            owner.rndGen()
+        )
+    )
+{
+    // Construct parcel diameters - one per injector cell
+    forAll(diameters_, i)
+    {
+        diameters_[i] = parcelPDF_->sample();
+    }
+
+    // Determine total volume of particles to inject
+    this->volumeTotal_ =
+        nParcelsPerInjector_*sum(pow3(diameters_))*mathematicalConstant::pi/6.0;
+
+    // Set/cache the injector cells
+    forAll(positions_, i)
+    {
+        this->findCellAtPosition
+        (
+            injectorCells_[i],
+            positions_[i]
+        );
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::FieldActivatedInjection<CloudType>::~FieldActivatedInjection()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::FieldActivatedInjection<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::FieldActivatedInjection<CloudType>::timeEnd() const
+{
+    return GREAT;
+}
+
+
+template<class CloudType>
+void Foam::FieldActivatedInjection<CloudType>::setPositionAndCell
+(
+    const label parcelI,
+    const label,
+    const scalar,
+    vector& position,
+    label& cellOwner
+)
+{
+    position = positions_[parcelI];
+    cellOwner = injectorCells_[parcelI];
+}
+
+
+template<class CloudType>
+void Foam::FieldActivatedInjection<CloudType>::setProperties
+(
+    const label parcelI,
+    const label,
+    const scalar,
+    typename CloudType::parcelType& parcel
+)
+{
+    // set particle velocity
+    parcel.U() = U0_;
+
+    // set particle diameter
+    parcel.d() = diameters_[parcelI];
+}
+
+
+template<class CloudType>
+bool Foam::FieldActivatedInjection<CloudType>::fullyDescribed() const
+{
+    return false;
+}
+
+
+template<class CloudType>
+bool Foam::FieldActivatedInjection<CloudType>::validInjection
+(
+    const label parcelI
+)
+{
+    const label cellI = injectorCells_[parcelI];
+
+    if
+    (
+        nParcelsInjected_[parcelI] < nParcelsPerInjector_
+     && factor_*referenceField_[cellI] > thresholdField_[cellI]
+    )
+    {
+        nParcelsInjected_[parcelI]++;
+        return true;
+    }
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
new file mode 100644
index 000000000..7021842a4
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/FieldActivatedInjection/FieldActivatedInjection.H
@@ -0,0 +1,204 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::FieldActivatedInjection
+
+Description
+    Injection at specified positions, with the conditions:
+
+    - for injection to be allowed
+
+        factor*referenceField[cellI] >= thresholdField[cellI]
+
+        where:
+          - referenceField is the field used to supply the look-up values
+          - thresholdField supplies the values beyond which the injection is
+            permitted
+
+    - limited to a user-supllied number of injections per injector location
+
+SourceFiles
+    FieldActivatedInjection.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef FieldActivatedInjection_H
+#define FieldActivatedInjection_H
+
+#include "InjectionModel.H"
+#include "pdf.H"
+#include "volFieldsFwd.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class FieldActivatedInjection Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class FieldActivatedInjection
+:
+    public InjectionModel<CloudType>
+{
+    // Private data
+
+        // Model parameters
+
+            //- Factor to apply to reference field
+            const scalar factor_;
+
+            //- Reference field
+            const volScalarField& referenceField_;
+
+            //- Threshold field
+            const volScalarField& thresholdField_;
+
+
+        // Injector properties
+
+            //- Name of file containing positions data
+            const word positionsFile_;
+
+            //- Field of injector (x,y,z) positions
+            vectorIOField positions_;
+
+            //- Field of cell labels corresponding to injector positions
+            labelList injectorCells_;
+
+            //- Number of parcels per injector
+            const label nParcelsPerInjector_;
+
+            //- Field of number of parcels injected for each injector
+            labelList nParcelsInjected_;
+
+
+        // Parcel properties
+
+            //- Initial parcel velocity
+            const vector U0_;
+
+            //- Field of parcel diameters
+            scalarList diameters_;
+
+            //- Parcel size PDF model
+            const autoPtr<pdf> parcelPDF_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Number of parcels to introduce over the time step relative to SOI
+        label parcelsToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+        //- Volume of parcels to introduce over the time step relative to SOI
+        scalar volumeToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("FieldActivatedInjection");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        FieldActivatedInjection
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    // Destructor
+    virtual ~FieldActivatedInjection();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates injection model
+        bool active() const;
+
+        //- Return the end-of-injection time
+        scalar timeEnd() const;
+
+
+        // Injection geometry
+
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                vector& position,
+                label& cellOwner
+            );
+
+            //- Set the parcel properties
+            virtual void setProperties
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                typename CloudType::parcelType& parcel
+            );
+
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const;
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "FieldActivatedInjection.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
index 1e592740f..beac4501a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.C
@@ -25,9 +25,264 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "InjectionModel.H"
+#include "mathematicalConstants.H"
+#include "meshTools.H"
+
+// * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::readProps()
+{
+    IOobject propsDictHeader
+    (
+        "injectionProperties",
+        owner_.db().time().timeName(),
+        "uniform"/cloud::prefix/owner_.name(),
+        owner_.db(),
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (propsDictHeader.headerOk())
+    {
+        const IOdictionary propsDict(propsDictHeader);
+
+        propsDict.readIfPresent("massInjected", massInjected_);
+        propsDict.readIfPresent("nInjections", nInjections_);
+        propsDict.readIfPresent("parcelsAddedTotal", parcelsAddedTotal_);
+        propsDict.readIfPresent("timeStep0", timeStep0_);
+    }
+}
+
+
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::writeProps()
+{
+    if (owner_.db().time().outputTime())
+    {
+        IOdictionary propsDict
+        (
+            IOobject
+            (
+                "injectionProperties",
+                owner_.db().time().timeName(),
+                "uniform"/cloud::prefix/owner_.name(),
+                owner_.db(),
+                IOobject::NO_READ,
+                IOobject::NO_WRITE,
+                false
+            )
+        );
+
+        propsDict.add("massInjected", massInjected_);
+        propsDict.add("nInjections", nInjections_);
+        propsDict.add("parcelsAddedTotal", parcelsAddedTotal_);
+        propsDict.add("timeStep0", timeStep0_);
+
+        propsDict.regIOobject::write();
+    }
+}
+
+
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
+(
+    const scalar time,
+    label& newParcels,
+    scalar& newVolume
+)
+{
+    // Initialise values
+    newParcels = 0;
+    newVolume = 0.0;
+
+    // Return if not started injection event
+    if (time < SOI_)
+    {
+        timeStep0_ = time;
+        return;
+    }
+
+    // Make times relative to SOI
+    scalar t0 = timeStep0_ - SOI_;
+    scalar t1 = time - SOI_;
+
+    // Number of parcels to inject
+    newParcels = parcelsToInject(t0, t1);
+
+    // Volume of parcels to inject
+    newVolume = volumeToInject(t0, t1);
+
+    // Hold previous time if no parcels, but non-zero volume fraction
+    if ((newParcels == 0) && (newVolume > 0.0))
+    {
+        // hold value of timeStep0_
+    }
+    else
+    {
+        // advance value of timeStep0_
+        timeStep0_ = time;
+    }
+}
+
+
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::findCellAtPosition
+(
+    label& cellI,
+    vector& position
+)
+{
+    const vector p0 = position;
+
+    bool foundCell = false;
+
+    cellI = owner_.mesh().findCell(position);
+
+    if (cellI >= 0)
+    {
+        const vector& C = owner_.mesh().C()[cellI];
+        position += SMALL*(C - position);
+
+        foundCell = owner_.mesh().pointInCell(position, cellI);
+    }
+    reduce(foundCell, orOp<bool>());
+
+    // Last chance - find nearest cell and try that one
+    // - the point is probably on an edge
+    if (!foundCell)
+    {
+        cellI = owner_.mesh().findNearestCell(position);
+
+        if (cellI >= 0)
+        {
+            const vector& C = owner_.mesh().C()[cellI];
+            position += SMALL*(C - position);
+
+            foundCell = owner_.mesh().pointInCell(position, cellI);
+        }
+        reduce(foundCell, orOp<bool>());
+    }
+
+    if (!foundCell)
+    {
+        FatalErrorIn
+        (
+            "Foam::InjectionModel<CloudType>::findCellAtPosition"
+            "("
+                "label&, "
+                "vector&"
+            ")"
+        )<< "Cannot find parcel injection cell. "
+         << "Parcel position = " << p0 << nl
+         << abort(FatalError);
+    }
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::InjectionModel<CloudType>::setNumberOfParticles
+(
+    const label parcels,
+    const scalar volume,
+    const scalar diameter,
+    const scalar rho
+)
+{
+    scalar nP = 0.0;
+    switch (parcelBasis_)
+    {
+        case pbMass:
+        {
+            nP =
+                volume/volumeTotal_
+               *massTotal_/rho
+               /(parcels*mathematicalConstant::pi/6.0*pow3(diameter));
+            break;
+        }
+        case pbNumber:
+        {
+            nP = massTotal_/(rho*volumeTotal_*parcels);
+            break;
+        }
+        default:
+        {
+            nP = 0.0;
+            FatalErrorIn
+            (
+                "Foam::scalar "
+                "Foam::InjectionModel<CloudType>::setNumberOfParticles"
+                "("
+                    "const label, "
+                    "const scalar, "
+                    "const scalar, "
+                    "const scalar"
+                ")"
+            )<< "Unknown parcelBasis type" << nl
+             << exit(FatalError);
+        }
+    }
+
+    return nP;
+}
+
+
+template<class CloudType>
+void Foam::InjectionModel<CloudType>::postInjectCheck
+(
+    const label parcelsAdded,
+    const scalar massAdded
+)
+{
+    const label allParcelsAdded = returnReduce(parcelsAdded, sumOp<label>());
+
+    if (allParcelsAdded > 0)
+    {
+        Info<< nl
+            << "--> Cloud: " << owner_.name() << nl
+            << "    Added " << allParcelsAdded << " new parcels" << nl << endl;
+    }
+
+    // Increment total number of parcels added
+    parcelsAddedTotal_ += allParcelsAdded;
+
+    // Increment total mass injected
+    massInjected_ += returnReduce(massAdded, sumOp<scalar>());
+
+    // Update time for start of next injection
+    time0_ = owner_.db().time().value();
+
+    // Increment number of injections
+    nInjections_++;
+
+    // Write current state to properties file
+    writeProps();
+}
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::InjectionModel<CloudType>::InjectionModel(CloudType& owner)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null),
+    SOI_(0.0),
+    volumeTotal_(0.0),
+    massTotal_(0.0),
+    massInjected_(0.0),
+    nInjections_(0),
+    parcelsAddedTotal_(0),
+    parcelBasis_(pbNumber),
+    time0_(0.0),
+    timeStep0_(0.0)
+{
+    readProps();
+}
+
+
 template<class CloudType>
 Foam::InjectionModel<CloudType>::InjectionModel
 (
@@ -35,15 +290,51 @@ Foam::InjectionModel<CloudType>::InjectionModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs")),
     SOI_(readScalar(coeffDict_.lookup("SOI"))),
     volumeTotal_(0.0),
-    timeStep0_(0.0),
-    nParcels_(0),
-    volume_(0.0)
-{}
+    massTotal_(dimensionedScalar(coeffDict_.lookup("massTotal")).value()),
+    massInjected_(0.0),
+    nInjections_(0),
+    parcelsAddedTotal_(0),
+    parcelBasis_(pbNumber),
+    time0_(owner.db().time().value()),
+    timeStep0_(0.0)
+{
+    // Provide some info
+    // - also serves to initialise mesh dimensions - needed for parallel runs
+    //   due to lazy evaluation of valid mesh dimensions
+    Info<< "    Constructing " << owner.mesh().nGeometricD() << "-D injection"
+        << endl;
+
+    word parcelBasisType = coeffDict_.lookup("parcelBasisType");
+    if (parcelBasisType == "mass")
+    {
+        parcelBasis_ = pbMass;
+    }
+    else if (parcelBasisType == "number")
+    {
+        parcelBasis_ = pbNumber;
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "Foam::InjectionModel<CloudType>::InjectionModel"
+            "("
+                "const dictionary&, "
+                "CloudType&, "
+                "const word&"
+            ")"
+        )<< "parcelBasisType must be either 'number' or 'mass'" << nl
+         << exit(FatalError);
+    }
+
+    readProps();
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -56,106 +347,91 @@ Foam::InjectionModel<CloudType>::~InjectionModel()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-const CloudType& Foam::InjectionModel<CloudType>::owner() const
+template<class TrackData>
+void Foam::InjectionModel<CloudType>::inject(TrackData& td)
 {
-    return owner_;
-}
-
-
-template<class CloudType>
-CloudType& Foam::InjectionModel<CloudType>::owner()
-{
-    return owner_;
-}
-
-
-template<class CloudType>
-const Foam::dictionary& Foam::InjectionModel<CloudType>::dict() const
-{
-    return dict_;
-}
-
-
-template<class CloudType>
-const Foam::dictionary& Foam::InjectionModel<CloudType>::coeffDict() const
-{
-    return coeffDict_;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::InjectionModel<CloudType>::timeStart() const
-{
-    return SOI_;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::InjectionModel<CloudType>::volumeTotal() const
-{
-    return volumeTotal_;
-}
-
-
-template<class CloudType>
-Foam::label Foam::InjectionModel<CloudType>::nParcels() const
-{
-    return nParcels_;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::InjectionModel<CloudType>::volume() const
-{
-    return volume_;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::InjectionModel<CloudType>::volumeFraction() const
-{
-    return volume_/volumeTotal_;
-}
-
-
-template<class CloudType>
-void Foam::InjectionModel<CloudType>::prepareForNextTimeStep
-(
-    const scalar time0,
-    const scalar time1
-)
-{
-    // Initialise values
-    nParcels_ = 0;
-    volume_ = 0.0;
-
-    // Return if not started injection event
-    if (time1 < SOI_)
+    if (!active())
     {
-        timeStep0_ = time1;
         return;
     }
 
-    // Make times relative to SOI
-    scalar t0 = timeStep0_ - SOI_;
-    scalar t1 = time1 - SOI_;
+    const scalar time = owner_.db().time().value();
+    const scalar carrierDt = owner_.db().time().deltaTValue();
+    const polyMesh& mesh = owner_.mesh();
 
-    // Number of parcels to inject
-    nParcels_ = nParcelsToInject(t0, t1);
+    // Prepare for next time step
+    label parcelsAdded = 0;
+    scalar massAdded = 0.0;
+    label newParcels = 0;
+    scalar newVolume = 0.0;
 
-    // Volume of parcels to inject
-    volume_ = volumeToInject(t0, t1);
+    prepareForNextTimeStep(time, newParcels, newVolume);
 
-    // Hold previous time if no parcels, but non-zero volume fraction
-    if ((nParcels_ == 0) && (volume_ > 0.0))
+    // Duration of injection period during this timestep
+    const scalar deltaT =
+        max(0.0, min(carrierDt, min(time - SOI_, timeEnd() - time0_)));
+
+    // Pad injection time if injection starts during this timestep
+    const scalar padTime = max(0.0, SOI_ - time0_);
+
+    // Introduce new parcels linearly across carrier phase timestep
+    for (label parcelI=0; parcelI<newParcels; parcelI++)
     {
-        // hold value of timeStep0_
-    }
-    else
-    {
-        // advance value of timeStep0_
-        timeStep0_ = time1;
+        if (validInjection(parcelI))
+        {
+            // Calculate the pseudo time of injection for parcel 'parcelI'
+            scalar timeInj = time0_ + padTime + deltaT*parcelI/newParcels;
+
+            // Determine the injection position and owner cell
+            label cellI = -1;
+            vector pos = vector::zero;
+            setPositionAndCell(parcelI, newParcels, timeInj, pos, cellI);
+
+            if (cellI > -1)
+            {
+                // Lagrangian timestep
+                scalar dt = time - timeInj;
+
+                // Apply corrections to position for 2-D cases
+                meshTools::constrainToMeshCentre(mesh, pos);
+
+                // Create a new parcel
+                parcelType* pPtr = new parcelType(td.cloud(), pos, cellI);
+
+                // Assign new parcel properties in injection model
+                setProperties(parcelI, newParcels, timeInj, *pPtr);
+
+                // Check new parcel properties
+                td.cloud().checkParcelProperties(*pPtr, dt, fullyDescribed());
+
+                // Apply correction to velocity for 2-D cases
+                meshTools::constrainDirection
+                (
+                    mesh,
+                    mesh.solutionD(),
+                    pPtr->U()
+                );
+
+                // Number of particles per parcel
+                pPtr->nParticle() =
+                    setNumberOfParticles
+                    (
+                        newParcels,
+                        newVolume,
+                        pPtr->d(),
+                        pPtr->rho()
+                    );
+
+                // Add the new parcel
+                td.cloud().addParticle(pPtr);
+
+                massAdded += pPtr->nParticle()*pPtr->mass();
+                parcelsAdded++;
+            }
+        }
     }
+
+    postInjectCheck(parcelsAdded, massAdded);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
index 6a59139bf..73db9d5ee 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModel.H
@@ -25,9 +25,20 @@ License
 Class
     Foam::InjectionModel
 
-
 Description
-    Templated injection model class
+    Templated injection model class.
+
+    The injection model nominally describes the parcel:
+    - position
+    - diameter
+    - velocity
+    In this case, the fullyDescribed() flag should be set to 0 (false). When
+    the parcel is then added to the cloud, the remaining properties are
+    populated using values supplied in the constant properties.
+
+    If, however, all of a parcel's properties are described in the model, the
+    fullDescribed() flag should be set to 1 (true).
+
 
 SourceFiles
     InjectionModel.C
@@ -54,61 +65,135 @@ namespace Foam
 template<class CloudType>
 class InjectionModel
 {
+public:
+
+    // Enumerations
+
+        //- Parcel basis representation options
+        //  i.e constant number of particles OR constant mass per parcel
+        enum parcelBasis
+        {
+            pbNumber,
+            pbMass
+        };
+
+
+private:
 
     // Private data
 
         //- The cloud dictionary
         const dictionary& dict_;
 
-        // Reference to the owner cloud class
+        //- Reference to the owner cloud class
         CloudType& owner_;
 
         //- The coefficients dictionary
         const dictionary coeffDict_;
 
 
+    // Private member functions
+
+        //- Read injector properties from previous run (if applicable)
+        void readProps();
+
+        //- Write injector properties
+        void writeProps();
+
+
 protected:
 
     // Protected data
 
+        //- Convenience typedef for parcel type
+        typedef typename CloudType::parcelType parcelType;
+
         // Global injection properties
 
             //- Start of injection [s]
-            scalar SOI_;
+            const scalar SOI_;
 
-            //- Total volume of parcels to introduce [m^3]
-            //  Initialised in the individual injection models
+            //- Total volume of particles introduced by this injector [m^3]
+            //  - scaled to ensure massTotal is achieved
             scalar volumeTotal_;
 
+            //- Total mass to inject [kg]
+            scalar massTotal_;
+
+            //- Total mass injected to date [kg]
+            scalar massInjected_;
+
+
+        // Counters
+
+            //- Number of injections counter
+            label nInjections_;
+
+            //- Running counter of total number of parcels added
+            label parcelsAddedTotal_;
+
 
         // Injection properties per Lagrangian time step
 
+            //- Parcel basis enumeration
+            parcelBasis parcelBasis_;
+
+            //- Continuous phase time at start of injection time step [s]
+            scalar time0_;
+
             //- Time at start of injection time step [s]
             scalar timeStep0_;
 
-            //- Number of parcels to introduce []
-            label nParcels_;
-
-            //- Volume of parcels to introduce [m^3]
-            scalar volume_;
-
 
     // Protected member functions
 
-        //- Number of parcels to introduce over the time step
-        virtual label nParcelsToInject
+        //- Number of parcels to introduce over the time step relative to SOI
+        virtual label parcelsToInject
         (
             const scalar time0,
             const scalar time1
         ) const = 0;
 
-        //- Volume of parcels to introduce over the time step
+        //- Volume of parcels to introduce over the time step relative to SOI
         virtual scalar volumeToInject
         (
             const scalar time0,
             const scalar time1
         ) const = 0;
 
+        //- Additional flag to identify whether or not injection of parcelI is
+        //  permitted
+        virtual bool validInjection(const label parcelI) = 0;
+
+        //- Determine properties for next time step/injection interval
+        virtual void prepareForNextTimeStep
+        (
+            const scalar time,
+            label& newParcels,
+            scalar& newVolume
+        );
+
+        //- Find the cell that contains the supplied position
+        //  Will modify position slightly towards the owner cell centroid to
+        //  ensure that it lies in a cell and not edge/face
+        virtual void findCellAtPosition(label& cellI, vector& position);
+
+        //- Set number of particles to inject given parcel properties
+        virtual scalar setNumberOfParticles
+        (
+            const label parcels,
+            const scalar volume,
+            const scalar diameter,
+            const scalar rho
+        );
+
+        //- Post injection checks
+        virtual void postInjectCheck
+        (
+            const label parcelsAdded,
+            const scalar massAdded
+        );
+
 
 public:
 
@@ -131,6 +216,9 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        InjectionModel(CloudType& owner);
+
         //- Construct from dictionary
         InjectionModel
         (
@@ -140,33 +228,31 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~InjectionModel();
+    //- Destructor
+    virtual ~InjectionModel();
 
 
-    // Selector
-
-        static autoPtr<InjectionModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+    //- Selector
+    static autoPtr<InjectionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Access
 
+        //- Return the owner cloud dictionary
+        inline const dictionary& dict() const;
+
         //- Return const access the owner cloud object
-        const CloudType& owner() const;
+        inline const CloudType& owner() const;
 
         //- Return non-const access the owner cloud object for manipulation
-        CloudType& owner();
-
-        //- Return the dictionary
-        const dictionary& dict() const;
+        inline CloudType& owner();
 
         //- Return the coefficients dictionary
-        const dictionary& coeffDict() const;
+        inline const dictionary& coeffDict() const;
 
 
     // Member Functions
@@ -178,58 +264,59 @@ public:
         // Global information
 
             //- Return the start-of-injection time
-            scalar timeStart() const;
+            inline scalar timeStart() const;
 
             //- Return the total volume to be injected across the event
-            scalar volumeTotal() const;
+            inline scalar volumeTotal() const;
+
+            //- Return mass of particles to introduce
+            inline scalar massTotal() const;
+
+            //- Return mass of particles injected (cumulative)
+            inline scalar massInjected() const;
 
             //- Return the end-of-injection time
             virtual scalar timeEnd() const = 0;
 
+            // Counters
 
-        // Per Lagrangian time step properties
+                //- Return the number of injections
+                inline label nInjections() const;
 
-            //- Determine properties for next time step/injection interval
-            void prepareForNextTimeStep
-            (
-                const scalar time0,
-                const scalar time1
-            );
+                //- Return the total number parcels added
+                inline label parcelsAddedTotal() const;
 
-            //- Return the number of parcels to introduce
-            label nParcels() const;
 
-            //- Return the volume of parcels to introduce
-            scalar volume() const;
+        // Per-injection event functions
 
-            //- Return the volume fraction to introduce
-            scalar volumeFraction() const;
+            //- Main injection loop
+            template<class TrackData>
+            void inject(TrackData& td);
 
 
         // Injection geometry
 
-            //- Return the injection position
-            virtual vector position
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
+                const label nParcels,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                vector& position,
+                label& cellOwner
             ) = 0;
 
-            //- Return the velocity of the parcel to introduce at a time
-            virtual vector velocity
+            //- Set the parcel properties
+            virtual void setProperties
             (
-                const label iParcel,
+                const label parcelI,
+                const label nParcels,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                typename CloudType::parcelType& parcel
             ) = 0;
 
-            //- Return the diameter of the parcel to introduce at a time
-            virtual scalar d0
-            (
-                const label iParcel,
-                const scalar time
-            ) const = 0;
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const = 0;
 };
 
 
@@ -255,6 +342,25 @@ public:
             add##SS##CloudType##ParcelType##ConstructorToTable_;
 
 
+#define makeInjectionModelThermoType(SS, CloudType, ParcelType, ThermoType)   \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    InjectionModel<CloudType<ParcelType<ThermoType> > >::                     \
+        adddictionaryConstructorToTable                                       \
+        <SS<CloudType<ParcelType<ThermoType> > > >                            \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "InjectionModelI.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
new file mode 100644
index 000000000..db84b2b0f
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/InjectionModelI.H
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "InjectionModel.H"
+
+template<class CloudType>
+const Foam::dictionary& Foam::InjectionModel<CloudType>::dict() const
+{
+    return dict_;
+}
+
+
+template<class CloudType>
+const CloudType& Foam::InjectionModel<CloudType>::owner() const
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+CloudType& Foam::InjectionModel<CloudType>::owner()
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::InjectionModel<CloudType>::coeffDict() const
+{
+    return coeffDict_;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::InjectionModel<CloudType>::timeStart() const
+{
+    return SOI_;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::InjectionModel<CloudType>::volumeTotal() const
+{
+    return volumeTotal_;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::InjectionModel<CloudType>::massTotal() const
+{
+    return massTotal_;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::InjectionModel<CloudType>::massInjected() const
+{
+    return massInjected_;
+}
+
+
+template<class CloudType>
+Foam::label Foam::InjectionModel<CloudType>::nInjections() const
+{
+    return nInjections_;
+}
+
+
+template<class CloudType>
+Foam::label Foam::InjectionModel<CloudType>::parcelsAddedTotal() const
+{
+    return parcelsAddedTotal_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
index 4b0081684..3c0a9f3f3 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectionModel/NewInjectionModel.C
@@ -36,10 +36,7 @@ Foam::InjectionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word InjectionModelType
-    (
-        dict.lookup("InjectionModel")
-    );
+    word InjectionModelType(dict.lookup("InjectionModel"));
 
     Info<< "Selecting InjectionModel " << InjectionModelType << endl;
 
@@ -51,11 +48,14 @@ Foam::InjectionModel<CloudType>::New
         FatalErrorIn
         (
             "InjectionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
         )   << "Unknown InjectionModelType type "
             << InjectionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid InjectionModel types are :" << nl
+            << "    Valid InjectionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
new file mode 100644
index 000000000..7b934cfff
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "KinematicLookupTableInjection.H"
+#include "scalarIOList.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::KinematicLookupTableInjection<CloudType>::parcelsToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::KinematicLookupTableInjection<CloudType>::volumeToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    scalar volume = 0.0;
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        forAll(injectors_, i)
+        {
+            volume += injectors_[i].mDot()/injectors_[i].rho()*(time1 - time0);
+        }
+    }
+
+    return volume;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::KinematicLookupTableInjection<CloudType>::KinematicLookupTableInjection
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    InjectionModel<CloudType>(dict, owner, typeName),
+    inputFileName_(this->coeffDict().lookup("inputFile")),
+    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    nParcelsPerSecond_
+    (
+        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
+    ),
+    injectors_
+    (
+        IOobject
+        (
+            inputFileName_,
+            owner.db().time().constant(),
+            owner.db(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    injectorCells_(0)
+{
+    // Set/cache the injector cells
+    injectorCells_.setSize(injectors_.size());
+    forAll(injectors_, i)
+    {
+        this->findCellAtPosition(injectorCells_[i], injectors_[i].x());
+    }
+
+    // Determine volume of particles to inject
+    this->volumeTotal_ = 0.0;
+    forAll(injectors_, i)
+    {
+        this->volumeTotal_ += injectors_[i].mDot()/injectors_[i].rho();
+    }
+    this->volumeTotal_ *= duration_;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::KinematicLookupTableInjection<CloudType>::~KinematicLookupTableInjection()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::KinematicLookupTableInjection<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::KinematicLookupTableInjection<CloudType>::timeEnd() const
+{
+    return this->SOI_ + duration_;
+}
+
+
+template<class CloudType>
+void Foam::KinematicLookupTableInjection<CloudType>::setPositionAndCell
+(
+    const label parcelI,
+    const label nParcels,
+    const scalar time,
+    vector& position,
+    label& cellOwner
+)
+{
+    label injectorI = parcelI*injectorCells_.size()/nParcels;
+
+    position = injectors_[injectorI].x();
+    cellOwner = injectorCells_[injectorI];
+}
+
+
+template<class CloudType>
+void Foam::KinematicLookupTableInjection<CloudType>::setProperties
+(
+    const label parcelI,
+    const label nParcels,
+    const scalar,
+    typename CloudType::parcelType& parcel
+)
+{
+    label injectorI = parcelI*injectorCells_.size()/nParcels;
+
+    // set particle velocity
+    parcel.U() = injectors_[injectorI].U();
+
+    // set particle diameter
+    parcel.d() = injectors_[injectorI].d();
+
+    // set particle density
+    parcel.rho() = injectors_[injectorI].rho();
+}
+
+
+template<class CloudType>
+bool Foam::KinematicLookupTableInjection<CloudType>::fullyDescribed() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+bool Foam::KinematicLookupTableInjection<CloudType>::validInjection
+(
+    const label
+)
+{
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
new file mode 100644
index 000000000..142303fa1
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.H
@@ -0,0 +1,181 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::KinematicLookupTableInjection
+
+Description
+    Particle injection sources read from look-up table. Each row corresponds to
+    an injection site.
+
+    (
+        (x y z) (u v w) d rho mDot   // injector 1
+        (x y z) (u v w) d rho mDot   // injector 2
+        ...
+        (x y z) (u v w) d rho mDot   // injector N
+    );
+
+    where:
+        x, y, z = global cartesian co-ordinates [m]
+        u, v, w = global cartesian velocity components [m/s]
+        d       = diameter [m]
+        rho     = density [kg/m3]
+        mDot    = mass flow rate [kg/m3]
+
+SourceFiles
+    KinematicLookupTableInjection.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef KinematicLookupTableInjection_H
+#define KinematicLookupTableInjection_H
+
+#include "InjectionModel.H"
+#include "kinematicParcelInjectionDataIOList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class KinematicLookupTableInjection Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class KinematicLookupTableInjection
+:
+    public InjectionModel<CloudType>
+{
+    // Private data
+
+        //- Name of file containing injector/parcel data
+        const word inputFileName_;
+
+        //- Injection duration - common to all injection sources
+        const scalar duration_;
+
+        //- Number of parcels per injector - common to all injection sources
+        const label nParcelsPerSecond_;
+
+        //- List of injectors
+        kinematicParcelInjectionDataIOList injectors_;
+
+        //- List of injector cells per injector
+        List<label> injectorCells_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Number of parcels to introduce over the time step relative to SOI
+        label parcelsToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+        //- Volume of parcels to introduce over the time step relative to SOI
+        scalar volumeToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("KinematicLookupTableInjection");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        KinematicLookupTableInjection
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~KinematicLookupTableInjection();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates injection model
+        bool active() const;
+
+        //- Return the end-of-injection time
+        scalar timeEnd() const;
+
+
+        // Injection geometry
+
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                vector& position,
+                label& cellOwner
+            );
+
+            //- Set the parcel properties
+            virtual void setProperties
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                typename CloudType::parcelType& parcel
+            );
+
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const;
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "KinematicLookupTableInjection.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
similarity index 71%
rename from src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.C
rename to src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
index b5cccec6a..1c423c048 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicThermoCloud/basicThermoCloud.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.C
@@ -24,46 +24,43 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicThermoCloud.H"
+#include "kinematicParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(basicThermoCloud, 0);
-};
-
+    defineTypeNameAndDebug(kinematicParcelInjectionData, 0);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::basicThermoCloud::basicThermoCloud
-(
-    const word& cloudType,
-    const volPointInterpolation& vpi,
-    const volScalarField& rho,
-    const volVectorField& U,
-    const dimensionedVector& g,
-    basicThermo& thermo
-)
+Foam::kinematicParcelInjectionData::kinematicParcelInjectionData()
 :
-    ThermoCloud<basicThermoParcel>(cloudType, vpi, rho, U, g, thermo)
-{
-    basicThermoParcel::readFields(*this);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::basicThermoCloud::~basicThermoCloud()
+    x_(point::zero),
+    U_(vector::zero),
+    d_(0.0),
+    rho_(0.0),
+    mDot_(0.0)
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+Foam::kinematicParcelInjectionData::kinematicParcelInjectionData
+(
+    const dictionary& dict
+)
+:
+    x_(dict.lookup("x")),
+    U_(dict.lookup("U")),
+    d_(readScalar(dict.lookup("d"))),
+    rho_(readScalar(dict.lookup("rho"))),
+    mDot_(readScalar(dict.lookup("mDot")))
+{}
 
-void Foam::basicThermoCloud::writeFields() const
-{
-    basicThermoParcel::writeFields(*this);
-}
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::kinematicParcelInjectionData::~kinematicParcelInjectionData()
+{}
 
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.H
new file mode 100644
index 000000000..aec74f22f
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionData.H
@@ -0,0 +1,216 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::kinematicParcelInjectionData
+
+Description
+    Container class to provide injection data for kinematic parcels
+
+SourceFiles
+    kinematicParcelInjectionData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef kinematicParcelInjectionData_H
+#define kinematicParcelInjectionData_H
+
+#include "dictionary.H"
+#include "vector.H"
+#include "point.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class kinematicParcelInjectionData;
+
+// Forward declaration of friend functions
+
+Ostream& operator<<
+(
+    Ostream&,
+    const kinematicParcelInjectionData&
+);
+
+Istream& operator>>
+(
+    Istream&,
+    kinematicParcelInjectionData&
+);
+
+/*---------------------------------------------------------------------------*\
+               Class kinematicParcelInjectionData Declaration
+\*---------------------------------------------------------------------------*/
+
+class kinematicParcelInjectionData
+{
+protected:
+
+    // Parcel properties
+
+        //- Position [m]
+        point x_;
+
+        //- Velocity [m/s]
+        vector U_;
+
+        //- Diameter [m]
+        scalar d_;
+
+        //- Density [kg/m3]
+        scalar rho_;
+
+        //- Mass flow rate [kg/s]
+        scalar mDot_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("kinematicParcelInjectionData");
+
+    // Constructors
+
+        //- Null constructor
+        kinematicParcelInjectionData();
+
+        //- Construct from dictionary
+        kinematicParcelInjectionData(const dictionary& dict);
+
+        //- Construct from Istream
+        kinematicParcelInjectionData(Istream& is);
+
+
+    //-Destructor
+    virtual ~kinematicParcelInjectionData();
+
+
+    // Access
+
+        //- Return const access to the position
+        inline const point& x() const;
+
+        //- Return const access to the velocity
+        inline const vector& U() const;
+
+        //- Return const access to the diameter
+        inline scalar d() const;
+
+        //- Return const access to the density
+        inline scalar rho() const;
+
+        //- Return const access to the mass flow rate
+        inline scalar mDot() const;
+
+
+    // Edit
+
+        //- Return access to the position
+        inline point& x();
+
+        //- Return access to the velocity
+        inline vector& U();
+
+        //- Return access to the diameter
+        inline scalar& d();
+
+        //- Return access to the density
+        inline scalar& rho();
+
+        //- Return access to the mass flow rate
+        inline scalar& mDot();
+
+
+    // I-O
+
+        // Friend Operators
+
+            friend bool operator==
+            (
+                const kinematicParcelInjectionData& a,
+                const kinematicParcelInjectionData& b
+            )
+            {
+                notImplemented
+                (
+                    "operator=="
+                    "("
+                        "const kinematicParcelInjectionData&, "
+                        "const kinematicParcelInjectionData&"
+                    ")"
+                );
+
+                return false;
+            }
+
+            friend bool operator!=
+            (
+                const kinematicParcelInjectionData& a,
+                const kinematicParcelInjectionData& b
+            )
+            {
+                notImplemented
+                (
+                    "operator=="
+                    "("
+                        "const kinematicParcelInjectionData&, "
+                        "const kinematicParcelInjectionData&"
+                    ")"
+                );
+
+                return false;
+            }
+
+            //- Ostream operator
+            friend Ostream& operator<<
+            (
+                Ostream& os,
+                const kinematicParcelInjectionData& data
+            );
+
+            //- Istream operator
+            friend Istream& operator>>
+            (
+                Istream& is,
+                kinematicParcelInjectionData& data
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "kinematicParcelInjectionDataI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/test/Matrix/MatrixTest.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataI.H
similarity index 60%
rename from applications/test/Matrix/MatrixTest.C
rename to src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataI.H
index 8dbae8f65..82b5952ec 100644
--- a/applications/test/Matrix/MatrixTest.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataI.H
@@ -24,56 +24,67 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "Matrix.H"
-#include "vector.H"
-
-using namespace Foam;
+#include "kinematicParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main(int argc, char *argv[])
+inline const Foam::point& Foam::kinematicParcelInjectionData::x() const
 {
-    Matrix<scalar> hmm(3, 3);
+    return x_;
+}
 
-    hmm[0][0] = -3.0;
-    hmm[0][1] = 10.0;
-    hmm[0][2] = -4.0;
-    hmm[1][0] = 2.0;
-    hmm[1][1] = 3.0;
-    hmm[1][2] = 10.0;
-    hmm[2][0] = 2.0;
-    hmm[2][1] = 6.0;
-    hmm[2][2] = 1.0;
 
-    Info<< hmm << endl << hmm - 2.0*(-hmm) << endl;
-    Info<< max(hmm) << endl;
-    Info<< min(hmm) << endl;
+inline const Foam::vector& Foam::kinematicParcelInjectionData::U() const
+{
+    return U_;
+}
 
-    Matrix<scalar> hmm2(3, 3, 1.0);
 
-    hmm = hmm2;
+inline Foam::scalar Foam::kinematicParcelInjectionData::d() const
+{
+    return d_;
+}
 
-    Info<< hmm << endl;
 
-    Matrix<scalar> hmm3(Sin);
+inline Foam::scalar Foam::kinematicParcelInjectionData::rho() const
+{
+    return rho_;
+}
 
-    Info<< hmm3 << endl;
 
-    Matrix<scalar> hmm4;
+inline Foam::scalar Foam::kinematicParcelInjectionData::mDot() const
+{
+    return mDot_;
+}
 
-    hmm4 = hmm2;
 
-    Info<< hmm4 << endl;
+inline Foam::point& Foam::kinematicParcelInjectionData::x()
+{
+    return x_;
+}
 
-    Matrix<scalar> hmm5;
 
-    hmm4 = hmm5;
-    Info<< hmm5 << endl;
+inline Foam::vector& Foam::kinematicParcelInjectionData::U()
+{
+    return U_;
+}
 
-    Info << "End\n" << endl;
 
-    return 0;
+inline Foam::scalar& Foam::kinematicParcelInjectionData::d()
+{
+    return d_;
+}
+
+
+inline Foam::scalar& Foam::kinematicParcelInjectionData::rho()
+{
+    return rho_;
+}
+
+
+inline Foam::scalar& Foam::kinematicParcelInjectionData::mDot()
+{
+    return mDot_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C
new file mode 100644
index 000000000..028246756
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIO.C
@@ -0,0 +1,89 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "kinematicParcelInjectionData.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::kinematicParcelInjectionData::kinematicParcelInjectionData(Istream& is)
+{
+    is.check("reading (Px Py Pz)");
+    is >> x_;
+
+    is.check("reading (Ux Uy Uz)");
+    is >> U_;
+
+    is.check("reading d");
+    is >> d_;
+
+    is.check("reading rho");
+    is >> rho_;
+
+    is.check("reading mDot");
+    is >> mDot_;
+
+    is.check("kinematicParcelInjectionData(Istream& is)");
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const kinematicParcelInjectionData& data
+)
+{
+    os << data.x_ << data.U_ << data.d_ << data.rho_ << data.mDot_;
+
+    return os;
+}
+
+
+Foam::Istream& Foam::operator>>(Istream& is, kinematicParcelInjectionData& data)
+{
+    is.check("reading (Px Py Pz)");
+    is >> data.x_;
+
+    is.check("reading (Ux Uy Uz)");
+    is >> data.U_;
+
+    is.check("reading d");
+    is >> data.d_;
+
+    is.check("reading rho");
+    is >> data.rho_;
+
+    is.check("reading mDot");
+    is >> data.mDot_;
+
+    is.check("operator(Istream&, kinematicParcelInjectionData&)");
+
+    return is;
+}
+
+
+// ************************************************************************* //
diff --git a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.C
similarity index 89%
rename from src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.C
rename to src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.C
index 9bcf3e25b..a400ab2e1 100644
--- a/src/finiteVolume/interpolation/surfaceInterpolation/limitedSchemes/linearUpwindV/linearUpwindV.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.C
@@ -24,16 +24,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "linearUpwindV.H"
-#include "fvMesh.H"
-#include "volFields.H"
-#include "surfaceFields.H"
+#include "kinematicParcelInjectionDataIOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    makelimitedSurfaceInterpolationTypeScheme(linearUpwindV, vector)
+    defineTemplateTypeNameAndDebug(IOList<kinematicParcelInjectionData>, 0);
 }
 
+
 // ************************************************************************* //
diff --git a/src/lagrangian/dieselSpray/sprayThermoTypes/sprayThermoTypes.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.H
similarity index 77%
rename from src/lagrangian/dieselSpray/sprayThermoTypes/sprayThermoTypes.H
rename to src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.H
index 79429b886..4175df121 100644
--- a/src/lagrangian/dieselSpray/sprayThermoTypes/sprayThermoTypes.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/kinematicParcelInjectionDataIOList.H
@@ -22,31 +22,27 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Typedef
-    Foam::specieProperties
+Class
 
 Description
-    Foam::specieProperties
+
+SourceFiles
+    kinematicParcelInjectionDataIOList.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef sprayThermoTypes_H
-#define sprayThermoTypes_H
+#ifndef kinematicParcelInjectionDataIOList_H
+#define kinematicParcelInjectionDataIOList_H
 
-#include "sutherlandTransport.H"
-#include "specieThermo.H"
-#include "janafThermo.H"
-#include "perfectGas.H"
+#include "IOList.H"
+#include "kinematicParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef sutherlandTransport<specieThermo<janafThermo<perfectGas> > >
-        specieProperties;
-
-  // typedef sutherlandTransport<specieThermo<hConstThermo<perfectGas> > >
-  //    specieProperties;
+    typedef IOList<kinematicParcelInjectionData>
+        kinematicParcelInjectionDataIOList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
index 139b530fc..f231d316c 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.C
@@ -25,11 +25,12 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ManualInjection.H"
+#include "mathematicalConstants.H"
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::label Foam::ManualInjection<CloudType>::nParcelsToInject
+Foam::label Foam::ManualInjection<CloudType>::parcelsToInject
 (
     const scalar time0,
     const scalar time1
@@ -105,8 +106,7 @@ Foam::ManualInjection<CloudType>::ManualInjection
     }
 
     // Determine volume of particles to inject
-    this->volumeTotal_ = sum(pow(diameters_, 3))
-        *mathematicalConstant::pi/6.0;
+    this->volumeTotal_ = sum(pow3(diameters_))*mathematicalConstant::pi/6.0;
 }
 
 
@@ -130,71 +130,53 @@ template<class CloudType>
 Foam::scalar Foam::ManualInjection<CloudType>::timeEnd() const
 {
     // Not used
-    return 0.0;
+    return this->SOI_;
 }
 
 
 template<class CloudType>
-Foam::vector Foam::ManualInjection<CloudType>::position
-(
-    const label iParcel,
-    const scalar time,
-    const polyMeshInfo& meshInfo
-)
-{
-    vector pos = positions_[iParcel];
-    if (meshInfo.caseIs2d())
-    {
-        if (meshInfo.caseIs2dWedge())
-        {
-            pos.component(meshInfo.emptyComponent()) = 0.0;
-        }
-        else if (meshInfo.caseIs2dSlab())
-        {
-            pos.component(meshInfo.emptyComponent()) =
-                meshInfo.centrePoint().component(meshInfo.emptyComponent());
-        }
-        else
-        {
-            FatalErrorIn
-            (
-                "Foam::vector Foam::ManualInjection<CloudType>::position"
-            )   << "Could not determine 2-D case geometry" << nl
-                << abort(FatalError);
-        }
-    }
-
-    return pos;
-}
-
-
-template<class CloudType>
-Foam::vector Foam::ManualInjection<CloudType>::velocity
+void Foam::ManualInjection<CloudType>::setPositionAndCell
 (
+    const label parcelI,
     const label,
     const scalar,
-    const polyMeshInfo& meshInfo
+    vector& position,
+    label& cellOwner
 )
 {
-    vector vel = U0_;
-    if (meshInfo.caseIs2dSlab())
-    {
-        vel.component(meshInfo.emptyComponent()) =
-            meshInfo.centrePoint().component(meshInfo.emptyComponent());
-    }
-
-    return vel;
+    position = positions_[parcelI];
+    this->findCellAtPosition(cellOwner, position);
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::ManualInjection<CloudType>::d0
+void Foam::ManualInjection<CloudType>::setProperties
 (
-    const label iParcel,
-    const scalar
-) const
+    const label parcelI,
+    const label,
+    const scalar,
+    typename CloudType::parcelType& parcel
+)
 {
-    return diameters_[iParcel];
+    // set particle velocity
+    parcel.U() = U0_;
+
+    // set particle diameter
+    parcel.d() = diameters_[parcelI];
+}
+
+
+template<class CloudType>
+bool Foam::ManualInjection<CloudType>::fullyDescribed() const
+{
+    return false;
+}
+
+
+template<class CloudType>
+bool Foam::ManualInjection<CloudType>::validInjection(const label)
+{
+    return true;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
index f5da2a4e3..1bea55bcd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ManualInjection/ManualInjection.H
@@ -27,23 +27,21 @@ Class
 
 Description
     Manual injection
+
     - User specifies
       - Total mass to inject
-      - Parcel positions in file <positionsFile>
+      - Parcel positions in file @c positionsFile
       - Initial parcel velocity
     - Parcel diameters obtained by PDF model
-    - All parcels introduced at the start of the calculation
-
-    NOTE - not suitable for 2-D slab/wedge simulations unless the positions
-           file describes 2-D data!
+    - All parcels introduced at SOI
 
 SourceFiles
     ManualInjection.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef manualInjection_H
-#define manualInjection_H
+#ifndef ManualInjection_H
+#define ManualInjection_H
 
 #include "InjectionModel.H"
 #include "pdf.H"
@@ -62,12 +60,8 @@ class ManualInjection
 :
     public InjectionModel<CloudType>
 {
-
     // Private data
 
-        //- Coefficients dictionary
-        dictionary coeffDict_;
-
         //- Name of file containing positions data
         const word positionsFile_;
 
@@ -75,7 +69,7 @@ class ManualInjection
         vectorIOField positions_;
 
         //- Field of parcel diameters
-        scalarField diameters_;
+        scalarList diameters_;
 
         //- Initial parcel velocity
         const vector U0_;
@@ -91,14 +85,14 @@ protected:
 
     // Protected member functions
 
-        //- Number of parcels to introduce over the time step
-        label nParcelsToInject
+        //- Number of parcels to introduce over the time step relative to SOI
+        label parcelsToInject
         (
             const scalar time0,
             const scalar time1
         ) const;
 
-        //- Volume of parcels to introduce over the time step
+        //- Volume of parcels to introduce over the time step relative to SOI
         scalar volumeToInject
         (
             const scalar time0,
@@ -122,9 +116,8 @@ public:
         );
 
 
-    // Destructor
-
-        ~ManualInjection();
+    //- Destructor
+    virtual ~ManualInjection();
 
 
     // Member Functions
@@ -138,28 +131,31 @@ public:
 
         // Injection geometry
 
-            //- Return the injection position
-            vector position
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
+                const label nParcels,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                vector& position,
+                label& cellOwner
             );
 
-            //- Return the velocity of the parcel to introduce at a time
-            vector velocity
+            //- Set the parcel properties
+            virtual void setProperties
             (
-                const label,
+                const label parcelI,
+                const label nParcels,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                typename CloudType::parcelType& parcel
             );
 
-            //- Return the diameter of the parcel to introduce at a time
-            scalar d0
-            (
-                const label,
-                const scalar
-            ) const;
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const;
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
index 5a6068db2..79c22b92f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.C
@@ -30,7 +30,7 @@ License
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::label Foam::NoInjection<CloudType>::nParcelsToInject
+Foam::label Foam::NoInjection<CloudType>::parcelsToInject
 (
     const scalar,
     const scalar
@@ -56,11 +56,11 @@ Foam::scalar Foam::NoInjection<CloudType>::volumeToInject
 template<class CloudType>
 Foam::NoInjection<CloudType>::NoInjection
 (
-    const dictionary& dict,
+    const dictionary&,
     CloudType& owner
 )
 :
-    InjectionModel<CloudType>(dict, owner, typeName)
+    InjectionModel<CloudType>(owner)
 {}
 
 
@@ -88,37 +88,45 @@ Foam::scalar Foam::NoInjection<CloudType>::timeEnd() const
 
 
 template<class CloudType>
-Foam::vector Foam::NoInjection<CloudType>::position
+void Foam::NoInjection<CloudType>::setPositionAndCell
 (
+    const label,
     const label,
     const scalar,
-    const polyMeshInfo&
+    vector&,
+    label&
+)
+{}
+
+
+template<class CloudType>
+void Foam::NoInjection<CloudType>::setProperties
+(
+    const label,
+    const label,
+    const scalar,
+    typename CloudType::parcelType& parcel
 )
 {
-    return vector::zero;
+    // set particle velocity
+    parcel.U() = vector::zero;
+
+    // set particle diameter
+    parcel.d() = 0.0;
 }
 
 
 template<class CloudType>
-Foam::vector Foam::NoInjection<CloudType>::velocity
-(
-    const label,
-    const scalar,
-    const polyMeshInfo&
-)
+bool Foam::NoInjection<CloudType>::fullyDescribed() const
 {
-    return vector::zero;
+    return false;
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::NoInjection<CloudType>::d0
-(
-    const label,
-    const scalar
-) const
+bool Foam::NoInjection<CloudType>::validInjection(const label)
 {
-    return 0.0;
+    return false;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
index fc9436018..cb619c009 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/NoInjection/NoInjection.H
@@ -26,15 +26,15 @@ Class
     Foam::NoInjection
 
 Description
-    Place holder for 'no injection' option
+    Place holder for 'none' option
 
 SourceFiles
     NoInjection.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef noInjection_H
-#define noInjection_H
+#ifndef NoInjection_H
+#define NoInjection_H
 
 #include "InjectionModel.H"
 
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                          Class NoInjection Declaration
+                       Class NoInjection Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -52,19 +52,18 @@ class NoInjection
 :
     public InjectionModel<CloudType>
 {
-
 protected:
 
     // Protected member functions
 
-        //- Number of parcels to introduce over the time step
-        label nParcelsToInject
+        //- Number of parcels to introduce over the time step relative to SOI
+        label parcelsToInject
         (
             const scalar,
             const scalar
         ) const;
 
-        //- Volume of parcels to introduce over the time step
+        //- Volume of parcels to introduce over the time step relative to SOI
         scalar volumeToInject
         (
             const scalar,
@@ -75,7 +74,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("NoInjection");
+    TypeName("none");
 
 
     // Constructors
@@ -83,14 +82,13 @@ public:
         //- Construct from components
         NoInjection
         (
-            const dictionary& dict,
-            CloudType& owner
+            const dictionary&,
+            CloudType&
         );
 
 
-    // Destructor
-
-        ~NoInjection();
+    //- Destructor
+    virtual ~NoInjection();
 
 
     // Member Functions
@@ -104,28 +102,30 @@ public:
 
         // Injection geometry
 
-            //- Return the injection position
-            vector position
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
             (
-                const label iParcel,
+                const label parcelI,
+                const label nParcels,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                vector& position,
+                label& cellOwner
             );
 
-            //- Return the velocity of the parcel to introduce at a time
-            vector velocity
+            virtual void setProperties
             (
-                const label,
+                const label parcelI,
+                const label nParcels,
                 const scalar time,
-                const polyMeshInfo& meshInfo
+                typename CloudType::parcelType& parcel
             );
 
-            //- Return the diameter of the parcel to introduce at a time
-            scalar d0
-            (
-                const label,
-                const scalar
-            ) const;
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const;
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
new file mode 100644
index 000000000..00a2273a6
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -0,0 +1,216 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "PatchInjection.H"
+#include "DataEntry.H"
+#include "pdf.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::PatchInjection<CloudType>::parcelsToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        return round(fraction_*(time1 - time0)*parcelsPerSecond_);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::PatchInjection<CloudType>::volumeToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        return fraction_*volumeFlowRate_().integrate(time0, time1);
+    }
+    else
+    {
+        return 0.0;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PatchInjection<CloudType>::PatchInjection
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    InjectionModel<CloudType>(dict, owner, typeName),
+    patchName_(this->coeffDict().lookup("patchName")),
+    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    parcelsPerSecond_
+    (
+        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
+    ),
+    U0_(this->coeffDict().lookup("U0")),
+    volumeFlowRate_
+    (
+        DataEntry<scalar>::New
+        (
+            "volumeFlowRate",
+            this->coeffDict()
+        )
+    ),
+    parcelPDF_
+    (
+        pdf::New
+        (
+            this->coeffDict().subDict("parcelPDF"),
+            owner.rndGen()
+        )
+    ),
+    cellOwners_(),
+    fraction_(1.0)
+{
+    label patchId = owner.mesh().boundaryMesh().findPatchID(patchName_);
+
+    if (patchId < 0)
+    {
+        FatalErrorIn
+        (
+            "PatchInjection<CloudType>::PatchInjection"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Requested patch " << patchName_ << " not found" << nl
+            << "Available patches are: " << owner.mesh().boundaryMesh().names()
+            << nl << exit(FatalError);
+    }
+
+    const polyPatch& patch = owner.mesh().boundaryMesh()[patchId];
+
+    cellOwners_ = patch.faceCells();
+
+    label patchSize = cellOwners_.size();
+    label totalPatchSize = patchSize;
+    reduce(totalPatchSize, sumOp<label>());
+    fraction_ = scalar(patchSize)/totalPatchSize;
+
+    // Set total volume/mass to inject
+    this->volumeTotal_ = fraction_*volumeFlowRate_().integrate(0.0, duration_);
+    this->massTotal_ *= fraction_;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PatchInjection<CloudType>::~PatchInjection()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::PatchInjection<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::PatchInjection<CloudType>::timeEnd() const
+{
+    return this->SOI_ + duration_;
+}
+
+
+template<class CloudType>
+void Foam::PatchInjection<CloudType>::setPositionAndCell
+(
+    const label,
+    const label,
+    const scalar,
+    vector& position,
+    label& cellOwner
+)
+{
+    if (cellOwners_.size() > 0)
+    {
+        label cellI = this->owner().rndGen().integer(0, cellOwners_.size() - 1);
+
+        cellOwner = cellOwners_[cellI];
+        position = this->owner().mesh().C()[cellOwner];
+    }
+    else
+    {
+        cellOwner = -1;
+        // dummy position
+        position = pTraits<vector>::max;
+    }
+}
+
+
+template<class CloudType>
+void Foam::PatchInjection<CloudType>::setProperties
+(
+    const label,
+    const label,
+    const scalar,
+    typename CloudType::parcelType& parcel
+)
+{
+    // set particle velocity
+    parcel.U() = U0_;
+
+    // set particle diameter
+    parcel.d() = parcelPDF_->sample();
+}
+
+
+template<class CloudType>
+bool Foam::PatchInjection<CloudType>::fullyDescribed() const
+{
+    return false;
+}
+
+
+template<class CloudType>
+bool Foam::PatchInjection<CloudType>::validInjection(const label)
+{
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
new file mode 100644
index 000000000..24548bb92
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.H
@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::PatchInjection
+
+Description
+    Patch injection
+
+    - User specifies
+      - Total mass to inject
+      - Name of patch
+      - Injection duration
+      - Initial parcel velocity
+      - Injection volume flow rate
+    - Parcel diameters obtained by PDF model
+    - Parcels injected at cell centres adjacent to patch
+
+SourceFiles
+    PatchInjection.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PatchInjection_H
+#define PatchInjection_H
+
+#include "InjectionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class Type>
+class DataEntry;
+
+class pdf;
+
+/*---------------------------------------------------------------------------*\
+                       Class PatchInjection Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class PatchInjection
+:
+    public InjectionModel<CloudType>
+{
+    // Private data
+
+        //- Name of patch
+        const word patchName_;
+
+        //- Injection duration [s]
+        const scalar duration_;
+
+        //- Number of parcels to introduce per second []
+        const label parcelsPerSecond_;
+
+        //- Initial parcel velocity [m/s]
+        const vector U0_;
+
+        //- Volume flow rate of parcels to introduce relative to SOI [m^3/s]
+        const autoPtr<DataEntry<scalar> > volumeFlowRate_;
+
+        //- Parcel size PDF model
+        const autoPtr<pdf> parcelPDF_;
+
+        //- Cell owners
+        labelList cellOwners_;
+
+        //- Fraction of injection controlled by this processor
+        scalar fraction_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Number of parcels to introduce over the time step relative to SOI
+        label parcelsToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+        //- Volume of parcels to introduce over the time step relative to SOI
+        scalar volumeToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PatchInjection");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        PatchInjection
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~PatchInjection();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates injection model
+        bool active() const;
+
+        //- Return the end-of-injection time
+        scalar timeEnd() const;
+
+
+        // Injection geometry
+
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                vector& position,
+                label& cellOwner
+            );
+
+            virtual void setProperties
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                typename CloudType::parcelType& parcel
+            );
+
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const;
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PatchInjection.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
new file mode 100644
index 000000000..d0d7c87aa
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.C
@@ -0,0 +1,217 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "LocalInteraction.H"
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::label Foam::LocalInteraction<CloudType>::applyToPatch
+(
+    const label globalPatchI
+) const
+{
+    forAll(patchIds_, patchI)
+    {
+        if (patchIds_[patchI] == globalPatchI)
+        {
+            return patchI;
+        }
+    }
+
+    return -1;
+}
+
+
+// * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::LocalInteraction<CloudType>::LocalInteraction
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    PatchInteractionModel<CloudType>(dict, cloud, typeName),
+    patchData_(this->coeffDict().lookup("patches")),
+    patchIds_(patchData_.size())
+{
+    const polyMesh& mesh = cloud.mesh();
+    const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
+
+    // check that user patches are valid region patches
+    forAll(patchData_, patchI)
+    {
+        const word& patchName = patchData_[patchI].patchName();
+        patchIds_[patchI] = bMesh.findPatchID(patchName);
+        if (patchIds_[patchI] < 0)
+        {
+            FatalErrorIn("LocalInteraction(const dictionary&, CloudType&)")
+                << "Patch " << patchName << " not found. Available patches "
+                << "are: " << bMesh.names() << nl << exit(FatalError);
+        }
+    }
+
+    // check that all walls are specified
+    DynamicList<word> badWalls;
+    forAll(bMesh, patchI)
+    {
+        if
+        (
+            isA<wallPolyPatch>(bMesh[patchI])
+         && applyToPatch(bMesh[patchI].index()) < 0
+        )
+        {
+            badWalls.append(bMesh[patchI].name());
+        }
+    }
+
+    if (badWalls.size() > 0)
+    {
+        FatalErrorIn("LocalInteraction(const dictionary&, CloudType&)")
+            << "All wall patches must be specified when employing local patch "
+            << "interaction. Please specify data for patches:" << nl
+            << badWalls << nl << exit(FatalError);
+    }
+
+    // check that interactions are valid/specified
+    forAll(patchData_, patchI)
+    {
+        const word& interactionTypeName =
+            patchData_[patchI].interactionTypeName();
+        const typename PatchInteractionModel<CloudType>::interactionType& it =
+            this->wordToInteractionType(interactionTypeName);
+
+        if (it == PatchInteractionModel<CloudType>::itOther)
+        {
+            const word& patchName = patchData_[patchI].patchName();
+            FatalErrorIn("LocalInteraction(const dictionary&, CloudType&)")
+                << "Unknown patch interaction type "
+                << interactionTypeName << " for patch " << patchName
+                << ". Valid selections are:"
+                << this->PatchInteractionModel<CloudType>::interactionTypeNames_
+                << nl << exit(FatalError);
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::LocalInteraction<CloudType>::~LocalInteraction()
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::LocalInteraction<CloudType>::active() const
+{
+    return true;
+}
+
+
+template <class CloudType>
+bool Foam::LocalInteraction<CloudType>::correct
+(
+    const polyPatch& pp,
+    const label faceId,
+    bool& keepParticle,
+    vector& U
+) const
+{
+    label patchI = applyToPatch(pp.index());
+
+    if (patchI >= 0)
+    {
+        typename PatchInteractionModel<CloudType>::interactionType it =
+            this->wordToInteractionType
+            (
+                patchData_[patchI].interactionTypeName()
+            );
+
+        switch (it)
+        {
+            case PatchInteractionModel<CloudType>::itEscape:
+            {
+                keepParticle = false;
+                U = vector::zero;
+                break;
+            }
+            case PatchInteractionModel<CloudType>::itStick:
+            {
+                keepParticle = true;
+                U = vector::zero;
+                break;
+            }
+            case PatchInteractionModel<CloudType>::itRebound:
+            {
+                keepParticle = true;
+
+                vector nw = pp.faceAreas()[pp.whichFace(faceId)];
+                nw /= mag(nw);
+
+                scalar Un = U & nw;
+                vector Ut = U - Un*nw;
+
+                if (Un > 0)
+                {
+                    U -= (1.0 + patchData_[patchI].e())*Un*nw;
+                }
+
+                U -= patchData_[patchI].mu()*Ut;
+
+                break;
+            }
+            default:
+            {
+                FatalErrorIn
+                (
+                    "bool LocalInteraction<CloudType>::correct"
+                    "("
+                        "const polyPatch&, "
+                        "const label, "
+                        "bool&, "
+                        "vector&"
+                    ") const"
+                )   << "Unknown interaction type "
+                    << patchData_[patchI].interactionTypeName()
+                    << "(" << it << ") for patch "
+                    << patchData_[patchI].patchName()
+                    << ". Valid selections are:" << this->interactionTypeNames_
+                    << endl << abort(FatalError);
+            }
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
new file mode 100644
index 000000000..508050b45
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/LocalInteraction.H
@@ -0,0 +1,115 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::LocalInteraction
+
+Description
+    Patch interaction specified on a patch-by-patch basis
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef LocalInteraction_H
+#define LocalInteraction_H
+
+#include "PatchInteractionModel.H"
+#include "patchInteractionData.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                      Class LocalInteraction Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class LocalInteraction
+:
+    public PatchInteractionModel<CloudType>
+{
+    // Private data
+
+        //- List of participating patches
+        const List<patchInteractionData> patchData_;
+
+        //- List of participating patch ids
+        List<label> patchIds_;
+
+
+    // Private member functions
+
+        //- Returns local patchI if patch is in patchIds_ list
+        label applyToPatch(const label globalPatchI) const;
+
+
+
+public:
+
+    //- Runtime type information
+    TypeName("LocalInteraction");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        LocalInteraction(const dictionary& dict, CloudType& cloud);
+
+
+    //- Destructor
+    virtual ~LocalInteraction();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates patch interaction model
+        virtual bool active() const;
+
+        //- Apply velocity correction
+        //  Returns true if particle remains in same cell
+        virtual bool correct
+        (
+            const polyPatch& pp,
+            const label faceId,
+            bool& keepParticle,
+            vector& U
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "LocalInteraction.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
new file mode 100644
index 000000000..a11c4857a
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.C
@@ -0,0 +1,89 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "patchInteractionData.H"
+#include "dictionaryEntry.H"
+#include "PatchInteractionModel.H"
+
+// * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * * //
+
+Foam::patchInteractionData::patchInteractionData()
+:
+    interactionTypeName_("unknownInteractionTypeName"),
+    patchName_("unknownPatch"),
+    e_(0.0),
+    mu_(0.0)
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+const Foam::word& Foam::patchInteractionData::interactionTypeName() const
+{
+    return interactionTypeName_;
+}
+
+
+const Foam::word& Foam::patchInteractionData::patchName() const
+{
+    return patchName_;
+}
+
+
+Foam::scalar Foam::patchInteractionData::e() const
+{
+    return e_;
+}
+
+
+Foam::scalar Foam::patchInteractionData::mu() const
+{
+    return mu_;
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>
+(
+    Istream& is,
+    patchInteractionData& pid
+)
+{
+    is.check("Istream& operator>>(Istream&, patchInteractionData&)");
+
+    const dictionaryEntry entry(dictionary::null, is);
+
+    pid.patchName_ = entry.keyword();
+    entry.lookup("type") >> pid.interactionTypeName_;
+    pid.e_ = entry.lookupOrDefault<scalar>("e", 1.0);
+    pid.mu_ = entry.lookupOrDefault<scalar>("mu", 0.0);
+
+    return is;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.H
new file mode 100644
index 000000000..7fc83ac26
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/LocalInteraction/patchInteractionData.H
@@ -0,0 +1,157 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::patchInteractionData
+
+Description
+    Helper class for the LocalInteraction patch interaction model
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef patchInteractionData_H
+#define patchInteractionData_H
+
+#include "Istream.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                    Class patchInteractionData Declaration
+\*---------------------------------------------------------------------------*/
+
+// Forward declaration of classes
+class patchInteractionData;
+
+// Forward declaration of friend functions
+Istream& operator>>
+(
+    Istream& is,
+    patchInteractionData& pid
+);
+
+
+class patchInteractionData
+{
+    // Private data
+
+        //- Interaction type name
+        word interactionTypeName_;
+
+        //- Patch name
+        word patchName_;
+
+        //- Elasticity coefficient
+        scalar e_;
+
+        //- Restitution coefficient
+        scalar mu_;
+
+
+public:
+
+    // Constructor
+
+        //- Construct null
+        patchInteractionData();
+
+
+    // Member functions
+
+        // Access
+
+            //- Return const access to the interaction type name
+            const word& interactionTypeName() const;
+
+            //- Return const access to the patch name
+            const word& patchName() const;
+
+            //- Return const access to the elasticity coefficient
+            scalar e() const;
+
+            //- Return const access to the restitution coefficient
+            scalar mu() const;
+
+
+        // I-O
+
+            //- Istream operator
+            friend Istream& operator>>
+            (
+                Istream& is,
+                patchInteractionData& pid
+            );
+/*            {
+                is.check
+                (
+                    "Istream& operator>>"
+                    "(Istream&, patchInteractionData&)"
+                );
+
+                const dictionaryEntry entry(dictionary::null, is);
+
+                pid.patchName_ = entry.keyword();
+                entry.lookup("type") >> pid.interactionTypeName_;
+                pid.e_ = entry.lookupOrDefault<scalar>("e", 1.0);
+                pid.mu_ = entry.lookupOrDefault<scalar>("mu", 0.0);
+
+                if
+                (
+                    PatchInteractionModel<CloudType>::wordToInteractionType
+                    (
+                        pid.interactionTypeName_
+                    )
+                == PatchInteractionModel<CloudType>::itOther)
+                {
+                    FatalErrorIn
+                    (
+                        "friend Istream& operator>>"
+                        "("
+                            "Istream&, "
+                            "patchInteractionData&"
+                        ")"
+                    )   << "Unknown patch interaction type "
+                        << pid.interactionTypeName_
+                        << ". Valid selections are:"
+                        << PatchInteractionModel<CloudType>::
+                        interactionTypeNames_
+                        << endl << abort(FatalError);
+                }
+
+                return is;
+            }
+*/};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
new file mode 100644
index 000000000..d41fe9d59
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/NewPatchInteractionModel.C
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "PatchInteractionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::autoPtr<Foam::PatchInteractionModel<CloudType> >
+Foam::PatchInteractionModel<CloudType>::New
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+{
+    word PatchInteractionModelType(dict.lookup("PatchInteractionModel"));
+
+    Info<< "Selecting PatchInteractionModel " << PatchInteractionModelType
+        << endl;
+
+    typename dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(PatchInteractionModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "PatchInteractionModel<CloudType>::New"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown PatchInteractionModelType type "
+            << PatchInteractionModelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid PatchInteractionModel types are:" << nl
+            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+    }
+
+    return autoPtr<PatchInteractionModel<CloudType> >(cstrIter()(dict, owner));
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
new file mode 100644
index 000000000..33ba20ca1
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.C
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "PatchInteractionModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::wordList Foam::PatchInteractionModel<CloudType>::interactionTypeNames_
+(
+    IStringStream
+    (
+        "(rebound stick escape)"
+    )()
+);
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::word Foam::PatchInteractionModel<CloudType>::interactionTypeToWord
+(
+    const interactionType& itEnum
+)
+{
+    switch (itEnum)
+    {
+        case itRebound:
+        {
+            return "rebound";
+            break;
+        }
+        case itStick:
+        {
+            return "stick";
+            break;
+        }
+        case itEscape:
+        {
+            return "escape";
+            break;
+        }
+        default:
+        {
+            return "other";
+        }
+    }
+#ifdef __ICC
+    // Prevent Icc complaining about missing return statement.
+    return word::null;
+#endif
+}
+
+
+template<class CloudType>
+typename Foam::PatchInteractionModel<CloudType>::interactionType
+Foam::PatchInteractionModel<CloudType>::wordToInteractionType
+(
+    const word& itWord
+)
+{
+    if (itWord == "rebound")
+    {
+        return itRebound;
+    }
+    else if (itWord == "stick")
+    {
+        return itStick;
+    }
+    else if (itWord == "escape")
+    {
+        return itEscape;
+    }
+    else
+    {
+        return itOther;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PatchInteractionModel<CloudType>::PatchInteractionModel
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& type
+)
+:
+    dict_(dict),
+    owner_(owner),
+    coeffDict_(dict.subDict(type + "Coeffs"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PatchInteractionModel<CloudType>::~PatchInteractionModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+const CloudType&
+Foam::PatchInteractionModel<CloudType>::owner() const
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::PatchInteractionModel<CloudType>::dict() const
+{
+    return dict_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary&
+Foam::PatchInteractionModel<CloudType>::coeffDict() const
+{
+    return coeffDict_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "NewPatchInteractionModel.C"
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
new file mode 100644
index 000000000..d373fd2d0
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/PatchInteractionModel/PatchInteractionModel.H
@@ -0,0 +1,214 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::PatchInteractionModel
+
+Description
+    Templated patch interaction model class
+
+SourceFiles
+    PatchInteractionModel.C
+    NewPatchInteractionModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PatchInteractionModel_H
+#define PatchInteractionModel_H
+
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+#include "polyPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class PatchInteractionModel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class PatchInteractionModel
+{
+public:
+
+    // Public enumerations
+
+        // Interaction types
+        enum interactionType
+        {
+            itRebound,
+            itStick,
+            itEscape,
+            itOther
+        };
+
+        static wordList interactionTypeNames_;
+
+
+private:
+
+    // Private data
+
+        //- The cloud dictionary
+        const dictionary& dict_;
+
+        //- Reference to the owner cloud class
+        CloudType& owner_;
+
+        //- The coefficients dictionary
+        const dictionary coeffDict_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PatchInteractionModel");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        PatchInteractionModel,
+        dictionary,
+        (
+            const dictionary& dict,
+            CloudType& owner
+        ),
+        (dict, owner)
+    );
+
+
+    // Constructors
+
+        //- Construct from components
+        PatchInteractionModel
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& type
+        );
+
+
+    //- Destructor
+    virtual ~PatchInteractionModel();
+
+
+    //- Selector
+    static autoPtr<PatchInteractionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
+
+
+    // Access
+
+        //- Return the owner cloud object
+        const CloudType& owner() const;
+
+        //- Return the dictionary
+        const dictionary& dict() const;
+
+        //- Return the coefficients dictionary
+        const dictionary& coeffDict() const;
+
+
+    // Member Functions
+
+        //- Convert interaction result to word
+        static word interactionTypeToWord(const interactionType& itEnum);
+
+        //- Convert word to interaction result
+        static interactionType wordToInteractionType(const word& itWord);
+
+        //- Flag to indicate whether model activates patch interaction model
+        virtual bool active() const = 0;
+
+        //- Apply velocity correction
+        //  Returns true if particle remains in same cell
+        virtual bool correct
+        (
+            const polyPatch& pp,
+            const label faceId,
+            bool& keepParticle,
+            vector& U
+        ) const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makePatchInteractionModel(CloudType)                                  \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(PatchInteractionModel<CloudType>, 0); \
+                                                                              \
+    defineTemplateRunTimeSelectionTable                                       \
+    (                                                                         \
+        PatchInteractionModel<CloudType>,                                     \
+        dictionary                                                            \
+    );
+
+
+#define makePatchInteractionModelType(SS, CloudType, ParcelType)              \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+                                                                              \
+    PatchInteractionModel<CloudType<ParcelType> >::                           \
+        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
+            add##SS##CloudType##ParcelType##ConstructorToTable_;
+
+
+#define makePatchInteractionModelThermoType(SS, CloudType, ParcelType, ThermoType)\
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    PatchInteractionModel<CloudType<ParcelType<ThermoType> > >::              \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PatchInteractionModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
similarity index 89%
rename from src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C
rename to src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
index f6f81b0c9..536bc71fc 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.C
@@ -35,7 +35,7 @@ Foam::Rebound<CloudType>::Rebound
     CloudType& cloud
 )
 :
-    WallInteractionModel<CloudType>(dict, cloud, typeName),
+    PatchInteractionModel<CloudType>(dict, cloud, typeName),
     UFactor_(readScalar(this->coeffDict().lookup("UFactor")))
 {}
 
@@ -57,26 +57,27 @@ bool Foam::Rebound<CloudType>::active() const
 
 
 template<class CloudType>
-void Foam::Rebound<CloudType>::correct
+bool Foam::Rebound<CloudType>::correct
 (
-    const wallPolyPatch& wpp,
+    const polyPatch& pp,
     const label faceId,
+    bool& keepParticle,
     vector& U
 ) const
 {
-    vector nw = wpp.faceAreas()[wpp.whichFace(faceId)];
+    keepParticle = true;
+
+    vector nw = pp.faceAreas()[pp.whichFace(faceId)];
     nw /= mag(nw);
 
     scalar Un = U & nw;
-    vector Ut = U - Un*nw;
 
     if (Un > 0.0)
     {
         U -= UFactor_*2.0*Un*nw;
     }
 
-    U -= Ut;
-
+    return true;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
similarity index 82%
rename from src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.H
rename to src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
index 1df6aff32..5ce40bf7b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/WallInteractionModel/Rebound/Rebound.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/Rebound/Rebound.H
@@ -26,14 +26,14 @@ Class
     Foam::Rebound
 
 Description
-    Simple rebound wall interaction model
+    Simple rebound patch interaction model
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef Rebound_H
 #define Rebound_H
 
-#include "WallInteractionModel.H"
+#include "PatchInteractionModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,7 +46,7 @@ namespace Foam
 template<class CloudType>
 class Rebound
 :
-    public WallInteractionModel<CloudType>
+    public PatchInteractionModel<CloudType>
 {
     // Private data
 
@@ -64,28 +64,25 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        Rebound
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+        Rebound(const dictionary& dict, CloudType& cloud);
 
 
-    // Destructor
-
-        ~Rebound();
+    //- Destructor
+    virtual ~Rebound();
 
 
     // Member Functions
 
-        //- Flag to indicate whether model activates heat transfer model
-        bool active() const;
+        //- Flag to indicate whether model activates patch interaction model
+        virtual bool active() const;
 
-        //- Apply wall correction
-        virtual void correct
+        //- Apply velocity correction
+        //  Returns true if particle remains in same cell
+        virtual bool correct
         (
-            const wallPolyPatch& wpp,
+            const polyPatch& pp,
             const label faceId,
+            bool& keepParticle,
             vector& U
         ) const;
 };
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
new file mode 100644
index 000000000..ccbbe5bc3
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.C
@@ -0,0 +1,165 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "StandardWallInteraction.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::StandardWallInteraction<CloudType>::StandardWallInteraction
+(
+    const dictionary& dict,
+    CloudType& cloud
+)
+:
+    PatchInteractionModel<CloudType>(dict, cloud, typeName),
+    interactionType_
+    (
+        this->wordToInteractionType(this->coeffDict().lookup("type"))
+    ),
+    e_(0.0),
+    mu_(0.0)
+{
+    switch (interactionType_)
+    {
+        case PatchInteractionModel<CloudType>::itOther:
+        {
+            word interactionTypeName(this->coeffDict().lookup("type"));
+
+            FatalErrorIn
+            (
+                "StandardWallInteraction<CloudType>::StandardWallInteraction"
+                "("
+                    "const dictionary&, "
+                    "CloudType& cloud"
+                ")"
+            )   << "Unknown interaction result type "
+                << interactionTypeName
+                << ". Valid selections are:" << this->interactionTypeNames_
+                << endl << exit(FatalError);
+
+            break;
+        }
+        case PatchInteractionModel<CloudType>::itRebound:
+        {
+            e_ = this->coeffDict().lookupOrDefault("e", 1.0);
+            mu_ = this->coeffDict().lookupOrDefault("mu", 0.0);
+            break;
+        }
+        default:
+        {
+            // do nothing
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::StandardWallInteraction<CloudType>::~StandardWallInteraction()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::StandardWallInteraction<CloudType>::active() const
+{
+    return true;
+}
+
+
+template <class CloudType>
+bool Foam::StandardWallInteraction<CloudType>::correct
+(
+    const polyPatch& pp,
+    const label faceId,
+    bool& keepParticle,
+    vector& U
+) const
+{
+    if (isA<wallPolyPatch>(pp))
+    {
+        switch (interactionType_)
+        {
+            case PatchInteractionModel<CloudType>::itEscape:
+            {
+                keepParticle = false;
+                U = vector::zero;
+                break;
+            }
+            case PatchInteractionModel<CloudType>::itStick:
+            {
+                keepParticle = true;
+                U = vector::zero;
+                break;
+            }
+            case PatchInteractionModel<CloudType>::itRebound:
+            {
+                keepParticle = true;
+
+                vector nw = pp.faceAreas()[pp.whichFace(faceId)];
+                nw /= mag(nw);
+
+                scalar Un = U & nw;
+                vector Ut = U - Un*nw;
+
+                if (Un > 0)
+                {
+                    U -= (1.0 + e_)*Un*nw;
+                }
+
+                U -= mu_*Ut;
+
+                break;
+            }
+            default:
+            {
+                FatalErrorIn
+                (
+                    "bool StandardWallInteraction<CloudType>::correct"
+                    "("
+                        "const polyPatch&, "
+                        "const label, "
+                        "bool&, "
+                        "vector&"
+                    ") const"
+                )   << "Unknown interaction type "
+                    << this->interactionTypeToWord(interactionType_)
+                    << "(" << interactionType_ << ")" << endl
+                    << abort(FatalError);
+            }
+        }
+
+        return true;
+    }
+
+    return false;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
new file mode 100644
index 000000000..331140237
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PatchInteractionModel/StandardWallInteraction/StandardWallInteraction.H
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::StandardWallInteraction
+
+Description
+    Wall interaction model. Three choices:
+    - rebound - optionally specify elasticity and resitution coefficients
+    - stick   - particles assigined zero velocity
+    - escape  - remove particle from the domain
+
+    Example usage:
+
+        StandardWallInteractionCoeffs
+        {
+            type        rebound; // stick, escape
+            e           1;       // optional - elasticity coeff
+            mu          0;       // optional - restitution coeff
+        }
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef StandardWallInteraction_H
+#define StandardWallInteraction_H
+
+#include "PatchInteractionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                   Class StandardWallInteraction Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class StandardWallInteraction
+:
+    public PatchInteractionModel<CloudType>
+{
+protected:
+
+    // Protected data
+
+        //- Interaction type
+        typename PatchInteractionModel<CloudType>::interactionType
+            interactionType_;
+
+        //- Elasticity coefficient
+        scalar e_;
+
+        //- Restitution coefficient
+        scalar mu_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("StandardWallInteraction");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        StandardWallInteraction(const dictionary& dict, CloudType& cloud);
+
+
+    //- Destructor
+    virtual ~StandardWallInteraction();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates patch interaction model
+        virtual bool active() const;
+
+        //- Apply velocity correction
+        //  Returns true if particle remains in same cell
+        virtual bool correct
+        (
+            const polyPatch& pp,
+            const label faceId,
+            bool& keepParticle,
+            vector& U
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "StandardWallInteraction.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C
new file mode 100644
index 000000000..b7d1d1035
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.C
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "NoPostProcessing.H"
+
+// * * * * * * * * * * * * * protected Member Functions  * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::NoPostProcessing<CloudType>::write()
+{
+// do nothing
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::NoPostProcessing<CloudType>::NoPostProcessing
+(
+    const dictionary&,
+    CloudType& owner
+)
+:
+    PostProcessingModel<CloudType>(owner)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::NoPostProcessing<CloudType>::~NoPostProcessing()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::NoPostProcessing<CloudType>::active() const
+{
+    return false;
+}
+
+
+template<class CloudType>
+void Foam::NoPostProcessing<CloudType>::postPatch
+(
+    const typename CloudType::parcelType&,
+    const label
+)
+{
+// do nothing
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H
new file mode 100644
index 000000000..96f840ef3
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/NoPostProcessing/NoPostProcessing.H
@@ -0,0 +1,109 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::NoPostProcessing
+
+Description
+    Place holder for 'none' option
+
+SourceFiles
+    NoPostProcessing.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef NoPostProcessing_H
+#define NoPostProcessing_H
+
+#include "PostProcessingModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class NoPostProcessing Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class NoPostProcessing
+:
+    public PostProcessingModel<CloudType>
+{
+protected:
+
+    // Protected member functions
+
+        //- Write post-processing info
+        void write();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("none");
+
+
+    // Constructors
+
+        //- Construct from components
+        NoPostProcessing(const dictionary&, CloudType&);
+
+
+    //- Destructor
+    virtual ~NoPostProcessing();
+
+
+    // Member Functions
+
+        // Evaluation
+
+            //- Flag to indicate whether model activates post-processing model
+            virtual bool active() const;
+
+            //- Gather post-processing info on patch
+            virtual void postPatch
+            (
+                const typename CloudType::parcelType& p,
+                const label patchI
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "NoPostProcessing.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
new file mode 100644
index 000000000..12f8f89cd
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.C
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "PatchPostProcessing.H"
+#include "Pstream.H"
+#include "ListListOps.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::label Foam::PatchPostProcessing<CloudType>::applyToPatch
+(
+    const label globalPatchI
+) const
+{
+    forAll(patchIds_, patchI)
+    {
+        if (patchIds_[patchI] == globalPatchI)
+        {
+            return patchI;
+        }
+    }
+
+    return -1;
+}
+
+
+// * * * * * * * * * * * * * protected Member Functions  * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::PatchPostProcessing<CloudType>::write()
+{
+    forAll(patchData_, patchI)
+    {
+        List<List<string> > procData(Pstream::nProcs());
+        procData[Pstream::myProcNo()] = patchData_[patchI];
+
+        Pstream::gatherList(procData);
+
+        if (Pstream::master())
+        {
+            fileName outputDir;
+
+            if (Pstream::parRun())
+            {
+                // Put in undecomposed case (Note: gives problems for
+                // distributed data running)
+                outputDir =
+                    mesh_.time().path()/".."/"postProcessing"/cloud::prefix/
+                    this->owner().name()/this->owner().time().timeName();
+            }
+            else
+            {
+                outputDir =
+                    mesh_.time().path()/"postProcessing"/cloud::prefix/
+                    this->owner().name()/this->owner().time().timeName();
+            }
+
+            // Create directory if it doesn't exist
+            mkDir(outputDir);
+
+            OFstream patchOutFile
+            (
+                outputDir/patchNames_[patchI] + ".post",
+                IOstream::ASCII,
+                IOstream::currentVersion,
+                mesh_.time().writeCompression()
+            );
+
+            List<string> globalData;
+            globalData = ListListOps::combine<List<string> >
+            (
+                procData,
+                accessOp<List<string> >()
+            );
+            sort(globalData);
+
+            patchOutFile<< "# Time " + parcelType::propHeader << nl;
+
+            forAll(globalData, i)
+            {
+                patchOutFile<< globalData[i].c_str() << nl;
+            }
+        }
+
+        patchData_[patchI].clearStorage();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PatchPostProcessing<CloudType>::PatchPostProcessing
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    PostProcessingModel<CloudType>(dict, owner, typeName),
+    mesh_(owner.mesh()),
+    maxStoredParcels_(readLabel(this->coeffDict().lookup("maxStoredParcels"))),
+    patchNames_(this->coeffDict().lookup("patches")),
+    patchData_(patchNames_.size()),
+    patchIds_(patchNames_.size())
+{
+    forAll(patchNames_, patchI)
+    {
+        label id = mesh_.boundaryMesh().findPatchID(patchNames_[patchI]);
+        if (id < 0)
+        {
+            FatalErrorIn
+            (
+                "PatchPostProcessing<CloudType>::PatchPostProcessing"
+                "("
+                    "const dictionary&, "
+                    "CloudType& owner"
+                ")"
+            )<< "Requested patch " << patchNames_[patchI] << " not found" << nl
+             << "Available patches are: " << mesh_.boundaryMesh().names() << nl
+             << exit(FatalError);
+        }
+        patchIds_[patchI] = id;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PatchPostProcessing<CloudType>::~PatchPostProcessing()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::PatchPostProcessing<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+void Foam::PatchPostProcessing<CloudType>::postPatch
+(
+    const parcelType& p,
+    const label patchI
+)
+{
+    label localPatchI = applyToPatch(patchI);
+    if (localPatchI >= 0 && patchData_[localPatchI].size() < maxStoredParcels_)
+    {
+        OStringStream data;
+        data<< this->owner().time().timeName() << ' ' << p;
+        patchData_[localPatchI].append(data.str());
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
new file mode 100644
index 000000000..f11772534
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessing.H
@@ -0,0 +1,154 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::PatchPostProcessing
+
+Description
+    Standard post-processing
+
+SourceFiles
+    PatchPostProcessing.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PatchPostProcessing_H
+#define PatchPostProcessing_H
+
+#include "PostProcessingModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class PatchPostProcessing Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class PatchPostProcessing
+:
+    public PostProcessingModel<CloudType>
+{
+    // Private data
+
+        typedef typename CloudType::parcelType parcelType;
+
+        //- Reference to the mesh
+        const polyMesh& mesh_;
+
+        //- Maximum number of parcels to store
+        label maxStoredParcels_;
+
+        //- List of patch names
+        wordList patchNames_;
+
+        //- List of output data per patch
+        List<DynamicList<string> > patchData_;
+
+        //- Mapping from local to global patch ids
+        labelList patchIds_;
+
+
+    // Private member functions
+
+        //- Returns local patchI if patch is in patchIds_ list
+        label applyToPatch(const label globalPatchI) const;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Write post-processing info
+        void write();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PatchPostProcessing");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        PatchPostProcessing(const dictionary& dict, CloudType& owner);
+
+
+    //- Destructor
+    virtual ~PatchPostProcessing();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const access to the mesh
+            inline const polyMesh& mesh() const;
+
+            //- Return maximum number of parcels to store per patch
+            inline label maxStoredParcels() const;
+
+            //- Return const access to the list of patch names
+            inline const wordList& patchNames() const;
+
+            //- Return const mapping from local to global patch ids
+            inline const labelList& patchIds() const;
+
+
+        // Evaluation
+
+            //- Flag to indicate whether model activates post-processing model
+            virtual bool active() const;
+
+            //- Gather post-processing info on patch
+            virtual void postPatch
+            (
+                const parcelType& p,
+                const label patchI
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "PatchPostProcessingI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PatchPostProcessing.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
new file mode 100644
index 000000000..818ad93d8
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PatchPostProcessing/PatchPostProcessingI.H
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+const Foam::polyMesh& Foam::PatchPostProcessing<CloudType>::mesh() const
+{
+    return mesh_;
+}
+
+
+template<class CloudType>
+Foam::label Foam::PatchPostProcessing<CloudType>::maxStoredParcels() const
+{
+    return maxStoredParcels_;
+}
+
+
+template<class CloudType>
+const Foam::wordList& Foam::PatchPostProcessing<CloudType>::patchNames() const
+{
+    return patchNames_;
+}
+
+
+template<class CloudType>
+const Foam::labelList&
+Foam::PatchPostProcessing<CloudType>::patchIds() const
+{
+    return patchIds_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
new file mode 100644
index 000000000..c74d986e1
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/NewPostProcessingModel.C
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "PostProcessingModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::autoPtr<Foam::PostProcessingModel<CloudType> >
+Foam::PostProcessingModel<CloudType>::New
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+{
+    word PostProcessingModelType(dict.lookup("PostProcessingModel"));
+
+    Info<< "Selecting PostProcessingModel " << PostProcessingModelType << endl;
+
+    typename dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(PostProcessingModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "PostProcessingModel<CloudType>::New"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown PostProcessingModelType type "
+            << PostProcessingModelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid PostProcessingModel types are:" << nl
+            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+    }
+
+    return autoPtr<PostProcessingModel<CloudType> >(cstrIter()(dict, owner));
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.C b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
similarity index 78%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.C
rename to src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
index c4deba056..880333002 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.C
@@ -24,18 +24,28 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "MassTransferModel.H"
+#include "PostProcessingModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::MassTransferModel<CloudType>::MassTransferModel
+Foam::PostProcessingModel<CloudType>::PostProcessingModel(CloudType& owner)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null)
+{}
+
+
+template<class CloudType>
+Foam::PostProcessingModel<CloudType>::PostProcessingModel
 (
     const dictionary& dict,
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs"))
 {}
@@ -44,35 +54,24 @@ Foam::MassTransferModel<CloudType>::MassTransferModel
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class CloudType>
-Foam::MassTransferModel<CloudType>::~MassTransferModel()
+Foam::PostProcessingModel<CloudType>::~PostProcessingModel()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-template<class CloudType>
-const CloudType& Foam::MassTransferModel<CloudType>::owner() const
-{
-    return owner_;
-}
-
 
 template<class CloudType>
-const Foam::dictionary& Foam::MassTransferModel<CloudType>::dict() const
+void Foam::PostProcessingModel<CloudType>::post()
 {
-    return dict_;
-}
-
-
-template<class CloudType>
-const Foam::dictionary& Foam::MassTransferModel<CloudType>::coeffDict() const
-{
-    return coeffDict_;
+    if (owner_.time().outputTime())
+    {
+        this->write();
+    }
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "NewMassTransferModel.C"
+#include "NewPostProcessingModel.C"
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
new file mode 100644
index 000000000..f9d253192
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModel.H
@@ -0,0 +1,209 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::PostProcessingModel
+
+Description
+    Templated post-processing model class
+
+SourceFiles
+    PostProcessingModel.C
+    NewPostProcessingModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PostProcessingModel_H
+#define PostProcessingModel_H
+
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                    Class PostProcessingModel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class PostProcessingModel
+{
+    // Private data
+
+        //- The cloud dictionary
+        const dictionary& dict_;
+
+        //- Reference to the owner cloud class
+        CloudType& owner_;
+
+        //- The coefficients dictionary
+        const dictionary coeffDict_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Write post-processing info
+        virtual void write() = 0;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PostProcessingModel");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        PostProcessingModel,
+        dictionary,
+        (
+            const dictionary& dict,
+            CloudType& owner
+        ),
+        (dict, owner)
+    );
+
+
+    // Constructors
+
+        //- Construct null from owner
+        PostProcessingModel(CloudType& owner);
+
+        //- Construct from dictionary
+        PostProcessingModel
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& type
+        );
+
+
+    //- Destructor
+    virtual ~PostProcessingModel();
+
+
+    //- Selector
+    static autoPtr<PostProcessingModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return the owner cloud dictionary
+            inline const dictionary& dict() const;
+
+            //- Return const access the owner cloud object
+            inline const CloudType& owner() const;
+
+            //- Return non-const access the owner cloud object for manipulation
+            inline CloudType& owner();
+
+            //- Return the coefficients dictionary
+            inline const dictionary& coeffDict() const;
+
+
+        // Evaluation
+
+            //- Main post-processing function
+            virtual void post();
+
+            //- Flag to indicate whether model activates post-processing model
+            virtual bool active() const = 0;
+
+            //- Gather post-processing info on patch
+            virtual void postPatch
+            (
+                const typename CloudType::parcelType& p,
+                const label patchI
+            ) = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makePostProcessingModel(CloudType)                                    \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(PostProcessingModel<CloudType>, 0);   \
+                                                                              \
+    defineTemplateRunTimeSelectionTable                                       \
+    (                                                                         \
+        PostProcessingModel<CloudType>,                                       \
+        dictionary                                                            \
+    );
+
+
+#define makePostProcessingModelType(SS, CloudType, ParcelType)                \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+                                                                              \
+    PostProcessingModel<CloudType<ParcelType> >::                             \
+        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
+            add##SS##CloudType##ParcelType##ConstructorToTable_;
+
+
+#define makePostProcessingModelThermoType(SS, CloudType, ParcelType, ThermoType)\
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    PostProcessingModel<CloudType<ParcelType<ThermoType> > >::                \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "PostProcessingModelI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PostProcessingModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H
new file mode 100644
index 000000000..9428c5b1c
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Kinematic/PostProcessingModel/PostProcessingModel/PostProcessingModelI.H
@@ -0,0 +1,55 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+const Foam::dictionary& Foam::PostProcessingModel<CloudType>::dict() const
+{
+    return dict_;
+}
+
+
+template<class CloudType>
+const CloudType& Foam::PostProcessingModel<CloudType>::owner() const
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+CloudType& Foam::PostProcessingModel<CloudType>::owner()
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::PostProcessingModel<CloudType>::coeffDict() const
+{
+    return coeffDict_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
index e305e5a44..7a66f2e38 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.C
@@ -35,18 +35,18 @@ Foam::CompositionModel<CloudType>::CompositionModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs")),
-    carrierThermo_(owner.carrierThermo()),
-    gases_(owner.gases()),
+    mcCarrierThermo_(owner.mcCarrierThermo()),
     liquids_
     (
         liquidMixture::New
         (
             owner.mesh().objectRegistry::lookupObject<dictionary>
             (
-                "thermophysicalProperties"
+                owner.carrierThermo().name()
             )
         )
     ),
@@ -56,9 +56,16 @@ Foam::CompositionModel<CloudType>::CompositionModel
         (
             owner.mesh().objectRegistry::lookupObject<dictionary>
             (
-                "thermophysicalProperties"
+                owner.carrierThermo().name()
             )
         )
+    ),
+    phaseProps_
+    (
+        coeffDict_.lookup("phases"),
+        mcCarrierThermo_.species(),
+        liquids_().components(),
+        solids_().components()
     )
 {}
 
@@ -94,18 +101,10 @@ const Foam::dictionary& Foam::CompositionModel<CloudType>::coeffDict() const
 
 
 template<class CloudType>
-const Foam::hCombustionThermo&
-Foam::CompositionModel<CloudType>::carrierThermo() const
+const Foam::multiComponentMixture<typename CloudType::thermoType>&
+Foam::CompositionModel<CloudType>::mcCarrierThermo() const
 {
-    return carrierThermo_;
-}
-
-
-template<class CloudType>
-const Foam::PtrList<Foam::specieReactingProperties>&
-Foam::CompositionModel<CloudType>::gases() const
-{
-    return gases_;
+    return mcCarrierThermo_;
 }
 
 
@@ -123,6 +122,552 @@ const Foam::solidMixture& Foam::CompositionModel<CloudType>::solids() const
 }
 
 
+template<class CloudType>
+const Foam::phasePropertiesList&
+Foam::CompositionModel<CloudType>::phaseProps() const
+{
+    return phaseProps_;
+}
+
+
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::nPhase() const
+{
+    return phaseProps_.size();
+}
+
+
+template<class CloudType>
+const Foam::wordList&
+Foam::CompositionModel<CloudType>::phaseTypes() const
+{
+    // if only 1 phase, return the constituent component names
+    if (phaseProps_.size() == 1)
+    {
+        return phaseProps_[0].names();
+    }
+    else
+    {
+        return phaseProps_.phaseTypes();
+    }
+}
+
+
+template<class CloudType>
+const Foam::wordList&
+Foam::CompositionModel<CloudType>::stateLabels() const
+{
+    return phaseProps_.stateLabels();
+}
+
+
+template<class CloudType>
+const Foam::wordList&
+Foam::CompositionModel<CloudType>::componentNames(const label phaseI) const
+{
+    return phaseProps_[phaseI].names();
+}
+
+
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::globalCarrierId
+(
+    const word& cmptName
+) const
+{
+    forAll(mcCarrierThermo_.species(), i)
+    {
+        if (cmptName == mcCarrierThermo_.species()[i])
+        {
+            return i;
+        }
+    }
+
+    FatalErrorIn
+    (
+        "Foam::label Foam::CompositionModel<CloudType>::globalCarrierId"
+        "("
+            "const word&"
+        ") const"
+    )   << "Unable to determine global id for requested component "
+        << cmptName << nl << abort(FatalError);
+
+    return -1;
+}
+
+
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::globalId
+(
+    const label phaseI,
+    const word& cmptName
+) const
+{
+    label id = phaseProps_[phaseI].globalId(cmptName);
+
+    if (id < 0)
+    {
+        FatalErrorIn
+        (
+            "Foam::label Foam::CompositionModel<CloudType>::globalId"
+            "("
+                "const label, "
+                "const word&"
+            ") const"
+        )   << "Unable to determine global id for requested component "
+            << cmptName << nl << abort(FatalError);
+    }
+
+    return id;
+}
+
+
+template<class CloudType>
+const Foam::labelList& Foam::CompositionModel<CloudType>::globalIds
+(
+    const label phaseI
+) const
+{
+    return phaseProps_[phaseI].globalIds();
+}
+
+
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::localId
+(
+    const label phaseI,
+    const word& cmptName
+) const
+{
+    label id = phaseProps_[phaseI].id(cmptName);
+
+    if (id < 0)
+    {
+        FatalErrorIn
+        (
+            "Foam::label Foam::CompositionModel<CloudType>::localId"
+            "("
+                "const label, "
+                "const word&"
+            ") const"
+        )   << "Unable to determine local id for component " << cmptName
+            << nl << abort(FatalError);
+    }
+
+    return id;
+}
+
+
+template<class CloudType>
+Foam::label Foam::CompositionModel<CloudType>::localToGlobalCarrierId
+(
+    const label phaseI,
+    const label id
+) const
+{
+    label gid = phaseProps_[phaseI].globalCarrierIds()[id];
+
+    if (gid < 0)
+    {
+        FatalErrorIn
+        (
+            "Foam::label "
+            "Foam::CompositionModel<CloudType>::localToGlobalCarrierId"
+            "("
+                "const label, "
+                "const label"
+            ") const"
+        )   << "Unable to determine global carrier id for phase "
+            << phaseI << " with local id " << id
+            << nl << abort(FatalError);
+    }
+
+    return gid;
+}
+
+
+template<class CloudType>
+const Foam::scalarField& Foam::CompositionModel<CloudType>::Y0
+(
+    const label phaseI
+) const
+{
+    return phaseProps_[phaseI].Y();
+}
+
+
+template<class CloudType>
+Foam::scalarField Foam::CompositionModel<CloudType>::X
+(
+    const label phaseI,
+    const scalarField& Y
+) const
+{
+    const phaseProperties& props = phaseProps_[phaseI];
+    scalarField X(Y.size(), 0.0);
+    scalar WInv = 0.0;
+    switch (props.phase())
+    {
+        case phaseProperties::GAS:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                WInv += Y[i]/mcCarrierThermo_.speciesData()[gid].W();
+                X[i] = Y[i]/mcCarrierThermo_.speciesData()[gid].W();
+            }
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                WInv += Y[i]/this->liquids().properties()[gid].W();
+                X[i] += Y[i]/this->liquids().properties()[gid].W();
+            }
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalarField Foam::CompositionModel<CloudType>::X"
+                "("
+                    "const label, "
+                    "const scalarField&"
+                ") const"
+            )   << "Only possible to convert gas and liquid mass fractions"
+                << nl << abort(FatalError);
+        }
+    }
+
+    return X/WInv;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::CompositionModel<CloudType>::H
+(
+    const label phaseI,
+    const scalarField& Y,
+    const scalar p,
+    const scalar T
+) const
+{
+    const phaseProperties& props = phaseProps_[phaseI];
+    scalar HMixture = 0.0;
+    switch (props.phase())
+    {
+        case phaseProperties::GAS:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HMixture += Y[i]*mcCarrierThermo_.speciesData()[gid].H(T);
+            }
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HMixture += Y[i]*this->liquids().properties()[gid].h(p, T);
+            }
+            break;
+        }
+        case phaseProperties::SOLID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HMixture +=
+                     Y[i]
+                    *(
+                        this->solids().properties()[gid].Hf()
+                      + this->solids().properties()[gid].cp()*T
+                     );
+            }
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalar Foam::CompositionModel<CloudType>::H"
+                "("
+                "    const label, "
+                "    const scalarField&, "
+                "    const scalar, "
+                "    const scalar"
+                ") const"
+            )   << "Unknown phase enumeration" << nl << abort(FatalError);
+        }
+    }
+
+    return HMixture;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::CompositionModel<CloudType>::Hs
+(
+    const label phaseI,
+    const scalarField& Y,
+    const scalar p,
+    const scalar T
+) const
+{
+    const phaseProperties& props = phaseProps_[phaseI];
+    scalar HsMixture = 0.0;
+    switch (props.phase())
+    {
+        case phaseProperties::GAS:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HsMixture += Y[i]*mcCarrierThermo_.speciesData()[gid].Hs(T);
+            }
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HsMixture +=
+                    Y[i]
+                   *(
+                       this->liquids().properties()[gid].h(p, T)
+                     - this->liquids().properties()[gid].h(p, 298.25)
+                    );
+            }
+            break;
+        }
+        case phaseProperties::SOLID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HsMixture += Y[i]*this->solids().properties()[gid].cp()*T;
+            }
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalar Foam::CompositionModel<CloudType>::Hs"
+                "("
+                "    const label, "
+                "    const scalarField&, "
+                "    const scalar, "
+                "    const scalar"
+                ") const"
+            )   << "Unknown phase enumeration" << nl << abort(FatalError);
+        }
+    }
+
+    return HsMixture;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::CompositionModel<CloudType>::Hc
+(
+    const label phaseI,
+    const scalarField& Y,
+    const scalar p,
+    const scalar T
+) const
+{
+    const phaseProperties& props = phaseProps_[phaseI];
+    scalar HcMixture = 0.0;
+    switch (props.phase())
+    {
+        case phaseProperties::GAS:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HcMixture += Y[i]*mcCarrierThermo_.speciesData()[gid].Hc();
+            }
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HcMixture +=
+                    Y[i]*this->liquids().properties()[gid].h(p, 298.15);
+            }
+            break;
+        }
+        case phaseProperties::SOLID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                HcMixture += Y[i]*this->solids().properties()[gid].Hf();
+            }
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalar Foam::CompositionModel<CloudType>::Hc"
+                "("
+                "    const label, "
+                "    const scalarField&, "
+                "    const scalar, "
+                "    const scalar"
+                ") const"
+            )   << "Unknown phase enumeration" << nl << abort(FatalError);
+        }
+    }
+
+    return HcMixture;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::CompositionModel<CloudType>::cp
+(
+    const label phaseI,
+    const scalarField& Y,
+    const scalar p,
+    const scalar T
+) const
+{
+    const phaseProperties& props = phaseProps_[phaseI];
+    scalar cpMixture = 0.0;
+    switch (props.phase())
+    {
+        case phaseProperties::GAS:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                cpMixture += Y[i]*mcCarrierThermo_.speciesData()[gid].Cp(T);
+            }
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                cpMixture += Y[i]*this->liquids().properties()[gid].cp(p, T);
+            }
+            break;
+        }
+        case phaseProperties::SOLID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                cpMixture += Y[i]*this->solids().properties()[gid].cp();
+            }
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalar Foam::CompositionModel<CloudType>::cp"
+                "("
+                    "const label, "
+                    "const scalarField&, "
+                    "const scalar, "
+                    "const scalar"
+                ") const"
+            )   << "Unknown phase enumeration" << nl << abort(FatalError);
+        }
+    }
+
+    return cpMixture;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::CompositionModel<CloudType>::L
+(
+    const label phaseI,
+    const scalarField& Y,
+    const scalar p,
+    const scalar T
+) const
+{
+    const phaseProperties& props = phaseProps_[phaseI];
+    scalar LMixture = 0.0;
+    switch (props.phase())
+    {
+        case phaseProperties::GAS:
+        {
+            if (debug)
+            {
+                WarningIn
+                (
+                    "Foam::scalar Foam::CompositionModel<CloudType>::L"
+                    "("
+                        "const label, "
+                        "const scalarField&, "
+                        "const scalar, "
+                        "const scalar"
+                    ") const\n"
+                )   << "No support for gaseous components" << endl;
+            }
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            forAll(Y, i)
+            {
+                label gid = props.globalIds()[i];
+                LMixture += Y[i]*this->liquids().properties()[gid].hl(p, T);
+            }
+            break;
+        }
+        case phaseProperties::SOLID:
+        {
+            if (debug)
+            {
+                WarningIn
+                (
+                    "Foam::scalar Foam::CompositionModel<CloudType>::L"
+                    "("
+                        "const label, "
+                        "const scalarField&, "
+                        "const scalar, "
+                        "const scalar"
+                    ") const\n"
+                )   << "No support for solid components" << endl;
+            }
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "Foam::scalar Foam::CompositionModel<CloudType>::L"
+                "("
+                    "const label, "
+                    "const scalarField&, "
+                    "const scalar, "
+                    "const scalar"
+                ") const"
+            )   << "Unknown phase enumeration" << nl << abort(FatalError);
+        }
+    }
+
+    return LMixture;
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #include "NewCompositionModel.C"
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
index 37cf9b5f8..5f411ffd6 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/CompositionModel.H
@@ -25,10 +25,10 @@ License
 Class
     Foam::CompositionModel
 
-
 Description
     Templated reacting parcel composition model class
-    Consists of gases (via thermo package), liquids and solids
+    Consists of carrier species (via thermo package), and additional liquids
+    and solids
 
 SourceFiles
     CompositionModel.C
@@ -44,11 +44,13 @@ SourceFiles
 #include "runTimeSelectionTables.H"
 
 #include "PtrList.H"
-#include "hCombustionThermo.H"
+#include "multiComponentMixture.H"
 
 #include "liquidMixture.H"
 #include "solidMixture.H"
 
+#include "phasePropertiesList.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -61,7 +63,6 @@ namespace Foam
 template<class CloudType>
 class CompositionModel
 {
-
     // Private data
 
         //- The cloud dictionary
@@ -73,18 +74,18 @@ class CompositionModel
         //- The coefficients dictionary
         const dictionary& coeffDict_;
 
-        //- Reference to the carrier phase thermo package
-        hCombustionThermo& carrierThermo_;
+        //- Reference to the multi-component carrier phase thermo
+        multiComponentMixture<typename CloudType::thermoType>& mcCarrierThermo_;
 
-        //- Reference to the carrier phase species
-        const PtrList<specieReactingProperties>& gases_;
-
-        //- Global liquid properties data
+        //- Global (additional) liquid properties data
         autoPtr<liquidMixture> liquids_;
 
-        //- Global solid properties data
+        //- Global (additional) solid properties data
         autoPtr<solidMixture> solids_;
 
+        //- List of phase properties
+        phasePropertiesList phaseProps_;
+
 
 public:
 
@@ -116,18 +117,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~CompositionModel();
+    //- Destructor
+    virtual ~CompositionModel();
 
 
-    // Selector
-
-        static autoPtr<CompositionModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+    //- Selector
+    static autoPtr<CompositionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Member Functions
@@ -144,98 +143,133 @@ public:
             const dictionary& coeffDict() const;
 
             //- Return the carrier phase thermo package
-            const hCombustionThermo& carrierThermo() const;
+            const multiComponentMixture<typename CloudType::thermoType>&
+                mcCarrierThermo() const;
 
-            //- Return the gases
-            const PtrList<specieReactingProperties>& gases() const;
 
-            //- Return the global liquids
-            const liquidMixture& liquids() const;
+            // Composition lists
 
-            //- Return the global solids
-            const solidMixture& solids() const;
+                //- Return the global (additional) liquids
+                const liquidMixture& liquids() const;
 
-            //- Return the list of composition names
-            virtual const wordList compositionNames() const = 0;
+                //- Return the global (additional) solids
+                const solidMixture& solids() const;
 
-            //- Return the list of gas names
-            virtual const wordList& gasNames() const = 0;
+                //- Return the list of phase properties
+                const phasePropertiesList& phaseProps() const;
 
-            //- Return local id of gas based on gasName
-            virtual label gasLocalId(const word& gasName) const = 0;
+                //- Return the number of phases
+                label nPhase() const;
 
-            //- Return global id of gas based on gasName
-            virtual label gasGlobalId(const word& gasName) const = 0;
 
-            //- Return the list indices of gases in global thermo list
-            virtual const labelList& gasGlobalIds() const = 0;
+            // Phase properties
 
-            //- Return the list of gas mass fractions
-            virtual const scalarField& YGas0() const = 0;
+                //- Return the list of phase type names
+                //  If only 1 phase, return the component names of that phase
+                const wordList& phaseTypes() const;
 
-            //- Return the list of liquid names
-            virtual const wordList& liquidNames() const = 0;
+                //- Return the list of state labels (s), (l), (g) etc.
+                const wordList& stateLabels() const;
 
-            //- Return local id of liquid based on liquidName
-            virtual label liquidLocalId(const word& liquidName) const = 0;
+                //- Return the list of component names for phaseI
+                const wordList& componentNames(const label phaseI) const;
 
-            //- Return global id of liquid based on liquidName
-            virtual label liquidGlobalId(const word& liquidName) const = 0;
+                //- Return global id of component cmptName in carrier thermo
+                label globalCarrierId(const word& cmptName) const;
 
-            //- Return the list indices of liquid in global thermo list
-            virtual const labelList& liquidGlobalIds() const = 0;
+                //- Return global id of component cmptName in phase phaseI
+                label globalId(const label phaseI, const word& cmptName) const;
 
-            //- Return the list of liquid mass fractions
-            virtual const scalarField& YLiquid0() const = 0;
+                //- Return global ids of for phase phaseI
+                const labelList& globalIds(const label phaseI) const;
 
-            //- Return the list of solid names
-            virtual const wordList& solidNames() const = 0;
+                //- Return local id of component cmptName in phase phaseI
+                label localId(const label phaseI, const word& cmptName) const;
 
-            //- Return local id of solid based on solidName
-            virtual label solidLocalId(const word& solidName) const = 0;
+                //- Return global carrier id of component given local id
+                label localToGlobalCarrierId
+                (
+                    const label phaseI,
+                    const label id
+                ) const;
 
-            //- Return global id of solid based on solidName
-            virtual label solidGlobalId(const word& solidName) const = 0;
+                //- Return the list of phase phaseI mass fractions
+                const scalarField& Y0(const label phaseI) const;
 
-            //- Return the list indices of solids in global thermo list
-            virtual const labelList& solidGlobalIds() const = 0;
+                //- Return the list of phase phaseI volume fractions fractions
+                //  based on supplied mass fractions Y
+                scalarField X
+                (
+                    const label phaseI,
+                    const scalarField& Y
+                ) const;
 
-            //- Return the list of solid mass fractions
-            virtual const scalarField& YSolid0() const = 0;
 
-            //- Return the list of mixture mass fractions
-            virtual const scalarField& YMixture0() const = 0;
+            // Mixture properties
 
-            //- Return the gas constant for the gas mixture
-            virtual scalar RGas(const scalarField& YGas) const = 0;
+                //- Return the list of mixture mass fractions
+                //  If only 1 phase, return component fractions of that phase
+                virtual const scalarField& YMixture0() const = 0;
 
-            //- Return enthalpy for the gas mixture
-            virtual scalar HGas
+                // Indices of gas, liquid and solid phases in phase properties
+                // list - returns -1 if not applicable
+
+                    //- Gas id
+                    virtual label idGas() const = 0;
+
+                    //- Liquid id
+                    virtual label idLiquid() const = 0;
+
+                    //- Solid id
+                    virtual label idSolid() const = 0;
+
+
+        // Evaluation
+
+            //- Return total enthalpy for the phase phaseI
+            virtual scalar H
             (
-                 const scalarField& YGas,
-                 const scalar T
-            ) const = 0;
-
-            //- Return specific heat caparcity for the gas mixture
-            virtual scalar cpGas
-            (
-                 const scalarField& YGas,
-                 const scalar T
-            ) const = 0;
-
-            //- Return specific heat caparcity for the liquid mixture
-            virtual scalar cpLiquid
-            (
-                const scalarField& YLiquid,
+                const label phaseI,
+                const scalarField& Y,
                 const scalar p,
                 const scalar T
-            ) const = 0;
+            ) const;
 
-            //- Return specific heat caparcity for the solid mixture
-            virtual scalar cpSolid
+            //- Return sensible enthalpy for the phase phaseI
+            virtual scalar Hs
             (
-                const scalarField& YSolid
-            ) const = 0;
+                const label phaseI,
+                const scalarField& Y,
+                const scalar p,
+                const scalar T
+            ) const;
+
+            //- Return chemical enthalpy for the phase phaseI
+            virtual scalar Hc
+            (
+                const label phaseI,
+                const scalarField& Y,
+                const scalar p,
+                const scalar T
+            ) const;
+
+            //- Return specific heat caoacity for the phase phaseI
+            virtual scalar cp
+            (
+                const label phaseI,
+                const scalarField& Y,
+                const scalar p,
+                const scalar T
+            ) const;
+
+            //- Return latent heat for the phase phaseI
+            virtual scalar L
+            (
+                const label phaseI,
+                const scalarField& Y,
+                const scalar p,
+                const scalar T
+            ) const;
 };
 
 
@@ -260,13 +294,18 @@ public:
     );
 
 
-#define makeCompositionModelType(SS, CloudType, ParcelType)                   \
+#define makeCompositionModelThermoType(SS, CloudType, ParcelType, ThermoType) \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
                                                                               \
-    CompositionModel<CloudType<ParcelType> >::                                \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    CompositionModel<CloudType<ParcelType<ThermoType> > >::                   \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
index 6b3fab728..ba46a05c4 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/CompositionModel/NewCompositionModel.C
@@ -36,34 +36,31 @@ Foam::CompositionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word ReactingCompositionModelType
-    (
-        dict.lookup("CompositionModel")
-    );
+    word CompositionModelType(dict.lookup("CompositionModel"));
 
-    Info<< "Selecting CompositionModel "
-        << ReactingCompositionModelType << endl;
+    Info<< "Selecting CompositionModel " << CompositionModelType << endl;
 
     typename dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(ReactingCompositionModelType);
+        dictionaryConstructorTablePtr_->find(CompositionModelType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
             "CompositionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
-            << "Unknown ReactingCompositionModelType type "
-            << ReactingCompositionModelType
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown CompositionModelType type "
+            << CompositionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid CompositionModel types are :" << nl
-            << dictionaryConstructorTablePtr_->toc()
+            << "    Valid CompositionModel types are:" << nl
+            << dictionaryConstructorTablePtr_->toc() << nl
             << exit(FatalError);
     }
 
-    return autoPtr<CompositionModel<CloudType> >
-        (cstrIter()(dict, owner));
+    return autoPtr<CompositionModel<CloudType> >(cstrIter()(dict, owner));
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
index dd8f481f7..239d976b0 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.C
@@ -26,6 +26,62 @@ License
 
 #include "SingleMixtureFraction.H"
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::SingleMixtureFraction<CloudType>::constructIds()
+{
+    forAll(this->phaseProps(), phaseI)
+    {
+        switch (this->phaseProps()[phaseI].phase())
+        {
+            case phaseProperties::GAS:
+            {
+                idGas_ = phaseI;
+                break;
+            }
+            case phaseProperties::LIQUID:
+            {
+                idLiquid_ = phaseI;
+                break;
+            }
+            case phaseProperties::SOLID:
+            {
+                idSolid_ = phaseI;
+                break;
+            }
+            default:
+            {
+                FatalErrorIn
+                (
+                    "void Foam::SingleMixtureFraction<CloudType>::"
+                    "constructIds()"
+                )   << "Unknown phase enumeration" << nl << abort(FatalError);
+            }
+        }
+    }
+
+    if (idGas_ < 0)
+    {
+        FatalErrorIn("Foam::SingleMixtureFraction<CloudType>::constructIds()")
+            << "No gas phase found in phase list:" << nl
+            << this->phaseTypes() << nl << endl;
+    }
+    if (idLiquid_ < 0)
+    {
+        FatalErrorIn("Foam::SingleMixtureFraction<CloudType>::constructIds()")
+            << "No liquid phase found in phase list:" << nl
+            << this->phaseTypes() << nl << endl;
+    }
+    if (idSolid_ < 0)
+    {
+        FatalErrorIn("Foam::SingleMixtureFraction<CloudType>::constructIds()")
+            << "No solid phase found in phase list:" << nl
+            << this->phaseTypes() << nl << endl;
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class CloudType>
@@ -37,181 +93,45 @@ Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction
 :
     CompositionModel<CloudType>(dict, owner, typeName),
 
-    gasNames_(this->coeffDict().lookup("gasNames")),
-    gasGlobalIds_(gasNames_.size(), -1),
-    YGas0_(this->coeffDict().lookup("YGas0")),
-    YGasTot0_(readScalar(this->coeffDict().lookup("YGasTot0"))),
-
-    liquidNames_(this->coeffDict().lookup("liquidNames")),
-    liquidGlobalIds_(liquidNames_.size(), -1),
-    YLiquid0_(this->coeffDict().lookup("YLiquid0")),
-    YLiquidTot0_(readScalar(this->coeffDict().lookup("YLiquidTot0"))),
-
-    solidNames_(this->coeffDict().lookup("solidNames")),
-    solidGlobalIds_(solidNames_.size(), -1),
-    YSolid0_(this->coeffDict().lookup("YSolid0")),
-    YSolidTot0_(readScalar(this->coeffDict().lookup("YSolidTot0"))),
+    idGas_(-1),
+    idLiquid_(-1),
+    idSolid_(-1),
 
     YMixture0_(3)
 {
-    // Construct gasGlobalIds_ list
-    forAll(gasNames_, i)
-    {
-        forAll (this->carrierThermo().composition().Y(), j)
-        {
-            word specieName(this->carrierThermo().composition().Y()[j].name());
+    constructIds();
 
-            if (specieName == gasNames_[i])
-            {
-                gasGlobalIds_[i] = j;
-                break;
-            }
-        }
-        if (gasGlobalIds_[i] == -1)
-        {
-            Info<< "\nThermo package species composition comprises:" << endl;
-            forAll (this->carrierThermo().composition().Y(), k)
-            {
-                Info<< this->carrierThermo().composition().Y()[k].name()
-                    << endl;
-            }
-
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )   << "Could not find gas species " << gasNames_[i]
-                << " in species list" <<  exit(FatalError);
-        }
-    }
-
-    // Construct liquidGlobalIds_ list
-    forAll(liquidNames_, i)
-    {
-        forAll (this->liquids().components(), j)
-        {
-            word specieName(this->liquids().components()[j]);
-
-            if (specieName == liquidNames_[i])
-            {
-                liquidGlobalIds_[i] = j;
-                break;
-            }
-        }
-        if (liquidGlobalIds_[i] == -1)
-        {
-            Info<< "\nLiquid mixture species composition comprises:" << endl;
-            forAll (this->liquids().components(), k)
-            {
-                Info<< this->liquids().components()[k] << endl;
-            }
-
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )   << "Could not find liquid species " << liquidNames_[i]
-                << " in species list" <<  exit(FatalError);
-        }
-    }
-
-    // Construct solidGlobalIds_ list
-    forAll(solidNames_, i)
-    {
-        forAll (this->solids().components(), j)
-        {
-            word specieName(this->solids().components()[j]);
-
-            if (specieName == solidNames_[i])
-            {
-                solidGlobalIds_[i] = j;
-                break;
-            }
-        }
-        if (solidGlobalIds_[i] == -1)
-        {
-            Info<< "\nSolid mixture species composition comprises:" << endl;
-            forAll (this->solids().components(), k)
-            {
-                Info<< this->solids().components()[k] << endl;
-            }
-
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )   << "Could not find solid species " << solidNames_[i]
-                << " in species list" <<  exit(FatalError);
-        }
-    }
-
-    // Set mixture fractions
-    YMixture0_[0] = YGasTot0_;
-    YMixture0_[1] = YLiquidTot0_;
-    YMixture0_[2] = YSolidTot0_;
-
-    // Check that total mass fractions = 1
-
-    if (YGas0_.size())
-    {
-        if (mag(sum(YGas0_) - 1) > SMALL)
-        {
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )<< "Mass fractions of YGas0 must sum to unity"
-             <<  exit(FatalError);
-        }
-    }
-    else
-    {
-        YMixture0_[0] = 0.0;
-    }
-
-    if (YLiquid0_.size())
-    {
-        if (mag(sum(YLiquid0_) - 1) > SMALL)
-        {
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )<< "Mass fractions of YLiquid0 must sum to unity"
-             <<  exit(FatalError);
-        }
-    }
-    else
-    {
-        YMixture0_[1] = 0.0;
-    }
-
-    if (YSolid0_.size())
-    {
-        if (mag(sum(YSolid0_) - 1) > SMALL)
-        {
-            FatalErrorIn
-            (
-                "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-                "(const dictionary&, CloudType&)"
-            )<< "Mass fractions of YSolid0 must sum to unity"
-             <<  exit(FatalError);
-        }
-    }
-    else
-    {
-        YMixture0_[2] = 0.0;
-    }
-
-    // Check total mixture fraction sums to 1
-    if (mag(sum(YMixture0_) - 1) > SMALL)
+    if (this->phaseProps().size() != 3)
     {
         FatalErrorIn
         (
-            "Foam::SingleMixtureFraction<CloudType>::SingleMixtureFraction"
-            "(const dictionary&, CloudType&)"
-        )   << "Mass fractions YGasTot0 + YSolidTot0 + YSolidTot0 must sum "
-            << "to unity" <<  exit(FatalError);
+            "Foam::SingleMixtureFraction<CloudType>::"
+            "SingleMixtureFraction"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Incorrect numebr of phases: " << nl
+            << "    Please specify 1 gas, 1 liquid and 1 solid" << nl
+            << exit(FatalError);
+    }
+
+    this->coeffDict().lookup("YGasTot0") >> YMixture0_[idGas_];
+    this->coeffDict().lookup("YLiquidTot0") >> YMixture0_[idLiquid_];
+    this->coeffDict().lookup("YSolidTot0") >> YMixture0_[idSolid_];
+
+    if (mag(sum(YMixture0_) - 1.0) > SMALL)
+    {
+        FatalErrorIn
+        (
+            "Foam::SingleMixtureFraction<CloudType>::"
+            "SingleMixtureFraction"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Sum of phases should be 1. Phase fractions:" << nl
+            << YMixture0_ << nl << exit(FatalError);
     }
 }
 
@@ -225,157 +145,11 @@ Foam::SingleMixtureFraction<CloudType>::~SingleMixtureFraction()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class CloudType>
-const Foam::wordList
-Foam::SingleMixtureFraction<CloudType>::compositionNames() const
-{
-    wordList names(3);
-    names[0] = "Gas";
-    names[1] = "Liquid";
-    names[2] = "Solid";
-    return names;
-}
-
-template<class CloudType>
-const Foam::wordList&
-Foam::SingleMixtureFraction<CloudType>::gasNames() const
-{
-     return gasNames_;
-}
-
-
-template<class CloudType>
-Foam::label
-Foam::SingleMixtureFraction<CloudType>::gasLocalId(const word& gasName) const
-{
-    forAll(gasNames_, i)
-    {
-        if (gasName == gasNames_[i])
-        {
-            return i;
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "gasLocalId(const word& gasName) const"
-    )<< "Gas name " << gasName << " not found in gasNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-Foam::label
-Foam::SingleMixtureFraction<CloudType>::gasGlobalId(const word& gasName) const
-{
-    forAll(gasNames_, i)
-    {
-        if (gasName == gasNames_[i])
-        {
-            return gasGlobalIds_[i];
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "gasGlobalId(const word& gasName) const"
-    )<< "Gas name " << gasName << " not found in gasNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-const Foam::labelList&
-Foam::SingleMixtureFraction<CloudType>::gasGlobalIds() const
-{
-    return gasGlobalIds_;
-}
-
-
 template<class CloudType>
 const Foam::scalarField&
 Foam::SingleMixtureFraction<CloudType>::YGas0() const
 {
-    return YGas0_;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::YGasTot0() const
-{
-    return YGasTot0_;
-}
-
-
-template<class CloudType>
-const Foam::wordList&
-Foam::SingleMixtureFraction<CloudType>::liquidNames() const
-{
-     return liquidNames_;
-}
-
-
-template<class CloudType>
-Foam::label Foam::SingleMixtureFraction<CloudType>::liquidLocalId
-(
-    const word& liquidName
-) const
-{
-    forAll(liquidNames_, i)
-    {
-        if (liquidName == liquidNames_[i])
-        {
-            return i;
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "liquidLocalId(const word& liquidName) const"
-    )<< "Liquid name " << liquidName << " not found in liquidNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-Foam::label Foam::SingleMixtureFraction<CloudType>::liquidGlobalId
-(
-    const word& liquidName
-) const
-{
-    forAll(liquidNames_, i)
-    {
-        if (liquidName == liquidNames_[i])
-        {
-            return liquidGlobalIds_[i];
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "liquidGlobalId(const word& liquidName) const"
-    )<< "Liquid name " << liquidName << " not found in liquidNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-const Foam::labelList&
-Foam::SingleMixtureFraction<CloudType>::liquidGlobalIds() const
-{
-    return liquidGlobalIds_;
+    return this->phaseProps()[idGas_].Y();
 }
 
 
@@ -383,81 +157,7 @@ template<class CloudType>
 const Foam::scalarField&
 Foam::SingleMixtureFraction<CloudType>::YLiquid0() const
 {
-    return YLiquid0_;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::YLiquidTot0() const
-{
-    return YLiquidTot0_;
-}
-
-
-template<class CloudType>
-const Foam::wordList&
-Foam::SingleMixtureFraction<CloudType>::solidNames() const
-{
-    return solidNames_;
-}
-
-
-template<class CloudType>
-Foam::label Foam::SingleMixtureFraction<CloudType>::solidLocalId
-(
-    const word& solidName
-) const
-{
-    forAll(solidNames_, i)
-    {
-        if (solidName == solidNames_[i])
-        {
-            return i;
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "SolididLocalId(const word& solidName) const"
-    )<< "Solid name " << solidName << " not found in solidNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-Foam::label
-Foam::SingleMixtureFraction<CloudType>::solidGlobalId
-(
-    const word& solidName
-) const
-{
-    forAll(solidNames_, i)
-    {
-        if (solidName == solidNames_[i])
-        {
-            return solidGlobalIds_[i];
-        }
-    }
-
-    WarningIn
-    (
-        "Foam::label SingleMixtureFraction<CloudType>::"
-        "solidGlobalId(const word& solidName) const"
-    )<< "Solid name " << solidName << " not found in solidNames_"
-     << endl;
-
-    return -1;
-}
-
-
-template<class CloudType>
-const Foam::labelList&
-Foam::SingleMixtureFraction<CloudType>::solidGlobalIds() const
-{
-    return solidGlobalIds_;
+    return this->phaseProps()[idLiquid_].Y();
 }
 
 
@@ -465,15 +165,7 @@ template<class CloudType>
 const Foam::scalarField&
 Foam::SingleMixtureFraction<CloudType>::YSolid0() const
 {
-    return YSolid0_;
-}
-
-
-template<class CloudType>
-Foam::scalar
-Foam::SingleMixtureFraction<CloudType>::YSolidTot0() const
-{
-    return YSolidTot0_;
+    return this->phaseProps()[idSolid_].Y();
 }
 
 
@@ -486,92 +178,23 @@ Foam::SingleMixtureFraction<CloudType>::YMixture0() const
 
 
 template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::RGas
-(
-    const scalarField& YGas
-) const
+Foam::label Foam::SingleMixtureFraction<CloudType>::idGas() const
 {
-    scalar RGasMixture = 0.0;
-    forAll(YGas, i)
-    {
-        label id = gasGlobalIds_[i];
-        RGasMixture += YGas[i]*this->gases()[id].R();
-    }
-    return RGasMixture;
+    return idGas_;
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::HGas
-(
-    const scalarField& YGas,
-    const scalar T
-)
-const
+Foam::label Foam::SingleMixtureFraction<CloudType>::idLiquid() const
 {
-    scalar HMixture = 0.0;
-    forAll(YGas, i)
-    {
-        label id = gasGlobalIds_[i];
-        HMixture += YGas[i]*this->gases()[id].H(T);
-    }
-    return HMixture;
+    return idLiquid_;
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::cpGas
-(
-    const scalarField& YGas,
-    const scalar T
-)
-const
+Foam::label Foam::SingleMixtureFraction<CloudType>::idSolid() const
 {
-    scalar cpMixture = 0.0;
-    forAll(YGas, i)
-    {
-        label id = gasGlobalIds_[i];
-        cpMixture += YGas[i]*this->gases()[id].Cp(T);
-    }
-    return cpMixture;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::cpLiquid
-(
-    const scalarField& YLiquid,
-    const scalar p,
-    const scalar T
-)
-const
-{
-    scalar cpMixture = 0.0;
-    forAll(YLiquid, i)
-    {
-        label id = liquidGlobalIds_[i];
-        cpMixture += YLiquid[i]*this->liquids().properties()[id].cp(p, T);
-    }
-
-    return cpMixture;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::SingleMixtureFraction<CloudType>::cpSolid
-(
-    const scalarField& YSolid
-)
-const
-{
-    scalar cpMixture = 0.0;
-    forAll(YSolid, i)
-    {
-        label id = solidGlobalIds_[i];
-        cpMixture += YSolid[i]*this->solids().properties()[id].cp();
-    }
-
-    return cpMixture;
+    return idSolid_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
index 2e5ee5ac5..7e5a6a73f 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SingleMixtureFraction/SingleMixtureFraction.H
@@ -25,10 +25,8 @@ License
 Class
     Foam::SingleMixtureFraction
 
-
 Description
-    Templated parcel single mixture fraction class
-    - Each phase sums to a mass fraction of 1
+    Templated parcel multi-phase, multi-component class
 
 SourceFiles
     SingleMixtureFraction.C
@@ -54,70 +52,33 @@ class SingleMixtureFraction
 :
     public CompositionModel<CloudType>
 {
-
     // Private data
 
-        //- Parcel properties
+        // Indices of the phases
 
-            //- List of gas names
-            const wordList gasNames_;
+            //- Gas
+            label idGas_;
 
-            //- Return local id of gas based on gasName
-            label gasLocalId(const word& gasName) const;
+            //- Liquid
+            label idLiquid_;
 
-            //- Return global id of gas based on gasName
-            label gasGlobalId(const word& gasName) const;
+            //- Solid
+            label idSolid_;
 
-            //- List of IDs of gases in global list
-            labelList gasGlobalIds_;
 
-            //- Initial mass fractions of gases
-            const scalarField YGas0_;
+       // Mixture properties
 
-            //- Initial total mass fractions of gases
-            const scalar YGasTot0_;
-
-            //- List of liquid names
-            const wordList liquidNames_;
-
-            //- Return local id of liquid based on liquidName
-            label liquidLocalId(const word& liquidName) const;
-
-            //- Return global id of liquid based on liquidName
-            label liquidGlobalId(const word& liquidName) const;
-
-            //- List of IDs of liquids in global list
-            labelList liquidGlobalIds_;
-
-            //- Initial mass fractions of liquids
-            const scalarField YLiquid0_;
-
-            //- Initial total mass fractions of liquids
-            const scalar YLiquidTot0_;
-
-            //- List of solids species
-            const wordList solidNames_;
-
-            //- Return local id of solid based on solidName
-            label solidLocalId(const word& solidName) const;
-
-            //- Return global id of solid based on solidName
-            label solidGlobalId(const word& solidName) const;
-
-            //- List of IDs of solids in global list
-            labelList solidGlobalIds_;
-
-            //- Initial mass fractions of solids
-            const scalarField YSolid0_;
-
-            //- Initial total mass fractions of solids
-            const scalar YSolidTot0_;
-
-            //- Initial total mass fractions of the mixture
-            //  Index 0 = gas, 1 = liquid, 2 = solid
+            //- Phase component total fractions
             scalarField YMixture0_;
 
 
+    // Private member functions
+
+        //- Construct the indices and check correct specification of
+        //  1 gas, 1 liquid and 1 solid
+        void constructIds();
+
+
 public:
 
     //- Runtime type information
@@ -127,83 +88,60 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        SingleMixtureFraction
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+        SingleMixtureFraction(const dictionary& dict, CloudType& owner);
 
 
-    // Destructor
-
-        virtual ~SingleMixtureFraction();
+    //- Destructor
+    virtual ~SingleMixtureFraction();
 
 
     // Member Functions
 
         // Access
 
-            //- Return the list of composition names
-            const wordList compositionNames() const;
+            // Gas properties
 
-            //- Return the list of gas names
-            const wordList& gasNames() const;
+                //- Return the list of gas mass fractions
+                const scalarField& YGas0() const;
 
-            //- Return the list indices of gases in global thermo list
-            const labelList& gasGlobalIds() const;
+                //- Return the total gas mass fraction
+                scalar YGasTot0() const;
 
-            //- Return the list of gas mass fractions
-            const scalarField& YGas0() const;
 
-            //- Return the total gas mass fraction
-            scalar YGasTot0() const;
+            // Liquid properties
 
-            //- Return the list of liquid names
-            const wordList& liquidNames() const;
+                //- Return the list of liquid mass fractions
+                const scalarField& YLiquid0() const;
 
-            //- Return the list indices of liquid in global thermo list
-            const labelList& liquidGlobalIds() const;
+                //- Return the total liquid mass fraction
+                scalar YLiquidTot0() const;
 
-            //- Return the list of liquid mass fractions
-            const scalarField& YLiquid0() const;
 
-            //- Return the total liquid mass fraction
-            scalar YLiquidTot0() const;
+            // Solid properties
 
-             //- Return the list of solid names
-            const wordList& solidNames() const;
+                //- Return the list of solid mass fractions
+                const scalarField& YSolid0() const;
 
-            //- Return the list indices of solids in global thermo list
-            const labelList& solidGlobalIds() const;
+                //- Return the total solid mass fraction
+                scalar YSolidTot0() const;
 
-            //- Return the list of solid mass fractions
-            const scalarField& YSolid0() const;
 
-            //- Return the total solid mass fraction
-            scalar YSolidTot0() const;
+            // Mixture properties
 
-            //- Return the list of mixture mass fractions
-            const scalarField& YMixture0() const;
+                //- Return the list of mixture mass fractions
+                virtual const scalarField& YMixture0() const;
 
-            //- Return the gas constant for the gas mixture
-            scalar RGas(const scalarField& YGas) const;
+                // Indices of gas, liquid and solid phases in phase properties
+                // list
 
-            //- Return enthalpy for the gas mixture
-            scalar HGas(const scalarField& YGas, const scalar T) const;
+                    //- Gas id
+                    virtual label idGas() const;
 
-            //- Return specific heat caparcity for the gas mixture
-            scalar cpGas(const scalarField& YGas, const scalar T) const;
+                    //- Liquid id
+                    virtual label idLiquid() const;
 
-            //- Return specific heat caparcity for the liquid mixture
-            scalar cpLiquid
-            (
-                const scalarField& YLiquid,
-                const scalar p,
-                const scalar T
-            ) const;
-
-            //- Return specific heat caparcity for the solid mixture
-            scalar cpSolid(const scalarField& YSolid) const;
+                    //- Solid id
+                    virtual label idSolid() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
new file mode 100644
index 000000000..947770826
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.C
@@ -0,0 +1,173 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "SinglePhaseMixture.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+void Foam::SinglePhaseMixture<CloudType>::constructIds()
+{
+    if (this->phaseProps().size() == 0)
+    {
+        FatalErrorIn
+        (
+            "void Foam::SinglePhaseMixture<CloudType>::constructIds()"
+        )   << "Phase list is empty" << nl << exit(FatalError);
+    }
+    else if (this->phaseProps().size() > 1)
+    {
+        FatalErrorIn
+        (
+            "void Foam::SinglePhaseMixture<CloudType>::constructIds()"
+        )   << "Only one phase permitted" << nl << exit(FatalError);
+    }
+
+    switch (this->phaseProps()[0].phase())
+    {
+        case phaseProperties::GAS:
+        {
+            idGas_ = 0;
+            break;
+        }
+        case phaseProperties::LIQUID:
+        {
+            idLiquid_ = 0;
+            break;
+        }
+        case phaseProperties::SOLID:
+        {
+            idSolid_ = 0;
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "void Foam::SinglePhaseMixture<CloudType>::constructIds()"
+            )   << "Unknown phase enumeration" << nl << abort(FatalError);
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::SinglePhaseMixture<CloudType>::SinglePhaseMixture
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    CompositionModel<CloudType>(dict, owner, typeName),
+    idGas_(-1),
+    idLiquid_(-1),
+    idSolid_(-1)
+{
+    constructIds();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::SinglePhaseMixture<CloudType>::~SinglePhaseMixture()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+const Foam::scalarField&
+Foam::SinglePhaseMixture<CloudType>::YGas0() const
+{
+    notImplemented
+    (
+        "const Foam::scalarField& "
+        "Foam::SinglePhaseMixture<CloudType>::YGas0() const"
+    );
+    return this->phaseProps()[0].Y();
+}
+
+
+template<class CloudType>
+const Foam::scalarField&
+Foam::SinglePhaseMixture<CloudType>::YLiquid0() const
+{
+    notImplemented
+    (
+        "const Foam::scalarField& "
+        "Foam::SinglePhaseMixture<CloudType>::YLiquid0() const"
+    );
+    return this->phaseProps()[0].Y();
+}
+
+
+template<class CloudType>
+const Foam::scalarField&
+Foam::SinglePhaseMixture<CloudType>::YSolid0() const
+{
+    notImplemented
+    (
+        "const Foam::scalarField& "
+        "Foam::SinglePhaseMixture<CloudType>::YSolid0() const"
+    );
+    return this->phaseProps()[0].Y();
+}
+
+
+template<class CloudType>
+const Foam::scalarField&
+Foam::SinglePhaseMixture<CloudType>::YMixture0() const
+{
+    return this->phaseProps()[0].Y();
+}
+
+
+template<class CloudType>
+Foam::label Foam::SinglePhaseMixture<CloudType>::idGas() const
+{
+    return idGas_;
+}
+
+
+template<class CloudType>
+Foam::label Foam::SinglePhaseMixture<CloudType>::idLiquid() const
+{
+    return idLiquid_;
+}
+
+
+template<class CloudType>
+Foam::label Foam::SinglePhaseMixture<CloudType>::idSolid() const
+{
+    return idSolid_;
+}
+
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
new file mode 100644
index 000000000..2ee582465
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/CompositionModel/SinglePhaseMixture/SinglePhaseMixture.H
@@ -0,0 +1,156 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::SinglePhaseMixture
+
+Description
+    Templated parcel single phase, multi-component class
+
+SourceFiles
+    SinglePhaseMixture.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SinglePhaseMixture_H
+#define SinglePhaseMixture_H
+
+#include "CompositionModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class SinglePhaseMixture Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class SinglePhaseMixture
+:
+    public CompositionModel<CloudType>
+{
+    // Private data
+
+        // Indices of the phases - only 1 will be set
+
+            //- Gas
+            label idGas_;
+
+            //- Liquid
+            label idLiquid_;
+
+            //- Solid
+            label idSolid_;
+
+
+    // Private member functions
+
+        //- Construct the indices and check correct specification of
+        //  1 gas or 1 liquid or 1 solid
+        void constructIds();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("SinglePhaseMixture");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        SinglePhaseMixture(const dictionary& dict, CloudType& owner);
+
+
+    //- Destructor
+    virtual ~SinglePhaseMixture();
+
+
+    // Member Functions
+
+        // Access
+
+            // Gas properties
+
+                //- Return the list of gas mass fractions
+                const scalarField& YGas0() const;
+
+                //- Return the total gas mass fraction
+                scalar YGasTot0() const;
+
+
+            // Liquid properties
+
+                //- Return the list of liquid mass fractions
+                const scalarField& YLiquid0() const;
+
+                //- Return the total liquid mass fraction
+                scalar YLiquidTot0() const;
+
+
+            // Solid properties
+
+                //- Return the list of solid mass fractions
+                const scalarField& YSolid0() const;
+
+                //- Return the total solid mass fraction
+                scalar YSolidTot0() const;
+
+
+            // Mixture properties
+
+                //- Return the list of mixture mass fractions
+                virtual const scalarField& YMixture0() const;
+
+                // Indices of gas, liquid and solid phases in phase properties
+                // list
+
+                    //- Gas id
+                    virtual label idGas() const;
+
+                    //- Liquid id
+                    virtual label idLiquid() const;
+
+                    //- Solid id
+                    virtual label idSolid() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "SinglePhaseMixture.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
new file mode 100644
index 000000000..66c82149c
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
@@ -0,0 +1,200 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "ReactingLookupTableInjection.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::ReactingLookupTableInjection<CloudType>::parcelsToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::ReactingLookupTableInjection<CloudType>::volumeToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    scalar volume = 0.0;
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        forAll(injectors_, i)
+        {
+            volume += injectors_[i].mDot()/injectors_[i].rho()*(time1 - time0);
+        }
+    }
+
+    return volume;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ReactingLookupTableInjection<CloudType>::ReactingLookupTableInjection
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    InjectionModel<CloudType>(dict, owner, typeName),
+    inputFileName_(this->coeffDict().lookup("inputFile")),
+    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    nParcelsPerSecond_
+    (
+        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
+    ),
+    injectors_
+    (
+        IOobject
+        (
+            inputFileName_,
+            owner.db().time().constant(),
+            owner.db(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    injectorCells_(0)
+{
+    // Set/cache the injector cells
+    injectorCells_.setSize(injectors_.size());
+    forAll(injectors_, i)
+    {
+        this->findCellAtPosition(injectorCells_[i], injectors_[i].x());
+    }
+
+    // Determine volume of particles to inject
+    this->volumeTotal_ = 0.0;
+    forAll(injectors_, i)
+    {
+        this->volumeTotal_ += injectors_[i].mDot()/injectors_[i].rho();
+    }
+    this->volumeTotal_ *= duration_;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ReactingLookupTableInjection<CloudType>::~ReactingLookupTableInjection()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::ReactingLookupTableInjection<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::ReactingLookupTableInjection<CloudType>::timeEnd() const
+{
+    return this->SOI_ + duration_;
+}
+
+
+template<class CloudType>
+void Foam::ReactingLookupTableInjection<CloudType>::setPositionAndCell
+(
+    const label parcelI,
+    const label nParcels,
+    const scalar time,
+    vector& position,
+    label& cellOwner
+)
+{
+    label injectorI = parcelI*injectorCells_.size()/nParcels;
+
+    position = injectors_[injectorI].x();
+    cellOwner = injectorCells_[injectorI];
+}
+
+
+template<class CloudType>
+void Foam::ReactingLookupTableInjection<CloudType>::setProperties
+(
+    const label parcelI,
+    const label nParcels,
+    const scalar,
+    typename CloudType::parcelType& parcel
+)
+{
+    label injectorI = parcelI*injectorCells_.size()/nParcels;
+
+    // set particle velocity
+    parcel.U() = injectors_[injectorI].U();
+
+    // set particle diameter
+    parcel.d() = injectors_[injectorI].d();
+
+    // set particle density
+    parcel.rho() = injectors_[injectorI].rho();
+
+    // set particle temperature
+    parcel.T() = injectors_[injectorI].T();
+
+    // set particle specific heat capacity
+    parcel.cp() = injectors_[injectorI].cp();
+
+    // set particle component mass fractions
+    parcel.Y() = injectors_[injectorI].Y();
+}
+
+
+template<class CloudType>
+bool Foam::ReactingLookupTableInjection<CloudType>::fullyDescribed() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+bool Foam::ReactingLookupTableInjection<CloudType>::validInjection(const label)
+{
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
new file mode 100644
index 000000000..1f16dffb3
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.H
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::ReactingLookupTableInjection
+
+Description
+    Particle injection sources read from look-up table. Each row corresponds to
+    an injection site.
+
+    (
+        (x y z) (u v w) d rho mDot T cp (Y0..YN)  // injector 1
+        (x y z) (u v w) d rho mDot T cp (Y0..YN)  // injector 2
+        ...
+        (x y z) (u v w) d rho mDot T cp (Y0..YN)  // injector N
+    );
+
+    where:
+        x, y, z = global cartesian co-ordinates [m]
+        u, v, w = global cartesian velocity components [m/s]
+        d       = diameter [m]
+        rho     = density [kg/m3]
+        mDot    = mass flow rate [kg/m3]
+        T       = temperature [K]
+        cp      = specific heat capacity [J/kg/K]
+        Y       = list of mass fractions
+
+SourceFiles
+    ReactingLookupTableInjection.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ReactingLookupTableInjection_H
+#define ReactingLookupTableInjection_H
+
+#include "InjectionModel.H"
+#include "reactingParcelInjectionDataIOList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class ReactingLookupTableInjection Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class ReactingLookupTableInjection
+:
+    public InjectionModel<CloudType>
+{
+    // Private data
+
+        //- Name of file containing injector/parcel data
+        const word inputFileName_;
+
+        //- Injection duration - common to all injection sources
+        const scalar duration_;
+
+        //- Number of parcels per injector - common to all injection sources
+        const label nParcelsPerSecond_;
+
+        //- List of injectors
+        reactingParcelInjectionDataIOList injectors_;
+
+        //- List of injector cells per injector
+        List<label> injectorCells_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Number of parcels to introduce over the time step relative to SOI
+        label parcelsToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+        //- Volume of parcels to introduce over the time step relative to SOI
+        scalar volumeToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("ReactingLookupTableInjection");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        ReactingLookupTableInjection
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~ReactingLookupTableInjection();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates injection model
+        bool active() const;
+
+        //- Return the end-of-injection time
+        scalar timeEnd() const;
+
+
+        // Injection geometry
+
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                vector& position,
+                label& cellOwner
+            );
+
+            //- Set the parcel properties
+            virtual void setProperties
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                typename CloudType::parcelType& parcel
+            );
+
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const;
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ReactingLookupTableInjection.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionData.C
similarity index 70%
rename from src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C
rename to src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionData.C
index 28c4bc623..ec4b25c5b 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicKinematicCloud/basicKinematicCloud.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionData.C
@@ -24,45 +24,37 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicKinematicCloud.H"
+#include "reactingParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(basicKinematicCloud, 0);
-};
-
+    defineTypeNameAndDebug(reactingParcelInjectionData, 0);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::basicKinematicCloud::basicKinematicCloud
-(
-    const word& cloudType,
-    const volPointInterpolation& vpi,
-    const volScalarField& rho,
-    const volVectorField& U,
-    const volScalarField& mu,
-    const dimensionedVector& g
-)
+Foam::reactingParcelInjectionData::reactingParcelInjectionData()
 :
-    KinematicCloud<basicKinematicParcel>(cloudType, vpi, rho, U, mu, g)
-{
-    basicKinematicParcel::readFields(*this);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::basicKinematicCloud::~basicKinematicCloud()
+    thermoParcelInjectionData(),
+    Y_()
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+Foam::reactingParcelInjectionData::reactingParcelInjectionData
+(
+    const dictionary& dict
+)
+:
+    thermoParcelInjectionData(dict),
+    Y_(dict.lookup("Y"))
+{}
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::reactingParcelInjectionData::~reactingParcelInjectionData()
+{}
 
-void Foam::basicKinematicCloud::writeFields() const
-{
-    basicKinematicParcel::writeFields(*this);
-}
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionData.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionData.H
new file mode 100644
index 000000000..83de5a890
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionData.H
@@ -0,0 +1,181 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::reactingParcelInjectionData
+
+Description
+    Container class to provide injection data for reacting parcels
+
+SourceFiles
+    reactingParcelInjectionData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef reactingParcelInjectionData_H
+#define reactingParcelInjectionData_H
+
+#include "thermoParcelInjectionData.H"
+#include "scalarList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class reactingParcelInjectionData;
+
+// Forward declaration of friend functions
+
+Ostream& operator<<
+(
+    Ostream&,
+    const reactingParcelInjectionData&
+);
+
+Istream& operator>>
+(
+    Istream&,
+    reactingParcelInjectionData&
+);
+
+/*---------------------------------------------------------------------------*\
+               Class reactingParcelInjectionData Declaration
+\*---------------------------------------------------------------------------*/
+
+class reactingParcelInjectionData
+:
+    public thermoParcelInjectionData
+{
+protected:
+
+    // Parcel properties
+
+        //- List of mass fractions
+        scalarList Y_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("reactingParcelInjectionData");
+
+    // Constructors
+
+        //- Null constructor
+        reactingParcelInjectionData();
+
+        //- Construct from dictionary
+        reactingParcelInjectionData(const dictionary& dict);
+
+        //- Construct from Istream
+        reactingParcelInjectionData(Istream& is);
+
+
+    //-Destructor
+    virtual ~reactingParcelInjectionData();
+
+
+    // Access
+
+        //- Return const access to the list of mass fractions
+        inline const scalarList& Y() const;
+
+
+    // Edit
+
+        //- Return access to the mass fractions
+        inline scalarList& Y();
+
+
+    // I-O
+
+        // Friend Operators
+
+            friend bool operator==
+            (
+                const reactingParcelInjectionData& a,
+                const reactingParcelInjectionData& b
+            )
+            {
+                notImplemented
+                (
+                    "operator=="
+                    "("
+                        "const reactingParcelInjectionData&, "
+                        "const reactingParcelInjectionData&"
+                    ")"
+                );
+
+                return false;
+            }
+
+            friend bool operator!=
+            (
+                const reactingParcelInjectionData& a,
+                const reactingParcelInjectionData& b
+            )
+            {
+                notImplemented
+                (
+                    "operator=="
+                    "("
+                        "const reactingParcelInjectionData&, "
+                        "const reactingParcelInjectionData&"
+                    ")"
+                );
+
+                return false;
+            }
+
+            //- Ostream operator
+            friend Ostream& operator<<
+            (
+                Ostream& os,
+                const reactingParcelInjectionData& data
+            );
+
+            //- Istream operator
+            friend Istream& operator>>
+            (
+                Istream& is,
+                reactingParcelInjectionData& data
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "reactingParcelInjectionDataI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/test/liquid/liquidTest.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataI.H
similarity index 86%
rename from applications/test/liquid/liquidTest.C
rename to src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataI.H
index fb706a42f..5d1d68537 100644
--- a/applications/test/liquid/liquidTest.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataI.H
@@ -22,26 +22,21 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "C7H8.H"
-using namespace Foam;
+#include "reactingParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main()
+inline const Foam::scalarList& Foam::reactingParcelInjectionData::Y() const
 {
-    C7H8 fuel;
+    return Y_;
+}
 
-    Info<< fuel.rho(1e5, 300) << endl;
-    Info<< fuel << endl;
 
-    Info << "End\n" << endl;
-
-    return 0;
+inline Foam::scalarList& Foam::reactingParcelInjectionData::Y()
+{
+    return Y_;
 }
 
 
diff --git a/applications/test/NamedEnum/namedEnumTest.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C
similarity index 63%
rename from applications/test/NamedEnum/namedEnumTest.C
rename to src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C
index f9e4e51d7..b636a15ba 100644
--- a/applications/test/NamedEnum/namedEnumTest.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIO.C
@@ -22,55 +22,49 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "NamedEnum.H"
-#include "IOstreams.H"
-
-using namespace Foam;
-
-class namedEnumTest
-{
-public:
-
-    enum options
-    {
-        a,
-        b,
-        c
-    };
-
-    static const Foam::NamedEnum<options, 3> namedEnum;
-};
-
-
-template<>
-const char* Foam::NamedEnum<namedEnumTest::options, 3>::names[] =
-{
-    "a",
-    "b",
-    "c"
-};
-
-const Foam::NamedEnum<namedEnumTest::options, 3> namedEnumTest::namedEnum;
-
+#include "reactingParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main(int argc, char *argv[])
+Foam::reactingParcelInjectionData::reactingParcelInjectionData(Istream& is)
+:
+    thermoParcelInjectionData(is)
 {
-    Info<< namedEnumTest::namedEnum["a"] << endl;
-    Info<< namedEnumTest::namedEnum[namedEnumTest::a] << endl;
+    is.check("reading Y's");
+    is >> Y_;
 
-    namedEnumTest::options hmm(namedEnumTest::namedEnum.read(Sin));
-    Info<< namedEnumTest::namedEnum[hmm] << endl;
+    is.check("reactingParcelInjectionData(Istream& is)");
+}
 
-    Info << "End\n" << endl;
 
-    return 0;
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const reactingParcelInjectionData& data
+)
+{
+    os << static_cast<const thermoParcelInjectionData&>(data);
+
+    os << data.Y_;
+
+    return os;
+}
+
+
+Foam::Istream& Foam::operator>>(Istream& is, reactingParcelInjectionData& data)
+{
+    is >> static_cast<thermoParcelInjectionData&>(data);
+
+    is.check("reading Y's");
+    is >> data.Y_;
+
+    is.check("operator(Istream&, reactingParcelInjectionData&)");
+
+    return is;
 }
 
 
diff --git a/applications/test/Unix/UnixTest.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.C
similarity index 88%
rename from applications/test/Unix/UnixTest.C
rename to src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.C
index 69a44315b..ae0b760a0 100644
--- a/applications/test/Unix/UnixTest.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.C
@@ -22,24 +22,15 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "OSspecific.H"
-
-using namespace Foam;
+#include "reactingParcelInjectionDataIOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main(int argc, char *argv[])
+namespace Foam
 {
-    rmDir("hmm");
-
-    Info << "End\n" << endl;
-
-    return 0;
+    defineTemplateTypeNameAndDebug(IOList<reactingParcelInjectionData>, 0);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.H b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.H
new file mode 100644
index 000000000..3aa23e2ee
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/reactingParcelInjectionDataIOList.H
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+
+Description
+
+SourceFiles
+    reactingParcelInjectionDataIOList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef reactingParcelInjectionDataIOList_H
+#define reactingParcelInjectionDataIOList_H
+
+#include "IOList.H"
+#include "reactingParcelInjectionData.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    typedef IOList<reactingParcelInjectionData>
+        reactingParcelInjectionDataIOList;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
new file mode 100644
index 000000000..5b9b341ea
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "LiquidEvaporation.H"
+#include "specie.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::scalarField Foam::LiquidEvaporation<CloudType>::calcXc
+(
+    const label cellI
+) const
+{
+    scalarField Xc(this->owner().mcCarrierThermo().Y().size());
+
+    forAll(Xc, i)
+    {
+        Xc[i] =
+            this->owner().mcCarrierThermo().Y()[i][cellI]
+           /this->owner().mcCarrierThermo().speciesData()[i].W();
+    }
+
+    return Xc/sum(Xc);
+}
+
+
+template <class CloudType>
+Foam::scalar Foam::LiquidEvaporation<CloudType>::Sh
+(
+    const scalar Re,
+    const scalar Sc
+) const
+{
+    return 2.0 + 0.6*Foam::sqrt(Re)*cbrt(Sc);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::LiquidEvaporation<CloudType>::LiquidEvaporation
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    PhaseChangeModel<CloudType>(dict, owner, typeName),
+    liquids_
+    (
+        liquidMixture::New
+        (
+            owner.mesh().objectRegistry::lookupObject<dictionary>
+            (
+                owner.carrierThermo().name()
+            )
+        )
+    ),
+    activeLiquids_(this->coeffDict().lookup("activeLiquids")),
+    liqToCarrierMap_(activeLiquids_.size(), -1),
+    liqToLiqMap_(activeLiquids_.size(), -1)
+{
+    if (activeLiquids_.size() == 0)
+    {
+        WarningIn
+        (
+            "Foam::LiquidEvaporation<CloudType>::LiquidEvaporation"
+            "("
+                "const dictionary& dict, "
+                "CloudType& owner"
+            ")"
+        )   << "Evaporation model selected, but no active liquids defined"
+            << nl << endl;
+    }
+
+    // Determine mapping between liquid and carrier phase species
+    forAll(activeLiquids_, i)
+    {
+        liqToCarrierMap_[i] =
+            owner.composition().globalCarrierId(activeLiquids_[i]);
+    }
+
+    // Determine mapping between model active liquids and global liquids
+    label idLiquid = owner.composition().idLiquid();
+    forAll(activeLiquids_, i)
+    {
+        liqToLiqMap_[i] =
+            owner.composition().localId(idLiquid, activeLiquids_[i]);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::LiquidEvaporation<CloudType>::~LiquidEvaporation()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::LiquidEvaporation<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+void Foam::LiquidEvaporation<CloudType>::calculate
+(
+    const scalar dt,
+    const label cellI,
+    const scalar Re,
+    const scalar d,
+    const scalar nu,
+    const scalar T,
+    const scalar Ts,
+    const scalar pc,
+    scalarField& dMassPC
+) const
+{
+    // construct carrier phase species volume fractions for cell, cellI
+    scalarField Xc = calcXc(cellI);
+
+    // droplet surface area
+    scalar A = mathematicalConstant::pi*sqr(d);
+
+    // calculate mass transfer of each specie in liquid
+    forAll(activeLiquids_, i)
+    {
+        label gid = liqToCarrierMap_[i];
+        label lid = liqToLiqMap_[i];
+
+        // vapour diffusivity [m2/s]
+        scalar Dab = liquids_->properties()[lid].D(pc, Ts);
+
+        // saturation pressure for species i [pa]
+        // - carrier phase pressure assumed equal to the liquid vapour pressure
+        //   close to the surface
+        // NOTE: if pSat > pc then particle is superheated
+        // calculated evaporation rate will be greater than that of a particle
+        // at boiling point, but this is not a boiling model
+        scalar pSat = liquids_->properties()[lid].pv(pc, T);
+
+        // Schmidt number
+        scalar Sc = nu/(Dab + ROOTVSMALL);
+
+        // Sherwood number
+        scalar Sh = this->Sh(Re, Sc);
+
+        // mass transfer coefficient [m/s]
+        scalar kc = Sh*Dab/(d + ROOTVSMALL);
+
+        // vapour concentration at droplet surface [kmol/m3] at film temperature
+        scalar Cs = pSat/(specie::RR*Ts);
+
+        // vapour concentration in bulk gas [kmol/m3] at film temperature
+        scalar Cinf = Xc[gid]*pc/(specie::RR*Ts);
+
+        // molar flux of vapour [kmol/m2/s]
+        scalar Ni = max(kc*(Cs - Cinf), 0.0);
+
+        // mass transfer [kg]
+        dMassPC[lid] += Ni*A*liquids_->properties()[lid].W()*dt;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
new file mode 100644
index 000000000..c18eee74b
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.H
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::LiquidEvaporation
+
+Description
+    Liquid evaporation model
+    - uses ideal gas assumption
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef LiquidEvaporation_H
+#define LiquidEvaporation_H
+
+#include "PhaseChangeModel.H"
+#include "liquidMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                     Class LiquidEvaporation Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class LiquidEvaporation
+:
+    public PhaseChangeModel<CloudType>
+{
+protected:
+
+    // Protected data
+
+        //- Global liquid properties data
+        autoPtr<liquidMixture> liquids_;
+
+        //- List of active liquid names
+        List<word> activeLiquids_;
+
+        //- Mapping between liquid and carrier species
+        List<label> liqToCarrierMap_;
+
+        //- Mapping between local and global liquid species
+        List<label> liqToLiqMap_;
+
+
+    // Protected member functions
+
+        //- Sherwood number as a function of Reynolds and Schmidt numbers
+        scalar Sh(const scalar Re, const scalar Sc) const;
+
+        //- Calculate the carrier phase component volume fractions at cellI
+        scalarField calcXc(const label cellI) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("LiquidEvaporation");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        LiquidEvaporation
+        (
+            const dictionary& dict,
+            CloudType& cloud
+        );
+
+
+    //- Destructor
+    virtual ~LiquidEvaporation();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates phase change model
+        virtual bool active() const;
+
+        //- Update model
+        virtual void calculate
+        (
+            const scalar dt,
+            const label cellI,
+            const scalar Re,
+            const scalar d,
+            const scalar nu,
+            const scalar T,
+            const scalar Ts,
+            const scalar pc,
+            scalarField& dMassPC
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "LiquidEvaporation.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
new file mode 100644
index 000000000..4e84e9bdf
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.C
@@ -0,0 +1,76 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "NoPhaseChange.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::NoPhaseChange<CloudType>::NoPhaseChange
+(
+    const dictionary&,
+    CloudType& owner
+)
+:
+    PhaseChangeModel<CloudType>(owner)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template <class CloudType>
+Foam::NoPhaseChange<CloudType>::~NoPhaseChange()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::NoPhaseChange<CloudType>::active() const
+{
+    return false;
+}
+
+
+template<class CloudType>
+void Foam::NoPhaseChange<CloudType>::calculate
+(
+    const scalar,
+    const label,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalar,
+    scalarField&
+) const
+{
+    // Nothing to do...
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
new file mode 100644
index 000000000..cd7ef22de
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/NoPhaseChange/NoPhaseChange.H
@@ -0,0 +1,102 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::NoPhaseChange
+
+Description
+    Dummy phase change model for 'none'
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef NoPhaseChange_H
+#define NoPhaseChange_H
+
+#include "PhaseChangeModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+/*---------------------------------------------------------------------------*\
+                       Class NoPhaseChange Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class NoPhaseChange
+:
+    public PhaseChangeModel<CloudType>
+{
+public:
+
+    //- Runtime type information
+    TypeName("none");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        NoPhaseChange(const dictionary&, CloudType&);
+
+
+    //- Destructor
+    virtual ~NoPhaseChange();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates phase change model
+        virtual bool active() const;
+
+        //- Update model
+        virtual void calculate
+        (
+            const scalar dt,
+            const label cellI,
+            const scalar Re,
+            const scalar d,
+            const scalar nu,
+            const scalar T,
+            const scalar Ts,
+            const scalar pc,
+            scalarField& dMassPC
+        ) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "NoPhaseChange.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
new file mode 100644
index 000000000..f9a9d87d9
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/NewPhaseChangeModel.C
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "PhaseChangeModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::autoPtr<Foam::PhaseChangeModel<CloudType> >
+Foam::PhaseChangeModel<CloudType>::New
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+{
+    word PhaseChangeModelType(dict.lookup("PhaseChangeModel"));
+
+    Info<< "Selecting PhaseChangeModel " << PhaseChangeModelType << endl;
+
+    typename dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(PhaseChangeModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "PhaseChangeModel<CloudType>::New"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown PhaseChangeModelType type "
+            << PhaseChangeModelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid PhaseChangeModel types are:" << nl
+            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+    }
+
+    return autoPtr<PhaseChangeModel<CloudType> >(cstrIter()(dict, owner));
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
new file mode 100644
index 000000000..bae1f5deb
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.C
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "PhaseChangeModel.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class CloudType>
+const Foam::wordList Foam::PhaseChangeModel<CloudType>::
+enthalpyTransferTypeNames
+(
+    IStringStream
+    (
+        "("
+            "latentHeat "
+            "enthalpyDifference"
+        ")"
+    )()
+);
+
+
+// * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * * //
+
+template<class CloudType>
+typename Foam::PhaseChangeModel<CloudType>::enthalpyTransferType
+Foam::PhaseChangeModel<CloudType>::wordToEnthalpyTransfer(const word& etName)
+const
+{
+    forAll(enthalpyTransferTypeNames, i)
+    {
+        if (etName == enthalpyTransferTypeNames[i])
+        {
+            return enthalpyTransferType(i);
+        }
+    }
+
+    FatalErrorIn
+    (
+        "PhaseChangeModel<CloudType>::enthalpyTransferType"
+        "PhaseChangeModel<CloudType>::wordToEnthalpyTransfer(const word&) const"
+    )   << "Unknown enthalpyType " << etName << ". Valid selections are:" << nl
+        << enthalpyTransferTypeNames << exit(FatalError);
+
+    return enthalpyTransferType(0);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
+(
+    CloudType& owner
+)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null),
+    enthalpyTransfer_(etLatentHeat)
+{}
+
+
+template<class CloudType>
+Foam::PhaseChangeModel<CloudType>::PhaseChangeModel
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& type
+)
+:
+    dict_(dict),
+    owner_(owner),
+    coeffDict_(dict.subDict(type + "Coeffs")),
+    enthalpyTransfer_
+    (
+        wordToEnthalpyTransfer(coeffDict_.lookup("enthalpyTransfer"))
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::PhaseChangeModel<CloudType>::~PhaseChangeModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+template<class CloudType>
+const CloudType& Foam::PhaseChangeModel<CloudType>::owner() const
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::PhaseChangeModel<CloudType>::dict() const
+{
+    return dict_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::PhaseChangeModel<CloudType>::coeffDict() const
+{
+    return coeffDict_;
+}
+
+
+template<class CloudType>
+const typename Foam::PhaseChangeModel<CloudType>::enthalpyTransferType&
+Foam::PhaseChangeModel<CloudType>::enthalpyTransfer() const
+{
+    return enthalpyTransfer_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "NewPhaseChangeModel.C"
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
new file mode 100644
index 000000000..04b6e605c
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/PhaseChangeModel/PhaseChangeModel.H
@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::PhaseChangeModel
+
+Description
+    Templated phase change model class
+
+SourceFiles
+    PhaseChangeModel.C
+    NewPhaseChangeModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef PhaseChangeModel_H
+#define PhaseChangeModel_H
+
+#include "IOdictionary.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class PhaseChangeModel Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class PhaseChangeModel
+{
+public:
+
+    // Public enumerations
+
+        //- Enthalpy transfer type
+        enum enthalpyTransferType
+        {
+            etLatentHeat,
+            etEnthalpyDifference
+        };
+
+        //- Name representations of enthalpy transfer types
+        static const Foam::wordList enthalpyTransferTypeNames;
+
+
+protected:
+
+    // Protected data
+
+        //- The cloud dictionary
+        const dictionary& dict_;
+
+        //- Reference to the owner cloud class
+        CloudType& owner_;
+
+        //- The coefficient dictionary
+        const dictionary coeffDict_;
+
+        //- Enthalpy transfer type enumeration
+        enthalpyTransferType enthalpyTransfer_;
+
+
+    // Protected member functions
+
+        //- Convert word to enthalpy transfer type
+        enthalpyTransferType wordToEnthalpyTransfer(const word& etName) const;
+
+        //- Sherwood number
+        scalar Sh() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("PhaseChangeModel");
+
+    //- Declare runtime constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        PhaseChangeModel,
+        dictionary,
+        (
+            const dictionary& dict,
+            CloudType& owner
+        ),
+        (dict, owner)
+    );
+
+
+    // Constructors
+
+        //- Construct null from owner
+        PhaseChangeModel(CloudType& owner);
+
+        //- Construct from dictionary
+        PhaseChangeModel
+        (
+            const dictionary& dict,
+            CloudType& owner,
+            const word& type
+        );
+
+
+    //- Destructor
+    virtual ~PhaseChangeModel();
+
+
+    //- Selector
+    static autoPtr<PhaseChangeModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
+
+
+    // Access
+
+        //- Return the owner cloud object
+        const CloudType& owner() const;
+
+        //- Return the cloud dictionary
+        const dictionary& dict() const;
+
+        //- Return the coefficient dictionary
+        const dictionary& coeffDict() const;
+
+        //- Return the enthalpy transfer type enumeration
+        const enthalpyTransferType& enthalpyTransfer() const;
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates phase change model
+        virtual bool active() const = 0;
+
+        //- Update model
+        virtual void calculate
+        (
+            const scalar dt,
+            const label cellI,
+            const scalar Re,
+            const scalar d,
+            const scalar nu,
+            const scalar T,
+            const scalar Ts,
+            const scalar pc,
+            scalarField& dMassPC
+        ) const = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makePhaseChangeModel(CloudType)                                       \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(PhaseChangeModel<CloudType>, 0);      \
+                                                                              \
+    defineTemplateRunTimeSelectionTable                                       \
+    (                                                                         \
+        PhaseChangeModel<CloudType>,                                          \
+        dictionary                                                            \
+    );
+
+
+#define makePhaseChangeModelThermoType(SS, CloudType, ParcelType, ThermoType) \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    PhaseChangeModel<CloudType<ParcelType<ThermoType> > >::                   \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "PhaseChangeModel.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
similarity index 85%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
index 007318f67..b5a1e2b3f 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.C
@@ -35,7 +35,7 @@ Foam::ConstantRateDevolatilisation<CloudType>::ConstantRateDevolatilisation
     CloudType& owner
 )
 :
-    MassTransferModel<CloudType>(dict, owner, typeName),
+    DevolatilisationModel<CloudType>(dict, owner, typeName),
     A0_(dimensionedScalar(this->coeffDict().lookup("A0")).value()),
     volatileResidualCoeff_
     (
@@ -60,34 +60,27 @@ bool Foam::ConstantRateDevolatilisation<CloudType>::active() const
 }
 
 
-template<class CloudType>
-bool Foam::ConstantRateDevolatilisation<CloudType>::changesVolume() const
-{
-    return false;
-}
-
-
 template<class CloudType>
 Foam::scalar Foam::ConstantRateDevolatilisation<CloudType>::calculate
 (
     const scalar dt,
     const scalar mass0,
     const scalar mass,
-    const scalarField& YMixture0,
-    const scalarField& YMixture,
     const scalar T,
+    const scalar YVolatile0,
+    const scalar YVolatile,
     bool& canCombust
 ) const
 {
-    const scalar massVolatile0 = YMixture0[0]*mass0;
-    const scalar massVolatile  = YMixture[0]*mass;
+    const scalar massVolatile0 = YVolatile0*mass0;
+    const scalar massVolatile  = YVolatile*mass;
 
     if (massVolatile <= volatileResidualCoeff_*massVolatile0)
     {
         canCombust = true;
     }
 
-    // Volatile mass transfer from particle to carrier gas phase
+    // Volatile devolatilisation from particle to carrier gas phase
     const scalar dMass = min(dt*A0_*massVolatile0, massVolatile);
 
     return dMass;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
similarity index 87%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
index dc06a4434..e1fca5152 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/ConstantRateDevolatilisation/ConstantRateDevolatilisation.H
@@ -34,7 +34,7 @@ Description
 #ifndef ConstantRateDevolatilisation_H
 #define ConstantRateDevolatilisation_H
 
-#include "MassTransferModel.H"
+#include "DevolatilisationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,9 +47,8 @@ namespace Foam
 template<class CloudType>
 class ConstantRateDevolatilisation
 :
-    public MassTransferModel<CloudType>
+    public DevolatilisationModel<CloudType>
 {
-
     // Private data
 
         // Model constants
@@ -79,28 +78,24 @@ public:
         );
 
 
-    // Destructor
-
-        ~ConstantRateDevolatilisation();
+    //- Destructor
+    virtual ~ConstantRateDevolatilisation();
 
 
     // Member Functions
 
-        //- Flag to indicate whether model activates mass transfer model
-        bool active() const;
-
-        //- Flag to indicate whether model changes particle volume
-        bool changesVolume() const;
+        //- Flag to indicate whether model activates devolatilisation model
+        virtual bool active() const;
 
         //- Update model
-        scalar calculate
+        virtual scalar calculate
         (
             const scalar dt,
             const scalar mass0,
             const scalar mass,
-            const scalarField& YMixture0,
-            const scalarField& YMixture,
             const scalar T,
+            const scalar YVolatile0,
+            const scalar YVolatile,
             bool& canCombust
         ) const;
 };
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
new file mode 100644
index 000000000..2849c7865
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.C
@@ -0,0 +1,91 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "DevolatilisationModel.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::DevolatilisationModel<CloudType>::DevolatilisationModel
+(
+    CloudType& owner
+)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null)
+{}
+
+
+template<class CloudType>
+Foam::DevolatilisationModel<CloudType>::DevolatilisationModel
+(
+    const dictionary& dict,
+    CloudType& owner,
+    const word& type
+)
+:
+    dict_(dict),
+    owner_(owner),
+    coeffDict_(dict.subDict(type + "Coeffs"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::DevolatilisationModel<CloudType>::~DevolatilisationModel()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+template<class CloudType>
+const CloudType& Foam::DevolatilisationModel<CloudType>::owner() const
+{
+    return owner_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::DevolatilisationModel<CloudType>::dict() const
+{
+    return dict_;
+}
+
+
+template<class CloudType>
+const Foam::dictionary& Foam::DevolatilisationModel<CloudType>::coeffDict() const
+{
+    return coeffDict_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "NewDevolatilisationModel.C"
+
+// ************************************************************************* //
+
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
similarity index 68%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
index f792e165c..5c903a7f8 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/MassTransferModel/MassTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/DevolatilisationModel.H
@@ -23,20 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::MassTransferModel
-
+    Foam::DevolatilisationModel
 
 Description
-    Templated mass transfer model class
+    Templated devolatilisation model class
 
 SourceFiles
-    MassTransferModel.C
-    NewMassTransferModel.C
+    DevolatilisationModel.C
+    NewDevolatilisationModel.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef MassTransferModel_H
-#define MassTransferModel_H
+#ifndef DevolatilisationModel_H
+#define DevolatilisationModel_H
 
 #include "IOdictionary.H"
 #include "autoPtr.H"
@@ -48,13 +47,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class MassTransferModel Declaration
+                      Class DevolatilisationModel Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class MassTransferModel
+class DevolatilisationModel
 {
-
 protected:
 
     // Protected data
@@ -72,13 +70,13 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("MassTransferModel");
+    TypeName("DevolatilisationModel");
 
     //- Declare runtime constructor selection table
     declareRunTimeSelectionTable
     (
         autoPtr,
-        MassTransferModel,
+        DevolatilisationModel,
         dictionary,
         (
             const dictionary& dict,
@@ -90,8 +88,11 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        DevolatilisationModel(CloudType& owner);
+
         //- Construct from dictionary
-        MassTransferModel
+        DevolatilisationModel
         (
             const dictionary& dict,
             CloudType& owner,
@@ -99,18 +100,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~MassTransferModel();
+    //- Destructor
+    virtual ~DevolatilisationModel();
 
 
-    // Selector
-
-        static autoPtr<MassTransferModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
+    //- Selector
+    static autoPtr<DevolatilisationModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Access
@@ -127,21 +126,18 @@ public:
 
     // Member Functions
 
-        //- Flag to indicate whether model activates mass transfer model
+        //- Flag to indicate whether model activates devolatilisation model
         virtual bool active() const = 0;
 
-        //- Flag to indicate whether model changes particle volume
-        virtual bool changesVolume() const = 0;
-
         //- Update model
         virtual scalar calculate
         (
             const scalar dt,
             const scalar mass0,
             const scalar mass,
-            const scalarField& YMixture0,
-            const scalarField& YMixture,
             const scalar T,
+            const scalar YVolatile0,
+            const scalar YVolatile,
             bool& canCombust
         ) const = 0;
 };
@@ -153,30 +149,35 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeMassTransferModel(CloudType)                                      \
+#define makeDevolatilisationModel(CloudType)                                  \
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(MassTransferModel<CloudType>, 0);     \
+    defineNamedTemplateTypeNameAndDebug(DevolatilisationModel<CloudType>, 0); \
                                                                               \
     defineTemplateRunTimeSelectionTable                                       \
     (                                                                         \
-        MassTransferModel<CloudType>,                                         \
+        DevolatilisationModel<CloudType>,                                     \
         dictionary                                                            \
     );
 
 
-#define makeMassTransferModelType(SS, CloudType, ParcelType)                  \
+#define makeDevolatilisationModelThermoType(SS, CloudType, ParcelType, ThermoType)\
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
                                                                               \
-    MassTransferModel<CloudType<ParcelType> >::                               \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    DevolatilisationModel<CloudType<ParcelType<ThermoType> > >::              \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "MassTransferModel.C"
+#   include "DevolatilisationModel.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
new file mode 100644
index 000000000..78750f32b
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/DevolatilisationModel/NewDevolatilisationModel.C
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "DevolatilisationModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::autoPtr<Foam::DevolatilisationModel<CloudType> >
+Foam::DevolatilisationModel<CloudType>::New
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+{
+    word DevolatilisationModelType(dict.lookup("DevolatilisationModel"));
+
+    Info<< "Selecting DevolatilisationModel " << DevolatilisationModelType
+        << endl;
+
+    typename dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(DevolatilisationModelType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "DevolatilisationModel<CloudType>::New"
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown DevolatilisationModelType type "
+            << DevolatilisationModelType
+            << ", constructor not in hash table" << nl << nl
+            << "    Valid DevolatilisationModel types are:" << nl
+            << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
+    }
+
+    return autoPtr<DevolatilisationModel<CloudType> >(cstrIter()(dict, owner));
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
similarity index 79%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
index b9d1268e8..b9ded070a 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.C
@@ -24,52 +24,45 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "NoMassTransfer.H"
+#include "NoDevolatilisation.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::NoMassTransfer<CloudType>::NoMassTransfer
+Foam::NoDevolatilisation<CloudType>::NoDevolatilisation
 (
-    const dictionary& dict,
-    CloudType& cloud
+    const dictionary&,
+    CloudType& owner
 )
 :
-    MassTransferModel<CloudType>(dict, cloud, typeName)
+    DevolatilisationModel<CloudType>(owner)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::NoMassTransfer<CloudType>::~NoMassTransfer()
+Foam::NoDevolatilisation<CloudType>::~NoDevolatilisation()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class CloudType>
-bool Foam::NoMassTransfer<CloudType>::active() const
+bool Foam::NoDevolatilisation<CloudType>::active() const
 {
     return false;
 }
 
 
 template<class CloudType>
-bool Foam::NoMassTransfer<CloudType>::changesVolume() const
-{
-    return false;
-}
-
-
-template<class CloudType>
-Foam::scalar Foam::NoMassTransfer<CloudType>::calculate
+Foam::scalar Foam::NoDevolatilisation<CloudType>::calculate
 (
     const scalar,
     const scalar,
     const scalar,
-    const scalarField&,
-    const scalarField&,
+    const scalar,
+    const scalar,
     const scalar,
     bool& canCombust
 ) const
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
similarity index 73%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
index e46e6edf7..683e42ac3 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/NoMassTransfer/NoMassTransfer.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/NoDevolatilisation/NoDevolatilisation.H
@@ -23,69 +23,61 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::NoMassTransfer
+    Foam::NoDevolatilisation
 
 Description
-    Dummy mass transfer model for 'no mass transfer'
+    Dummy devolatilisation model for 'none'
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef NoMassTransfer_H
-#define NoMassTransfer_H
+#ifndef NoDevolatilisation_H
+#define NoDevolatilisation_H
 
-#include "MassTransferModel.H"
+#include "DevolatilisationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 /*---------------------------------------------------------------------------*\
-                            Class NoMassTransfer Declaration
+                     Class NoDevolatilisation Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
-class NoMassTransfer
+class NoDevolatilisation
 :
-    public MassTransferModel<CloudType>
+    public DevolatilisationModel<CloudType>
 {
 
 public:
 
     //- Runtime type information
-    TypeName("NoMassTransfer");
+    TypeName("none");
 
 
     // Constructors
 
         //- Construct from dictionary
-        NoMassTransfer
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+        NoDevolatilisation(const dictionary&, CloudType& owner);
 
 
-    // Destructor
-
-        ~NoMassTransfer();
+    //- Destructor
+    virtual ~NoDevolatilisation();
 
 
     // Member Functions
 
-        //- Flag to indicate whether model activates mass transfer model
-        bool active() const;
-
-        //- Flag to indicate whether model changes particle volume
-        bool changesVolume() const;
+        //- Flag to indicate whether model activates devolatilisation model
+        virtual bool active() const;
 
         //- Update model
-        scalar calculate
+        virtual scalar calculate
         (
             const scalar,
             const scalar,
             const scalar,
-            const scalarField&,
-            const scalarField&,
+            const scalar,
+            const scalar,
             const scalar,
             bool&
         ) const;
@@ -99,7 +91,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "NoMassTransfer.C"
+#   include "NoDevolatilisation.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
similarity index 83%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
index 2cea254aa..4061099d7 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.C
@@ -29,13 +29,14 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template <class CloudType>
-Foam::SingleKineticRateDevolatilisation<CloudType>::SingleKineticRateDevolatilisation
+Foam::SingleKineticRateDevolatilisation<CloudType>::
+SingleKineticRateDevolatilisation
 (
     const dictionary& dict,
     CloudType& owner
 )
 :
-    MassTransferModel<CloudType>(dict, owner, typeName),
+    DevolatilisationModel<CloudType>(dict, owner, typeName),
     A1_(dimensionedScalar(this->coeffDict().lookup("A1")).value()),
     E_(dimensionedScalar(this->coeffDict().lookup("E")).value()),
     volatileResidualCoeff_
@@ -62,27 +63,20 @@ bool Foam::SingleKineticRateDevolatilisation<CloudType>::active() const
 }
 
 
-template<class CloudType>
-bool Foam::SingleKineticRateDevolatilisation<CloudType>::changesVolume() const
-{
-    return false;
-}
-
-
 template<class CloudType>
 Foam::scalar Foam::SingleKineticRateDevolatilisation<CloudType>::calculate
 (
     const scalar dt,
     const scalar mass0,
     const scalar mass,
-    const scalarField& YMixture0,
-    const scalarField& YMixture,
     const scalar T,
+    const scalar YVolatile0,
+    const scalar YVolatile,
     bool& canCombust
 ) const
 {
-    const scalar massVolatile0 = YMixture0[0]*mass;
-    const scalar massVolatile = YMixture[0]*mass;
+    const scalar massVolatile0 = YVolatile0*mass;
+    const scalar massVolatile = YVolatile*mass;
 
     if (massVolatile <= volatileResidualCoeff_*massVolatile0)
     {
@@ -92,7 +86,7 @@ Foam::scalar Foam::SingleKineticRateDevolatilisation<CloudType>::calculate
     // Kinetic rate
     const scalar kappa = A1_*exp(-E_/(specie::RR*T));
 
-    // Volatile mass transfer from particle to carrier gas phase
+    // Volatile devolatilisation from particle to carrier gas phase
     const scalar dMass = min(dt*kappa*massVolatile, massVolatile);
 
     return dMass;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
similarity index 87%
rename from src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
index 6d6e7bd5f..0e2626be5 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/MassTransferModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/DevolatilisationModel/SingleKineticRateDevolatilisation/SingleKineticRateDevolatilisation.H
@@ -33,7 +33,7 @@ Description
 #ifndef SingleKineticRateDevolatilisation_H
 #define SingleKineticRateDevolatilisation_H
 
-#include "MassTransferModel.H"
+#include "DevolatilisationModel.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,9 +46,8 @@ namespace Foam
 template<class CloudType>
 class SingleKineticRateDevolatilisation
 :
-    public MassTransferModel<CloudType>
+    public DevolatilisationModel<CloudType>
 {
-
     // Private data
 
         // Model constants
@@ -81,28 +80,24 @@ public:
         );
 
 
-    // Destructor
-
-        ~SingleKineticRateDevolatilisation();
+    //- Destructor
+    virtual ~SingleKineticRateDevolatilisation();
 
 
     // Member Functions
 
-        //- Flag to indicate whether model activates mass transfer model
-        bool active() const;
-
-        //- Flag to indicate whether model changes particle volume
-        bool changesVolume() const;
+        //- Flag to indicate whether model activates devolatilisation model
+        virtual bool active() const;
 
         //- Update model
-        scalar calculate
+        virtual scalar calculate
         (
             const scalar dt,
             const scalar mass0,
             const scalar mass,
-            const scalarField& YMixture0,
-            const scalarField& YMixture,
             const scalar T,
+            const scalar YVolatile0,
+            const scalar YVolatile,
             bool& canCombust
         ) const;
 };
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
new file mode 100644
index 000000000..cf303b088
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
@@ -0,0 +1,218 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "ReactingMultiphaseLookupTableInjection.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label
+Foam::ReactingMultiphaseLookupTableInjection<CloudType>::parcelsToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+template<class CloudType>
+Foam::scalar
+Foam::ReactingMultiphaseLookupTableInjection<CloudType>::volumeToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    scalar volume = 0.0;
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        forAll(injectors_, i)
+        {
+            volume += injectors_[i].mDot()/injectors_[i].rho()*(time1 - time0);
+        }
+    }
+
+    return volume;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ReactingMultiphaseLookupTableInjection<CloudType>::
+ReactingMultiphaseLookupTableInjection
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    InjectionModel<CloudType>(dict, owner, typeName),
+    inputFileName_(this->coeffDict().lookup("inputFile")),
+    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    nParcelsPerSecond_
+    (
+        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
+    ),
+    injectors_
+    (
+        IOobject
+        (
+            inputFileName_,
+            owner.db().time().constant(),
+            owner.db(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    injectorCells_(0)
+{
+    // Set/cache the injector cells
+    injectorCells_.setSize(injectors_.size());
+    forAll(injectors_, i)
+    {
+        this->findCellAtPosition(injectorCells_[i], injectors_[i].x());
+    }
+
+    // Determine volume of particles to inject
+    this->volumeTotal_ = 0.0;
+    forAll(injectors_, i)
+    {
+        this->volumeTotal_ += injectors_[i].mDot()/injectors_[i].rho();
+    }
+    this->volumeTotal_ *= duration_;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ReactingMultiphaseLookupTableInjection<CloudType>::
+~ReactingMultiphaseLookupTableInjection()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::ReactingMultiphaseLookupTableInjection<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar
+Foam::ReactingMultiphaseLookupTableInjection<CloudType>::timeEnd() const
+{
+    return this->SOI_ + duration_;
+}
+
+
+template<class CloudType>
+void Foam::ReactingMultiphaseLookupTableInjection<CloudType>::setPositionAndCell
+(
+    const label parcelI,
+    const label nParcels,
+    const scalar time,
+    vector& position,
+    label& cellOwner
+)
+{
+    label injectorI = parcelI*injectorCells_.size()/nParcels;
+
+    position = injectors_[injectorI].x();
+    cellOwner = injectorCells_[injectorI];
+}
+
+
+template<class CloudType>
+void Foam::ReactingMultiphaseLookupTableInjection<CloudType>::setProperties
+(
+    const label parcelI,
+    const label nParcels,
+    const scalar,
+    typename CloudType::parcelType& parcel
+)
+{
+    label injectorI = parcelI*injectorCells_.size()/nParcels;
+
+    // set particle velocity
+    parcel.U() = injectors_[injectorI].U();
+
+    // set particle diameter
+    parcel.d() = injectors_[injectorI].d();
+
+    // set particle density
+    parcel.rho() = injectors_[injectorI].rho();
+
+    // set particle temperature
+    parcel.T() = injectors_[injectorI].T();
+
+    // set particle specific heat capacity
+    parcel.cp() = injectors_[injectorI].cp();
+
+    // set particle component mass fractions
+    parcel.Y() = injectors_[injectorI].Y();
+
+    // set particle gaseous component mass fractions
+    parcel.YGas() = injectors_[injectorI].YGas();
+
+    // set particle liquid component mass fractions
+    parcel.YLiquid() = injectors_[injectorI].YLiquid();
+
+    // set particle solid component mass fractions
+    parcel.YSolid() = injectors_[injectorI].YSolid();
+}
+
+
+template<class CloudType>
+bool
+Foam::ReactingMultiphaseLookupTableInjection<CloudType>::fullyDescribed() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+bool Foam::ReactingMultiphaseLookupTableInjection<CloudType>::validInjection
+(
+    const label
+)
+{
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
new file mode 100644
index 000000000..51ba96d82
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.H
@@ -0,0 +1,187 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::ReactingMultiphaseLookupTableInjection
+
+Description
+    Particle injection sources read from look-up table. Each row corresponds to
+    an injection site.
+
+    (
+       (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
+       (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
+       ...
+       (x y z) (u v w) d rho mDot T cp (Y0..Y2) (Yg0..YgN) (Yl0..YlN) (Ys0..YsN)
+    );
+
+    where:
+        x, y, z  = global cartesian co-ordinates [m]
+        u, v, w  = global cartesian velocity components [m/s]
+        d        = diameter [m]
+        rho      = density [kg/m3]
+        mDot     = mass flow rate [kg/m3]
+        T        = temperature [K]
+        cp       = specific heat capacity [J/kg/K]
+        Y(3)     = total mass fraction of gas (Y0), liquid (Y1), solid (Y3)
+        Yg(Ngas) = mass fractions of gaseous components
+        Yl(Nliq) = mass fractions of liquid components
+        Ys(Nsld) = mass fractions of solid components
+
+SourceFiles
+    ReactingMultiphaseLookupTableInjection.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ReactingMultiphaseLookupTableInjection_H
+#define ReactingMultiphaseLookupTableInjection_H
+
+#include "InjectionModel.H"
+#include "reactingMultiphaseParcelInjectionDataIOList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+           Class ReactingMultiphaseLookupTableInjection Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class ReactingMultiphaseLookupTableInjection
+:
+    public InjectionModel<CloudType>
+{
+    // Private data
+
+        //- Name of file containing injector/parcel data
+        const word inputFileName_;
+
+        //- Injection duration - common to all injection sources
+        const scalar duration_;
+
+        //- Number of parcels per injector - common to all injection sources
+        const label nParcelsPerSecond_;
+
+        //- List of injectors
+        reactingMultiphaseParcelInjectionDataIOList injectors_;
+
+        //- List of injector cells per injector
+        List<label> injectorCells_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Number of parcels to introduce over the time step relative to SOI
+        label parcelsToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+        //- Volume of parcels to introduce over the time step relative to SOI
+        scalar volumeToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("ReactingMultiphaseLookupTableInjection");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        ReactingMultiphaseLookupTableInjection
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~ReactingMultiphaseLookupTableInjection();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates injection model
+        bool active() const;
+
+        //- Return the end-of-injection time
+        scalar timeEnd() const;
+
+
+        // Injection geometry
+
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                vector& position,
+                label& cellOwner
+            );
+
+            //- Set the parcel properties
+            virtual void setProperties
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                typename CloudType::parcelType& parcel
+            );
+
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const;
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ReactingMultiphaseLookupTableInjection.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionData.C
similarity index 66%
rename from src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionData.C
index a6bf65cd5..9e65ec61a 100644
--- a/src/lagrangian/intermediate/clouds/derived/basicReactingCloud/basicReactingCloud.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionData.C
@@ -24,56 +24,44 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicReactingCloud.H"
+#include "reactingMultiphaseParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    defineTypeNameAndDebug(basicReactingCloud, 0);
-};
-
+    defineTypeNameAndDebug(reactingMultiphaseParcelInjectionData, 0);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::basicReactingCloud::basicReactingCloud
-(
-    const word& cloudType,
-    const volPointInterpolation& vpi,
-    const volScalarField& rho,
-    const volVectorField& U,
-    const dimensionedVector& g,
-    hCombustionThermo& thermo,
-    PtrList<specieReactingProperties>& gases
-)
+Foam::reactingMultiphaseParcelInjectionData::
+reactingMultiphaseParcelInjectionData()
 :
-    ReactingCloud<basicReactingParcel>
-    (
-        cloudType,
-        vpi,
-        rho,
-        U,
-        g,
-        thermo,
-        gases
-    )
-{
-    basicReactingParcel::readFields(*this);
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::basicReactingCloud::~basicReactingCloud()
+    reactingParcelInjectionData(),
+    YGas_(),
+    YLiquid_(),
+    YSolid_()
 {}
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+Foam::reactingMultiphaseParcelInjectionData::
+reactingMultiphaseParcelInjectionData
+(
+    const dictionary& dict
+)
+:
+    reactingParcelInjectionData(dict),
+    YGas_(dict.lookup("YGas")),
+    YLiquid_(dict.lookup("YLiquid")),
+    YSolid_(dict.lookup("YSolid"))
+{}
 
-void Foam::basicReactingCloud::writeFields() const
-{
-    basicReactingParcel::writeFields(*this);
-}
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::reactingMultiphaseParcelInjectionData::
+~reactingMultiphaseParcelInjectionData()
+{}
 
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionData.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionData.H
new file mode 100644
index 000000000..e5fa17af5
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionData.H
@@ -0,0 +1,198 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::reactingMultiphaseParcelInjectionData
+
+Description
+    Container class to provide injection data for reacting multiphase parcels
+
+SourceFiles
+    reactingMultiphaseParcelInjectionData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef reactingMultiphaseParcelInjectionData_H
+#define reactingMultiphaseParcelInjectionData_H
+
+#include "reactingParcelInjectionData.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class reactingMultiphaseParcelInjectionData;
+
+// Forward declaration of friend functions
+
+Ostream& operator<<
+(
+    Ostream&,
+    const reactingMultiphaseParcelInjectionData&
+);
+
+Istream& operator>>
+(
+    Istream&,
+    reactingMultiphaseParcelInjectionData&
+);
+
+/*---------------------------------------------------------------------------*\
+            Class reactingMultiphaseParcelInjectionData Declaration
+\*---------------------------------------------------------------------------*/
+
+class reactingMultiphaseParcelInjectionData
+:
+    public reactingParcelInjectionData
+{
+protected:
+
+    // Parcel properties
+
+        //- List of gaseous mass fractions
+        scalarList YGas_;
+
+        //- List of liquid mass fractions
+        scalarList YLiquid_;
+
+        //- List of solid mass fractions
+        scalarList YSolid_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("reactingMultiphaseParcelInjectionData");
+
+    // Constructors
+
+        //- Null constructor
+        reactingMultiphaseParcelInjectionData();
+
+        //- Construct from dictionary
+        reactingMultiphaseParcelInjectionData(const dictionary& dict);
+
+        //- Construct from Istream
+        reactingMultiphaseParcelInjectionData(Istream& is);
+
+
+    //-Destructor
+    virtual ~reactingMultiphaseParcelInjectionData();
+
+
+    // Access
+
+        //- Return const access to the list of gaseous mass fractions
+        inline const scalarList& YGas() const;
+
+        //- Return const access to the list of liquid mass fractions
+        inline const scalarList& YLiquid() const;
+
+        //- Return const access to the list of solid mass fractions
+        inline const scalarList& YSolid() const;
+
+
+    // Edit
+
+        //- Return access to the gaseous mass fractions
+        inline scalarList& YGas();
+
+        //- Return access to the liquid mass fractions
+        inline scalarList& YLiquid();
+
+        //- Return access to the solid mass fractions
+        inline scalarList& YSolid();
+
+
+    // I-O
+
+        // Friend Operators
+
+            friend bool operator==
+            (
+                const reactingMultiphaseParcelInjectionData& a,
+                const reactingMultiphaseParcelInjectionData& b
+            )
+            {
+                notImplemented
+                (
+                    "operator=="
+                    "("
+                        "const reactingMultiphaseParcelInjectionData&, "
+                        "const reactingMultiphaseParcelInjectionData&"
+                    ")"
+                );
+
+                return false;
+            }
+
+            friend bool operator!=
+            (
+                const reactingMultiphaseParcelInjectionData& a,
+                const reactingMultiphaseParcelInjectionData& b
+            )
+            {
+                notImplemented
+                (
+                    "operator=="
+                    "("
+                        "const reactingMultiphaseParcelInjectionData&, "
+                        "const reactingMultiphaseParcelInjectionData&"
+                    ")"
+                );
+
+                return false;
+            }
+
+            //- Ostream operator
+            friend Ostream& operator<<
+            (
+                Ostream& os,
+                const reactingMultiphaseParcelInjectionData& data
+            );
+
+            //- Istream operator
+            friend Istream& operator>>
+            (
+                Istream& is,
+                reactingMultiphaseParcelInjectionData& data
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "reactingMultiphaseParcelInjectionDataI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/test/IStringStream/IStringStreamTest.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataI.H
similarity index 66%
rename from applications/test/IStringStream/IStringStreamTest.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataI.H
index d0b438daf..00d8bd94d 100644
--- a/applications/test/IStringStream/IStringStreamTest.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataI.H
@@ -22,39 +22,48 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "IStringStream.H"
-#include "wordList.H"
-#include "IOstreams.H"
-
-using namespace Foam;
+#include "reactingMultiphaseParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main(int argc, char *argv[])
+inline const Foam::scalarList&
+Foam::reactingMultiphaseParcelInjectionData::YGas() const
 {
-    IStringStream testStream(Foam::string("1002 sfsd sdfsd"));
+    return YGas_;
+}
 
-    label i(readLabel(testStream));
 
-    Info<< i << endl;
+inline const Foam::scalarList&
+Foam::reactingMultiphaseParcelInjectionData::YLiquid() const
+{
+    return YLiquid_;
+}
 
-    word bla(testStream);
-    word bla2(testStream);
 
-    Info<< bla << tab << bla2 << endl;
+inline const Foam::scalarList&
+Foam::reactingMultiphaseParcelInjectionData::YSolid() const
+{
+    return YSolid_;
+}
 
-    wordList wl(IStringStream("(hello1")());
 
-    Info<< wl << endl;
+inline Foam::scalarList& Foam::reactingMultiphaseParcelInjectionData::YGas()
+{
+    return YGas_;
+}
 
-    Info<< "\nEnd\n" << endl;
 
-    return 0;
+inline Foam::scalarList& Foam::reactingMultiphaseParcelInjectionData::YLiquid()
+{
+    return YLiquid_;
+}
+
+
+inline Foam::scalarList& Foam::reactingMultiphaseParcelInjectionData::YSolid()
+{
+    return YSolid_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIO.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIO.C
new file mode 100644
index 000000000..44468773b
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIO.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "reactingMultiphaseParcelInjectionData.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::reactingMultiphaseParcelInjectionData::
+reactingMultiphaseParcelInjectionData(Istream& is)
+:
+    reactingParcelInjectionData(is)
+{
+    is.check("reading YGas's");
+    is >> YGas_;
+
+    is.check("reading YLiquid's");
+    is >> YLiquid_;
+
+    is.check("reading YSolid's");
+    is >> YSolid_;
+
+    is.check("reactingMultiphaseParcelInjectionData(Istream& is)");
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const reactingMultiphaseParcelInjectionData& data
+)
+{
+    os << static_cast<const reactingParcelInjectionData&>(data);
+
+    os << data.YGas_ << data.YLiquid_ << data.YSolid_;
+
+    return os;
+}
+
+
+Foam::Istream& Foam::operator>>
+(
+    Istream& is,
+    reactingMultiphaseParcelInjectionData& data
+)
+{
+    is >> static_cast<reactingParcelInjectionData&>(data);
+
+    is.check("reading YGas's");
+    is >> data.YGas_;
+
+    is.check("reading YLiquid's");
+    is >> data.YLiquid_;
+
+    is.check("reading YSolid's");
+    is >> data.YSolid_;
+
+    is.check("operator(Istream&, reactingMultiphaseParcelInjectionData&)");
+
+    return is;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/mkdir/mkdirTest.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.C
similarity index 88%
rename from applications/test/mkdir/mkdirTest.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.C
index 8ec161bcf..e2ace8a88 100644
--- a/applications/test/mkdir/mkdirTest.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.C
@@ -22,23 +22,15 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "OSspecific.H"
-using namespace Foam;
+#include "reactingMultiphaseParcelInjectionDataIOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main(int argc, char *argv[])
+namespace Foam
 {
-    fileName path("/hmm/hmm2/hmm3");
-
-    mkDir(path);
-
-    return 0;
+    defineTemplateTypeNameAndDebug(IOList<reactingMultiphaseParcelInjectionData>, 0);
 }
 
 
diff --git a/applications/test/cyclic/cyclicTest.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.H
similarity index 75%
rename from applications/test/cyclic/cyclicTest.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.H
index e41422d3a..6c9cc504f 100644
--- a/applications/test/cyclic/cyclicTest.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/reactingMultiphaseParcelInjectionDataIOList.H
@@ -22,43 +22,31 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Application
-    icofoam
+Class
 
 Description
-    Incompressible CFD code
+
+SourceFiles
+    reactingMultiphaseParcelInjectionDataIOList.C
 
 \*---------------------------------------------------------------------------*/
 
-#include "fvCFD.H"
+#ifndef reactingMultiphaseParcelInjectionDataIOList_H
+#define reactingMultiphaseParcelInjectionDataIOList_H
+
+#include "IOList.H"
+#include "reactingMultiphaseParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-int main(int argc, char *argv[])
+namespace Foam
 {
-
-#include "setRootCase.H"
-
-#include "createTime.H"
-#include "createMesh.H"
-#include "createFields.H"
-
-    Info<< polyPatch::constraintTypes() << endl;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-    Info<< nl << "Starting tests" << endl;
-
-    Info<< mesh.V() << endl;
-    Info<< mesh.Sf() << endl;
-    Info<< mesh.owner() << endl;
-    Info<< mesh.neighbour() << endl;
-
-    Info<< fvc::div(U);
-
-    Info<< "end" << endl;
+    typedef IOList<reactingMultiphaseParcelInjectionData>
+        reactingMultiphaseParcelInjectionDataIOList;
 }
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
similarity index 79%
rename from src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
index 8156ed553..1a0ce2e53 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.C
@@ -31,11 +31,11 @@ License
 template <class CloudType>
 Foam::NoSurfaceReaction<CloudType>::NoSurfaceReaction
 (
-    const dictionary& dict,
+    const dictionary&,
     CloudType& owner
 )
 :
-    SurfaceReactionModel<CloudType>(dict, owner, typeName)
+    SurfaceReactionModel<CloudType>(owner)
 {}
 
 
@@ -56,24 +56,30 @@ bool Foam::NoSurfaceReaction<CloudType>::active() const
 
 
 template<class CloudType>
-void Foam::NoSurfaceReaction<CloudType>::calculate
+Foam::scalar Foam::NoSurfaceReaction<CloudType>::calculate
 (
-    const scalar dt,
-    const label celli,
-    const scalar dp,
-    const scalar T0,
-    const scalar T1,
-    const scalar Tc,
-    const scalar rhoc,
-    const scalar massp,
-    scalarField& YGas,
-    scalarField& YLiquid,
-    scalarField& YSolid,
-    scalarField& YMixture,
-    scalar& dMassMTSR,
-    scalarList& dMassSR
+    const scalar,
+    const label,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalar,
+    const scalarField&,
+    const scalarField&,
+    const scalarField&,
+    const scalarField&,
+    const scalar,
+    scalarField&,
+    scalarField&,
+    scalarField&,
+    scalarField&
 ) const
-{}
+{
+    // do nothing
+    return 0.0;
+}
 
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
similarity index 78%
rename from src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
index 4becc3b69..a7c83e9b2 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/NoSurfaceReaction/NoSurfaceReaction.H
@@ -26,7 +26,7 @@ Class
     Foam::NoSurfaceReaction
 
 Description
-    Dummy Devolatisation model for 'no devolatisation'
+    Dummy surface reaction model for 'none'
 
 \*---------------------------------------------------------------------------*/
 
@@ -40,7 +40,7 @@ Description
 namespace Foam
 {
 /*---------------------------------------------------------------------------*\
-                            Class NoSurfaceReaction Declaration
+                     Class NoSurfaceReaction Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -48,11 +48,10 @@ class NoSurfaceReaction
 :
     public SurfaceReactionModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
-    TypeName("NoSurfaceReaction");
+    TypeName("none");
 
 
     // Constructors
@@ -65,33 +64,35 @@ public:
         );
 
 
-    // Destructor
-
-        ~NoSurfaceReaction();
+    //- Destructor
+    virtual ~NoSurfaceReaction();
 
 
     // Member Functions
 
         //- Flag to indicate whether model activates devolatisation model
-        bool active() const;
+        virtual bool active() const;
 
         //- Update surface reactions
-        void calculate
+        virtual scalar calculate
         (
             const scalar dt,
-            const label celli,
-            const scalar dp,
-            const scalar T0,
-            const scalar T1,
+            const label cellI,
+            const scalar d,
+            const scalar T,
             const scalar Tc,
+            const scalar pc,
             const scalar rhoc,
-            const scalar massp,
-            scalarField& YGas,
-            scalarField& YLiquid,
-            scalarField& YSolid,
-            scalarField& YMixture,
-            scalar& dMassMTSR,
-            scalarList& dMassSR
+            const scalar mass,
+            const scalarField& YGas,
+            const scalarField& YLiquid,
+            const scalarField& YSolid,
+            const scalarField& YMixture,
+            const scalar N,
+            scalarField& dMassGas,
+            scalarField& dMassLiquid,
+            scalarField& dMassSolid,
+            scalarField& dMassSRCarrier
         ) const;
 };
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
similarity index 88%
rename from src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
index 48364bf7e..62af29b0d 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/NewSurfaceReactionModel.C
@@ -36,10 +36,7 @@ Foam::SurfaceReactionModel<CloudType>::New
     CloudType& owner
 )
 {
-    word SurfaceReactionModelType
-    (
-        dict.lookup("SurfaceReactionModel")
-    );
+    word SurfaceReactionModelType(dict.lookup("SurfaceReactionModel"));
 
     Info<< "Selecting SurfaceReactionModel " << SurfaceReactionModelType
         << endl;
@@ -52,12 +49,14 @@ Foam::SurfaceReactionModel<CloudType>::New
         FatalErrorIn
         (
             "SurfaceReactionModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
-            << "Unknown SurfaceReactionModelType type "
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown SurfaceReactionModelType type "
             << SurfaceReactionModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid SurfaceReactionModel types are :" << nl
+            << "    Valid SurfaceReactionModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
similarity index 91%
rename from src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
index 179e1ac24..dcf8f78a2 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.C
@@ -28,6 +28,18 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::SurfaceReactionModel<CloudType>::SurfaceReactionModel
+(
+    CloudType& owner
+)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null)
+{}
+
+
 template<class CloudType>
 Foam::SurfaceReactionModel<CloudType>::SurfaceReactionModel
 (
@@ -35,7 +47,8 @@ Foam::SurfaceReactionModel<CloudType>::SurfaceReactionModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
     coeffDict_(dict.subDict(type + "Coeffs"))
 {}
@@ -49,6 +62,7 @@ Foam::SurfaceReactionModel<CloudType>::~SurfaceReactionModel()
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
 template<class CloudType>
 const CloudType& Foam::SurfaceReactionModel<CloudType>::owner() const
 {
diff --git a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
similarity index 73%
rename from src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
rename to src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
index 26c67faa4..e5c2e7b2c 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/SurfaceReactionModel/SurfaceReactionModel/SurfaceReactionModel.H
@@ -25,7 +25,6 @@ License
 Class
     Foam::SurfaceReactionModel
 
-
 Description
     Templated surface reaction model class
 
@@ -43,7 +42,6 @@ SourceFiles
 #include "runTimeSelectionTables.H"
 
 #include "scalarField.H"
-#include "scalarList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,13 +55,12 @@ namespace Foam
 template<class CloudType>
 class SurfaceReactionModel
 {
-
     // Private data
 
         //- The cloud dictionary
         const dictionary& dict_;
 
-        // reference to the owner cloud class
+        //- Reference to the owner cloud class
         CloudType& owner_;
 
         //- The coefficients dictionary
@@ -92,6 +89,9 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        SurfaceReactionModel(CloudType& owner);
+
         //- Construct from dictionary
         SurfaceReactionModel
         (
@@ -101,18 +101,16 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~SurfaceReactionModel();
+    //- Destructor
+    virtual ~SurfaceReactionModel();
 
 
-    // Selector
-
-        static autoPtr<SurfaceReactionModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+    //- Selector
+    static autoPtr<SurfaceReactionModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& cloud
+    );
 
 
     // Access
@@ -129,26 +127,30 @@ public:
 
     // Member Functions
 
-        //- Flag to indicate whether model activates devolatisation model
+        //- Flag to indicate whether model activates surface reaction model
         virtual bool active() const = 0;
 
         //- Update surface reactions
-        virtual void calculate
+        //  Returns the heat of reaction
+        virtual scalar calculate
         (
             const scalar dt,
-            const label celli,
-            const scalar dp,
-            const scalar T0,
-            const scalar T1,
+            const label cellI,
+            const scalar d,
+            const scalar T,
             const scalar Tc,
+            const scalar pc,
             const scalar rhoc,
-            const scalar massp,
-            scalarField& YGas,
-            scalarField& YLiquid,
-            scalarField& YSolid,
-            scalarField& YMixture,
-            scalar& dMassMTSR,
-            scalarList& dMassSR
+            const scalar mass,
+            const scalarField& YGas,
+            const scalarField& YLiquid,
+            const scalarField& YSolid,
+            const scalarField& YMixture,
+            const scalar N,
+            scalarField& dMassGas,
+            scalarField& dMassLiquid,
+            scalarField& dMassSolid,
+            scalarField& dMassSRCarrier
         ) const = 0;
 };
 
@@ -170,22 +172,18 @@ public:
     );
 
 
-#define makeSurfaceReactionModelType(SS, CloudType, ParcelType)               \
+#define makeSurfaceReactionModelThermoType(SS, CloudType, ParcelType, ThermoType)\
                                                                               \
-    defineNamedTemplateTypeNameAndDebug(SS<CloudType<ParcelType> >, 0);       \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
                                                                               \
-    SurfaceReactionModel<CloudType<ParcelType> >::                            \
-        adddictionaryConstructorToTable<SS<CloudType<ParcelType> > >          \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
-
-
-#define makeSurfaceReactionModelTypeInstance(SS, CloudType, ParcelType)       \
-                                                                              \
-    defineNamedTemplateTypeNameAndDebug(SS, 0);                               \
-                                                                              \
-    SurfaceReactionModel<CloudType<ParcelType> >::                            \
-        adddictionaryConstructorToTable<SS>                                   \
-            add##SS##CloudType##ParcelType##ConstructorToTable_;
+    SurfaceReactionModel<CloudType<ParcelType<ThermoType> > >::               \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
index 5653c3f9d..ed8615e8c 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.C
@@ -28,6 +28,16 @@ License
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+template<class CloudType>
+Foam::HeatTransferModel<CloudType>::HeatTransferModel(CloudType& owner)
+:
+    dict_(dictionary::null),
+    owner_(owner),
+    coeffDict_(dictionary::null),
+    BirdCorrection_(false)
+{}
+
+
 template<class CloudType>
 Foam::HeatTransferModel<CloudType>::HeatTransferModel
 (
@@ -35,9 +45,11 @@ Foam::HeatTransferModel<CloudType>::HeatTransferModel
     CloudType& owner,
     const word& type
 )
-:   dict_(dict),
+:
+    dict_(dict),
     owner_(owner),
-    coeffDict_(dict.subDict(type + "Coeffs"))
+    coeffDict_(dict.subDict(type + "Coeffs")),
+    BirdCorrection_(coeffDict_.lookup("BirdCorrection"))
 {}
 
 
@@ -72,54 +84,36 @@ const Foam::dictionary& Foam::HeatTransferModel<CloudType>::coeffDict() const
 
 
 template<class CloudType>
-Foam::scalar Foam::HeatTransferModel<CloudType>::h
-(
-    const scalar dp,
-    const vector& Ur,
-    const scalar rhoc,
-    const scalar rhop,
-    const scalar cpc,
-    const scalar cpp,
-    const scalar muc
-) const
+const Foam::Switch& Foam::HeatTransferModel<CloudType>::BirdCorrection() const
 {
-    const scalar Re = rhoc*mag(Ur)*dp/(muc + SMALL);
-
-//    const scalar Pr = muc/alphac;
-    const scalar Pr = this->Pr();
-
-    const scalar Nu = this->Nu(Re, Pr);
-
-    const scalar kappa = cpc*muc/Pr;
-
-    return Nu*kappa/dp;
+    return BirdCorrection_;
 }
 
 
 template<class CloudType>
-Foam::scalar Foam::HeatTransferModel<CloudType>::Cu
+Foam::scalar Foam::HeatTransferModel<CloudType>::htc
 (
     const scalar dp,
-    const vector& Ur,
-    const scalar rhoc,
-    const scalar rhop,
-    const scalar cpc,
-    const scalar cpp,
-    const scalar muc
+    const scalar Re,
+    const scalar Pr,
+    const scalar kappa,
+    const scalar NCpW
 ) const
 {
-    const scalar Re = rhoc*mag(Ur)*dp/(muc + SMALL);
-
-//    const scalar Pr = muc/alphac;
-    const scalar Pr = this->Pr();
-
     const scalar Nu = this->Nu(Re, Pr);
 
-    const scalar kappa = cpc*muc/Pr;
+    scalar htc = Nu*kappa/dp;
 
-    const scalar htc = Nu*kappa/dp;
+    if (BirdCorrection_ && (mag(htc) > ROOTVSMALL) && (mag(NCpW) > ROOTVSMALL))
+    {
+        const scalar phit = min(NCpW/htc, 50);
+        if (phit > 0.001)
+        {
+            htc *= phit/(exp(phit) - 1.0);
+        }
+    }
 
-    return 6.0*htc/(dp*rhop*cpp);
+    return htc;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
index da0b33eda..135253ef6 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/HeatTransferModel.H
@@ -25,7 +25,6 @@ License
 Class
     Foam::HeatTransferModel
 
-
 Description
     Templated heat transfer model class
 
@@ -54,7 +53,6 @@ namespace Foam
 template<class CloudType>
 class HeatTransferModel
 {
-
     // Private data
 
         //- The cloud dictionary
@@ -63,9 +61,12 @@ class HeatTransferModel
         //- Reference to the owner cloud class
         CloudType& owner_;
 
-        //- The coefficents dictionary
+        //- The coefficients dictionary
         const dictionary coeffDict_;
 
+        //- Apply Bird's correction to the htc
+        const Switch BirdCorrection_;
+
 
 public:
 
@@ -88,6 +89,9 @@ public:
 
     // Constructors
 
+        //- Construct null from owner
+        HeatTransferModel(CloudType& owner);
+
         //- Construct from dictionary
         HeatTransferModel
         (
@@ -97,70 +101,56 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~HeatTransferModel();
+    //- Destructor
+    virtual ~HeatTransferModel();
 
 
-    // Selector
-
-        static autoPtr<HeatTransferModel<CloudType> > New
-        (
-            const dictionary& dict,
-            CloudType& owner
-        );
-
-
-    // Access
-
-        //- Return the cloud dictionary
-        const dictionary& dict() const;
-
-        //- Return the coefficients dictionary
-        const dictionary& coeffDict() const;
-
-        //- Return the owner cloud object
-        const CloudType& owner() const;
+    //- Selector
+    static autoPtr<HeatTransferModel<CloudType> > New
+    (
+        const dictionary& dict,
+        CloudType& owner
+    );
 
 
     // Member Functions
 
-        //- Flag to indicate whether model activates heat transfer model
-        virtual bool active() const = 0;
+        // Access
 
-        //- Nusselt number
-        virtual scalar Nu
-        (
-            const scalar Re,
-            const scalar Pr
-        ) const = 0;
+            //- Return the cloud dictionary
+            const dictionary& dict() const;
 
-        //- Prandtl number
-        virtual scalar Pr() const = 0;
+            //- Return the coefficients dictionary
+            const dictionary& coeffDict() const;
 
-        //- Return heat transfer coefficient
-        scalar h
-        (
-            const scalar dp,
-            const vector& Ur,
-            const scalar rhoc,
-            const scalar rhop,
-            const scalar cpc,
-            const scalar cpp,
-            const scalar muc
-        ) const;
+            //- Return the owner cloud object
+            const CloudType& owner() const;
 
-        //- Return linearised coefficient for temperature equation
-        scalar Cu
-        (
-            const scalar dp,
-            const vector& Ur,
-            const scalar rhoc,
-            const scalar rhop,
-            const scalar cpc,
-            const scalar cpp,
-            const scalar muc
-        ) const;
+            //- Return the Bird htc correction flag
+            const Switch& BirdCorrection() const;
+
+            //- Flag to indicate whether model activates heat transfer model
+            virtual bool active() const = 0;
+
+
+        // Evaluation
+
+            //- Nusselt number
+            virtual scalar Nu
+            (
+                const scalar Re,
+                const scalar Pr
+            ) const = 0;
+
+            //- Return heat transfer coefficient
+            virtual scalar htc
+            (
+                const scalar dp,
+                const scalar Re,
+                const scalar Pr,
+                const scalar kappa,
+                const scalar NCpW
+            ) const;
 };
 
 
@@ -190,6 +180,20 @@ public:
             add##SS##CloudType##ParcelType##ConstructorToTable_;
 
 
+#define makeHeatTransferModelThermoType(SS, CloudType, ParcelType, ThermoType)\
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug                                       \
+    (                                                                         \
+        SS<CloudType<ParcelType<ThermoType> > >,                              \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    HeatTransferModel<CloudType<ParcelType<ThermoType> > >::                  \
+        adddictionaryConstructorToTable                                       \
+            <SS<CloudType<ParcelType<ThermoType> > > >                        \
+            add##SS##CloudType##ParcelType##ThermoType##ConstructorToTable_;
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
index 29aa8eee7..55794e6b9 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/HeatTransferModel/NewHeatTransferModel.C
@@ -36,10 +36,7 @@ Foam::HeatTransferModel<CloudType>::New
     CloudType& owner
 )
 {
-    word HeatTransferModelType
-    (
-        dict.lookup("HeatTransferModel")
-    );
+    word HeatTransferModelType(dict.lookup("HeatTransferModel"));
 
     Info<< "Selecting HeatTransferModel " << HeatTransferModelType << endl;
 
@@ -51,12 +48,14 @@ Foam::HeatTransferModel<CloudType>::New
         FatalErrorIn
         (
             "HeatTransferModel<CloudType>::New"
-            "(const dictionary&, CloudType&)"
-        )
-            << "Unknown HeatTransferModelType type "
+            "("
+                "const dictionary&, "
+                "CloudType&"
+            ")"
+        )   << "Unknown HeatTransferModelType type "
             << HeatTransferModelType
             << ", constructor not in hash table" << nl << nl
-            << "    Valid HeatTransferModel types are :" << nl
+            << "    Valid HeatTransferModel types are:" << nl
             << dictionaryConstructorTablePtr_->toc() << exit(FatalError);
     }
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
index 8f4d01b2a..402040cd6 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.C
@@ -31,11 +31,11 @@ License
 template <class CloudType>
 Foam::NoHeatTransfer<CloudType>::NoHeatTransfer
 (
-    const dictionary& dict,
-    CloudType& cloud
+    const dictionary&,
+    CloudType& owner
 )
 :
-    HeatTransferModel<CloudType>(dict, cloud, typeName)
+    HeatTransferModel<CloudType>(owner)
 {}
 
 
@@ -62,11 +62,6 @@ Foam::scalar Foam::NoHeatTransfer<CloudType>::Nu
     const scalar
 ) const
 {
-    notImplemented
-    (
-        "Foam::scalar Foam::NoHeatTransfer<CloudType>::Nu"
-        "(const scalar, const scalar)"
-    );
     return 0.0;
 }
 
@@ -74,8 +69,7 @@ Foam::scalar Foam::NoHeatTransfer<CloudType>::Nu
 template <class CloudType>
 Foam::scalar Foam::NoHeatTransfer<CloudType>::Pr() const
 {
-    notImplemented("Foam::scalar Foam::NoHeatTransfer<CloudType>::Pr()");
-    return 0.0;
+    return 1.0;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
index a8d700d00..6b7a1b9f0 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/NoHeatTransfer/NoHeatTransfer.H
@@ -26,7 +26,7 @@ Class
     Foam::NoHeatTransfer
 
 Description
-    Dummy heat transfer model for 'no heat transfer'
+    Dummy heat transfer model for 'none'
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,8 +39,9 @@ Description
 
 namespace Foam
 {
+
 /*---------------------------------------------------------------------------*\
-                          Class NoHeatTransfer Declaration
+                       Class NoHeatTransfer Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class CloudType>
@@ -48,42 +49,36 @@ class NoHeatTransfer
 :
     public HeatTransferModel<CloudType>
 {
-
 public:
 
     //- Runtime type information
-    TypeName("NoHeatTransfer");
+    TypeName("none");
 
 
     // Constructors
 
         //- Construct from dictionary
-        NoHeatTransfer
-        (
-            const dictionary& dict,
-            CloudType& cloud
-        );
+        NoHeatTransfer(const dictionary&, CloudType& owner);
 
 
-    // Destructor
-
-        ~NoHeatTransfer();
+    //- Destructor
+    virtual ~NoHeatTransfer();
 
 
     // Member Functions
 
         //- Flag to indicate whether model activates heat transfer model
-        bool active() const;
+        virtual bool active() const;
 
         //- Nusselt number
-        scalar Nu
+        virtual scalar Nu
         (
             const scalar,
             const scalar
         ) const;
 
         //- Prandtl number
-        scalar Pr() const;
+        virtual scalar Pr() const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
index 2ae7956f2..8dc355f95 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.C
@@ -24,8 +24,6 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
 #include "RanzMarshall.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -37,8 +35,7 @@ Foam::RanzMarshall<CloudType>::RanzMarshall
     CloudType& cloud
 )
 :
-    HeatTransferModel<CloudType>(dict, cloud, typeName),
-    Pr_(dimensionedScalar(this->coeffDict().lookup("Pr")).value())
+    HeatTransferModel<CloudType>(dict, cloud, typeName)
 {}
 
 
@@ -65,14 +62,7 @@ Foam::scalar Foam::RanzMarshall<CloudType>::Nu
     const scalar Pr
 ) const
 {
-    return 2.0 + 0.6*pow(Re, 1.0/2.0)*pow(Pr, 1.0/3.0);
-}
-
-
-template <class CloudType>
-Foam::scalar Foam::RanzMarshall<CloudType>::Pr() const
-{
-    return Pr_;
+    return 2.0 + 0.6*sqrt(Re)*cbrt(Pr);
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
index 2163024b7..794ff084a 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/HeatTransferModel/RanzMarshall/RanzMarshall.H
@@ -39,8 +39,9 @@ Description
 
 namespace Foam
 {
+
 /*---------------------------------------------------------------------------*\
-                           Class RanzMarshall Declaration
+                         Class RanzMarshall Declaration
 \*---------------------------------------------------------------------------*/
 
 template <class CloudType>
@@ -49,12 +50,6 @@ class RanzMarshall
     public HeatTransferModel<CloudType>
 {
 
-    // Private data
-
-        // Prandtl number
-        const scalar Pr_;
-
-
 public:
 
     //- Runtime type information
@@ -71,25 +66,26 @@ public:
         );
 
 
-    // Destructor
-
-        ~RanzMarshall();
+    //- Destructor
+    virtual ~RanzMarshall();
 
 
     // Member Functions
 
-        //- Flag to indicate whether model activates heat transfer model
-        bool active() const;
+        // Access
 
-        //- Nusselt number
-        scalar Nu
-        (
-            const scalar Re,
-            const scalar Pr
-        ) const;
+            //- Flag to indicate whether model activates heat transfer model
+            virtual bool active() const;
 
-        //- Prandtl number
-        scalar Pr() const;
+
+        // Evaluation
+
+            //- Nusselt number
+            virtual scalar Nu
+            (
+                const scalar Re,
+                const scalar Pr
+            ) const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
new file mode 100644
index 000000000..73d0d4893
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
@@ -0,0 +1,198 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "ThermoLookupTableInjection.H"
+#include "scalarIOList.H"
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::label Foam::ThermoLookupTableInjection<CloudType>::parcelsToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        return round(injectorCells_.size()*(time1 - time0)*nParcelsPerSecond_);
+    }
+    else
+    {
+        return 0;
+    }
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::ThermoLookupTableInjection<CloudType>::volumeToInject
+(
+    const scalar time0,
+    const scalar time1
+) const
+{
+    scalar volume = 0.0;
+    if ((time0 >= 0.0) && (time0 < duration_))
+    {
+        forAll(injectors_, i)
+        {
+            volume += injectors_[i].mDot()/injectors_[i].rho()*(time1 - time0);
+        }
+    }
+
+    return volume;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ThermoLookupTableInjection<CloudType>::ThermoLookupTableInjection
+(
+    const dictionary& dict,
+    CloudType& owner
+)
+:
+    InjectionModel<CloudType>(dict, owner, typeName),
+    inputFileName_(this->coeffDict().lookup("inputFile")),
+    duration_(readScalar(this->coeffDict().lookup("duration"))),
+    nParcelsPerSecond_
+    (
+        readScalar(this->coeffDict().lookup("parcelsPerSecond"))
+    ),
+    injectors_
+    (
+        IOobject
+        (
+            inputFileName_,
+            owner.db().time().constant(),
+            owner.db(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    injectorCells_(0)
+{
+    // Set/cache the injector cells
+    injectorCells_.setSize(injectors_.size());
+    forAll(injectors_, i)
+    {
+        this->findCellAtPosition(injectorCells_[injectorI], injectors_[i].x());
+    }
+
+    // Determine volume of particles to inject
+    this->volumeTotal_ = 0.0;
+    forAll(injectors_, i)
+    {
+        this->volumeTotal_ += injectors_[i].mDot()/injectors_[i].rho();
+    }
+    this->volumeTotal_ *= duration_;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class CloudType>
+Foam::ThermoLookupTableInjection<CloudType>::~ThermoLookupTableInjection()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class CloudType>
+bool Foam::ThermoLookupTableInjection<CloudType>::active() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+Foam::scalar Foam::ThermoLookupTableInjection<CloudType>::timeEnd() const
+{
+    return this->SOI_ + duration_;
+}
+
+
+template<class CloudType>
+void Foam::ThermoLookupTableInjection<CloudType>::setPositionAndCell
+(
+    const label parcelI,
+    const label nParcels,
+    const scalar time,
+    vector& position,
+    label& cellOwner
+)
+{
+    label injectorI = parcelI*injectorCells_.size()/nParcels;
+
+    position = injectors_[injectorI].x();
+    cellOwner = injectorCells_[injectorI];
+}
+
+
+template<class CloudType>
+void Foam::ThermoLookupTableInjection<CloudType>::setProperties
+(
+    const label parcelI,
+    const label nParcels,
+    const scalar,
+    typename CloudType::parcelType* pPtr
+)
+{
+    label injectorI = parcelI*injectorCells_.size()/nParcels;
+
+    // set particle velocity
+    parcel.U() = injectors_[injectorI].U();
+
+    // set particle diameter
+    parcel.d() = injectors_[injectorI].d();
+
+    // set particle density
+    parcel.rho() = injectors_[injectorI].rho();
+
+    // set particle temperature
+    parcel.T() = injectors_[injectorI].T();
+
+    // set particle specific heat capacity
+    parcel.cp() = injectors_[injectorI].cp();
+}
+
+
+template<class CloudType>
+bool Foam::ThermoLookupTableInjection<CloudType>::fullyDescribed() const
+{
+    return true;
+}
+
+
+template<class CloudType>
+bool Foam::ThermoLookupTableInjection<CloudType>::validInjection(const label)
+{
+    return true;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
new file mode 100644
index 000000000..942fdbe7c
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.H
@@ -0,0 +1,186 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::ThermoLookupTableInjection
+
+Description
+    Particle injection sources read from look-up table. Each row corresponds to
+    an injection site.
+
+    (
+        (x y z) (u v w) d rho mDot T cp  // injector 1
+        (x y z) (u v w) d rho mDot T cp  // injector 2
+        ...
+        (x y z) (u v w) d rho mDot T cp  // injector N
+    );
+
+    where:
+        x, y, z = global cartesian co-ordinates [m]
+        u, v, w = global cartesian velocity components [m/s]
+        d       = diameter [m]
+        rho     = density [kg/m3]
+        mDot    = mass flow rate [kg/m3]
+        T       = temperature [K]
+        cp      = specific heat capacity [J/kg/K]
+
+SourceFiles
+    ThermoLookupTableInjection.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ThermoLookupTableInjection_H
+#define ThermoLookupTableInjection_H
+
+#include "InjectionModel.H"
+#include "kinematicParcelInjectionDataIOList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class ThermoLookupTableInjection Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class CloudType>
+class ThermoLookupTableInjection
+:
+    public InjectionModel<CloudType>
+{
+    // Private data
+
+        //- Name of file containing injector/parcel data
+        const word inputFileName_;
+
+        //- Injection duration - common to all injection sources
+        const scalar duration_;
+
+        //- Number of parcels per injector - common to all injection sources
+        const label nParcelsPerSecond_;
+
+        //- List of injectors
+        kinematicParcelInjectionDataIOList injectors_;
+
+        //- List of injector cells per injector
+        List<label> injectorCells_;
+
+
+protected:
+
+    // Protected member functions
+
+        //- Number of parcels to introduce over the time step relative to SOI
+        label parcelsToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+        //- Volume of parcels to introduce over the time step relative to SOI
+        scalar volumeToInject
+        (
+            const scalar time0,
+            const scalar time1
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("ThermoLookupTableInjection");
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        ThermoLookupTableInjection
+        (
+            const dictionary& dict,
+            CloudType& owner
+        );
+
+
+    //- Destructor
+    virtual ~ThermoLookupTableInjection();
+
+
+    // Member Functions
+
+        //- Flag to indicate whether model activates injection model
+        bool active() const;
+
+        //- Return the end-of-injection time
+        scalar timeEnd() const;
+
+
+        // Injection geometry
+
+            //- Set the injection position and owner cell
+            virtual void setPositionAndCell
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                vector& position,
+                label& cellOwner
+            );
+
+            //- Set the parcel properties
+            virtual void setProperties
+            (
+                const label parcelI,
+                const label nParcels,
+                const scalar time,
+                typename CloudType::parcelType& parcel
+            );
+
+            //- Flag to identify whether model fully describes the parcel
+            virtual bool fullyDescribed() const
+            {
+                return true;
+            }
+
+            //- Return flag to identify whether or not injection of parcelI is
+            //  permitted
+            virtual bool validInjection(const label parcelI);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "ThermoLookupTableInjection.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C
new file mode 100644
index 000000000..f9c57f2c5
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.C
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "thermoParcelInjectionData.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(thermoParcelInjectionData, 0);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::thermoParcelInjectionData::thermoParcelInjectionData()
+:
+    kinematicParcelInjectionData(),
+    T_(0.0),
+    cp_(0.0)
+{}
+
+
+Foam::thermoParcelInjectionData::thermoParcelInjectionData
+(
+    const dictionary& dict
+)
+:
+    kinematicParcelInjectionData(dict),
+    T_(readScalar(dict.lookup("T"))),
+    cp_(readScalar(dict.lookup("cp")))
+{}
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::thermoParcelInjectionData::~thermoParcelInjectionData()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.H b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.H
new file mode 100644
index 000000000..7db2e4a46
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionData.H
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::thermoParcelInjectionData
+
+Description
+    Container class to provide injection data for thermodynamic parcels
+
+SourceFiles
+    thermoParcelInjectionData.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef thermoParcelInjectionData_H
+#define thermoParcelInjectionData_H
+
+#include "kinematicParcelInjectionData.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class thermoParcelInjectionData;
+
+// Forward declaration of friend functions
+
+Ostream& operator<<
+(
+    Ostream&,
+    const thermoParcelInjectionData&
+);
+
+Istream& operator>>
+(
+    Istream&,
+    thermoParcelInjectionData&
+);
+
+/*---------------------------------------------------------------------------*\
+                 Class thermoParcelInjectionData Declaration
+\*---------------------------------------------------------------------------*/
+
+class thermoParcelInjectionData
+:
+    public kinematicParcelInjectionData
+{
+protected:
+
+    // Parcel properties
+
+        //- Temperature [K]
+        scalar T_;
+
+        //- Specific heat capacity [J/kg/K]
+        scalar cp_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("thermoParcelInjectionData");
+
+    // Constructors
+
+        //- Null constructor
+        thermoParcelInjectionData();
+
+        //- Construct from dictionary
+        thermoParcelInjectionData(const dictionary& dict);
+
+        //- Construct from Istream
+        thermoParcelInjectionData(Istream& is);
+
+
+    //-Destructor
+    virtual ~thermoParcelInjectionData();
+
+
+    // Access
+
+        //- Return const access to the temperature
+        inline scalar T() const;
+
+        //- Return const access to the specific heat capacity
+        inline scalar cp() const;
+
+
+    // Edit
+
+        //- Return access to the temperature
+        inline scalar& T();
+
+        //- Return access to the specific heat capacity
+        inline scalar& cp();
+
+
+    // I-O
+
+        // Friend Operators
+
+            friend bool operator==
+            (
+                const thermoParcelInjectionData& a,
+                const thermoParcelInjectionData& b
+            )
+            {
+                notImplemented
+                (
+                    "operator=="
+                    "("
+                        "const thermoParcelInjectionData&, "
+                        "const thermoParcelInjectionData&"
+                    ")"
+                );
+
+                return false;
+            }
+
+            friend bool operator!=
+            (
+                const thermoParcelInjectionData& a,
+                const thermoParcelInjectionData& b
+            )
+            {
+                notImplemented
+                (
+                    "operator=="
+                    "("
+                        "const thermoParcelInjectionData&, "
+                        "const thermoParcelInjectionData&"
+                    ")"
+                );
+
+                return false;
+            }
+
+            //- Ostream operator
+            friend Ostream& operator<<
+            (
+                Ostream& os,
+                const thermoParcelInjectionData& data
+            );
+
+            //- Istream operator
+            friend Istream& operator>>
+            (
+                Istream& is,
+                thermoParcelInjectionData& data
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "thermoParcelInjectionDataI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/test/findTimes/findTimes.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataI.H
similarity index 79%
rename from applications/test/findTimes/findTimes.C
rename to src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataI.H
index 9e88981d5..65ba60079 100644
--- a/applications/test/findTimes/findTimes.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataI.H
@@ -22,29 +22,33 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "argList.H"
-#include "Time.H"
-
-using namespace Foam;
+#include "thermoParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main(int argc, char *argv[])
+inline Foam::scalar Foam::thermoParcelInjectionData::T() const
 {
+    return T_;
+}
 
-#   include "setRootCase.H"
-#   include "createTime.H"
 
-    Info<< runTime.times() << endl;
+inline Foam::scalar Foam::thermoParcelInjectionData::cp() const
+{
+    return cp_;
+}
 
-    Info << "End\n" << endl;
 
-    return 0;
+inline Foam::scalar& Foam::thermoParcelInjectionData::T()
+{
+    return T_;
+}
+
+
+inline Foam::scalar& Foam::thermoParcelInjectionData::cp()
+{
+    return cp_;
 }
 
 
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C
new file mode 100644
index 000000000..93bf5dc8d
--- /dev/null
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIO.C
@@ -0,0 +1,77 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "thermoParcelInjectionData.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::thermoParcelInjectionData::thermoParcelInjectionData(Istream& is)
+:
+    kinematicParcelInjectionData(is)
+{
+    is.check("reading T");
+    is >> T_;
+
+    is.check("reading cp");
+    is >> cp_;
+
+    is.check("thermoParcelInjectionData(Istream& is)");
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const thermoParcelInjectionData& data
+)
+{
+    os << static_cast<const kinematicParcelInjectionData&>(data);
+
+    os << data.T_ << data.cp_;
+
+    return os;
+}
+
+
+Foam::Istream& Foam::operator>>(Istream& is, thermoParcelInjectionData& data)
+{
+    is >> static_cast<kinematicParcelInjectionData&>(data);
+
+    is.check("reading T");
+    is >> data.T_;
+
+    is.check("reading cp");
+    is >> data.cp_;
+
+    is.check("operator(Istream&, thermoParcelInjectionData&)");
+
+    return is;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/pTraits/pTraitsTest.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.C
similarity index 87%
rename from applications/test/pTraits/pTraitsTest.C
rename to src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.C
index e6bedacef..724cc82f0 100644
--- a/applications/test/pTraits/pTraitsTest.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.C
@@ -22,25 +22,15 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "IOstreams.H"
-#include "pTraits.H"
-
-using namespace Foam;
+#include "thermoParcelInjectionDataIOList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main()
+namespace Foam
 {
-    Info<< pTraits<scalar>::typeName << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
+    defineTemplateTypeNameAndDebug(IOList<thermoParcelInjectionData>, 0);
 }
 
 
diff --git a/applications/test/HashSet/hashSetTest.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.H
similarity index 78%
rename from applications/test/HashSet/hashSetTest.C
rename to src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.H
index 5c6bbf05f..a3d248ddc 100644
--- a/applications/test/HashSet/hashSetTest.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/thermoParcelInjectionDataIOList.H
@@ -22,35 +22,31 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
+Class
+
 Description
 
+SourceFiles
+    thermoParcelInjectionDataIOList.C
+
 \*---------------------------------------------------------------------------*/
 
-#include "labelHashSet.H"
+#ifndef thermoParcelInjectionDataIOList_H
+#define thermoParcelInjectionDataIOList_H
 
-using namespace Foam;
+#include "IOList.H"
+#include "thermoParcelInjectionData.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main(int argc, char *argv[])
+namespace Foam
 {
-    HashSet<Foam::string> testSet(0);
-
-    testSet.insert("kjhk");
-    testSet.insert("kjhk2");
-
-    Info<< testSet << endl;
-
-    labelHashSet testLabelHashSet(1);
-
-    testLabelHashSet.insert(11);
-    testLabelHashSet.insert(42);
-
-    Info<< testLabelHashSet << endl;
-
-    return 0;
+    typedef IOList<thermoParcelInjectionData>
+        thermoParcelInjectionDataIOList;
 }
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
 
 // ************************************************************************* //
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
index 4f783c758..64d3a61e5 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cloudAbsorptionEmission.H"
@@ -72,7 +70,7 @@ Foam::radiation::cloudAbsorptionEmission::~cloudAbsorptionEmission()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::cloudAbsorptionEmission::aDisp() const
+Foam::radiation::cloudAbsorptionEmission::aDisp(const label) const
 {
     tmp<volScalarField> ta
     (
@@ -107,7 +105,7 @@ Foam::radiation::cloudAbsorptionEmission::aDisp() const
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::cloudAbsorptionEmission::eDisp() const
+Foam::radiation::cloudAbsorptionEmission::eDisp(const label bandI) const
 {
     tmp<volScalarField> te
     (
@@ -132,7 +130,7 @@ Foam::radiation::cloudAbsorptionEmission::eDisp() const
 
 
 Foam::tmp<Foam::volScalarField>
-Foam::radiation::cloudAbsorptionEmission::EDisp() const
+Foam::radiation::cloudAbsorptionEmission::EDisp(const label bandI) const
 {
     tmp<volScalarField> tE
     (
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
index b41ef60d7..ffff5fa3f 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/absorptionEmission/cloudAbsorptionEmission/cloudAbsorptionEmission.H
@@ -53,7 +53,6 @@ class cloudAbsorptionEmission
 :
     public absorptionEmissionModel
 {
-
     // Private data
 
         //- Coefficients dictionary
@@ -72,16 +71,11 @@ public:
     // Constructors
 
         //- Construct from components
-        cloudAbsorptionEmission
-        (
-            const dictionary& dict,
-            const fvMesh& mesh
-        );
+        cloudAbsorptionEmission(const dictionary& dict, const fvMesh& mesh);
 
 
     // Destructor
-
-        ~cloudAbsorptionEmission();
+    virtual ~cloudAbsorptionEmission();
 
 
     // Member Operators
@@ -91,19 +85,19 @@ public:
             // Absorption coefficient
 
                 //- Absorption coefficient for dispersed phase
-                tmp<volScalarField> aDisp() const;
+                virtual tmp<volScalarField> aDisp(const label bandI = 0) const;
 
 
             // Emission coefficient
 
                 //- Emission coefficient for dispersed phase
-                tmp<volScalarField> eDisp() const;
+                virtual tmp<volScalarField> eDisp(const label bandI = 0) const;
 
 
             // Emission contribution
 
                 //- Return emission contribution for dispersed phase
-                tmp<volScalarField> EDisp() const;
+                virtual tmp<volScalarField> EDisp(const label bandI = 0) const;
 };
 
 
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
index 59df5a4d0..116539d1c 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "cloudScatter.H"
diff --git a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
index 1dece1b7d..090d338cf 100644
--- a/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
+++ b/src/lagrangian/intermediate/submodels/addOns/radiation/scatter/cloudScatter/cloudScatter.H
@@ -46,16 +46,13 @@ namespace radiation
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class cloudScatter Declaration
+                         Class cloudScatter Declaration
 \*---------------------------------------------------------------------------*/
 
 class cloudScatter
 :
     public scatterModel
 {
-
-private:
-
     // Private data
 
         //- Absorption model dictionary
@@ -82,14 +79,11 @@ public:
 
 
     // Destructor
-
-        ~cloudScatter();
+    virtual ~cloudScatter();
 
 
     // Member Operators
 
-        // Edit
-
         // Access
 
             //- Return scatter coefficient
diff --git a/src/lagrangian/molecularDynamics/Allwmake b/src/lagrangian/molecularDynamics/Allwmake
new file mode 100755
index 000000000..3f5d397e7
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/Allwmake
@@ -0,0 +1,9 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+set -x
+
+wmake libso potential
+wmake libso molecularMeasurements
+wmake libso molecule
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/Make/files b/src/lagrangian/molecularDynamics/molecularMeasurements/Make/files
new file mode 100644
index 000000000..8450dc836
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/Make/files
@@ -0,0 +1,3 @@
+distribution/distribution.C
+
+LIB = $(FOAM_LIBBIN)/libmolecularMeasurements
diff --git a/applications/test/CompactListList/Make/options b/src/lagrangian/molecularDynamics/molecularMeasurements/Make/options
similarity index 100%
rename from applications/test/CompactListList/Make/options
rename to src/lagrangian/molecularDynamics/molecularMeasurements/Make/options
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
new file mode 100644
index 000000000..70326948f
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.C
@@ -0,0 +1,237 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "bufferedAccumulator.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class Type>
+const char* const
+    Foam::bufferedAccumulator<Type>::typeName("bufferedAccumulator");
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+void Foam::bufferedAccumulator<Type>::accumulateAndResetBuffer(const label b)
+{
+    accumulationBuffer() += (*this)[b];
+
+    averagesTaken_++;
+
+    (*this)[b] = Field<Type>(bufferLength(), pTraits<Type>::zero);
+
+    bufferOffsets_[b] = 0;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::bufferedAccumulator<Type>::bufferedAccumulator()
+:
+    List< Field<Type> >(),
+    averagesTaken_(),
+    bufferOffsets_()
+{}
+
+
+template<class Type>
+Foam::bufferedAccumulator<Type>::bufferedAccumulator
+(
+    const label nBuffers,
+    const label bufferLength,
+    const label bufferingInterval
+)
+:
+    List< Field<Type> >(),
+    averagesTaken_(),
+    bufferOffsets_()
+{
+    setSizes
+    (
+        nBuffers,
+        bufferLength,
+        bufferingInterval
+    );
+}
+
+
+template<class Type>
+Foam::bufferedAccumulator<Type>::bufferedAccumulator
+(
+    const bufferedAccumulator<Type>& bA
+)
+:
+    List< Field<Type> >(static_cast< List< Field<Type> > >(bA)),
+    averagesTaken_(bA.averagesTaken()),
+    bufferOffsets_(bA.bufferOffsets())
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::bufferedAccumulator<Type>::~bufferedAccumulator()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::bufferedAccumulator<Type>::setSizes
+(
+    const label nBuffers,
+    const label bufferLength,
+    const label bufferingInterval
+)
+{
+    (*this).setSize(nBuffers + 1);
+
+    forAll((*this), b)
+    {
+        (*this)[b] = Field<Type>(bufferLength, pTraits<Type>::zero);
+    }
+
+    averagesTaken_ = 0;
+
+    bufferOffsets_.setSize(nBuffers);
+
+    forAll(bufferOffsets_, bO)
+    {
+        bufferOffsets_[bO] = -bufferingInterval * bO - 1;
+    }
+}
+
+
+template<class Type>
+Foam::label Foam::bufferedAccumulator<Type>::addToBuffers
+(
+    const List<Type>& valuesToAdd
+)
+{
+    label bufferToRefill = -1;
+
+    for (label b = 0; b < nBuffers(); b++)
+    {
+        Field<Type>& buf((*this)[b]);
+
+        label& bO = bufferOffsets_[b];
+
+        if (bO >= 0)
+        {
+            buf[bO] = valuesToAdd[b];
+        }
+
+        bO++;
+
+        if (bO == bufferLength())
+        {
+            accumulateAndResetBuffer(b);
+        }
+
+        if (bO == 0)
+        {
+            if (bufferToRefill != -1)
+            {
+                FatalErrorIn("bufferedAccumulator<Type>::addToBuffers ")
+                    << "More than one bufferedAccumulator accumulation "
+                    << "buffer filled at once, this is considered an error."
+                    << abort(FatalError);
+            }
+
+            bufferToRefill = b;
+        }
+    }
+
+    return bufferToRefill;
+}
+
+
+template<class Type>
+Foam::Field<Type> Foam::bufferedAccumulator<Type>::averaged() const
+{
+    if (averagesTaken_)
+    {
+        Field<Type> bA = accumulationBuffer()/averagesTaken_;
+
+        return bA;
+    }
+    else
+    {
+        WarningIn
+        (
+            "bufferedAccumulator<Type>::averagedbufferedAccumulator() const"
+        )   << "Averaged correlation function requested but averagesTaken = "
+            << averagesTaken_
+            << ". Returning empty field."
+            << endl;
+
+        return Field<Type>(bufferLength(), pTraits<Type>::zero);
+    }
+}
+
+
+template<class Type>
+void Foam::bufferedAccumulator<Type>::resetAveraging()
+{
+    accumulationBuffer() = Field<Type>(bufferLength(), pTraits<Type>::zero);
+
+    averagesTaken_ = 0;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::bufferedAccumulator<Type>::operator=
+(
+    const bufferedAccumulator<Type>& rhs
+)
+{
+    // Check for assignment to self
+    if (this == &rhs)
+    {
+        FatalErrorIn
+        (
+            "bufferedAccumulator<Type>::operator=(const bufferedAccumulator&)"
+        )   << "Attempted assignment to self"
+            << abort(FatalError);
+    }
+
+    List< Field<Type> >::operator=(rhs);
+
+    averagesTaken_ = rhs.averagesTaken();
+
+    bufferOffsets_ = rhs.bufferOffsets();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#   include "bufferedAccumulatorIO.C"
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
new file mode 100644
index 000000000..ad7de9acc
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulator.H
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::bufferedAccumulator
+
+Description
+
+SourceFiles
+    bufferedAccumulatorI.H
+    bufferedAccumulator.C
+    bufferedAccumulatorIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef bufferedAccumulator_H
+#define bufferedAccumulator_H
+
+#include "Field.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class Type>
+class bufferedAccumulator;
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const bufferedAccumulator<Type>&
+);
+
+/*---------------------------------------------------------------------------*\
+                      Class bufferedAccumulator Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class bufferedAccumulator
+:
+    public List< Field<Type> >
+{
+    // Private data
+
+        label averagesTaken_;
+
+        List<label> bufferOffsets_;
+
+
+    // Private Member Functions
+
+        inline Field<Type>& accumulationBuffer();
+
+        inline const Field<Type>& accumulationBuffer() const;
+
+        void accumulateAndResetBuffer(const label b);
+
+
+public:
+
+    //- Component type
+    typedef typename pTraits<Type>::cmptType cmptType;
+
+
+    // Static data members
+
+        static const char* const typeName;
+
+
+    // Constructors
+
+        //- Construct null
+        bufferedAccumulator();
+
+        //- Construct from components
+        bufferedAccumulator
+        (
+            const label nBuffers,
+            const label bufferLength,
+            const label bufferingInterval
+        );
+
+        //- Construct as copy
+        bufferedAccumulator(const bufferedAccumulator<Type>&);
+
+
+    // Destructor
+
+        ~bufferedAccumulator();
+
+
+    // Member Functions
+
+        label addToBuffers(const List<Type>& valuesToAdd);
+
+        Field<Type> averaged() const;
+
+        void resetAveraging();
+
+
+        // Access
+
+            inline label averagesTaken() const;
+
+            inline label nBuffers() const;
+
+            inline label bufferLength() const;
+
+            inline const List<label>& bufferOffsets() const;
+
+
+        // Edit
+
+            void setSizes
+            (
+                const label nBuffers,
+                const label bufferLength,
+                const label bufferingInterval
+            );
+
+
+    // Member Operators
+
+        void operator=(const bufferedAccumulator<Type>&);
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<< <Type>
+        (
+            Ostream&,
+            const bufferedAccumulator<Type>&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "bufferedAccumulatorI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "bufferedAccumulator.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
new file mode 100644
index 000000000..1343789a6
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorI.H
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+inline Field<Type>& bufferedAccumulator<Type>::accumulationBuffer()
+{
+    return (*this)[nBuffers()];
+}
+
+
+template<class Type>
+inline const Field<Type>& bufferedAccumulator<Type>::accumulationBuffer() const
+{
+    return (*this)[nBuffers()];
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+inline label bufferedAccumulator<Type>::averagesTaken() const
+{
+    return averagesTaken_;
+}
+
+
+template<class Type>
+inline label bufferedAccumulator<Type>::nBuffers() const
+{
+    return bufferOffsets_.size();
+}
+
+
+template<class Type>
+inline label bufferedAccumulator<Type>::bufferLength() const
+{
+    return (*this)[0].size();
+}
+
+
+template<class Type>
+inline const List<label>& bufferedAccumulator<Type>::bufferOffsets() const
+{
+    return bufferOffsets_;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/test/OStringStream/OStringStreamTest.C b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
similarity index 73%
rename from applications/test/OStringStream/OStringStreamTest.C
rename to src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
index d9b20b500..e91021a04 100644
--- a/applications/test/OStringStream/OStringStreamTest.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/bufferedAccumulator/bufferedAccumulatorIO.C
@@ -22,33 +22,30 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "OStringStream.H"
+#include "bufferedAccumulator.H"
 #include "IOstreams.H"
 
-using namespace Foam;
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main(int argc, char *argv[])
+template<class Type>
+Foam::Ostream&
+Foam::operator<<(Ostream& os, const bufferedAccumulator<Type>& bA)
 {
-    Info<< "khkj" << endl;
 
-    OStringStream testStream;
-    testStream << "hello " << 1 << endl;
-    Info<< testStream.str() << endl;
-    testStream.rewind();
-    Info<< testStream.str() << endl;
-    testStream << "hello " << 2 << endl;
-    Info<< testStream.str() << endl;
+    os  << bA.averagesTaken_
+        << static_cast<const List< Field<Type> >&>(bA)
+        << bA.bufferOffsets();
 
-    Info<< "End\n" << endl;
+    // Check state of Ostream
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<(Foam::Ostream&, "
+        "const Foam::bufferedAccumulator&)"
+    );
 
-    return 0;
+    return os;
 }
 
 
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
new file mode 100644
index 000000000..d7b37af08
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.C
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "correlationFunction.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<class Type>
+const char* const
+    Foam::correlationFunction<Type>::typeName("correlationFunction");
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+void Foam::correlationFunction<Type>::setTimesAndSizes
+(
+    const label tZeroBufferSize
+)
+{
+    sampleSteps_  = ceil(sampleInterval_/mesh_.time().deltaT().value());
+
+    sampleInterval_ = sampleSteps_*mesh_.time().deltaT().value();
+
+    label bufferLength(ceil(duration_/sampleInterval_));
+
+    duration_ = bufferLength*sampleInterval_;
+
+    label bufferingInterval(ceil(averagingInterval_/sampleInterval_));
+
+    averagingInterval_ = bufferingInterval*sampleInterval_;
+
+    label nBuffers(ceil(duration_/averagingInterval_));
+
+    this->setSizes
+    (
+        nBuffers,
+        bufferLength,
+        bufferingInterval
+    );
+
+    tZeroBuffers_ =
+        Field< Field<Type> >
+        (
+            nBuffers,
+            Field<Type>
+            (
+                tZeroBufferSize,
+                pTraits<Type>::zero
+            )
+        );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::correlationFunction<Type>::correlationFunction
+(
+    const polyMesh& mesh,
+    const dictionary& cfDict,
+    const label tZeroBufferSize
+)
+:
+    bufferedAccumulator<scalar>(),
+    mesh_(mesh)
+{
+    duration_ = readScalar(cfDict.lookup("duration"));
+
+    sampleInterval_ = readScalar(cfDict.lookup("sampleInterval"));
+
+    averagingInterval_ = readScalar(cfDict.lookup("averagingInterval"));
+
+    setTimesAndSizes(tZeroBufferSize);
+}
+
+
+template<class Type>
+Foam::correlationFunction<Type>::correlationFunction
+(
+    const polyMesh& mesh,
+    const label tZeroBufferSize,
+    const scalar duration,
+    const scalar sampleInterval,
+    const scalar averagingInterval
+)
+:
+    bufferedAccumulator<scalar>(),
+    mesh_(mesh),
+    duration_(duration),
+    sampleInterval_(sampleInterval),
+    averagingInterval_(averagingInterval)
+{
+    setTimesAndSizes(tZeroBufferSize);
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class Type>
+Foam::correlationFunction<Type>::~correlationFunction()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void Foam::correlationFunction<Type>::calculateCorrelationFunction
+(
+    const Field<Type>& currentValues
+)
+{
+    if (measurandFieldSize() != currentValues.size())
+    {
+        FatalErrorIn("correlationFunction<Type>::calculateCorrelationFunction")
+            << "Trying to supply a Field of length"
+            << currentValues.size()
+            << " to calculate the correlation function. "
+            << "Expecting a Field of length "
+            << measurandFieldSize() << nl
+            << abort(FatalError);
+    }
+
+    List<scalar> cFSums(nBuffers(),0.0);
+
+    forAll(tZeroBuffers_, tZB)
+    {
+        scalar& cFSum = cFSums[tZB];
+
+        const Field<Type>& tZeroBuffer = tZeroBuffers_[tZB];
+
+        forAll(currentValues, cV)
+        {
+            const Type& tZeroBufferValue = tZeroBuffer[cV];
+
+            const Type& currentValue = currentValues[cV];
+
+            forAll(currentValue, component)
+            {
+                cFSum +=
+                (
+                    tZeroBufferValue[component]*currentValue[component]
+                );
+            }
+        }
+
+        cFSum /= (measurandFieldSize()*currentValues[0].size());
+    }
+
+    label bufferToRefill = addToBuffers(cFSums);
+
+    if (bufferToRefill != -1)
+    {
+        tZeroBuffers_[bufferToRefill] = currentValues;
+    }
+}
+
+
+template<class Type>
+void Foam::correlationFunction<Type>::calculateCorrelationFunction
+(
+    const Type& currentValue
+)
+{
+    if( measurandFieldSize() != 1)
+    {
+        FatalErrorIn("correlationFunction<Type>::calculateCorrelationFunction")
+            << "Trying to supply a single value to calculate the correlation "
+            << "function.  Expecting a Field of length "
+            << measurandFieldSize()
+            << abort(FatalError);
+    }
+
+    calculateCorrelationFunction(Field<Type>(1, currentValue));
+}
+
+
+template<class Type>
+Foam::scalar Foam::correlationFunction<Type>::integral() const
+{
+    Field<scalar> averageCF(averaged());
+
+    scalar cFIntegral = 0.0;
+
+    for (label v = 0; v < averageCF.size() - 1; v++)
+    {
+        cFIntegral +=
+            0.5
+           *sampleInterval_
+           *(averageCF[v+1] + averageCF[v]);
+    }
+
+    return cFIntegral;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#   include "correlationFunctionIO.C"
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
new file mode 100644
index 000000000..6ef180bf8
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunction.H
@@ -0,0 +1,183 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::correlationFunction
+
+Description
+
+SourceFiles
+    correlationFunctionI.H
+    correlationFunction.C
+    correlationFunctionIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef correlationFunction_H
+#define correlationFunction_H
+
+#include "bufferedAccumulator.H"
+#include "dictionary.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+template<class Type>
+class correlationFunction;
+
+template<class Type>
+Ostream& operator<<
+(
+    Ostream&,
+    const correlationFunction<Type>&
+);
+
+/*---------------------------------------------------------------------------*\
+                    Class correlationFunction Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class correlationFunction
+:
+    public bufferedAccumulator<scalar>
+{
+    // Private data
+
+        const polyMesh& mesh_;
+
+        Field< Field<Type> > tZeroBuffers_;
+
+        scalar duration_;
+        scalar sampleInterval_;
+        scalar averagingInterval_;
+
+        label sampleSteps_;
+
+
+    // Private Member Functions
+
+        void setTimesAndSizes(const label);
+
+        //- Disallow default bitwise copy construct
+        correlationFunction(const correlationFunction<Type>&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const correlationFunction<Type>&);
+
+
+public:
+
+    //- Component type
+    typedef typename pTraits<Type>::cmptType cmptType;
+
+
+    // Static data members
+
+        static const char* const typeName;
+
+
+    // Constructors
+
+        //- Construct from dictionary
+        correlationFunction
+        (
+            const polyMesh&,
+            const dictionary&,
+            const label tZeroBufferSize
+        );
+
+        //- Construct from components
+        correlationFunction
+        (
+            const polyMesh&,
+            const label tZeroBufferSize,
+            const scalar duration,
+            const scalar sampleInterval,
+            const scalar averagingInterval
+
+        );
+
+
+    // Destructor
+
+        ~correlationFunction();
+
+
+    // Member Functions
+
+        void calculateCorrelationFunction(const Field<Type>&);
+
+        void calculateCorrelationFunction(const Type&);
+
+        scalar integral() const;
+
+        bool writeAveraged(Ostream&) const;
+
+
+    // Access
+
+        inline const Field< Field<Type> >& tZeroBuffers() const;
+
+        inline scalar duration() const;
+
+        inline scalar sampleInterval() const;
+
+        inline scalar averagingInterval() const;
+
+        inline label sampleSteps() const;
+
+        inline label measurandFieldSize() const;
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<< <Type>
+        (
+            Ostream&,
+            const correlationFunction<Type>&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "correlationFunctionI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "correlationFunction.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H
new file mode 100644
index 000000000..d7cec1aa9
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionI.H
@@ -0,0 +1,70 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+inline const Foam::Field< Foam::Field<Type> >&
+Foam::correlationFunction<Type>::tZeroBuffers() const
+{
+    return tZeroBuffers_;
+}
+
+
+template<class Type>
+inline Foam::scalar Foam::correlationFunction<Type>::duration() const
+{
+    return duration_;
+}
+
+
+template<class Type>
+inline Foam::scalar Foam::correlationFunction<Type>::sampleInterval() const
+{
+    return sampleInterval_;
+}
+
+
+template<class Type>
+inline Foam::scalar Foam::correlationFunction<Type>::averagingInterval() const
+{
+    return averagingInterval_;
+}
+
+
+template<class Type>
+inline Foam::label Foam::correlationFunction<Type>::sampleSteps() const
+{
+    return sampleSteps_;
+}
+
+
+template<class Type>
+inline Foam::label Foam::correlationFunction<Type>::measurandFieldSize() const
+{
+    return tZeroBuffers_[0].size();
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/delete/deleteTest.C b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C
similarity index 61%
rename from applications/test/delete/deleteTest.C
rename to src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C
index af78ad3bd..c59d759a9 100644
--- a/applications/test/delete/deleteTest.C
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/correlationFunction/correlationFunctionIO.C
@@ -22,43 +22,51 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Application
-    
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "string.H"
+#include "correlationFunction.H"
 #include "IOstreams.H"
 
-using namespace Foam;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
-
-int main()
+template<class Type>
+bool Foam::correlationFunction<Type>::writeAveraged(Ostream& os) const
 {
-    string a("a"), b("b"), c("c"), d("d"), e("e"), f("f"), g("g"), h("h"), i("i"), j("j");
-
-    Info<< "1) a = b + c + d + e + f + g;\n";
-    a = b + c + d + e + f + g;
-    Info<< a << endl;
+    Field<scalar> averageCF(averaged());
 
+    forAll(averageCF, v)
     {
-        Info<< "2) a = e + f + g;\n";
-        a = e + f + g;
-        Info<< a << endl;
+        os  << v*sampleInterval()
+            << token::SPACE
+            << averageCF[v]
+            << nl;
     }
 
-    Info<< "3) a = h + i + j;\n";
-    a = h + i + j;
-    Info<< a << endl;
+    return os.good();
+}
 
-    Info<< "end" << endl;
 
-    return 0;
+template<class Type>
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const correlationFunction<Type>& cF
+)
+{
+    os  << cF.duration()
+        << nl << cF.sampleInterval()
+        << nl << cF.averagingInterval()
+        << nl << cF.sampleSteps()
+        << nl << cF.tZeroBuffers()
+        << nl << static_cast<const bufferedAccumulator<scalar>&>(cF);
+
+    // Check state of Ostream
+    os.check
+    (
+        "Foam::Ostream& Foam::operator<<"
+        "(Ostream&, const correlationFunction<Type>&)"
+    );
+
+    return os;
 }
 
 
 // ************************************************************************* //
-
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
new file mode 100644
index 000000000..1e1c1bdd9
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.C
@@ -0,0 +1,447 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*----------------------------------------------------------------------------*/
+
+#include "distribution.H"
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+distribution::distribution()
+:
+    Map<label>(),
+    binWidth_(1)
+{}
+
+
+distribution::distribution(const scalar binWidth)
+:
+    Map<label>(),
+    binWidth_(binWidth)
+{}
+
+
+distribution::distribution(const distribution& d)
+:
+    Map<label>(static_cast< Map<label> >(d)),
+    binWidth_(d.binWidth())
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+distribution::~distribution()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+label distribution::totalEntries() const
+{
+    label sumOfEntries = 0;
+
+    forAllConstIter(Map<label>, *this, iter)
+    {
+        sumOfEntries += iter();
+
+        if (sumOfEntries < 0)
+        {
+            WarningIn("label distribution::totalEntries()")
+                << "Accumulated distribution values total has become negative: "
+                << "sumOfEntries = " << sumOfEntries
+                << ". This is most likely to be because too many samples "
+                << "have been added to the bins and the label has 'rolled "
+                << "round'. Try distribution::approxTotalEntries which "
+                << "returns a scalar." << endl;
+
+            sumOfEntries = -1;
+
+            break;
+        }
+    }
+
+    return sumOfEntries;
+}
+
+
+scalar distribution::approxTotalEntries() const
+{
+    scalar sumOfEntries = 0;
+
+    forAllConstIter(Map<label>, *this, iter)
+    {
+        sumOfEntries += scalar(iter());
+    }
+
+    return sumOfEntries;
+}
+
+
+scalar distribution::mean() const
+{
+    scalar runningSum = 0;
+
+    scalar totEnt = approxTotalEntries();
+
+    List<label> keys = toc();
+
+    forAll(keys,k)
+    {
+        label key = keys[k];
+
+        runningSum +=
+            (0.5 + scalar(key))
+           *binWidth_
+           *scalar((*this)[key])
+           /totEnt;
+    }
+
+    return runningSum;
+}
+
+
+scalar distribution::median()
+{
+    // From:
+    // http://mathworld.wolfram.com/StatisticalMedian.html
+    // The statistical median is the value of the distribution variable
+    // where the cumulative distribution = 0.5.
+
+    scalar median = 0.0;
+
+    scalar runningSum = 0.0;
+
+    List<Pair<scalar> > normDist(normalised());
+
+    if (normDist.size())
+    {
+        if (normDist.size() == 1)
+        {
+            median = normDist[0].first();
+        }
+        else if
+        (
+            normDist.size() > 1
+         && normDist[0].second()*binWidth_ > 0.5
+        )
+        {
+            scalar xk = normDist[1].first();
+            scalar xkm1 = normDist[0].first();
+            scalar Sk =
+                (normDist[0].second() + normDist[1].second())*binWidth_;
+            scalar Skm1 = normDist[0].second()*binWidth_;
+
+            median = (0.5 - Skm1)*(xk - xkm1)/(Sk - Skm1) + xkm1;
+        }
+        else
+        {
+            label lastNonZeroIndex = 0;
+
+            forAll(normDist,nD)
+            {
+                if (runningSum + (normDist[nD].second()*binWidth_) > 0.5)
+                {
+                    scalar xk = normDist[nD].first();
+                    scalar xkm1 = normDist[lastNonZeroIndex].first();
+                    scalar Sk = runningSum + (normDist[nD].second()*binWidth_);
+                    scalar Skm1 = runningSum;
+
+                    median = (0.5 - Skm1)*(xk - xkm1)/(Sk - Skm1) + xkm1;
+
+                    break;
+                }
+                else if (normDist[nD].second() > 0.0)
+                {
+                    runningSum += normDist[nD].second()*binWidth_;
+
+                    lastNonZeroIndex = nD;
+                }
+            }
+        }
+    }
+
+    return median;
+}
+
+
+void distribution::add(const scalar valueToAdd)
+{
+    iterator iter(this->begin());
+
+    label n = label(valueToAdd/binWidth_) - label(neg(valueToAdd/binWidth_));
+
+    iter = find(n);
+
+    if (iter == this->end())
+    {
+        this->insert(n,1);
+    }
+    else
+    {
+        (*this)[n]++;
+    }
+
+    if ((*this)[n] < 0)
+    {
+        FatalErrorIn("distribution::add(const scalar valueToAdd)")
+            << "Accumulated distribution value has become negative: "
+            << "bin = " << (0.5 + scalar(n)) * binWidth_
+            << ", value = " << (*this)[n]
+            << ". This is most likely to be because too many samples "
+            << "have been added to a bin and the label has 'rolled round'"
+            << abort(FatalError);
+    }
+}
+
+
+void distribution::add(const label valueToAdd)
+{
+    add(scalar(valueToAdd));
+}
+
+
+void distribution::insertMissingKeys()
+{
+    iterator iter(this->begin());
+
+    List<label> keys = toc();
+
+    sort(keys);
+
+    if (keys.size())
+    {
+        for (label k = keys[0]; k < keys[keys.size()-1]; k++)
+        {
+            iter = find(k);
+
+            if (iter == this->end())
+            {
+                this->insert(k,0);
+            }
+        }
+    }
+}
+
+
+List< Pair<scalar> > distribution::normalised()
+{
+    scalar totEnt = approxTotalEntries();
+
+    insertMissingKeys();
+
+    List<label> keys = toc();
+
+    sort(keys);
+
+    List<Pair<scalar> > normDist(size());
+
+    forAll(keys,k)
+    {
+        label key = keys[k];
+
+        normDist[k].first() = (0.5 + scalar(key))*binWidth_;
+
+        normDist[k].second() = scalar((*this)[key])/totEnt/binWidth_;
+    }
+
+    return normDist;
+}
+
+
+List< Pair<scalar> > distribution::normalisedMinusMean()
+{
+    return normalisedShifted(mean());
+}
+
+
+List< Pair<scalar> > distribution::normalisedShifted(const scalar shiftValue)
+{
+    List<Pair<scalar> > oldDist(normalised());
+
+    List<Pair<scalar> > newDist(oldDist.size());
+
+    forAll(oldDist,u)
+    {
+        oldDist[u].first() -= shiftValue;
+    }
+
+    scalar lowestOldBin = oldDist[0].first()/binWidth_ - 0.5;
+
+    label lowestNewKey = label
+    (
+        lowestOldBin + 0.5*sign(lowestOldBin)
+    );
+
+    scalar interpolationStartDirection =
+        sign(scalar(lowestNewKey) - lowestOldBin);
+
+    label newKey = lowestNewKey;
+
+//     Info << shiftValue
+//         << nl << lowestOldBin
+//         << nl << lowestNewKey
+//         << nl << interpolationStartDirection
+//         << endl;
+
+//     scalar checkNormalisation = 0;
+
+//     forAll (oldDist, oD)
+//     {
+//         checkNormalisation += oldDist[oD].second()*binWidth_;
+//     }
+
+//     Info << "Initial normalisation = " << checkNormalisation << endl;
+
+    forAll(oldDist,u)
+    {
+        newDist[u].first() = (0.5 + scalar(newKey)) * binWidth_;
+
+        if (interpolationStartDirection < 0)
+        {
+            if (u == 0)
+            {
+                newDist[u].second() =
+                    (0.5 + scalar(newKey))*oldDist[u].second()
+                  - oldDist[u].second()
+                        *(oldDist[u].first() - binWidth_)/ binWidth_;
+            }
+            else
+            {
+                newDist[u].second() =
+                    (0.5 + scalar(newKey))
+                   *(oldDist[u].second() - oldDist[u-1].second())
+                  +
+                    (
+                        oldDist[u-1].second()*oldDist[u].first()
+                      - oldDist[u].second()*oldDist[u-1].first()
+                    )
+                    /binWidth_;
+            }
+        }
+        else
+        {
+            if (u == oldDist.size() - 1)
+            {
+                newDist[u].second() =
+                    (0.5 + scalar(newKey))*-oldDist[u].second()
+                  + oldDist[u].second()*(oldDist[u].first() + binWidth_)
+                   /binWidth_;
+            }
+            else
+            {
+                newDist[u].second() =
+                    (0.5 + scalar(newKey))
+                   *(oldDist[u+1].second() - oldDist[u].second())
+                  +
+                    (
+                        oldDist[u].second()*oldDist[u+1].first()
+                      - oldDist[u+1].second()*oldDist[u].first()
+                    )
+                   /binWidth_;
+            }
+        }
+
+        newKey++;
+    }
+
+//     checkNormalisation = 0;
+
+//     forAll (newDist, nD)
+//     {
+//         checkNormalisation += newDist[nD].second()*binWidth_;
+//     }
+
+//     Info << "Shifted normalisation = " << checkNormalisation << endl;
+
+    return newDist;
+}
+
+
+List<Pair<scalar> > distribution::raw()
+{
+    insertMissingKeys();
+
+    List<label> keys = toc();
+
+    sort(keys);
+
+    List<Pair<scalar> > rawDist(size());
+
+    forAll(keys,k)
+    {
+        label key = keys[k];
+
+        rawDist[k].first() = (0.5 + scalar(key))*binWidth_;
+
+        rawDist[k].second() = scalar((*this)[key]);
+    }
+
+    return rawDist;
+}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void distribution::operator=(const distribution& rhs)
+{
+    // Check for assignment to self
+    if (this == &rhs)
+    {
+        FatalErrorIn("distribution::operator=(const distribution&)")
+            << "Attempted assignment to self"
+            << abort(FatalError);
+    }
+
+    Map<label>::operator=(rhs);
+
+    binWidth_ = rhs.binWidth();
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+Ostream& operator<<(Ostream& os, const distribution& d)
+{
+    os  << d.binWidth_
+        << static_cast<const Map<label>&>(d);
+
+    // Check state of Ostream
+    os.check
+    (
+        "Ostream& operator<<(Ostream&, "
+        "const distribution&)"
+    );
+
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
new file mode 100644
index 000000000..eb57047c1
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distribution.H
@@ -0,0 +1,133 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::distribution
+
+Description
+
+SourceFiles
+    distributionI.H
+    distribution.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef distribution_H
+#define distribution_H
+
+#include "Map.H"
+#include "Pair.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class distribution Declaration
+\*---------------------------------------------------------------------------*/
+
+class distribution
+:
+    public Map<label>
+{
+    // Private data
+
+        scalar binWidth_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        distribution();
+
+        //- Construct from binWidth
+        distribution(const scalar binWidth);
+
+        //- Construct as copy
+        distribution(const distribution&);
+
+
+    // Destructor
+
+        ~distribution();
+
+
+    // Member Functions
+
+        label totalEntries() const;
+
+        scalar approxTotalEntries() const;
+
+        scalar mean() const;
+
+        scalar median();
+
+        //- Add a value to the appropriate bin of the distribution.
+        void add(const scalar valueToAdd);
+
+        void add(const label valueToAdd);
+
+        void insertMissingKeys();
+
+        List<Pair<scalar> > normalised();
+
+        List<Pair<scalar> > normalisedMinusMean();
+
+        List<Pair<scalar> > normalisedShifted(const scalar shiftValue);
+
+        List<Pair<scalar> > raw();
+
+
+        // Access
+
+            inline scalar binWidth() const;
+
+
+    // Member Operators
+
+        void operator=(const distribution&);
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<<(Ostream&, const distribution&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "distributionI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distributionI.H b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distributionI.H
new file mode 100644
index 000000000..4939741b6
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecularMeasurements/distribution/distributionI.H
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::scalar Foam::distribution::binWidth() const
+{
+    return binWidth_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/Make/files b/src/lagrangian/molecularDynamics/molecule/Make/files
old mode 100755
new mode 100644
index 0bb1acc49..b7a6935bc
--- a/src/lagrangian/molecularDynamics/molecule/Make/files
+++ b/src/lagrangian/molecularDynamics/molecule/Make/files
@@ -1,47 +1,27 @@
-correlationFunction = correlationFunction
+interactionLists = interactionLists
+referredMolecule = $(interactionLists)/referredMolecule
+referredCellList = $(interactionLists)/referredCellList
+referredCell = $(interactionLists)/referredCell
+referralLists = $(interactionLists)/referralLists
+directInteractionList = $(interactionLists)/directInteractionList
 
-distribution = distribution
-
-molecule = molecule
-moleculeCloud = moleculeCloud
-
-reducedUnits = reducedUnits
-
-referredMolecule = referredMolecule
-referredCellList = referredCellList
-referredCell = referredCell
-referralLists = referralLists
-$(distribution)/distribution.C
-
-$(reducedUnits)/reducedUnits.C
-$(reducedUnits)/reducedUnitsIO.C
-
-$(molecule)/molecule.C
-$(molecule)/moleculeIO.C
-
-$(moleculeCloud)/moleculeCloud.C
-$(moleculeCloud)/moleculeCloudBuildCellOccupancy.C
-$(moleculeCloud)/moleculeCloudBuildCellInteractionLists.C
-$(moleculeCloud)/moleculeCloudBuildCellReferralLists.C
-
-$(moleculeCloud)/moleculeCloudTestEdgeEdgeDistance.C
-$(moleculeCloud)/moleculeCloudTestPointFaceDistance.C
-$(moleculeCloud)/moleculeCloudRealCellsInRangeOfSegment.C
-$(moleculeCloud)/moleculeCloudReferredCellsInRangeOfSegment.C
-
-$(moleculeCloud)/moleculeCloudCalculateForce.C
-$(moleculeCloud)/moleculeCloudCalculatePairForce.C
-$(moleculeCloud)/moleculeCloudCalculateTetherForce.C
-$(moleculeCloud)/moleculeCloudCalculateExternalForce.C
-$(moleculeCloud)/moleculeCloudIntegrateEquationsOfMotion.C
-$(moleculeCloud)/moleculeCloudRemoveHighEnergyOverlaps.C
-$(moleculeCloud)/moleculeCloudApplyConstraintsAndThermostats.C
-
-$(referralLists)/receivingReferralList.C
 $(referralLists)/sendingReferralList.C
+$(referralLists)/receivingReferralList.C
 $(referredCellList)/referredCellList.C
 $(referredCell)/referredCell.C
 $(referredMolecule)/referredMolecule.C
+$(directInteractionList)/directInteractionList.C
+$(interactionLists)/interactionLists.C
+
+reducedUnits = reducedUnits
+$(reducedUnits)/reducedUnits.C
+$(reducedUnits)/reducedUnitsIO.C
+
+molecule = molecule
+$(molecule)/molecule.C
+$(molecule)/moleculeIO.C
+
+moleculeCloud = moleculeCloud
+$(moleculeCloud)/moleculeCloud.C
 
 LIB = $(FOAM_LIBBIN)/libmolecule
-
diff --git a/src/lagrangian/molecularDynamics/molecule/Make/options b/src/lagrangian/molecularDynamics/molecule/Make/options
old mode 100755
new mode 100644
index cc91fd4bb..620e87e13
--- a/src/lagrangian/molecularDynamics/molecule/Make/options
+++ b/src/lagrangian/molecularDynamics/molecule/Make/options
@@ -1,10 +1,12 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/lagrangian/basic/lnInclude \
-    -I$(LIB_SRC)/lagrangian/molecularDynamics/potential/lnInclude
+    -I$(LIB_SRC)/lagrangian/molecularDynamics/potential/lnInclude \
+    -I$(LIB_SRC)/lagrangian/molecularDynamics/molecularMeasurements/lnInclude
 
 EXE_LIBS = \
     -lfiniteVolume \
     -llagrangian \
-    -lpotential
+    -lpotential \
+	-lmolecularMeasurements
 
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
new file mode 100644
index 000000000..364d038d6
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.C
@@ -0,0 +1,347 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "directInteractionList.H"
+#include "interactionLists.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::directInteractionList::buildDirectInteractionList
+(
+    bool pointPointListBuild
+)
+{
+    Info<< nl << "Building list of direct interaction neighbours" << endl;
+
+    const polyMesh& mesh(il_.mesh());
+
+    List<DynamicList<label> > directInteractionList(mesh.nCells());
+
+    if (pointPointListBuild)
+    {
+        Info<< tab << "Point-Point direct interaction list build." << endl;
+
+        label pointJIndex;
+
+        forAll (mesh.points(), pointIIndex)
+        {
+            for
+            (
+                pointJIndex = pointIIndex;
+                pointJIndex != mesh.points().size();
+                ++pointJIndex
+            )
+            {
+                if (il_.testPointPointDistance(pointIIndex, pointJIndex))
+                {
+                    const labelList& ptICells
+                    (
+                        mesh.pointCells()[pointIIndex]
+                    );
+
+                    const labelList& ptJCells
+                    (
+                        mesh.pointCells()[pointJIndex]
+                    );
+
+                    forAll(ptICells, pIC)
+                    {
+                        const label cellI(ptICells[pIC]);
+
+                        forAll(ptJCells, pJC)
+                        {
+                            const label cellJ(ptJCells[pJC]);
+
+                            if (cellJ > cellI)
+                            {
+                                if
+                                (
+                                    findIndex
+                                    (
+                                        directInteractionList[cellI],
+                                        cellJ
+                                    )
+                                 == -1
+                                )
+                                {
+                                    directInteractionList[cellI].append(cellJ);
+                                }
+                            }
+
+                            if (cellI > cellJ)
+                            {
+                                if
+                                (
+                                    findIndex
+                                    (
+                                        directInteractionList[cellJ],
+                                        cellI
+                                    )
+                                 ==
+                                    -1
+                                )
+                                {
+                                    directInteractionList[cellJ].append(cellI);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    else
+    {
+        Info<< tab << "Point-Face, Edge-Edge direct interaction list build."
+            << endl;
+
+        forAll(mesh.points(), p)
+        {
+            forAll(mesh.faces(), f)
+            {
+                if (il_.testPointFaceDistance(p, f))
+                {
+                    const labelList& pCells(mesh.pointCells()[p]);
+
+                    const label cellO(mesh.faceOwner()[f]);
+
+                    forAll(pCells, pC)
+                    {
+                        const label cellI(pCells[pC]);
+
+                        // cells are not added to their own DIL
+
+                        if (cellO > cellI)
+                        {
+                            if
+                            (
+                                findIndex
+                                (
+                                    directInteractionList[cellI],
+                                    cellO
+                                )
+                             ==
+                                -1
+                            )
+                            {
+                                directInteractionList[cellI].append(cellO);
+                            }
+                        }
+
+                        if (cellI > cellO)
+                        {
+                            if
+                            (
+                                findIndex
+                                (
+                                    directInteractionList[cellO],
+                                    cellI
+                                )
+                             ==
+                                -1
+                            )
+                            {
+                                directInteractionList[cellO].append(cellI);
+                            }
+                        }
+
+                        if (mesh.isInternalFace(f))
+                        {
+                            // boundary faces will not have neighbour
+                            // information
+
+                            const label cellN(mesh.faceNeighbour()[f]);
+
+                            if (cellN > cellI)
+                            {
+                                if
+                                (
+                                    findIndex
+                                    (
+                                        directInteractionList[cellI],
+                                        cellN
+                                    )
+                                 ==
+                                    -1
+                                )
+                                {
+                                    directInteractionList[cellI].append(cellN);
+                                }
+                            }
+
+                            if (cellI > cellN)
+                            {
+                                if
+                                (
+                                    findIndex
+                                    (
+                                        directInteractionList[cellN],
+                                        cellI
+                                    )
+                                 ==
+                                    -1
+                                )
+                                {
+                                    directInteractionList[cellN].append(cellI);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        label edgeJIndex;
+
+        forAll(mesh.edges(), edgeIIndex)
+        {
+            const edge& eI(mesh.edges()[edgeIIndex]);
+
+            for
+            (
+                edgeJIndex = edgeIIndex + 1;
+                edgeJIndex != mesh.edges().size();
+                ++edgeJIndex
+            )
+            {
+                const edge& eJ(mesh.edges()[edgeJIndex]);
+
+                if (il_.testEdgeEdgeDistance(eI, eJ))
+                {
+                    const labelList& eICells(mesh.edgeCells()[edgeIIndex]);
+
+                    const labelList& eJCells(mesh.edgeCells()[edgeJIndex]);
+
+                    forAll(eICells, eIC)
+                    {
+                        const label cellI(eICells[eIC]);
+
+                        forAll(eJCells, eJC)
+                        {
+                            const label cellJ(eJCells[eJC]);
+
+                            if (cellJ > cellI)
+                            {
+                                if
+                                (
+                                    findIndex
+                                    (
+                                        directInteractionList[cellI],
+                                        cellJ
+                                    )
+                                 ==
+                                    -1
+                                )
+                                {
+                                    directInteractionList[cellI].append(cellJ);
+                                }
+                            }
+
+                            if (cellI > cellJ)
+                            {
+                                if
+                                (
+                                    findIndex
+                                    (
+                                        directInteractionList[cellJ],
+                                        cellI
+                                    )
+                                 ==
+                                    -1
+                                )
+                                {
+                                    directInteractionList[cellJ].append(cellI);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+
+    forAll(directInteractionList, transDIL)
+    {
+        (*this)[transDIL].transfer
+        (
+            directInteractionList[transDIL].shrink()
+        );
+    }
+
+    // sorting DILs
+
+    forAll((*this), dIL)
+    {
+        sort((*this)[dIL]);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::directInteractionList::directInteractionList
+(
+    const interactionLists& il,
+    bool pointPointListBuild
+)
+:
+    labelListList(il.mesh().nCells()),
+    il_(il)
+{
+    if ((*this).size() > 1)
+    {
+        buildDirectInteractionList(pointPointListBuild);
+    }
+    else if ((*this).size() == 1)
+    {
+        Info<< nl
+            << "Single cell mesh, no direct interaction lists required."
+            << endl;
+
+        (*this)[0].setSize(0);
+    }
+}
+
+
+Foam::directInteractionList::directInteractionList
+(
+    const interactionLists& il
+)
+:
+    labelListList(il.mesh().nCells()),
+    il_(il)
+{
+    Info<< "Read directInteractionList from disk not implemented" << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::directInteractionList::~directInteractionList()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H
new file mode 100644
index 000000000..1d8c9dbb8
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionList.H
@@ -0,0 +1,126 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::directInteractionList
+
+Description
+
+SourceFiles
+    directInteractionListI.H
+    directInteractionList.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef directInteractionList_H
+#define directInteractionList_H
+
+#include "polyMesh.H"
+#include "List.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class interactionLists;
+
+/*---------------------------------------------------------------------------*\
+                           Class directInteractionList Declaration
+\*---------------------------------------------------------------------------*/
+
+class directInteractionList
+:
+    public labelListList
+{
+    // Private data
+
+        const interactionLists& il_;
+
+
+    // Private Member Functions
+
+        void buildDirectInteractionList
+        (
+            bool pointPointListBuild
+        );
+
+        //- Disallow default bitwise copy construct
+        directInteractionList(const directInteractionList&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const directInteractionList&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct lists by searching the mesh
+        directInteractionList
+        (
+            const interactionLists& il,
+            bool pointPointListBuild
+        );
+
+        //- Construct from file
+        directInteractionList
+        (
+            const interactionLists& il
+        );
+
+
+    // Destructor
+
+        ~directInteractionList();
+
+
+    // Member Functions
+
+        // Access
+
+        inline const interactionLists& il() const;
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream&, directInteractionList&);
+        friend Ostream& operator<<(Ostream&, const directInteractionList&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "directInteractionListI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionListI.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionListI.H
new file mode 100644
index 000000000..f21f94b41
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/directInteractionList/directInteractionListI.H
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline const Foam::interactionLists& Foam::directInteractionList::il() const
+{
+    return il_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
new file mode 100644
index 000000000..a3fb01ec9
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.C
@@ -0,0 +1,683 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "interactionLists.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+Foam::scalar Foam::interactionLists::transTol = 1e-12;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::interactionLists::buildCellReferralLists()
+{
+    Info<< nl << "Determining molecule referring schedule" << endl;
+
+    const referredCellList& refIntL(ril());
+
+    DynamicList<label> referralProcs;
+
+    // Run through all referredCells to build list of interacting processors
+
+    forAll(refIntL, rIL)
+    {
+        const referredCell& rC(refIntL[rIL]);
+
+        if (findIndex(referralProcs, rC.sourceProc()) == -1)
+        {
+            referralProcs.append(rC.sourceProc());
+        }
+    }
+
+    referralProcs.shrink();
+
+//     Pout << "referralProcs: " << nl << referralProcs << endl;
+
+    List<DynamicList<label> > cellSendingReferralLists(referralProcs.size());
+
+    List<DynamicList<DynamicList<label> > >
+        cellReceivingReferralLists(referralProcs.size());
+
+    // Run through all referredCells again building up send and receive info
+
+    forAll(refIntL, rIL)
+    {
+        const referredCell& rC(refIntL[rIL]);
+
+        label rPI = findIndex(referralProcs, rC.sourceProc());
+
+        DynamicList<DynamicList<label> >& rRL(cellReceivingReferralLists[rPI]);
+
+        DynamicList<label>& sRL(cellSendingReferralLists[rPI]);
+
+        label existingSource = findIndex(sRL, rC.sourceCell());
+
+        // Check to see if this source cell has already been allocated to
+        // come to this processor.  If not, add the source cell to the sending
+        // list and add the current referred cell to the receiving list.
+
+        // It shouldn't be possible for the sending and receiving lists to be
+        // different lengths, because their append operations happen at the
+        // same time.
+
+        if (existingSource == -1)
+        {
+            sRL.append(rC.sourceCell());
+
+            rRL.append
+            (
+                DynamicList<label> (labelList(1,rIL))
+            );
+        }
+        else
+        {
+            rRL[existingSource].append(rIL);
+
+            rRL[existingSource].shrink();
+        }
+    }
+
+    forAll(referralProcs, rPI)
+    {
+        DynamicList<DynamicList<label> >& rRL(cellReceivingReferralLists[rPI]);
+
+        DynamicList<label>& sRL(cellSendingReferralLists[rPI]);
+
+        sRL.shrink();
+
+        rRL.shrink();
+    }
+
+    // It is assumed that cell exchange is reciprocal, if proc A has cells to
+    // send to proc B, then proc B must have some to send to proc A.
+
+    cellReceivingReferralLists_.setSize(referralProcs.size());
+
+    cellSendingReferralLists_.setSize(referralProcs.size());
+
+    forAll(referralProcs, rPI)
+    {
+        DynamicList<DynamicList<label> >& rRL(cellReceivingReferralLists[rPI]);
+
+        labelListList translLL(rRL.size());
+
+        forAll(rRL, rRLI)
+        {
+            translLL[rRLI] = rRL[rRLI];
+        }
+
+        cellReceivingReferralLists_[rPI] = receivingReferralList
+        (
+            referralProcs[rPI],
+            translLL
+        );
+    }
+
+    // Send sendingReferralLists to each interacting processor.
+
+    forAll(referralProcs, rPI)
+    {
+
+        DynamicList<label>& sRL(cellSendingReferralLists[rPI]);
+
+        if (referralProcs[rPI] != Pstream::myProcNo())
+        {
+            if (Pstream::parRun())
+            {
+                OPstream toInteractingProc
+                (
+                    Pstream::blocking,
+                    referralProcs[rPI]
+                );
+
+                toInteractingProc << sendingReferralList
+                (
+                    Pstream::myProcNo(),
+                    sRL
+                );
+            }
+        }
+    }
+
+    // Receive sendingReferralLists from each interacting processor.
+
+    forAll(referralProcs, rPI)
+    {
+        if (referralProcs[rPI] != Pstream::myProcNo())
+        {
+            if (Pstream::parRun())
+            {
+                IPstream fromInteractingProc
+                (
+                    Pstream::blocking,
+                    referralProcs[rPI]
+                );
+
+                fromInteractingProc >> cellSendingReferralLists_[rPI];
+            }
+        }
+        else
+        {
+            cellSendingReferralLists_[rPI] = sendingReferralList
+            (
+                Pstream::myProcNo(),
+                cellSendingReferralLists[rPI]
+            );
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+
+Foam::interactionLists::interactionLists
+(
+    const polyMesh& mesh,
+    scalar rCutMaxSqr,
+    bool pointPointListBuild
+)
+:
+    mesh_(mesh),
+    rCutMaxSqr_(rCutMaxSqr),
+    dil_(*this, pointPointListBuild),
+    ril_(*this, pointPointListBuild),
+    cellSendingReferralLists_(),
+    cellReceivingReferralLists_()
+{
+    buildCellReferralLists();
+}
+
+
+Foam::interactionLists::interactionLists(const polyMesh& mesh)
+:
+    mesh_(mesh),
+    dil_(*this),
+    ril_(*this)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::interactionLists::~interactionLists()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::interactionLists::testPointPointDistance
+(
+    const label ptI,
+    const label ptJ
+) const
+{
+    return (magSqr(mesh_.points()[ptI] - mesh_.points()[ptJ]) <= rCutMaxSqr_);
+}
+
+
+bool Foam::interactionLists::testEdgeEdgeDistance
+(
+    const edge& eI,
+    const edge& eJ
+) const
+{
+    const vector& eJs(mesh_.points()[eJ.start()]);
+    const vector& eJe(mesh_.points()[eJ.end()]);
+
+    return testEdgeEdgeDistance(eI, eJs, eJe);
+}
+
+
+bool Foam::interactionLists::testPointFaceDistance
+(
+    const label p,
+    const label faceNo
+) const
+{
+    const vector& pointPosition(mesh_.points()[p]);
+
+    return testPointFaceDistance(pointPosition, faceNo);
+}
+
+
+bool Foam::interactionLists::testPointFaceDistance
+(
+    const label p,
+    const referredCell& refCell
+) const
+{
+    const vector& pointPosition(mesh_.points()[p]);
+
+    forAll (refCell.faces(), rCF)
+    {
+        if
+        (
+            testPointFaceDistance
+            (
+                pointPosition,
+                refCell.faces()[rCF],
+                refCell.vertexPositions(),
+                refCell.faceCentres()[rCF],
+                refCell.faceAreas()[rCF]
+            )
+        )
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+bool Foam::interactionLists::testPointFaceDistance
+(
+    const vectorList& pointsToTest,
+    const label faceNo
+) const
+{
+    forAll(pointsToTest, pTT)
+    {
+        const vector& p(pointsToTest[pTT]);
+
+        // if any point in the list is in range of the face
+        // then the rest do not need to be tested and
+        // true can be returned
+
+        if (testPointFaceDistance(p, faceNo))
+        {
+            return true;
+        }
+    }
+
+    return false;
+}
+
+
+bool Foam::interactionLists::testPointFaceDistance
+(
+    const vector& p,
+    const label faceNo
+) const
+{
+    const face& faceToTest(mesh_.faces()[faceNo]);
+
+    const vector& faceC(mesh_.faceCentres()[faceNo]);
+
+    const vector& faceA(mesh_.faceAreas()[faceNo]);
+
+    const vectorList& points(mesh_.points());
+
+    return testPointFaceDistance
+    (
+        p,
+        faceToTest,
+        points,
+        faceC,
+        faceA
+    );
+}
+
+
+bool Foam::interactionLists::testPointFaceDistance
+(
+    const vector& p,
+    const labelList& faceToTest,
+    const vectorList& points,
+    const vector& faceC,
+    const vector& faceA
+) const
+{
+    vector faceN(faceA/mag(faceA));
+
+    scalar perpDist((p - faceC) & faceN);
+
+    if (magSqr(perpDist) > rCutMaxSqr_)
+    {
+        return false;
+    }
+
+    vector pointOnPlane = (p - faceN * perpDist);
+
+    if (magSqr(faceC - pointOnPlane) < rCutMaxSqr_*1e-8)
+    {
+        // If pointOnPlane is very close to the face centre
+        // then defining the local axes will be inaccurate
+        // and it is very likely that pointOnPlane will be
+        // inside the face, so return true if the points
+        // are in range to be safe
+
+        return (magSqr(pointOnPlane - p) <= rCutMaxSqr_);
+    }
+
+    vector xAxis = (faceC - pointOnPlane)/mag(faceC - pointOnPlane);
+
+    vector yAxis =
+        ((faceC - pointOnPlane) ^ faceN)
+       /mag((faceC - pointOnPlane) ^ faceN);
+
+    List<vector2D> local2DVertices(faceToTest.size());
+
+    forAll(faceToTest, fTT)
+    {
+        const vector& V(points[faceToTest[fTT]]);
+
+        if (magSqr(V-p) <= rCutMaxSqr_)
+        {
+            return true;
+        }
+
+        local2DVertices[fTT] = vector2D
+        (
+            ((V - pointOnPlane) & xAxis),
+            ((V - pointOnPlane) & yAxis)
+        );
+    }
+
+    scalar localFaceCx((faceC - pointOnPlane) & xAxis);
+
+    scalar la_valid = -1;
+
+    forAll(local2DVertices, fV)
+    {
+        const vector2D& va(local2DVertices[fV]);
+
+        const vector2D& vb
+        (
+            local2DVertices[(fV + 1) % local2DVertices.size()]
+        );
+
+        if (mag(vb.y()-va.y()) > SMALL)
+        {
+            scalar la =
+                (
+                    va.x() - va.y()*((vb.x() - va.x())/(vb.y() - va.y()))
+                )
+               /localFaceCx;
+
+            scalar lv = -va.y()/(vb.y() - va.y());
+
+
+            if (la >= 0 && la <= 1 && lv >= 0 && lv <= 1)
+            {
+                la_valid = la;
+
+                break;
+            }
+        }
+    }
+
+    if (la_valid < 0)
+    {
+        // perpendicular point inside face, nearest point is pointOnPlane;
+        return (magSqr(pointOnPlane-p) <= rCutMaxSqr_);
+    }
+    else
+    {
+        // perpendicular point outside face, nearest point is
+        // on edge that generated la_valid;
+        return
+        (
+            magSqr(pointOnPlane + la_valid*(faceC - pointOnPlane) - p)
+         <= rCutMaxSqr_
+        );
+    }
+
+    // if the algorithm hasn't returned anything by now then something has
+    // gone wrong.
+
+    FatalErrorIn("interactionLists.C") << nl
+        << "point " << p << " to face " << faceToTest
+        << " comparison did not find a nearest point"
+        << " to be inside or outside face."
+        << abort(FatalError);
+
+    return false;
+}
+
+
+bool Foam::interactionLists::testEdgeEdgeDistance
+(
+    const edge& eI,
+    const vector& eJs,
+    const vector& eJe
+) const
+{
+    vector a(eI.vec(mesh_.points()));
+    vector b(eJe - eJs);
+
+    const vector& eIs(mesh_.points()[eI.start()]);
+
+    vector c(eJs - eIs);
+
+    vector crossab = a ^ b;
+    scalar magCrossSqr = magSqr(crossab);
+
+    if (magCrossSqr > VSMALL)
+    {
+        // If the edges are parallel then a point-face
+        // search will pick them up
+
+        scalar s = ((c ^ b) & crossab)/magCrossSqr;
+        scalar t = ((c ^ a) & crossab)/magCrossSqr;
+
+        // Check for end points outside of range 0..1
+        // If the closest point is outside this range
+        // a point-face search will have found it.
+
+        return
+        (
+            s >= 0
+         && s <= 1
+         && t >= 0
+         && t <= 1
+         && magSqr(eIs + a*s - eJs - b*t) <= rCutMaxSqr_
+        );
+    }
+
+    return false;
+}
+
+
+const Foam::labelList Foam::interactionLists::realCellsInRangeOfSegment
+(
+    const labelList& segmentFaces,
+    const labelList& segmentEdges,
+    const labelList& segmentPoints
+) const
+{
+    DynamicList<label> realCellsFoundInRange;
+
+    forAll(segmentFaces, sF)
+    {
+        const label f = segmentFaces[sF];
+
+        forAll (mesh_.points(), p)
+        {
+            if (testPointFaceDistance(p, f))
+            {
+                const labelList& pCells(mesh_.pointCells()[p]);
+
+                forAll(pCells, pC)
+                {
+                    const label cellI(pCells[pC]);
+
+                    if (findIndex(realCellsFoundInRange, cellI) == -1)
+                    {
+                        realCellsFoundInRange.append(cellI);
+                    }
+                }
+            }
+        }
+    }
+
+    forAll(segmentPoints, sP)
+    {
+        const label p = segmentPoints[sP];
+
+        forAll(mesh_.faces(), f)
+        {
+            if (testPointFaceDistance(p, f))
+            {
+                const label cellO(mesh_.faceOwner()[f]);
+
+                if (findIndex(realCellsFoundInRange, cellO) == -1)
+                {
+                    realCellsFoundInRange.append(cellO);
+                }
+
+                if (mesh_.isInternalFace(f))
+                {
+                    // boundary faces will not have neighbour information
+
+                    const label cellN(mesh_.faceNeighbour()[f]);
+
+                    if (findIndex(realCellsFoundInRange, cellN) == -1)
+                    {
+                        realCellsFoundInRange.append(cellN);
+                    }
+                }
+            }
+        }
+    }
+
+    forAll(segmentEdges, sE)
+    {
+        const edge& eJ(mesh_.edges()[segmentEdges[sE]]);
+
+        forAll (mesh_.edges(), edgeIIndex)
+        {
+            const edge& eI(mesh_.edges()[edgeIIndex]);
+
+            if (testEdgeEdgeDistance(eI, eJ))
+            {
+                const labelList& eICells(mesh_.edgeCells()[edgeIIndex]);
+
+                forAll(eICells, eIC)
+                {
+                    const label cellI(eICells[eIC]);
+
+                    if (findIndex(realCellsFoundInRange, cellI) == -1)
+                    {
+                        realCellsFoundInRange.append(cellI);
+                    }
+                }
+            }
+        }
+    }
+
+    return realCellsFoundInRange.shrink();
+}
+
+
+const Foam::labelList Foam::interactionLists::referredCellsInRangeOfSegment
+(
+    const List<referredCell>& referredInteractionList,
+    const labelList& segmentFaces,
+    const labelList& segmentEdges,
+    const labelList& segmentPoints
+) const
+{
+    DynamicList<label> referredCellsFoundInRange;
+
+    forAll(segmentFaces, sF)
+    {
+        const label f = segmentFaces[sF];
+
+        forAll(referredInteractionList, rIL)
+        {
+            const vectorList& refCellPoints
+                = referredInteractionList[rIL].vertexPositions();
+
+            if (testPointFaceDistance(refCellPoints, f))
+            {
+                if (findIndex(referredCellsFoundInRange, rIL) == -1)
+                {
+                    referredCellsFoundInRange.append(rIL);
+                }
+            }
+        }
+    }
+
+    forAll(segmentPoints, sP)
+    {
+        const label p = segmentPoints[sP];
+
+        forAll(referredInteractionList, rIL)
+        {
+            const referredCell& refCell(referredInteractionList[rIL]);
+
+            if (testPointFaceDistance(p, refCell))
+            {
+                if (findIndex(referredCellsFoundInRange, rIL) == -1)
+                {
+                    referredCellsFoundInRange.append(rIL);
+                }
+            }
+        }
+    }
+
+    forAll(segmentEdges, sE)
+    {
+        const edge& eI(mesh_.edges()[segmentEdges[sE]]);
+
+        forAll(referredInteractionList, rIL)
+        {
+            const vectorList& refCellPoints
+                = referredInteractionList[rIL].vertexPositions();
+
+            const edgeList& refCellEdges
+                = referredInteractionList[rIL].edges();
+
+            forAll(refCellEdges, rCE)
+            {
+                const edge& eJ(refCellEdges[rCE]);
+
+                if
+                (
+                    testEdgeEdgeDistance
+                    (
+                        eI,
+                        refCellPoints[eJ.start()],
+                        refCellPoints[eJ.end()]
+                    )
+                )
+                {
+                    if(findIndex(referredCellsFoundInRange, rIL) == -1)
+                    {
+                        referredCellsFoundInRange.append(rIL);
+                    }
+                }
+            }
+        }
+    }
+
+    return referredCellsFoundInRange.shrink();
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H
new file mode 100644
index 000000000..dc5a59f33
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionLists.H
@@ -0,0 +1,216 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::interactionLists
+
+Description
+
+SourceFiles
+    interactionListsI.H
+    interactionLists.C
+    interactionListsIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef interactionLists_H
+#define interactionLists_H
+
+#include "polyMesh.H"
+#include "vector2D.H"
+#include "directInteractionList.H"
+#include "referredCell.H"
+#include "referredCellList.H"
+#include "sendingReferralList.H"
+#include "receivingReferralList.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class interactionLists Declaration
+\*---------------------------------------------------------------------------*/
+
+class interactionLists
+{
+    // Private data
+
+        const polyMesh& mesh_;
+
+        scalar rCutMaxSqr_;
+
+        directInteractionList dil_;
+
+        referredCellList ril_;
+
+        List<sendingReferralList> cellSendingReferralLists_;
+
+        List<receivingReferralList> cellReceivingReferralLists_;
+
+
+    // Private Member Functions
+
+        //- Build referralLists which define how to send information
+        // to referredCells to source cells
+        void buildCellReferralLists();
+
+        //- Disallow default bitwise copy construct
+        interactionLists(const interactionLists&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const interactionLists&);
+
+
+public:
+
+    // Static data members
+
+        //- Tolerance for checking that faces on a patch segment
+        static scalar transTol;
+
+
+    // Constructors
+
+        //- Construct and create all information from the mesh
+        interactionLists
+        (
+            const polyMesh& mesh,
+            scalar rCutMaxSqr,
+            bool pointPointListBuild = false
+        );
+
+        //- Construct from file
+        interactionLists(const polyMesh& mesh);
+
+
+    // Destructor
+
+        ~interactionLists();
+
+
+    // Member Functions
+
+            bool testPointPointDistance
+            (
+                const label ptI,
+                const label ptJ
+            ) const;
+
+            bool testPointFaceDistance
+            (
+                const label p,
+                const label faceNo
+            ) const;
+
+            bool testPointFaceDistance
+            (
+                const label p,
+                const referredCell& refCell
+            ) const;
+
+            bool testPointFaceDistance
+            (
+                const vectorList& pointsToTest,
+                const label faceNo
+            ) const;
+
+            bool testPointFaceDistance
+            (
+                const vector& p,
+                const label faceNo
+            ) const;
+
+            bool testPointFaceDistance
+            (
+                const vector& p,
+                const labelList& faceToTest,
+                const vectorList& points,
+                const vector& faceC,
+                const vector& faceA
+            ) const;
+
+            bool testEdgeEdgeDistance
+            (
+                const edge& eI,
+                const edge& eJ
+            ) const;
+
+            bool testEdgeEdgeDistance
+            (
+                const edge& eI,
+                const vector& eJs,
+                const vector& eJe
+            ) const;
+
+            const labelList realCellsInRangeOfSegment
+            (
+                const labelList& segmentFaces,
+                const labelList& segmentEdges,
+                const labelList& segmentPoints
+            ) const;
+
+            const labelList referredCellsInRangeOfSegment
+            (
+                const List<referredCell>& referredInteractionList,
+                const labelList& segmentFaces,
+                const labelList& segmentEdges,
+                const labelList& segmentPoints
+            ) const;
+
+
+        // Access
+
+            inline const polyMesh& mesh() const;
+
+            inline const directInteractionList& dil() const;
+
+            inline const referredCellList& ril() const;
+            inline referredCellList& ril();
+
+            inline const List<sendingReferralList>&
+                cellSendingReferralLists() const;
+
+            inline const List<receivingReferralList>&
+                cellReceivingReferralLists() const;
+
+            inline label nInteractingProcs() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "interactionListsI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionListsI.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionListsI.H
new file mode 100644
index 000000000..d24696508
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/interactionListsI.H
@@ -0,0 +1,78 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+const Foam::polyMesh& Foam::interactionLists::mesh() const
+{
+    return mesh_;
+}
+
+
+const Foam::directInteractionList& Foam::interactionLists::dil() const
+{
+    return dil_;
+}
+
+
+inline const Foam::referredCellList& Foam::interactionLists::ril() const
+{
+    return ril_;
+}
+
+
+inline Foam::referredCellList& Foam::interactionLists::ril()
+{
+    return ril_;
+}
+
+
+inline const Foam::List<Foam::sendingReferralList>&
+    Foam::interactionLists::cellSendingReferralLists() const
+{
+    return cellSendingReferralLists_;
+}
+
+
+inline const Foam::List<Foam::receivingReferralList>&
+    Foam::interactionLists::cellReceivingReferralLists() const
+{
+    return cellReceivingReferralLists_;
+}
+
+
+inline Foam::label Foam::interactionLists::nInteractingProcs() const
+{
+    return cellReceivingReferralLists_.size();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C
new file mode 100644
index 000000000..8ec1d0685
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.C
@@ -0,0 +1,175 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*----------------------------------------------------------------------------*/
+
+#include "receivingReferralList.H"
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::receivingReferralList::receivingReferralList()
+:
+    labelListList(),
+    sourceProc_(-1)
+{}
+
+
+Foam::receivingReferralList::receivingReferralList
+(
+    const label sourceProc,
+    const labelListList& refCellsToSendTo
+)
+:
+    labelListList(refCellsToSendTo),
+    sourceProc_(sourceProc)
+{}
+
+
+Foam::receivingReferralList::receivingReferralList
+(
+    const receivingReferralList& rL
+)
+:
+    labelListList(rL),
+    sourceProc_(rL.sourceProc())
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::receivingReferralList::~receivingReferralList()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void Foam::receivingReferralList::operator=(const receivingReferralList& rhs)
+{
+    // Check for assignment to self
+    if (this == &rhs)
+    {
+        FatalErrorIn
+        (
+            "Foam::receivingReferralList::operator="
+            "(const Foam::receivingReferralList&)"
+        )
+            << "Attempted assignment to self"
+            << abort(FatalError);
+    }
+
+    labelListList::operator=(rhs);
+
+    sourceProc_ = rhs.sourceProc();
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+bool operator==
+(
+    const Foam::receivingReferralList& a,
+    const Foam::receivingReferralList& b
+)
+{
+    // Trivial reject: lists are different size
+    if (a.size() != b.size())
+    {
+        return false;
+    }
+
+    // Or if source processors are not the same.
+    if (a.sourceProc() != b.sourceProc())
+    {
+        return false;
+    }
+
+    Foam::List<bool> fnd(a.size(), false);
+
+    forAll (b, bI)
+    {
+        Foam::labelList curLList = b[bI];
+
+        bool found = false;
+
+        forAll (a, aI)
+        {
+            if (a[aI] == curLList)
+            {
+                found = true;
+                fnd[aI] = true;
+                break;
+            }
+        }
+
+        if (!found)
+        {
+            return false;
+        }
+    }
+
+    // check if all LLists on a were marked
+    bool result = true;
+
+    forAll (fnd, aI)
+    {
+        result = (result && fnd[aI]);
+    }
+
+    return result;
+}
+
+
+Foam::Istream& Foam::operator>>(Istream& is, receivingReferralList& rRL)
+{
+    is  >> rRL.sourceProc_ >> static_cast<labelListList&>(rRL);
+
+    is.check
+    (
+        "Istream& operator<<(Istream& f, const receivingReferralList& rRL"
+    );
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const receivingReferralList& rRL
+)
+{
+    os  << rRL.sourceProc() << token::SPACE
+        << static_cast< const labelListList& >(rRL);
+
+    os.check
+    (
+        "Ostream& operator<<(Ostream& f, const receivingReferralList& rRL"
+    );
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/basic/lagrangianField/LagrangianField.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H
similarity index 62%
rename from src/lagrangian/basic/lagrangianField/LagrangianField.H
rename to src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H
index 05a0bcc00..81505d68d 100644
--- a/src/lagrangian/basic/lagrangianField/LagrangianField.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralList.H
@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::LagrangianField
+    Foam::receivingReferralList
 
 Description
 
 SourceFiles
-    LagrangianFieldI.H
-    LagrangianField.C
-    LagrangianFieldIO.C
+    receivingReferralListI.H
+    receivingReferralList.C
+    receivingReferralListIO.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef LagrangianField_H
-#define LagrangianField_H
+#ifndef receivingReferralList_H
+#define receivingReferralList_H
 
-#include "DimensionedField.H"
+#include "labelList.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,83 +45,81 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class LagrangianField Declaration
+                    Class receivingReferralList Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class Type, class Cloud>
-class LagrangianField
+class receivingReferralList
 :
-    public DimensionedField<Type>
+    public labelListList
 {
     // Private data
 
-        //- Reference to lagrangian cloud this field is part of
-        const Cloud& cloud_;
+        label sourceProc_;
 
 
 public:
 
-    //- Runtime type information
-    TypeName("LagrangianField");
-
-
     // Constructors
 
+        //- Construct null
+        receivingReferralList();
+
         //- Construct from components
-        LagrangianField
+        receivingReferralList
         (
-            const IOobject& ioObject,
-            const Cloud& cloud,
-            const dimensions& dims,
-            const Field<Type> field
+            const label sourceProc,
+            const labelListList& refCellsToSendTo
         );
 
-        //- Construct from IOobject
-        LagrangianField
-        (
-            const IOobject& ioObject,
-            const Cloud& cloud
-        );
-
-        //- Construct from Cloud data
-        LagrangianField(const Cloud& cloud, const int typeFieldIndex);
-
         //- Construct as copy
-        LagrangianField(const LagrangianField<Type>&);
+        receivingReferralList(const receivingReferralList&);
 
 
     // Destructor
 
-        ~LagrangianField();
+        ~receivingReferralList();
 
 
     // Member Functions
 
         // Access
 
-            //- Map field back into Cloud
-            void map(Cloud& cloud, const int typeFieldIndex);
-
-
-        // Check
-
-        // Edit
-
-        // Write
+            inline label sourceProc() const;
 
 
     // Member Operators
 
-        void operator=(const LagrangianField&);
+        void operator=(const receivingReferralList&);
 
 
-    // Friend Functions
-
     // Friend Operators
 
+        friend bool operator==
+        (
+            const receivingReferralList& a,
+            const receivingReferralList& b
+        );
+
+        inline friend bool operator!=
+        (
+            const receivingReferralList& a,
+            const receivingReferralList& b
+        );
+
+
     // IOstream Operators
 
-        friend Ostream& operator<<(Ostream&, const LagrangianField&);
+        friend Istream& operator>>
+        (
+            Istream&,
+            receivingReferralList&
+        );
+
+        friend Ostream& operator<<
+        (
+            Ostream&,
+            const receivingReferralList&
+        );
 };
 
 
@@ -131,7 +129,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "LagrangianFieldI.H"
+#include "receivingReferralListI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralListI.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralListI.H
new file mode 100644
index 000000000..b8c0811d0
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/receivingReferralListI.H
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::label Foam::receivingReferralList::sourceProc() const
+{
+    return sourceProc_;
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+inline bool operator!=
+(
+    const Foam::receivingReferralList& a,
+    const Foam::receivingReferralList& b
+)
+{
+    return (!(a == b));
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
new file mode 100644
index 000000000..e17d80ed6
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.C
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*----------------------------------------------------------------------------*/
+
+#include "sendingReferralList.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::sendingReferralList::sendingReferralList()
+:
+    labelList(),
+    destinationProc_(-1)
+{}
+
+
+Foam::sendingReferralList::sendingReferralList
+(
+    const label destinationProc,
+    const labelList& cellsToSend
+)
+:
+    labelList(cellsToSend),
+    destinationProc_(destinationProc)
+{}
+
+
+Foam::sendingReferralList::sendingReferralList
+(
+    const sendingReferralList& rL
+)
+:
+    labelList(rL),
+    destinationProc_(rL.destinationProc())
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::sendingReferralList::~sendingReferralList()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+void Foam::sendingReferralList::operator=(const sendingReferralList& rhs)
+{
+    // Check for assignment to self
+    if (this == &rhs)
+    {
+        FatalErrorIn
+        (
+            "Foam::distribution::operator=(const Foam::distribution&)"
+        )
+            << "Attempted assignment to self"
+            << abort(FatalError);
+    }
+
+    labelList::operator=(rhs);
+
+    destinationProc_ = rhs.destinationProc();
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+bool operator==
+(
+    const Foam::sendingReferralList& a,
+    const Foam::sendingReferralList& b
+)
+{
+    // Trivial reject: lists are different size
+    if (a.size() != b.size())
+    {
+        return false;
+    }
+
+    // Or if source processors are not the same.
+    if (a.destinationProc() != b.destinationProc())
+    {
+        return false;
+    }
+
+    Foam::List<bool> fnd(a.size(), false);
+
+    forAll (b, bI)
+    {
+        Foam::label curLabel = b[bI];
+
+        bool found = false;
+
+        forAll (a, aI)
+        {
+            if (a[aI] == curLabel)
+            {
+                found = true;
+                fnd[aI] = true;
+                break;
+            }
+        }
+
+        if (!found)
+        {
+            return false;
+        }
+    }
+
+    // check if all labels on a were marked
+    bool result = true;
+
+    forAll (fnd, aI)
+    {
+        result = (result && fnd[aI]);
+    }
+
+    return result;
+}
+
+
+Foam::Istream& Foam::operator>>
+(
+    Istream& is,
+    sendingReferralList& sRL
+)
+{
+    is  >> sRL.destinationProc_ >> static_cast<labelList&>(sRL);
+
+    is.check("Istream& operator<<(Istream& f, const sendingReferralList& sRL");
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const sendingReferralList& rL
+)
+{
+    os  << rL.destinationProc() << token::SPACE
+        << static_cast< const labelList& >(rL);
+
+    os.check("Ostream& operator<<(Ostream& f, const sendingReferralList& rL");
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H
new file mode 100644
index 000000000..12b668da6
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralList.H
@@ -0,0 +1,138 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::sendingReferralList
+
+Description
+
+SourceFiles
+    sendingReferralListI.H
+    sendingReferralList.C
+    sendingReferralListIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef sendingReferralList_H
+#define sendingReferralList_H
+
+#include "labelList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class sendingReferralList Declaration
+\*---------------------------------------------------------------------------*/
+
+class sendingReferralList
+:
+    public labelList
+{
+    // Private data
+
+        label destinationProc_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        sendingReferralList();
+
+        //- Construct from components
+        sendingReferralList
+        (
+            const label destinationProc,
+            const labelList& cellsToSend
+        );
+
+        //- Construct as copy
+        sendingReferralList(const sendingReferralList&);
+
+
+    // Destructor
+
+        ~sendingReferralList();
+
+
+    // Member Functions
+
+        // Access
+
+            inline label destinationProc() const;
+
+
+    // Member Operators
+
+        void operator=(const sendingReferralList&);
+
+
+    // Friend Operators
+
+        friend bool operator==
+        (
+            const sendingReferralList& a,
+            const sendingReferralList& b
+        );
+
+        inline friend bool operator!=
+        (
+            const sendingReferralList& a,
+            const sendingReferralList& b
+        );
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>
+        (
+            Istream&,
+            sendingReferralList&
+        );
+
+        friend Ostream& operator<<
+        (
+            Ostream&,
+            const sendingReferralList&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "sendingReferralListI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralListI.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralListI.H
new file mode 100644
index 000000000..d7bd13d75
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referralLists/sendingReferralListI.H
@@ -0,0 +1,47 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::label Foam::sendingReferralList::destinationProc() const
+{
+    return destinationProc_;
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+inline bool operator!=
+(
+    const Foam::sendingReferralList& a,
+    const Foam::sendingReferralList& b
+)
+{
+    return (!(a == b));
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.C
new file mode 100644
index 000000000..bad65e88f
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.C
@@ -0,0 +1,449 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*----------------------------------------------------------------------------*/
+
+#include "referredCell.H"
+#include "interactionLists.H"
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void referredCell::setConstructionData
+(
+    const polyMesh& mesh,
+    const label sourceCell
+)
+{
+    // Points
+
+    const labelList& points = mesh.cellPoints()[sourceCell];
+
+    vectorList sourceCellVertices(points.size());
+
+    forAll(sourceCellVertices, sCV)
+    {
+        sourceCellVertices[sCV] = mesh.points()[points[sCV]];
+    }
+
+    vertexPositions_ = referPositions(sourceCellVertices);
+
+
+    // Edges
+
+    const labelList& edges = mesh.cellEdges()[sourceCell];
+
+    edgeList sourceCellEdges(edges.size());
+
+    forAll(sourceCellEdges, sCE)
+    {
+        sourceCellEdges[sCE] = mesh.edges()[edges[sCE]];
+    }
+
+    locallyMapEdgeList(points, sourceCellEdges);
+
+
+    // Faces
+
+    labelList faces(mesh.cells()[sourceCell]);
+
+    vectorList sourceCellFaceCentres(faces.size());
+
+    vectorList sourceCellFaceAreas(faces.size());
+
+    labelListList sourceCellFaces(faces.size());
+
+    forAll(faces, f)
+    {
+        sourceCellFaces[f] = mesh.faces()[faces[f]];
+
+        sourceCellFaceCentres[f] = mesh.faceCentres()[faces[f]];
+
+        sourceCellFaceAreas[f] = mesh.faceAreas()[faces[f]];
+    }
+
+    locallyMapFaceList(points, sourceCellFaces);
+
+    faceCentres_ = referPositions(sourceCellFaceCentres);
+
+    faceAreas_ = rotateVectors(sourceCellFaceAreas);
+}
+
+
+void referredCell::locallyMapEdgeList
+(
+    const labelList& points,
+    const edgeList& sourceCellEdges
+)
+{
+    edges_.setSize(sourceCellEdges.size());
+
+    forAll(sourceCellEdges, sCE)
+    {
+        const edge& e(sourceCellEdges[sCE]);
+
+        edges_[sCE].start() = findIndex(points, e.start());
+
+        edges_[sCE].end() = findIndex(points, e.end());
+
+        if
+        (
+            edges_[sCE].start() == -1
+         || edges_[sCE].end() == -1
+        )
+        {
+            FatalErrorIn("Foam::referredCell::locallyMapEdgeList")
+                << "edgeList and points labelList for "
+                << "referred cell do not match: "
+                << nl << "points: " << points
+                << nl << "egdes: " << sourceCellEdges
+                << abort(FatalError);
+        }
+    }
+}
+
+
+void referredCell::locallyMapFaceList
+(
+    const labelList& points,
+    const labelListList& sourceCellFaces
+)
+{
+    faces_.setSize(sourceCellFaces.size());
+
+    forAll(sourceCellFaces, sCF)
+    {
+        const labelList& sourceCellFace(sourceCellFaces[sCF]);
+
+        labelList& localFace(faces_[sCF]);
+
+        localFace.setSize(sourceCellFace.size());
+
+        forAll(sourceCellFace, p)
+        {
+            localFace[p] = findIndex(points, sourceCellFace[p]);
+
+            if (localFace[p] == -1)
+            {
+                FatalErrorIn("Foam::referredCell::locallyMapEdgeList")
+                    << "edgeList and points labelList for "
+                    << "referred cell do not match: "
+                    << nl << "points: " << points
+                    << nl << "faces: " << sourceCellFaces
+                    << abort(FatalError);
+            }
+        }
+    }
+}
+
+
+vector referredCell::referPosition(const vector& positionToRefer)
+{
+    return offset_ + (rotation_ & positionToRefer);
+}
+
+
+vectorList referredCell::referPositions(const vectorList& positionsToRefer)
+{
+    return offset_ + (rotation_ & positionsToRefer);
+}
+
+
+vector referredCell::rotateVector(const vector& vectorToRotate)
+{
+    return rotation_ & vectorToRotate;
+}
+
+
+vectorList referredCell::rotateVectors(const vectorList& vectorsToRotate)
+{
+    return rotation_ & vectorsToRotate;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+referredCell::referredCell()
+:
+    DynamicList<referredMolecule>(),
+    sourceProc_(-1),
+    sourceCell_(-1),
+    vertexPositions_(),
+    offset_(vector::zero),
+    rotation_(I)
+{}
+
+
+referredCell::referredCell
+(
+    const polyMesh& mesh,
+    const label sourceProc,
+    const label sourceCell,
+    const vector& offset,
+    const tensor& rotation
+)
+:
+    DynamicList<referredMolecule>(),
+    sourceProc_(sourceProc),
+    sourceCell_(sourceCell),
+    offset_(offset),
+    rotation_(rotation)
+{
+    setConstructionData(mesh, sourceCell);
+}
+
+
+referredCell::referredCell
+(
+    const label sourceProc,
+    const label sourceCell,
+    const vectorList& vertexPositions,
+    const edgeList& localEdges,
+    const labelListList& localFaces,
+    const vectorList& faceCentres,
+    const vectorList& faceAreas,
+    const vector& offset,
+    const tensor& rotation
+)
+:
+    DynamicList<referredMolecule>(),
+    sourceProc_(sourceProc),
+    sourceCell_(sourceCell),
+    edges_(localEdges),
+    faces_(localFaces),
+    offset_(offset),
+    rotation_(rotation)
+{
+    // Supplied vertexPositions, faceCentres and faceAreas are of the
+    // "original" cell, and need to be transformed to the referred
+    // locations on construction
+
+    vertexPositions_ = referPositions(vertexPositions);
+
+    faceCentres_ = referPositions(faceCentres);
+
+    faceAreas_ = rotateVectors(faceAreas);
+}
+
+
+referredCell::referredCell
+(
+    const polyMesh& mesh,
+    const label sourceProc,
+    const label sourceCell,
+    const vector& cS,
+    const vector& cD,
+    const vector& nS,
+    const vector& nD
+)
+:
+    DynamicList<referredMolecule>(),
+    sourceProc_(sourceProc),
+    sourceCell_(sourceCell)
+{
+    // It is assumed that the vectors originating from the faces being referred
+    // here are correct periodic faces - i.e. they have the same area etc.
+
+    vector nA = -nS/mag(nS);
+    vector nB = nD/mag(nD);
+
+    rotation_ = rotationTensor(nA, nB);
+
+    offset_ = cD - (rotation_ & cS);
+
+    // Allow sourceCell = -1 to create a dummy referredCell
+    // to obtain the transformation
+
+    if(sourceCell >= 0)
+    {
+        setConstructionData(mesh, sourceCell);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+referredCell::~referredCell()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+referredCell referredCell::reRefer
+(
+    const vector& cS,
+    const vector& cD,
+    const vector& nS,
+    const vector& nD
+)
+{
+    vector nA = -nS/mag(nS);
+    vector nB = nD/mag(nD);
+
+    tensor newRotation = rotationTensor(nA, nB);
+
+    vector newOffset = cD - (newRotation & cS);
+
+    tensor reReferredRotation = newRotation & rotation_;
+
+    vector reReferredOffset = newOffset + (newRotation & offset_);
+
+    return referredCell
+    (
+        sourceProc_,
+        sourceCell_,
+        rotation_.T() & (vertexPositions_ - offset_),
+        edges_,
+        faces_,
+        rotation_.T() & (faceCentres_ - offset_),
+        rotation_.T() & (faceAreas_),
+        reReferredOffset,
+        reReferredRotation
+    );
+}
+
+
+vector referredCell::referPosition(const vector& positionToRefer) const
+{
+    return offset_ + (rotation_ & positionToRefer);
+}
+
+
+vectorList referredCell::referPosition
+(
+    const vectorList& positionsToRefer
+) const
+{
+    return offset_ + (rotation_ & positionsToRefer);
+}
+
+
+vector referredCell::rotateVector(const vector& vectorToRotate) const
+{
+    return rotation_ & vectorToRotate;
+}
+
+
+vectorList referredCell::rotateVectors(const vectorList& vectorsToRotate) const
+{
+    return rotation_ & vectorsToRotate;
+}
+
+
+void referredCell::referInMols(const List<referredMolecule>& incomingMols)
+{
+    clear();
+
+    forAll(incomingMols, iM)
+    {
+        append
+        (
+            referredMolecule
+            (
+                incomingMols[iM].id(),
+                referPosition
+                (
+                    incomingMols[iM].position()
+                ),
+                referPosition
+                (
+                    incomingMols[iM].sitePositions()
+                )
+            )
+        );
+    }
+
+    shrink();
+}
+
+
+bool referredCell::duplicate(const referredCell& refCellDupl) const
+{
+    return
+    (
+        sourceProc_ == refCellDupl.sourceProc()
+     && sourceCell_ == refCellDupl.sourceCell()
+     && mag(offset_ - refCellDupl.offset()) < interactionLists::transTol
+    );
+}
+
+
+bool referredCell::duplicate(const label procNo,const label nCells) const
+{
+    return
+    (
+        sourceProc_ == procNo
+     && sourceCell_ < nCells
+     && mag(offset_) < interactionLists::transTol
+    );
+}
+
+
+// * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
+
+Istream& operator>>(Istream& is, referredCell& rC)
+{
+
+    is  >> rC.sourceProc_
+        >> rC.sourceCell_
+        >> rC.vertexPositions_
+        >> rC.edges_
+        >> rC.faces_
+        >> rC.faceCentres_
+        >> rC.faceAreas_
+        >> rC.offset_
+        >> rC.rotation_;
+
+    is.check("Istream& operator<<(Istream& f, const referredCell& rC");
+
+    return is;
+}
+
+
+Ostream& operator<<(Ostream& os, const referredCell& rC)
+{
+
+    os  << rC.sourceProc()
+        << token::SPACE << rC.sourceCell()
+        << token::SPACE << rC.vertexPositions()
+        << token::SPACE << rC.edges()
+        << token::SPACE << rC.faces()
+        << token::SPACE << rC.faceCentres()
+        << token::SPACE << rC.faceAreas()
+        << token::SPACE << rC.offset()
+        << token::SPACE << rC.rotation();
+
+    os.check("Ostream& operator<<(Ostream& f, const referredCell& rC");
+
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+}  // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H
new file mode 100644
index 000000000..0b75410e2
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCell.H
@@ -0,0 +1,277 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::referredCell
+
+Description
+
+SourceFiles
+    referredCellI.H
+    referredCell.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef referredCell_H
+#define referredCell_H
+
+#include "vector.H"
+#include "vectorList.H"
+#include "tensor.H"
+#include "transform.H"
+#include "DynamicList.H"
+#include "labelList.H"
+#include "edgeList.H"
+#include "polyMesh.H"
+
+#include "referredMolecule.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                          Class referredCell Declaration
+\*---------------------------------------------------------------------------*/
+
+class referredCell
+:
+    public DynamicList<referredMolecule>
+{
+    // Private data
+
+        label sourceProc_;
+
+        label sourceCell_;
+
+        //- Referred vertex positions
+        vectorList vertexPositions_;
+
+        edgeList edges_;
+
+        labelListList faces_;
+
+        vectorList faceCentres_;
+
+        vectorList faceAreas_;
+
+        labelList realCellsForInteraction_;
+
+        vector offset_;
+
+        tensor rotation_;
+
+
+    // Private Member Functions
+
+        void setConstructionData
+        (
+            const polyMesh& mesh,
+            const label sourceCell
+        );
+
+        void locallyMapEdgeList
+        (
+            const labelList& points,
+            const edgeList& sourceCellEdges
+        );
+
+        void locallyMapFaceList
+        (
+            const labelList& points,
+            const labelListList& sourceCellFaces
+        );
+
+        vector referPosition(const vector& positionToRefer);
+
+        vectorList referPositions(const vectorList& positionsToRefer);
+
+        vector rotateVector(const vector& vectorToRotate);
+
+        vectorList rotateVectors(const vectorList& vectorsToRotate);
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+
+        referredCell();
+
+        //- Construct from components with external edge information
+        referredCell
+        (
+            const polyMesh& mesh,
+            const label sourceProc,
+            const label sourceCell,
+            const vector& offset,
+            const tensor& rotation
+        );
+
+        //- Construct from components with existing local edge information
+        referredCell
+        (
+            const label sourceProc,
+            const label sourceCell,
+            const vectorList& vertexPositions,
+            const edgeList& localEdges,
+            const labelListList& localFaces,
+            const vectorList& faceCentres,
+            const vectorList& faceAreas,
+            const vector& offset,
+            const tensor& rotation
+        );
+
+        //- Construct from pair of face centers (c) and plain
+        //  face normals (n) (no need to make unit vectors or
+        //  reverse one direction)
+        //  Order of vectors important (S = source, D = Destination).
+        //  External edge information.
+
+        referredCell
+        (
+            const polyMesh& mesh,
+            const label sourceProc,
+            const label sourceCell,
+            const vector& cS,
+            const vector& cD,
+            const vector& nS,
+            const vector& nD
+        );
+
+
+    // Destructor
+
+        virtual ~referredCell();
+
+
+    // Member Functions
+
+        //- Take this referredCell object that has already had it's transform
+        //  calculated and refer it on again, retaining same source info.
+        referredCell reRefer
+        (
+            const vector& cS,
+            const vector& cD,
+            const vector& nS,
+            const vector& nD
+        );
+
+        //- Use internal transformatation values to transform the given
+        //  postion to its new location.
+        vector referPosition(const vector& positionToRefer) const;
+
+        //- Use internal transformatation values to transform the given
+        //  list of postions to their new locations.
+        vectorList referPosition(const vectorList& positionsToRefer) const;
+
+        //- Use internal transformatation values to rotate the given vector
+        vector rotateVector(const vector& vectorToRotate) const;
+
+        //- Use internal transformatation values to rotate the given
+        // list of vectors
+        vectorList rotateVectors(const vectorList& vectorsToRotate) const;
+
+        //- referInMols clears, the stored list of referred mols and takes
+        //  in a list of referred mols coming from a source processor,
+        //  transformingtheir positions
+        void referInMols(const List<referredMolecule>& incomingMols);
+
+        //- duplicate() function to test whether a referred or real cell
+        //  supplied by arguement is a duplicate of this referredCell.
+        //  Can be used bi-directionally - i.e. can be called on an existing
+        //  referred cell with a proposed referredCell as argument,
+        //  or vice versa.  Can only be called by a proposed referredCell with
+        //  a real cell index as arguement to test to see if the proposed
+        //  referredCell is a duplicate.
+        //  A duplicate cell is defined as one which has the same source
+        //  processor, source cell, and an equal offset. Real cells have zero
+        //  offset by definition.
+        bool duplicate(const referredCell& refCellDupl) const;
+
+        bool duplicate(const label procNo, const label nCells) const;
+
+
+        // Access
+
+            inline label sourceProc() const;
+
+            inline label sourceCell() const;
+
+            inline const vector& offset() const;
+
+            inline const tensor& rotation() const;
+
+            inline const vectorList& vertexPositions() const;
+
+            inline const edgeList& edges() const;
+
+            inline const labelListList& faces() const;
+
+            inline const vectorList& faceCentres() const;
+
+            inline const vectorList& faceAreas() const;
+
+            inline labelList& realCells();
+
+            inline const labelList& realCellsForInteraction() const;
+
+
+    // Friend Operators
+
+        inline friend bool operator==
+        (
+            const referredCell& a,
+            const referredCell& b
+        );
+
+        inline friend bool operator!=
+        (
+            const referredCell& a,
+            const referredCell& b
+        );
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>(Istream&, referredCell&);
+        friend Ostream& operator<<(Ostream&, const referredCell&);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "referredCellI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCellI.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCellI.H
new file mode 100644
index 000000000..b7db5657a
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCell/referredCellI.H
@@ -0,0 +1,127 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline label referredCell::sourceProc() const
+{
+    return sourceProc_;
+}
+
+
+inline label referredCell::sourceCell() const
+{
+    return sourceCell_;
+}
+
+
+inline const vector& referredCell::offset() const
+{
+    return offset_;
+}
+
+
+inline const tensor& referredCell::rotation() const
+{
+    return rotation_;
+}
+
+
+inline const vectorList& referredCell::vertexPositions() const
+{
+    return vertexPositions_;
+}
+
+
+inline const edgeList& referredCell::edges() const
+{
+    return edges_;
+}
+
+
+inline const labelListList& referredCell::faces() const
+{
+    return faces_;
+}
+
+
+inline const vectorList& referredCell::faceCentres() const
+{
+    return faceCentres_;
+}
+
+
+inline const vectorList& referredCell::faceAreas() const
+{
+    return faceAreas_;
+}
+
+
+inline labelList& referredCell::realCells()
+{
+    return realCellsForInteraction_;
+}
+
+
+inline const labelList& referredCell::realCellsForInteraction() const
+{
+    return realCellsForInteraction_;
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+inline bool operator==
+(
+    const referredCell& a,
+    const referredCell& b
+)
+{
+    return const_cast<referredCell&>(a).duplicate
+    (
+        const_cast<const referredCell&>(b)
+    );
+}
+
+
+inline bool operator!=
+(
+    const referredCell& a,
+    const referredCell& b
+)
+{
+    return !(a == b);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
new file mode 100644
index 000000000..5992e2159
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
@@ -0,0 +1,1578 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*----------------------------------------------------------------------------*/
+
+#include "referredCellList.H"
+#include "interactionLists.H"
+#include "polyBoundaryMeshEntries.H"
+#include "PstreamCombineReduceOps.H"
+#include "Time.H"
+#include "globalMeshData.H"
+#include "processorPolyPatch.H"
+#include "cyclicPolyPatch.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::referredCellList::buildReferredCellList
+(
+    bool pointPointListBuild
+)
+{
+    Info << nl << "Building list of referred interaction neighbours" << endl;
+
+    const polyMesh& mesh(il_.mesh());
+
+    DynamicList<referredCell> referredInteractionList;
+
+    // realCellsWithinRCutMaxOfAnyReferringPatch
+    DynamicList<label> rCellsWRRP;
+
+    // realFacesWithinRCutMaxOfAnyReferringPatch
+    DynamicList<label> rFacesWRRP;
+
+    // realEdgesWithinRCutMaxOfAnyReferringPatch
+    DynamicList<label> rEdgesWRRP;
+
+    // realPointsWithinRCutMaxOfAnyReferringPatch
+    DynamicList<label> rPointsWRRP;
+
+    labelListList processorPatchSegmentMapping
+    (
+        mesh.globalData().processorPatches().size()
+    );
+
+    List<vectorList> allNeighbourFaceCentres
+    (
+        mesh.globalData().processorPatches().size()
+    );
+
+    List<vectorList> allNeighbourFaceAreas
+    (
+        mesh.globalData().processorPatches().size()
+    );
+
+    label nUndecomposedPatches = 0;
+
+    if (Pstream::parRun())
+    {
+        dictionary patchDictionary;
+
+        DynamicList<word> patchNames;
+
+        Time undecomposedTime
+        (
+            Time::controlDictName,
+            mesh.time().rootPath(),
+            mesh.time().caseName().path()
+        );
+
+        IOobject undecomposedBoundaryHeader
+        (
+            "boundary",
+            undecomposedTime.constant(),
+            polyMesh::meshSubDir,
+            undecomposedTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        );
+
+        if (undecomposedBoundaryHeader.headerOk())
+        {
+            polyBoundaryMeshEntries undecomposedPatchEntries
+            (
+                undecomposedBoundaryHeader
+            );
+
+            forAll(undecomposedPatchEntries, patchi)
+            {
+                patchNames.append
+                (
+                    undecomposedPatchEntries[patchi].keyword()
+                );
+
+                patchDictionary.add
+                (
+                    undecomposedPatchEntries[patchi]
+                );
+            }
+        }
+        else
+        {
+            FatalErrorIn ("referredCellList.C")
+                << nl << "unable to read undecomposed boundary file from "
+                << "constant/polyMesh" << nl
+                << abort(FatalError);
+        }
+
+        labelIOList faceProcAddressing
+        (
+            IOobject
+            (
+                "faceProcAddressing",
+                mesh.time().constant(),
+                polyMesh::meshSubDir,
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE,
+                false
+            )
+        );
+
+        labelList procPatches(mesh.globalData().processorPatches());
+
+        nUndecomposedPatches = patchNames.size();
+
+        // processorPatchSegmentMapping works by mapping the original patch and
+        // half that a face on a processor patch was on before decomposition.
+        // This creates a patch segment for each half of each original (cyclic)
+        // patch which can be assessed separately.  There are n =
+        // patchNames.size() original patches, k = 0 to n-1.  The mapping is:
+        // value = 0: originally an internal face value = k, was originally on
+        // the on the patch k-1, 1st half value = -k, was originally on the on
+        // the patch k-1, 2nd half
+
+        forAll(procPatches,pP)
+        {
+            const processorPolyPatch& patch = refCast<const processorPolyPatch>
+            (
+                mesh.boundaryMesh()[procPatches[pP]]
+            );
+
+            labelList& procPatchSegMap = processorPatchSegmentMapping[pP];
+
+            procPatchSegMap.setSize(patch.size());
+
+            forAll (patch, pI)
+            {
+                label decomposedMeshFace = patch.start() + pI;
+
+                label faceProcAdd = faceProcAddressing[decomposedMeshFace];
+
+                label globalFace = abs(faceProcAdd)-1;
+
+                label minStart = -1;
+
+                forAll(patchNames, pN)
+                {
+                    if (patchDictionary.found(patchNames[pN]))
+                    {
+                        const dictionary& patchDict =
+                        patchDictionary.subDict(patchNames[pN]);
+
+                        label startFace
+                        (
+                            readLabel
+                            (
+                                patchDict.lookup("startFace")
+                            )
+                        );
+
+                        label nFaces(readLabel(patchDict.lookup("nFaces")));
+
+                        if (minStart < 0 || startFace < minStart)
+                        {
+                            minStart = startFace;
+                        }
+
+                        if
+                        (
+                            globalFace >= startFace
+                         && globalFace < startFace + nFaces/2
+                        )
+                        {
+                            procPatchSegMap[pI] = pN + 1;
+                        }
+                        else if
+                        (
+                            globalFace >= startFace + nFaces/2
+                         && globalFace < startFace + nFaces
+                        )
+                        {
+                            procPatchSegMap[pI] = -(pN + 1);
+                        }
+                    }
+                }
+
+                if (globalFace < minStart)
+                {
+                    procPatchSegMap[pI] = 0;
+                }
+            }
+        }
+
+        forAll(procPatches,pP)
+        {
+            const processorPolyPatch& patch = refCast<const processorPolyPatch>
+            (
+                mesh.boundaryMesh()[procPatches[pP]]
+            );
+
+            {
+                OPstream toNeighbProc
+                (
+                    Pstream::blocking,
+                    patch.neighbProcNo()
+                );
+
+                toNeighbProc << patch.faceCentres() << patch.faceAreas();
+            }
+        }
+
+        forAll(procPatches,pP)
+        {
+            const processorPolyPatch& patch = refCast<const processorPolyPatch>
+            (
+                mesh.boundaryMesh()[procPatches[pP]]
+            );
+
+            vectorList& neighbFaceCentres = allNeighbourFaceCentres[pP];
+
+            neighbFaceCentres.setSize(patch.size());
+
+            vectorList& neighbFaceAreas = allNeighbourFaceAreas[pP];
+
+            neighbFaceAreas.setSize(patch.size());
+
+            {
+                IPstream fromNeighbProc
+                (
+                    Pstream::blocking,
+                    patch.neighbProcNo()
+                );
+
+                fromNeighbProc >> neighbFaceCentres >> neighbFaceAreas;
+            }
+        }
+
+        // *************************************************************
+        // Tests that all processor patch segments from different
+        // original patches prior to decomposition produce the same
+        // transform. Check before 1st iteration.
+        // *************************************************************
+
+        forAll(procPatches,pP)
+        {
+            const processorPolyPatch& patch = refCast<const processorPolyPatch>
+            (
+                mesh.boundaryMesh()[procPatches[pP]]
+            );
+
+            const vectorList& neighbFaceCentres = allNeighbourFaceCentres[pP];
+
+            const vectorList& neighbFaceAreas = allNeighbourFaceAreas[pP];
+
+            label nUP;
+
+            for
+            (
+                nUP = -nUndecomposedPatches;
+                nUP <= nUndecomposedPatches;
+                nUP++
+            )
+            {
+                DynamicList<vector> refOff;
+
+                DynamicList<tensor> refTrans;
+
+                forAll (patch, faceI)
+                {
+                    if (processorPatchSegmentMapping[pP][faceI] == nUP)
+                    {
+                        referredCell testRefCell
+                        (
+                            mesh,
+                            -1,
+                            -1,
+                            patch.faceCentres()[faceI],
+                            neighbFaceCentres[faceI],
+                            patch.faceNormals()[faceI],
+                            neighbFaceAreas[faceI]
+                            /(mag(neighbFaceAreas[faceI]) + VSMALL)
+                        );
+
+                        refOff.append(testRefCell.offset());
+
+                        refTrans.append(testRefCell.rotation());
+                    }
+                }
+
+                refOff.shrink();
+
+                refTrans.shrink();
+
+                if (refOff.size())
+                {
+                    if
+                    (
+                        sum(mag(refOff-refOff[0]))/refOff.size()
+                            > interactionLists::transTol
+                     || sum(mag(refTrans-refTrans[0]))/refTrans.size()
+                            > interactionLists::transTol
+                    )
+                    {
+                        FatalErrorIn ("referredCellList.C")
+                            << nl << "Face pairs on patch "
+                            << patch.name()
+                            << ", segment " << patchNames[nUP]
+                            << " do not give the same referring "
+                            << " transformations to within tolerance of "
+                            << interactionLists::transTol << nl
+                            << " Referring offsets:" << refOff << nl
+                            << " Average sum of mag difference: "
+                            << sum(mag(refOff-refOff[0]))/refOff.size() << nl
+                            << " Referring transforms:" << refTrans << nl
+                            << " Average sum of mag difference: "
+                            << sum(mag(refTrans-refTrans[0]))/refTrans.size()
+                            << nl << abort(FatalError);
+                    }
+                }
+            }
+        }
+    }
+
+    label cellsReferredThisIteration = 1;
+
+    label iterationNo = 0;
+
+    while (cellsReferredThisIteration)
+    {
+        label refIntListStartSize = referredInteractionList.size();
+
+        forAll (mesh.boundaryMesh(), patchI)
+        {
+            // Treat local cyclics on each processor before processor
+            // boundaries.  Separate treatment allows the serial version to run
+            // transparently.
+
+            if (isA<cyclicPolyPatch>(mesh.boundaryMesh()[patchI]))
+            {
+                const cyclicPolyPatch& patch = refCast<const cyclicPolyPatch>
+                (
+                    mesh.boundaryMesh()[patchI]
+                );
+
+                if (patch.size())
+                {
+                    if (iterationNo == 0)
+                    {
+                        // Tests that all combinations of face pairs produce the
+                        // same transform.  Only check on 1st iteration.
+
+                        label faceL;
+                        // A face in the 1st half of the patch
+
+                        label faceM;
+                        // Face corresponding to faceL in the 2nd half of the
+                        // patch. Assumes correct face ordering.
+
+                        vectorList refOff(patch.size()/2);
+
+                        List<tensor> refTrans(patch.size()/2);
+
+                        for
+                        (
+                            faceL = 0, faceM = patch.size()/2;
+                            faceL < patch.size()/2;
+                            faceL++, faceM++
+                        )
+                        {
+                            referredCell testRefCell
+                            (
+                                mesh,
+                                -1,
+                                -1,
+                                patch.faceCentres()[faceL],
+                                patch.faceCentres()[faceM],
+                                patch.faceNormals()[faceL],
+                                patch.faceNormals()[faceM]
+                            );
+
+                            refOff[faceL] = testRefCell.offset();
+
+                            refTrans[faceL] = testRefCell.rotation();
+                        }
+
+                        if
+                        (
+                            sum(mag(refOff - refOff[0]))/(patch.size()/2)
+                                > interactionLists::transTol
+                         || sum(mag(refTrans - refTrans[0]))/(patch.size()/2)
+                                > interactionLists::transTol
+                        )
+                        {
+                            FatalErrorIn ("referredCellList.C")
+                                << nl << "Face pairs on patch "
+                                << patch.name()
+                                << " do not give the same referring "
+                                << " transformations to within tolerance of "
+                                << interactionLists::transTol << nl
+                                << " Referring offsets:" << refOff << nl
+                                << " Average sum of mag difference: "
+                                << sum(mag(refOff-refOff[0]))/refOff.size()
+                                << nl
+                                << " Referring transforms:" << refTrans << nl
+                                << " Average sum of mag difference: "
+                                << sum(mag(refTrans-refTrans[0]))
+                                   /refTrans.size()
+                                << nl << abort(FatalError);
+                        }
+                    }
+
+                    // *********************************************************
+                    // 1st half of face list - 1st side of boundary
+                    // *********************************************************
+
+                    label faceI;
+
+                    DynamicList<label> meshFacesOnThisSegment;
+
+                    for (faceI = 0; faceI < patch.size()/2; faceI++)
+                    {
+                        // unable to use the normal accessors for the polyPatch
+                        // because points on separate halves need used
+                        // separately
+
+                        meshFacesOnThisSegment.append(faceI + patch.start());
+                    }
+
+                    meshFacesOnThisSegment.shrink();
+
+                    DynamicList<label> meshEdgesOnThisSegment;
+
+                    DynamicList<label> meshPointsOnThisSegment;
+
+                    forAll(meshFacesOnThisSegment, mFOTS)
+                    {
+                        const label segFace = meshFacesOnThisSegment[mFOTS];
+
+                        const labelList& faceEdges = mesh.faceEdges()[segFace];
+
+                        forAll (faceEdges, fE)
+                        {
+                            const label faceEdge(faceEdges[fE]);
+
+                            if
+                            (
+                                findIndex
+                                (
+                                    meshEdgesOnThisSegment,
+                                    faceEdge
+                                ) == -1
+                            )
+                            {
+                                meshEdgesOnThisSegment.append(faceEdge);
+                            }
+                        }
+
+                        const face& facePoints(mesh.faces()[segFace]);
+
+                        forAll (facePoints, fP)
+                        {
+                            const label facePoint(facePoints[fP]);
+
+                            if
+                            (
+                                findIndex
+                                (
+                                    meshPointsOnThisSegment,
+                                    facePoint
+                                )
+                             ==
+                                -1
+                            )
+                            {
+                                meshPointsOnThisSegment.append(facePoint);
+                            }
+                        }
+                    }
+
+                    meshEdgesOnThisSegment.shrink();
+
+                    meshPointsOnThisSegment.shrink();
+
+                    if (iterationNo == 0)
+                    {
+                        // Assessing real cells in range is only required on
+                        // the 1st iteration because they do not change from
+                        // iteration to iteration.
+
+                        labelList realCellsFoundInRange
+                        (
+                            il_.realCellsInRangeOfSegment
+                            (
+                                meshFacesOnThisSegment,
+                                meshEdgesOnThisSegment,
+                                meshPointsOnThisSegment
+                            )
+                        );
+
+                        forAll(realCellsFoundInRange,cFIR)
+                        {
+                            const label realCell = realCellsFoundInRange[cFIR];
+
+                            referredCell cellToRefer
+                            (
+                                mesh,
+                                Pstream::myProcNo(),
+                                realCell,
+                                patch.faceCentres()[0],
+                                patch.faceCentres()[patch.size()/2],
+                                patch.faceNormals()[0],
+                                patch.faceNormals()[patch.size()/2]
+                            );
+
+                            // Test all existing referred and real cells to
+                            // check duplicates are not being made or cells
+                            // aren't being referred back onto themselves
+
+                            bool addCellToRefer = true;
+
+                            // Check if cellToRefer is an existing referred cell
+
+                            forAll(referredInteractionList, rIL)
+                            {
+                                if
+                                (
+                                    cellToRefer.duplicate
+                                    (
+                                        referredInteractionList[rIL]
+                                    )
+                                )
+                                {
+                                    addCellToRefer = false;
+
+                                    break;
+                                }
+                            }
+
+                            // Check for cellToRefer being referred back
+                            // ontop of a real cell
+
+                            if
+                            (
+                                cellToRefer.duplicate
+                                (
+                                    Pstream::myProcNo(),
+                                    mesh.nCells()
+                                )
+                            )
+                            {
+                                addCellToRefer = false;
+                            }
+
+                            if (addCellToRefer)
+                            {
+                                referredInteractionList.append(cellToRefer);
+                            }
+
+                            // add real cells found in range of cyclic patch
+                            // to whole mesh list
+
+                            if (findIndex (rCellsWRRP, realCell) == -1)
+                            {
+                                rCellsWRRP.append(realCell);
+                            }
+                        }
+                    }
+
+                    referredInteractionList.shrink();
+
+                    labelList referredCellsFoundInRange
+                    (
+                        il_.referredCellsInRangeOfSegment
+                        (
+                            referredInteractionList,
+                            meshFacesOnThisSegment,
+                            meshEdgesOnThisSegment,
+                            meshPointsOnThisSegment
+                        )
+                    );
+
+                    forAll(referredCellsFoundInRange,cFIR)
+                    {
+                        referredCell& existingRefCell =
+                            referredInteractionList
+                            [
+                                referredCellsFoundInRange[cFIR]
+                            ];
+
+                        referredCell cellToReRefer =
+                            existingRefCell.reRefer
+                            (
+                                patch.faceCentres()[0],
+                                patch.faceCentres()[patch.size()/2],
+                                patch.faceNormals()[0],
+                                patch.faceNormals()[patch.size()/2]
+                            );
+
+                        // Test all existing referred and real cells to check
+                        // duplicates are not being made or cells aren't being
+                        // referred back onto themselves
+
+                        bool addCellToReRefer = true;
+
+                        // Check if cellToRefer is an existing referred cell
+
+                        forAll(referredInteractionList, rIL)
+                        {
+                            if
+                            (
+                                cellToReRefer.duplicate
+                                (
+                                    referredInteractionList[rIL]
+                                )
+                            )
+                            {
+                                addCellToReRefer = false;
+
+                                break;
+                            }
+                        }
+
+                        // Check for cellToRefer being referred back
+                        // ontop of a real cell
+
+                        if
+                        (
+                            cellToReRefer.duplicate
+                            (
+                                Pstream::myProcNo(),
+                                mesh.nCells()
+                            )
+                        )
+                        {
+                            addCellToReRefer = false;
+                        }
+
+                        if (addCellToReRefer)
+                        {
+                            referredInteractionList.append(cellToReRefer);
+                        }
+                    }
+
+                    // *********************************************************
+                    // 2nd half of face list - 2nd side of boundary
+                    // *********************************************************
+
+                    meshFacesOnThisSegment.clear();
+
+                    for (faceI = patch.size()/2; faceI < patch.size(); faceI++)
+                    {
+                        // unable to use the normal accessors for the polyPatch
+                        // because points on separate halves need used
+                        // separately
+
+                        meshFacesOnThisSegment.append(faceI + patch.start());
+                    }
+
+                    meshFacesOnThisSegment.shrink();
+
+                    meshEdgesOnThisSegment.clear();
+
+                    meshPointsOnThisSegment.clear();
+
+                    forAll(meshFacesOnThisSegment, mFOTS)
+                    {
+                        const label segFace = meshFacesOnThisSegment[mFOTS];
+
+                        const labelList& faceEdges = mesh.faceEdges()[segFace];
+
+                        forAll (faceEdges, fE)
+                        {
+                            const label faceEdge(faceEdges[fE]);
+
+                            if
+                            (
+                                findIndex
+                                (
+                                    meshEdgesOnThisSegment,
+                                    faceEdge
+                                )
+                             ==
+                                -1
+                            )
+                            {
+                                meshEdgesOnThisSegment.append(faceEdge);
+                            }
+                        }
+
+                        const face& facePoints(mesh.faces()[segFace]);
+
+                        forAll (facePoints, fP)
+                        {
+                            const label facePoint(facePoints[fP]);
+
+                            if
+                            (
+                                findIndex
+                                (
+                                    meshPointsOnThisSegment,
+                                    facePoint
+                                )
+                             ==
+                                -1
+                            )
+                            {
+                                meshPointsOnThisSegment.append(facePoint);
+                            }
+                        }
+                    }
+
+                    meshEdgesOnThisSegment.shrink();
+
+                    meshPointsOnThisSegment.shrink();
+
+                    if (iterationNo == 0)
+                    {
+                        // Assessing real cells in range is only required on
+                        // the 1st iteration because they do not change from
+                        // iteration to iteration.
+
+                        labelList realCellsFoundInRange
+                        (
+                            il_.realCellsInRangeOfSegment
+                            (
+                                meshFacesOnThisSegment,
+                                meshEdgesOnThisSegment,
+                                meshPointsOnThisSegment
+                            )
+                        );
+
+                        forAll(realCellsFoundInRange,cFIR)
+                        {
+                            const label realCell = realCellsFoundInRange[cFIR];
+
+                            referredCell cellToRefer
+                            (
+                                mesh,
+                                Pstream::myProcNo(),
+                                realCell,
+                                patch.faceCentres()[patch.size()/2],
+                                patch.faceCentres()[0],
+                                patch.faceNormals()[patch.size()/2],
+                                patch.faceNormals()[0]
+                            );
+
+                            // Test all existing referred and real cells to
+                            // check duplicates are not being made or cells
+                            // aren't being referred back onto themselves
+
+                            bool addCellToRefer = true;
+
+                            // Check if cellToRefer is an existing referred cell
+
+                            forAll(referredInteractionList, rIL)
+                            {
+                                if
+                                (
+                                    cellToRefer.duplicate
+                                    (
+                                        referredInteractionList[rIL]
+                                    )
+                                )
+                                {
+                                    addCellToRefer = false;
+
+                                    break;
+                                }
+                            }
+
+                            // Check for cellToRefer being referred back
+                            // ontop of a real cell
+
+                            if
+                            (
+                                cellToRefer.duplicate
+                                (
+                                    Pstream::myProcNo(),
+                                    mesh.nCells()
+                                )
+                            )
+                            {
+                                addCellToRefer = false;
+                            }
+
+                            if (addCellToRefer)
+                            {
+                                referredInteractionList.append(cellToRefer);
+                            }
+
+                            // add real cells found in range of cyclic patch
+                            // to whole mesh list
+
+                            if (findIndex (rCellsWRRP, realCell) == -1)
+                            {
+                                rCellsWRRP.append(realCell);
+                            }
+                        }
+                    }
+
+                    referredInteractionList.shrink();
+
+                    referredCellsFoundInRange =
+                        il_.referredCellsInRangeOfSegment
+                        (
+                            referredInteractionList,
+                            meshFacesOnThisSegment,
+                            meshEdgesOnThisSegment,
+                            meshPointsOnThisSegment
+                        );
+
+                    forAll(referredCellsFoundInRange,cFIR)
+                    {
+                        referredCell& existingRefCell =
+                            referredInteractionList
+                            [
+                                referredCellsFoundInRange[cFIR]
+                            ];
+
+                        referredCell cellToReRefer =
+                            existingRefCell.reRefer
+                            (
+                                patch.faceCentres()[patch.size()/2],
+                                patch.faceCentres()[0],
+                                patch.faceNormals()[patch.size()/2],
+                                patch.faceNormals()[0]
+                            );
+
+                        // Test all existing referred and real cells to check
+                        // duplicates are not being made or cells aren't being
+                        // referred back onto themselves
+
+                        bool addCellToReRefer = true;
+
+                        // Check if cellToRefer is an existing referred cell
+
+                        forAll(referredInteractionList, rIL)
+                        {
+                            if
+                            (
+                                cellToReRefer.duplicate
+                                (
+                                    referredInteractionList[rIL]
+                                )
+                            )
+                            {
+                                addCellToReRefer = false;
+
+                                break;
+                            }
+                        }
+
+                        // Check for cellToRefer being referred back
+                        // ontop of a real cell
+
+                        if
+                        (
+                            cellToReRefer.duplicate
+                            (
+                                Pstream::myProcNo(),
+                                mesh.nCells()
+                            )
+                        )
+                        {
+                            addCellToReRefer = false;
+                        }
+
+                        if (addCellToReRefer)
+                        {
+                            referredInteractionList.append(cellToReRefer);
+                        }
+                    }
+                }
+            }
+        }
+
+        if (Pstream::parRun())
+        {
+            labelList procPatches(mesh.globalData().processorPatches());
+
+            forAll(procPatches,pP)
+            {
+                const processorPolyPatch& patch =
+                    refCast<const processorPolyPatch>
+                    (
+                        mesh.boundaryMesh()[procPatches[pP]]
+                    );
+
+                DynamicList<referredCell> referredCellsToTransfer;
+
+                const vectorList& neighbFaceCentres =
+                    allNeighbourFaceCentres[pP];
+
+                const vectorList& neighbFaceAreas = allNeighbourFaceAreas[pP];
+
+                label nUP;
+
+                for
+                (
+                    nUP = -nUndecomposedPatches;
+                    nUP <= nUndecomposedPatches;
+                    nUP++
+                )
+                {
+                    // faceT is used to specify one face on this patch segment
+                    // that will be used to calculate the transformation values.
+                    // All faces are guaranteed to produce the same transform
+                    // because of the checks carried out at the start of the
+                    // function.  Setting to -1 until the 1st face on this
+                    // segment is found.
+
+                    label faceT = -1;
+
+                    DynamicList<label> meshFacesOnThisSegment;
+
+                    forAll (patch, faceI)
+                    {
+                        if (processorPatchSegmentMapping[pP][faceI] == nUP)
+                        {
+                            if (faceT == -1)
+                            {
+                                faceT = faceI;
+                            }
+
+                            meshFacesOnThisSegment.append
+                            (
+                                faceI + patch.start()
+                            );
+                        }
+                    }
+
+                    meshFacesOnThisSegment.shrink();
+
+                    DynamicList<label> meshEdgesOnThisSegment;
+
+                    DynamicList<label> meshPointsOnThisSegment;
+
+                    forAll(meshFacesOnThisSegment, mFOTS)
+                    {
+                        const label segFace = meshFacesOnThisSegment[mFOTS];
+
+                        const labelList& faceEdges = mesh.faceEdges()[segFace];
+
+                        forAll (faceEdges, fE)
+                        {
+                            const label faceEdge(faceEdges[fE]);
+
+                            if
+                            (
+                                findIndex
+                                (
+                                    meshEdgesOnThisSegment,
+                                    faceEdge
+                                )
+                             ==
+                                -1
+                            )
+                            {
+                                meshEdgesOnThisSegment.append(faceEdge);
+                            }
+                        }
+
+                        const face& facePoints(mesh.faces()[segFace]);
+
+                        forAll (facePoints, fP)
+                        {
+                            const label facePoint(facePoints[fP]);
+
+                            if
+                            (
+                                findIndex
+                                (
+                                    meshPointsOnThisSegment,
+                                    facePoint
+                                )
+                             ==
+                                -1
+                            )
+                            {
+                                meshPointsOnThisSegment.append(facePoint);
+                            }
+                        }
+                    }
+
+                    meshEdgesOnThisSegment.shrink();
+
+                    meshPointsOnThisSegment.shrink();
+
+                    if (meshFacesOnThisSegment.size())
+                    {
+                        if (faceT == -1)
+                        {
+                            FatalErrorIn ("referredCellList.C")
+                                << nl << "faceT == -1 encountered but "
+                                << meshFacesOnThisSegment.size()
+                                << " faces found on patch segment."
+                                << abort(FatalError);
+                        }
+
+                        if (iterationNo == 0)
+                        {
+                            // Assessing real cells in range is only required on
+                            // the 1st iteration because they do not change from
+                            // iteration to iteration.
+
+                            labelList realCellsFoundInRange
+                            (
+                                il_.realCellsInRangeOfSegment
+                                (
+                                    meshFacesOnThisSegment,
+                                    meshEdgesOnThisSegment,
+                                    meshPointsOnThisSegment
+                                )
+                            );
+
+                            forAll(realCellsFoundInRange,cFIR)
+                            {
+                                const label realCell =
+                                    realCellsFoundInRange[cFIR];
+
+                                referredCell cellToRefer
+                                (
+                                    mesh,
+                                    Pstream::myProcNo(),
+                                    realCell,
+                                    patch.faceCentres()[faceT],
+                                    neighbFaceCentres[faceT],
+                                    patch.faceNormals()[faceT],
+                                    neighbFaceAreas[faceT]
+                                    /(mag(neighbFaceAreas[faceT]) + VSMALL)
+                                );
+
+                                referredCellsToTransfer.append(cellToRefer);
+
+                                // add real cells found in range of processor
+                                // patch to whole mesh list
+
+                                if (findIndex (rCellsWRRP, realCell) == -1)
+                                {
+                                    rCellsWRRP.append(realCell);
+                                }
+                            }
+                        }
+
+                        referredInteractionList.shrink();
+
+                        labelList referredCellsFoundInRange
+                        (
+                            il_.referredCellsInRangeOfSegment
+                            (
+                                referredInteractionList,
+                                meshFacesOnThisSegment,
+                                meshEdgesOnThisSegment,
+                                meshPointsOnThisSegment
+                            )
+                        );
+
+                        forAll(referredCellsFoundInRange,cFIR)
+                        {
+                            referredCell& existingRefCell =
+                                referredInteractionList
+                                [
+                                    referredCellsFoundInRange[cFIR]
+                                ];
+
+                            referredCell cellToReRefer =
+                                existingRefCell.reRefer
+                                (
+                                    patch.faceCentres()[faceT],
+                                    neighbFaceCentres[faceT],
+                                    patch.faceNormals()[faceT],
+                                    neighbFaceAreas[faceT]
+                                    /(mag(neighbFaceAreas[faceT]) + VSMALL)
+                                );
+
+                            referredCellsToTransfer.append(cellToReRefer);
+                        }
+                    }
+                }
+
+                referredCellsToTransfer.shrink();
+
+                // Send these cells to the neighbouring processor.
+
+                {
+                    OPstream toNeighbProc
+                    (
+                        Pstream::blocking,
+                        patch.neighbProcNo()
+                    );
+
+                    toNeighbProc << referredCellsToTransfer;
+                }
+            }
+
+            forAll(procPatches,pP)
+            {
+                const processorPolyPatch& patch =
+                refCast<const processorPolyPatch>
+                (
+                    mesh.boundaryMesh()[procPatches[pP]]
+                );
+
+                // Receive the cells from neighbour
+
+                List<referredCell> referredCellsFromNeighbour(patch.size());
+
+                {
+                    IPstream fromNeighbProc
+                    (
+                        Pstream::blocking,
+                        patch.neighbProcNo()
+                    );
+
+                    fromNeighbProc >> referredCellsFromNeighbour;
+                }
+
+                // Check to see if they are duplicates, if not append
+                // them to the referredInteractionList
+
+                forAll(referredCellsFromNeighbour,rCFN)
+                {
+                    referredCell& cellToRefer =
+                    referredCellsFromNeighbour[rCFN];
+
+                    // Test all existing referred and real cells to check
+                    // duplicates are not being made or cells aren't being
+                    // referred back onto themselves
+
+                    bool addCellToRefer = true;
+
+                    // Check if cellToRefer is an existing referred cell
+
+                    forAll(referredInteractionList, rIL)
+                    {
+                        if (cellToRefer.duplicate(referredInteractionList[rIL]))
+                        {
+                            addCellToRefer = false;
+
+                            break;
+                        }
+                    }
+
+                    // Check for cellToRefer being referred back ontop of a real
+                    // cell
+
+                    if
+                    (
+                        cellToRefer.duplicate
+                        (
+                            Pstream::myProcNo(),
+                            mesh.nCells()
+                        )
+                    )
+                    {
+                        addCellToRefer = false;
+                    }
+
+                    if (addCellToRefer)
+                    {
+                        referredInteractionList.append(cellToRefer);
+                    }
+                }
+            }
+        }
+
+        if (iterationNo == 0)
+        {
+            // record all real cells in range of any referring patch (cyclic or
+            // processor) on the first iteration when the real cells are
+            // evaluated.
+
+            rCellsWRRP.shrink();
+
+            // construct {faces, edges, points}WithinRCutMaxOfAnyReferringPatch
+
+            forAll(rCellsWRRP, rCWR)
+            {
+                const label realCell(rCellsWRRP[rCWR]);
+
+                const labelList& rCFaces
+                (
+                    mesh.cells()[realCell]
+                );
+
+                forAll(rCFaces, rCF)
+                {
+                    const label f(rCFaces[rCF]);
+
+                    if (findIndex(rFacesWRRP,f) == -1)
+                    {
+                        rFacesWRRP.append(f);
+                    }
+                }
+
+                const labelList& rCEdges
+                (
+                    mesh.cellEdges()[realCell]
+                );
+
+                forAll(rCEdges, rCE)
+                {
+                    const label e(rCEdges[rCE]);
+
+                    if (findIndex(rEdgesWRRP,e) == -1)
+                    {
+                        rEdgesWRRP.append(e);
+                    }
+                }
+
+                const labelList& rCPoints
+                (
+                    mesh.cellPoints()[realCell]
+                );
+
+                forAll(rCPoints, rCP)
+                {
+                    const label p(rCPoints[rCP]);
+
+                    if (findIndex(rPointsWRRP,p) == -1)
+                    {
+                        rPointsWRRP.append(p);
+                    }
+                }
+            }
+
+            rFacesWRRP.shrink();
+
+            rEdgesWRRP.shrink();
+
+            rPointsWRRP.shrink();
+        }
+
+        iterationNo++;
+
+        cellsReferredThisIteration =
+            referredInteractionList.size() - refIntListStartSize;
+
+        reduce(cellsReferredThisIteration, sumOp<label>());
+
+        Info<< tab << "Cells added this iteration: "
+            << cellsReferredThisIteration << endl;
+    }
+
+    referredInteractionList.shrink();
+
+    //     Info<< "referredInteractionList.size() = "
+    //         << referredInteractionList.size() << endl;
+
+    //     forAll(referredInteractionList,rIL)
+    //     {
+    //         Info<< referredInteractionList[rIL];
+    //     }
+
+    (*this).setSize
+    (
+        referredInteractionList.size()
+    );
+
+    forAll(referredInteractionList, rIL)
+    {
+        (*this)[rIL] = referredInteractionList[rIL];
+    }
+
+    Info<< nl << "Finding real cells in range of referred cells" << endl;
+
+    forAll(*this, rC)
+    {
+        const polyMesh& mesh(il_.mesh());
+
+        referredCell& refCell = (*this)[rC];
+
+        DynamicList<label> realCellsFoundInRange;
+
+        const vectorList& refCellPoints = refCell.vertexPositions();
+
+        forAll(rFacesWRRP, rCF)
+        {
+            const label f(rFacesWRRP[rCF]);
+
+            if (il_.testPointFaceDistance(refCellPoints,f))
+            {
+                const label cellO(mesh.faceOwner()[f]);
+
+                if (findIndex(realCellsFoundInRange, cellO) == -1)
+                {
+                    realCellsFoundInRange.append(cellO);
+                }
+
+                if (mesh.isInternalFace(f))
+                {
+                    // boundary faces will not have neighbour information
+
+                    const label cellN(mesh.faceNeighbour()[f]);
+
+                    if (findIndex(realCellsFoundInRange, cellN) == -1)
+                    {
+                        realCellsFoundInRange.append(cellN);
+                    }
+                }
+            }
+        }
+
+        forAll(rPointsWRRP, rCP)
+        {
+            const label p(rPointsWRRP[rCP]);
+
+            if (il_.testPointFaceDistance(p,refCell))
+            {
+                const labelList& pCells(mesh.pointCells()[p]);
+
+                forAll(pCells, pC)
+                {
+                    const label cellI(pCells[pC]);
+
+                    if (findIndex(realCellsFoundInRange, cellI) == -1)
+                    {
+                        realCellsFoundInRange.append(cellI);
+                    }
+                }
+            }
+        }
+
+
+        const edgeList& refCellEdges = refCell.edges();
+
+        forAll(rEdgesWRRP, rCE)
+        {
+            const label edgeIIndex(rEdgesWRRP[rCE]);
+
+            const edge& eI(mesh.edges()[edgeIIndex]);
+
+            forAll(refCellEdges, rCE)
+            {
+                const edge& eJ(refCellEdges[rCE]);
+
+                if
+                (
+                    il_.testEdgeEdgeDistance
+                    (
+                        eI,
+                        refCellPoints[eJ.start()],
+                        refCellPoints[eJ.end()]
+                    )
+                )
+                {
+                    const labelList& eICells(mesh.edgeCells()[edgeIIndex]);
+
+                    forAll(eICells, eIC)
+                    {
+                        const label cellI(eICells[eIC]);
+
+                        if (findIndex(realCellsFoundInRange, cellI) == -1)
+                        {
+                            realCellsFoundInRange.append(cellI);
+                        }
+                    }
+                }
+            }
+        }
+
+//         scalar rCutMaxSqr = molCloud_.rCutMax()*molCloud_.rCutMax();
+//
+//         forAll (molCloud_.mesh().points(), pointIIndex)
+//         {
+//             const point& ptI
+//             (
+//                 molCloud_.mesh().points()[pointIIndex]
+//             );
+//
+//             forAll(refCellPoints, rCP)
+//             {
+//                 if (magSqr(ptI - refCellPoints[rCP]) <= rCutMaxSqr)
+//                 {
+//                     const labelList& ptICells
+//                     (
+//                         molCloud_.mesh().pointCells()[pointIIndex]
+//                     );
+//
+//                     forAll(ptICells, pIC)
+//                     {
+//                         const label cellI(ptICells[pIC]);
+//
+//                         if (findIndex(realCellsFoundInRange, cellI) == -1)
+//                         {
+//                             realCellsFoundInRange.append(cellI);
+//                         }
+//                     }
+//                 }
+//             }
+//         }
+
+        refCell.realCells() = realCellsFoundInRange.shrink();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::referredCellList::referredCellList
+(
+    interactionLists& il,
+    bool pointPointListBuild
+)
+:
+    List<referredCell>(),
+    il_(il)
+{
+    buildReferredCellList(pointPointListBuild);
+}
+
+
+Foam::referredCellList::referredCellList(interactionLists& il)
+:
+    List<referredCell>(),
+    il_(il)
+{
+    Info<< "Read referredCellList from disk not implemented" << endl;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::referredCellList::~referredCellList()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::referredCellList::referMolecules
+(
+    const List<DynamicList<molecule*> >& cellOccupancy
+)
+{
+    // Create referred molecules for sending using cell occupancy and
+    // cellSendingReferralLists
+
+    forAll(il_.cellSendingReferralLists(), cSRL)
+    {
+        const sendingReferralList& sRL
+        (
+            il_.cellSendingReferralLists()[cSRL]
+        );
+
+        List<DynamicList<referredMolecule> > molsToReferOut(sRL.size());
+
+        forAll(sRL, sRLI)
+        {
+            List<molecule*> realMols = cellOccupancy[sRL[sRLI]];
+
+            forAll (realMols, rM)
+            {
+                molecule* mol = realMols[rM];
+
+                molsToReferOut[sRLI].append
+                (
+                    referredMolecule
+                    (
+                        mol->id(),
+                        mol->position(),
+                        mol->sitePositions()
+                    )
+                );
+            }
+
+            molsToReferOut[sRLI].shrink();
+        }
+
+        // Send lists of referred molecules to other processors
+
+        if (sRL.destinationProc() != Pstream::myProcNo())
+        {
+            if (Pstream::parRun())
+            {
+                OPstream toInteractingProc
+                (
+                    Pstream::blocking,
+                    sRL.destinationProc()
+                );
+
+                toInteractingProc << molsToReferOut;
+            }
+        }
+        else
+        {
+            // Refer molecules directly for referred cells on the same
+            // processor.
+
+            const receivingReferralList& rRL
+            (
+                il_.cellReceivingReferralLists()[cSRL]
+            );
+
+            forAll(rRL, rRLI)
+            {
+                forAll(rRL[rRLI], rC)
+                {
+                    referredCell& refCellToRefMolsTo = (*this)[rRL[rRLI][rC]];
+
+                    refCellToRefMolsTo.referInMols(molsToReferOut[rRLI]);
+                }
+            }
+        }
+    }
+
+    // Receive referred molecule lists to and distribute to referredCells
+    // according tocellReceivingReferralLists, referredCells deal with the
+    // transformations themselves
+
+    forAll(il_.cellReceivingReferralLists(), cRRL)
+    {
+        const receivingReferralList& rRL
+        (
+            il_.cellReceivingReferralLists()[cRRL]
+        );
+
+        List<List<referredMolecule> > molsToReferIn(rRL.size());
+
+        if (rRL.sourceProc() != Pstream::myProcNo())
+        {
+            if (Pstream::parRun())
+            {
+                IPstream fromInteractingProc
+                (
+                    Pstream::blocking,
+                    rRL.sourceProc()
+                );
+
+                fromInteractingProc >> molsToReferIn;
+            }
+
+            forAll(rRL, rRLI)
+            {
+                forAll(rRL[rRLI], rC)
+                {
+                    referredCell& refCellToRefMolsTo = (*this)[rRL[rRLI][rC]];
+
+                    refCellToRefMolsTo.referInMols(molsToReferIn[rRLI]);
+                }
+            }
+        }
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/IndirectList/IndirectList.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
similarity index 68%
rename from applications/test/IndirectList/IndirectList.H
rename to src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
index df8e59bdd..433cf7fe3 100644
--- a/applications/test/IndirectList/IndirectList.H
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.H
@@ -23,65 +23,76 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::IndirectList
+    Foam::referredCellList
 
 Description
 
 SourceFiles
-    IndirectListI.H
+    referredCellListI.H
+    referredCellList.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef IndirectList_H
-#define IndirectList_H
+#ifndef referredCellList_H
+#define referredCellList_H
 
-#include "List.H"
+#include "referredCell.H"
+#include "molecule.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward declaration of classes
+class interactionLists;
+
 /*---------------------------------------------------------------------------*\
-                           Class IndirectList Declaration
+                      Class referredCellList Declaration
 \*---------------------------------------------------------------------------*/
 
-template<class T>
-class IndirectList
+class referredCellList
+:
+    public List<referredCell>
 {
     // Private data
 
-        const UList<T>& completeList_;
-        List<label> addresses_;
+        const interactionLists& il_;
 
 
     // Private Member Functions
 
-        //- Disallow default bitwise assignment
-        void operator=(const IndirectList<T>&);
+        void buildReferredCellList
+        (
+            bool pointPointListBuild
+        );
 
 
 public:
 
     // Constructors
 
-        //- Construct given the complete list and the addressing array
-        inline IndirectList(const UList<T>&, const List<label>&);
+        //- Construct lists by searching the mesh
+        referredCellList
+        (
+            interactionLists& il,
+            bool pointPointListBuild
+        );
+
+        //- Construct from file
+        referredCellList (interactionLists& il);
+
+
+    // Destructor
+
+        ~referredCellList();
 
 
     // Member Functions
 
-        // Access
+        void referMolecules(const List<DynamicList<molecule*> >& cellOccupancy);
 
-            inline label size() const;
-            inline const UList<T>& completeList() const;
-            inline const List<label>& addresses() const;
-
-
-        // Member Operators
-
-            //- Return const access to an element
-            inline const T& operator[](const label) const;
+        inline const interactionLists& il() const;
 };
 
 
@@ -91,7 +102,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "IndirectListI.H"
+#include "referredCellListI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellListI.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellListI.H
new file mode 100644
index 000000000..fbdd12e30
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellListI.H
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
+
+inline const Foam::interactionLists& Foam::referredCellList::il() const
+{
+    return il_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.C
new file mode 100644
index 000000000..7e390bf4e
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.C
@@ -0,0 +1,86 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*----------------------------------------------------------------------------*/
+
+#include "referredMolecule.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::referredMolecule::referredMolecule()
+{}
+
+
+Foam::referredMolecule::referredMolecule
+(
+    const label id,
+    const vector& position,
+    const List<vector>& sitePositions
+)
+:
+    id_(id),
+    position_(position),
+    sitePositions_(sitePositions)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::referredMolecule::~referredMolecule()
+{}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+Foam::Istream& Foam::operator>>
+(
+    Istream& is,
+    referredMolecule& rM
+)
+{
+    is >> rM.id_ >> rM.position_ >> rM.sitePositions_;
+
+    is.check("Istream& operator<<(Istream& f, const referredMolecule& sRL");
+
+    return is;
+}
+
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const referredMolecule& rM
+)
+{
+    os  << rM.id()
+        << token::SPACE << rM.position()
+        << token::SPACE << rM.sitePositions();
+
+    os.check("Ostream& operator<<(Ostream& f, const referredMolecule& rM");
+
+    return os;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H
new file mode 100644
index 000000000..337b25d84
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMolecule.H
@@ -0,0 +1,137 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::referredMolecule
+
+Description
+
+SourceFiles
+    referredMoleculeI.H
+    referredMolecule.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef referredMolecule_H
+#define referredMolecule_H
+
+#include "vector.H"
+#include "List.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class referredMolecule Declaration
+\*---------------------------------------------------------------------------*/
+
+class referredMolecule
+{
+    // Private data
+
+        label id_;
+
+        vector position_;
+
+        List<vector> sitePositions_;
+
+
+public:
+
+    // Constructors
+
+        //- Construct null
+        referredMolecule();
+
+        //- Construct from components
+        referredMolecule
+        (
+            const label id,
+            const vector& position,
+            const List<vector>& sitePositions
+        );
+
+
+    // Destructor
+
+        virtual ~referredMolecule();
+
+
+    // Member Functions
+
+        // Access
+
+            inline label id() const;
+
+            inline const vector& position() const;
+
+            inline const List<vector>& sitePositions() const;
+
+
+    // Friend Operators
+
+        inline friend bool operator==
+        (
+            const referredMolecule& a,
+            const referredMolecule& b
+        );
+
+        inline friend bool operator!=
+        (
+            const referredMolecule& a,
+            const referredMolecule& b
+        );
+
+
+    // IOstream Operators
+
+        friend Istream& operator>>
+        (
+            Istream&,
+            referredMolecule&
+        );
+
+        friend Ostream& operator<<
+        (
+            Ostream&,
+            const referredMolecule&
+        );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "referredMoleculeI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/test/dictionary/calcEntry/calcEntry.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMoleculeI.H
similarity index 64%
rename from applications/test/dictionary/calcEntry/calcEntry.C
rename to src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMoleculeI.H
index 72509ea9d..0bf626ac2 100644
--- a/applications/test/dictionary/calcEntry/calcEntry.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredMolecule/referredMoleculeI.H
@@ -24,47 +24,51 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "calcEntry.H"
-#include "dictionary.H"
-#include "IStringStream.H"
-#include "OStringStream.H"
-#include "addToMemberFunctionSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace functionEntries
-{
-    defineTypeNameAndDebug(calcEntry, 0);
-
-    addToMemberFunctionSelectionTable
-    (
-        functionEntry,
-        calcEntry,
-        execute,
-        primitiveEntryIstream
-    );
-
-}
-}
-
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool Foam::functionEntries::calcEntry::execute
+inline Foam::label Foam::referredMolecule::id() const
+{
+    return id_;
+}
+
+
+inline const Foam::vector& Foam::referredMolecule::position() const
+{
+    return position_;
+}
+
+
+inline const Foam::List<Foam::vector>&
+Foam::referredMolecule::sitePositions() const
+{
+    return sitePositions_;
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+inline bool Foam::operator==
 (
-    const dictionary& parentDict,
-    primitiveEntry& entry,
-    Istream& is
+    const Foam::referredMolecule& a,
+    const Foam::referredMolecule& b
 )
 {
-    dictionary args(parentDict, is);
-    OStringStream resultStream;
-    resultStream
-        << (args.lookup("x")[0].number() + args.lookup("y")[0].number());
-    entry.read(parentDict, IStringStream(resultStream.str())());
-    return true;
+    return
+    (
+        a.id() == b.id()
+     && a.position() == b.position()
+    );
+}
+
+
+inline bool Foam::operator!=
+(
+    const Foam::referredMolecule& a,
+    const Foam::referredMolecule& b
+)
+{
+    return !(a == b);
 }
 
 
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
index db0c24bc9..9781c9d70 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
@@ -5,68 +5,68 @@ if (runTime.outputTime())
     \*-----------------------------------------------------------------------*/
 
     scalarField totalRhoN_sum(mesh.nCells(), 0.0);
-    
+
     forAll (allSpeciesRhoN, rN)
     {
         allSpeciesRhoN[rN].internalField() =
             allSpeciesN_RU[rN]
             /mesh.cellVolumes()
             /nAveragingSteps;
-            
+
         totalRhoN_sum += allSpeciesRhoN[rN].internalField();
     }
-    
+
     totalRhoN.internalField() = totalRhoN_sum;
-    
-    
+
+
     /*-----------------------------------------------------------------------*\
         Mass density
     \*-----------------------------------------------------------------------*/
-    
+
     scalarField totalRhoM_sum(mesh.nCells(), 0.0);
-    
+
     forAll (allSpeciesRhoM, rM)
     {
         allSpeciesRhoM[rM].internalField() =
             allSpeciesM_RU[rM]
             /mesh.cellVolumes()
             /nAveragingSteps;
-            
+
         totalRhoM_sum += allSpeciesRhoM[rM].internalField();
     }
-    
+
     totalRhoM.internalField() = totalRhoM_sum;
-    
+
     /*-----------------------------------------------------------------------*\
         Bulk velocity
     \*-----------------------------------------------------------------------*/
-    
+
     vectorField totalMomentum_sum(mesh.nCells(), vector::zero);
-    
+
     scalarField totalMass_sum(mesh.nCells(), 0.0);
-    
+
     forAll (allSpeciesVelocity, v)
     {
         // A check for 1/0 molecules is required.
-    
+
         vectorField& singleSpeciesVelocity
         (
             allSpeciesVelocity[v].internalField()
         );
-        
+
         forAll(singleSpeciesVelocity, sSV)
         {
-            if(allSpeciesN_RU[v][sSV])
+            if (allSpeciesN_RU[v][sSV])
             {
-                singleSpeciesVelocity[sSV] = 
+                singleSpeciesVelocity[sSV] =
                     allSpeciesVelocitySum_RU[v][sSV]
                     /allSpeciesN_RU[v][sSV];
-                    
+
                 totalMomentum_sum[sSV] +=
                     allSpeciesM_RU[v][sSV]
                     /allSpeciesN_RU[v][sSV]
                     *allSpeciesVelocitySum_RU[v][sSV];
-                    
+
                 totalMass_sum[sSV] += allSpeciesM_RU[v][sSV];
             }
             else
@@ -75,10 +75,10 @@ if (runTime.outputTime())
             }
         }
     }
-    
+
     forAll(totalVelocity.internalField(), tV)
     {
-        if(totalMass_sum[tV] > VSMALL)
+        if (totalMass_sum[tV] > VSMALL)
         {
             totalVelocity.internalField()[tV] =
                 totalMomentum_sum[tV]
@@ -90,34 +90,33 @@ if (runTime.outputTime())
             vector::zero;
         }
     }
-    
+
     /*-----------------------------------------------------------------------*\
         Kinetic temperature
     \*-----------------------------------------------------------------------*/
-    
+
     scalarField totalTemperatureVTerms_sum(mesh.nCells(), 0.0);
-    
+
     scalarField totalN_sum(mesh.nCells(), 0.0);
-    
+
     forAll (allSpeciesTemperature, t)
     {
         // A check for 1/0 molecules is required.
-    
+
         scalarField& singleSpeciesTemp
         (
             allSpeciesTemperature[t].internalField()
         );
-        
+
         forAll(singleSpeciesTemp, sST)
         {
-            if(allSpeciesN_RU[t][sST])
+            if (allSpeciesN_RU[t][sST])
             {
-                singleSpeciesTemp[sST] = 
+                singleSpeciesTemp[sST] =
                     allSpeciesM_RU[t][sST]
                     /allSpeciesN_RU[t][sST]
                     /(3.0 * moleculeCloud::kb * allSpeciesN_RU[t][sST])
-                    *
-                    (
+                   *(
                         allSpeciesVelocityMagSquaredSum_RU[t][sST]
                         -
                         (
@@ -127,14 +126,13 @@ if (runTime.outputTime())
                         )
                         /allSpeciesN_RU[t][sST]
                     );
-                    
+
                 totalTemperatureVTerms_sum[sST] +=
                     allSpeciesM_RU[t][sST]
-                    /allSpeciesN_RU[t][sST]
-                    *
-                    (
+                   /allSpeciesN_RU[t][sST]
+                   *(
                         allSpeciesVelocityMagSquaredSum_RU[t][sST]
-                        -
+                      -
                         (
                             allSpeciesVelocitySum_RU[t][sST]
                             &
@@ -142,7 +140,7 @@ if (runTime.outputTime())
                         )
                         /allSpeciesN_RU[t][sST]
                     );
-                    
+
                 totalN_sum[sST] += allSpeciesN_RU[t][sST];
             }
             else
@@ -151,7 +149,7 @@ if (runTime.outputTime())
             }
         }
     }
-    
+
     forAll(totalTemperature.internalField(), tT)
     {
         if(totalN_sum[tT] > 0)
@@ -165,41 +163,39 @@ if (runTime.outputTime())
             totalTemperature.internalField()[tT] = 0.0;
         }
     }
-    
+
     /*-----------------------------------------------------------------------*\
         Mean kinetic energy
     \*-----------------------------------------------------------------------*/
-    
+
     scalarField totalKE_sum(mesh.nCells(), 0.0);
-    
+
     forAll (allSpeciesMeanKE, mKE)
     {
         // A check for 1/0 molecules is required.
-    
+
         scalarField& singleSpeciesMeanKE
         (
             allSpeciesMeanKE[mKE].internalField()
         );
-        
+
         forAll(singleSpeciesMeanKE, sSMKE)
         {
             if(allSpeciesN_RU[mKE][sSMKE])
             {
-                singleSpeciesMeanKE[sSMKE] = 
+                singleSpeciesMeanKE[sSMKE] =
                     allSpeciesM_RU[mKE][sSMKE]
-                    /allSpeciesN_RU[mKE][sSMKE]
-                    /(2.0 * allSpeciesN_RU[mKE][sSMKE])
-                    *
-                    (
+                   /allSpeciesN_RU[mKE][sSMKE]
+                   /(2.0*allSpeciesN_RU[mKE][sSMKE])
+                   *(
                         allSpeciesVelocityMagSquaredSum_RU[mKE][sSMKE]
                     );
-                    
+
                 totalKE_sum[sSMKE] +=
                     allSpeciesM_RU[mKE][sSMKE]
                     /allSpeciesN_RU[mKE][sSMKE]
                     /2.0
-                    *
-                    (
+                   *(
                         allSpeciesVelocityMagSquaredSum_RU[mKE][sSMKE]
                     );
             }
@@ -209,7 +205,7 @@ if (runTime.outputTime())
             }
         }
     }
-    
+
     forAll(totalMeanKE.internalField(), tMKE)
     {
         if(totalN_sum[tMKE] > 0)
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
index ff9dc30ee..76fd5d6c6 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateAutoCorrelationFunctions.H
@@ -60,18 +60,15 @@ if (mesh.time().timeIndex() % pacf.sampleSteps() == 0)
     {
         p.x() +=
             mol().mass() * mol().U().y() * mol().U().z()
-            +
-            0.5 * mol().rf().yz();
+          + 0.5*mol().rf().yz();
 
         p.y() +=
             mol().mass() * mol().U().z() * mol().U().x()
-            +
-            0.5 * mol().rf().zx();
+          + 0.5*mol().rf().zx();
 
         p.z() +=
             mol().mass() * mol().U().x() * mol().U().y()
-            +
-            0.5 * mol().rf().xy();
+          + 0.5*mol().rf().xy();
     }
 
     pacf.calculateCorrelationFunction(p);
@@ -93,12 +90,10 @@ if (mesh.time().timeIndex() % hfacf.sampleSteps() == 0)
     {
         s +=
         (
-            0.5 * mol().mass() * magSqr(mol().U())
-            +
-            mol().potentialEnergy()
-        ) * mol().U()
-        +
-        0.5 * ( mol().rf() & mol().U() );
+            0.5*mol().mass()*magSqr(mol().U())
+          + mol().potentialEnergy()
+        )*mol().U()
+      + 0.5*(mol().rf() & mol().U());
     }
 
     hfacf.calculateCorrelationFunction(s);
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H
index 2a2f38975..fc054e670 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateTransportProperties.H
@@ -37,7 +37,7 @@ if (writeVacf)
     }
 }
 
-Info << "Diffusion coefficient = "
+Info<< "Diffusion coefficient = "
     << vacf.integral() << endl;
 
 if (writePacf)
@@ -57,13 +57,13 @@ Info<< "Viscosity = "
     << pacf.integral()/averageTemperature/moleculeCloud::kb/meshVolume
     << endl;
 
-if(writeHFacf)
+if (writeHFacf)
 {
     OFstream hfacfFile
     (
         runTime.path()/ + "hfacf"
     );
-    
+
     if (!hfacf.writeAveraged(hfacfFile))
     {
         FatalErrorIn(args.executable())
@@ -73,7 +73,7 @@ if(writeHFacf)
     }
 }
 
-Info << "Thermal conductivity = "
+Info<< "Thermal conductivity = "
     << hfacf.integral()
         /averageTemperature
         /averageTemperature
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
index dccd1891a..730db2d0a 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
@@ -2,25 +2,25 @@
 
 List< scalarField > allSpeciesN_RU
 (
-    molecules.pairPotentials().nIds(),
+    molecules.potential().nIds(),
     scalarField (mesh.nCells(), 0.0)
 );
 
 List< scalarField > allSpeciesM_RU
 (
-    molecules.pairPotentials().nIds(),
+    molecules.potential().nIds(),
     scalarField (mesh.nCells(), 0.0)
 );
 
 List< vectorField > allSpeciesVelocitySum_RU
 (
-    molecules.pairPotentials().nIds(),
+    molecules.potential().nIds(),
     vectorField (mesh.nCells(), vector::zero)
 );
 
 List< scalarField > allSpeciesVelocityMagSquaredSum_RU
 (
-    molecules.pairPotentials().nIds(),
+    molecules.potential().nIds(),
     scalarField (mesh.nCells(), 0.0)
 );
 
@@ -34,13 +34,13 @@ Info << nl << "Creating fields." << endl;
 
 PtrList<volScalarField> allSpeciesRhoN
 (
-    molecules.pairPotentials().nIds()
+    molecules.potential().nIds()
 );
 
 forAll (allSpeciesRhoN, rN)
 {
     Info << "    Creating number density field for "
-        << molecules.pairPotentials().idList()[rN] << endl;
+        << molecules.potential().idList()[rN] << endl;
 
     allSpeciesRhoN.set
     (
@@ -49,7 +49,7 @@ forAll (allSpeciesRhoN, rN)
         (
             IOobject
             (
-                "rhoN_" + molecules.pairPotentials().idList()[rN],
+                "rhoN_" + molecules.potential().idList()[rN],
                 runTime.timeName(),
                 mesh,
                 IOobject::NO_READ,
@@ -89,13 +89,13 @@ totalRhoN.correctBoundaryConditions();
 
 PtrList<volScalarField> allSpeciesRhoM
 (
-    molecules.pairPotentials().nIds()
+    molecules.potential().nIds()
 );
 
 forAll (allSpeciesRhoM, rM)
 {
     Info << "    Creating mass density field for "
-        << molecules.pairPotentials().idList()[rM] << endl;
+        << molecules.potential().idList()[rM] << endl;
 
     allSpeciesRhoM.set
     (
@@ -104,7 +104,7 @@ forAll (allSpeciesRhoM, rM)
         (
             IOobject
             (
-                "rhoM_" + molecules.pairPotentials().idList()[rM],
+                "rhoM_" + molecules.potential().idList()[rM],
                 runTime.timeName(),
                 mesh,
                 IOobject::NO_READ,
@@ -144,13 +144,13 @@ totalRhoM.correctBoundaryConditions();
 
 PtrList<volVectorField> allSpeciesVelocity
 (
-    molecules.pairPotentials().nIds()
+    molecules.potential().nIds()
 );
 
 forAll (allSpeciesVelocity, v)
 {
     Info << "    Creating velocity field for "
-        << molecules.pairPotentials().idList()[v] << endl;
+        << molecules.potential().idList()[v] << endl;
 
     allSpeciesVelocity.set
     (
@@ -159,7 +159,7 @@ forAll (allSpeciesVelocity, v)
         (
             IOobject
             (
-                "velocity_" + molecules.pairPotentials().idList()[v],
+                "velocity_" + molecules.potential().idList()[v],
                 runTime.timeName(),
                 mesh,
                 IOobject::NO_READ,
@@ -218,13 +218,13 @@ volVectorField totalVelocity
 
 PtrList<volScalarField> allSpeciesTemperature
 (
-    molecules.pairPotentials().nIds()
+    molecules.potential().nIds()
 );
 
 forAll (allSpeciesTemperature, t)
 {
     Info << "    Creating temperature field for "
-        << molecules.pairPotentials().idList()[t] << endl;
+        << molecules.potential().idList()[t] << endl;
 
     allSpeciesTemperature.set
     (
@@ -233,7 +233,7 @@ forAll (allSpeciesTemperature, t)
         (
             IOobject
             (
-                "temperature_" + molecules.pairPotentials().idList()[t],
+                "temperature_" + molecules.potential().idList()[t],
                 runTime.timeName(),
                 mesh,
                 IOobject::NO_READ,
@@ -274,13 +274,13 @@ totalTemperature.correctBoundaryConditions();
 
 PtrList<volScalarField> allSpeciesMeanKE
 (
-    molecules.pairPotentials().nIds()
+    molecules.potential().nIds()
 );
 
 forAll (allSpeciesMeanKE, mKE)
 {
     Info << "    Creating mean kinetic energy field for "
-        << molecules.pairPotentials().idList()[mKE] << endl;
+        << molecules.potential().idList()[mKE] << endl;
 
     allSpeciesMeanKE.set
     (
@@ -289,7 +289,7 @@ forAll (allSpeciesMeanKE, mKE)
         (
             IOobject
             (
-                "meanKE_" + molecules.pairPotentials().idList()[mKE],
+                "meanKE_" + molecules.potential().idList()[mKE],
                 runTime.timeName(),
                 mesh,
                 IOobject::NO_READ,
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/md.H b/src/lagrangian/molecularDynamics/molecule/mdTools/md.H
index 5c018694b..9a079764a 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/md.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/md.H
@@ -1,11 +1,9 @@
 #ifndef md_H
 #define md_H
-
-#   include "moleculeCloud.H"
-
-#   include "correlationFunction.H"
-#   include "distribution.H"
-#   include "reducedUnits.H"
-
+    #include "potential.H"
+    #include "moleculeCloud.H"
+    #include "correlationFunction.H"
+    #include "distribution.H"
+    #include "reducedUnits.H"
 #endif
 
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
index 462c10b15..284f2cca7 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
@@ -32,18 +32,28 @@ Description
 \*---------------------------------------------------------------------------*/
 
 
-vector singleStepTotalMomentum(vector::zero);
+vector singleStepTotalLinearMomentum(vector::zero);
+
+vector singleStepTotalAngularMomentum(vector::zero);
 
 scalar singleStepMaxVelocityMag = 0.0;
 
 scalar singleStepTotalMass = 0.0;
 
-scalar singleStepTotalKE = 0.0;
+scalar singleStepTotalLinearKE = 0.0;
+
+scalar singleStepTotalAngularKE = 0.0;
 
 scalar singleStepTotalPE = 0.0;
 
 scalar singleStepTotalrDotf = 0.0;
 
+//vector singleStepCentreOfMass(vector::zero);
+
+label singleStepNMols = molecules.size();
+
+label singleStepDOFs = 0;
+
 {
     IDLList<molecule>::iterator mol(molecules.begin());
 
@@ -54,76 +64,129 @@ scalar singleStepTotalrDotf = 0.0;
         ++mol
     )
     {
-        const scalar molM(mol().mass());
+        label molId = mol().id();
 
-        const vector& molU(mol().U());
+        scalar molMass(molecules.constProps(molId).mass());
 
-        singleStepTotalMomentum += molU * molM;
+        singleStepTotalMass += molMass;
 
-        singleStepTotalMass += molM;
+        //singleStepCentreOfMass += mol().position()*molMass;
+    }
 
-        if(mag(molU) > singleStepMaxVelocityMag)
+    // if(singleStepNMols)
+    // {
+    //     singleStepCentreOfMass /= singleStepTotalMass;
+    // }
+
+    for
+    (
+        mol = molecules.begin();
+        mol != molecules.end();
+        ++mol
+    )
+    {
+        label molId = mol().id();
+
+        const molecule::constantProperties cP(molecules.constProps(molId));
+
+        scalar molMass(cP.mass());
+
+        const diagTensor& molMoI(cP.momentOfInertia());
+
+        const vector& molV(mol().v());
+
+        const vector& molOmega(inv(molMoI) & mol().pi());
+
+        vector molPiGlobal = mol().Q() & mol().pi();
+
+        singleStepTotalLinearMomentum += molV * molMass;
+
+        singleStepTotalAngularMomentum += molPiGlobal;
+        //+((mol().position() - singleStepCentreOfMass) ^ (molV * molMass));
+
+        if(mag(molV) > singleStepMaxVelocityMag)
         {
-            singleStepMaxVelocityMag = mag(molU);
+            singleStepMaxVelocityMag = mag(molV);
         }
 
-        singleStepTotalKE += 0.5*molM*magSqr(molU);
+        singleStepTotalLinearKE += 0.5*molMass*magSqr(molV);
+
+        singleStepTotalAngularKE += 0.5*(molOmega & molMoI & molOmega);
 
         singleStepTotalPE += mol().potentialEnergy();
 
         singleStepTotalrDotf += tr(mol().rf());
+
+        singleStepDOFs += cP.degreesOfFreedom();
     }
 }
 
-label singleStepNMols = molecules.size();
-
 if (Pstream::parRun())
 {
-    reduce(singleStepTotalMomentum, sumOp<vector>());
+    reduce(singleStepTotalLinearMomentum, sumOp<vector>());
+
+    reduce(singleStepTotalAngularMomentum, sumOp<vector>());
 
     reduce(singleStepMaxVelocityMag, maxOp<scalar>());
 
     reduce(singleStepTotalMass, sumOp<scalar>());
 
-    reduce(singleStepTotalKE, sumOp<scalar>());
+    reduce(singleStepTotalLinearKE, sumOp<scalar>());
+
+    reduce(singleStepTotalAngularKE, sumOp<scalar>());
 
     reduce(singleStepTotalPE, sumOp<scalar>());
 
     reduce(singleStepTotalrDotf, sumOp<scalar>());
 
     reduce(singleStepNMols, sumOp<label>());
+
+    reduce(singleStepDOFs, sumOp<label>());
 }
 
 if (singleStepNMols)
 {
-    Info << "Number of mols in system = "
-            << singleStepNMols << nl
+    Info<< "Number of molecules in system = "
+        << singleStepNMols << nl
         << "Overall number density = "
-            << singleStepNMols/meshVolume << " m^-3" << nl
+        << singleStepNMols/meshVolume << nl
         << "Overall mass density = "
-            << singleStepTotalMass/meshVolume << " kg/m^3" << nl
-        << "Average velocity per mol = "
-            << singleStepTotalMomentum/singleStepTotalMass << " m/s" << nl
+        << singleStepTotalMass/meshVolume << nl
+        << "Average linear momentum per molecule = "
+        << singleStepTotalLinearMomentum/singleStepNMols << ' '
+        << mag(singleStepTotalLinearMomentum)/singleStepNMols << nl
+        << "Average angular momentum per molecule = "
+        << singleStepTotalAngularMomentum << ' '
+        << mag(singleStepTotalAngularMomentum)/singleStepNMols << nl
         << "Maximum |velocity| = "
-            << singleStepMaxVelocityMag << " m/s" << nl
-        << "Average KE per mol = "
-            << singleStepTotalKE/singleStepNMols << " J" << nl
-        << "Average PE per mol = "
-            << singleStepTotalPE/singleStepNMols << " J" << nl
-        << "Average TE per mol = "
-            << (singleStepTotalKE + singleStepTotalPE)/singleStepNMols << " J"
+        << singleStepMaxVelocityMag << nl
+        << "Average linear KE per molecule = "
+        << singleStepTotalLinearKE/singleStepNMols << nl
+        << "Average angular KE per molecule = "
+        << singleStepTotalAngularKE/singleStepNMols << nl
+        << "Average PE per molecule = "
+        << singleStepTotalPE/singleStepNMols << nl
+        << "Average TE per molecule = "
+        <<
+        (
+            singleStepTotalLinearKE
+          + singleStepTotalAngularKE
+          + singleStepTotalPE
+        )
+        /singleStepNMols
         << endl;
 
-//     Info << singleStepNMols << " "
-// //     << singleStepTotalMomentum/singleStepTotalMass << " "
-//     << singleStepMaxVelocityMag << " "
-//     << singleStepTotalKE/singleStepNMols << " "
-//     << singleStepTotalPE/singleStepNMols << " "
-//     << (singleStepTotalKE + singleStepTotalPE)/singleStepNMols << endl;
+        // Info << singleStepNMols << " "
+        //     << singleStepTotalMomentum/singleStepTotalMass << " "
+        //     << singleStepMaxVelocityMag << " "
+        //     << singleStepTotalKE/singleStepNMols << " "
+        //     << singleStepTotalPE/singleStepNMols << " "
+        //     << (singleStepTotalKE + singleStepTotalPE)
+        //        /singleStepNMols << endl;
 }
 else
 {
-    Info << "No molecules in system" << endl;
+    Info<< "No molecules in system" << endl;
 }
 
 
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
index 337647ec0..af0197b5f 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
@@ -2,25 +2,25 @@ if (runTime.outputTime())
 {
     allSpeciesN_RU = List< scalarField >
     (
-        molecules.pairPotentials().nIds(),
-        scalarField (mesh.nCells(), 0.0)
+        molecules.potential().nIds(),
+        scalarField(mesh.nCells(), 0.0)
     );
 
     allSpeciesM_RU = List< scalarField >
     (
-        molecules.pairPotentials().nIds(),
-        scalarField (mesh.nCells(), 0.0)
+        molecules.potential().nIds(),
+        scalarField(mesh.nCells(), 0.0)
     );
 
     allSpeciesVelocitySum_RU = List< vectorField >
     (
-        molecules.pairPotentials().nIds(),
-        vectorField (mesh.nCells(), vector::zero)
+        molecules.potential().nIds(),
+        vectorField(mesh.nCells(), vector::zero)
     );
 
     allSpeciesVelocityMagSquaredSum_RU = List< scalarField >
     (
-        molecules.pairPotentials().nIds(),
-        scalarField (mesh.nCells(), 0.0)
+        molecules.potential().nIds(),
+        scalarField(mesh.nCells(), 0.0)
     );
 }
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
index 92bc8b1f8..fcdb9cca5 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
@@ -33,11 +33,13 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-accumulatedTotalMomentum += singleStepTotalMomentum;
+accumulatedTotalLinearMomentum += singleStepTotalLinearMomentum;
 
 accumulatedTotalMass += singleStepTotalMass;
 
-accumulatedTotalKE += singleStepTotalKE;
+accumulatedTotalLinearKE += singleStepTotalLinearKE;
+
+accumulatedTotalAngularKE += singleStepTotalAngularKE;
 
 accumulatedTotalPE += singleStepTotalPE;
 
@@ -45,22 +47,22 @@ accumulatedTotalrDotfSum += singleStepTotalrDotf;
 
 accumulatedNMols += singleStepNMols;
 
+accumulatedDOFs += singleStepDOFs;
+
 if (runTime.outputTime())
 {
-    // calculate averages
-
     if (accumulatedNMols)
     {
         Info << "calculating averages" << endl;
 
         averageTemperature =
         (
-            2.0/(3.0 * moleculeCloud::kb * accumulatedNMols)
+            2.0/(moleculeCloud::kb * accumulatedDOFs)
             *
             (
-                accumulatedTotalKE
+                accumulatedTotalLinearKE + accumulatedTotalAngularKE
                 -
-                0.5*magSqr(accumulatedTotalMomentum)/accumulatedTotalMass
+                0.5*magSqr(accumulatedTotalLinearMomentum)/accumulatedTotalMass
             )
         );
 
@@ -77,40 +79,36 @@ if (runTime.outputTime())
             meshVolume
         );
 
-        // output values
-
         Info << "----------------------------------------" << nl
             << "Averaged properties" << nl
             << "Average |velocity| = "
-                << mag(accumulatedTotalMomentum)/accumulatedTotalMass
-                << " m/s" << nl
-            << "Average temperature = "
-                << averageTemperature << " K" << nl
-            << "accumulatedTotalrDotfSum = "
-                << accumulatedTotalrDotfSum << nl
-            << "Average pressure = "
-                << averagePressure << " N/m^2" << nl
+            << mag(accumulatedTotalLinearMomentum)/accumulatedTotalMass << nl
+            << "Average temperature = " << averageTemperature << nl
+            << "Average pressure = " << averagePressure << nl
             << "----------------------------------------" << endl;
     }
     else
     {
-        Info << "Not averaging temperature and pressure: "
+        Info<< "Not averaging temperature and pressure: "
             << "no molecules in system" << endl;
     }
 
-    // reset counters
-
-    accumulatedTotalMomentum = vector::zero;
+    accumulatedTotalLinearMomentum = vector::zero;
 
     accumulatedTotalMass = 0.0;
 
-    accumulatedTotalKE = 0.0;
+    accumulatedTotalLinearKE = 0.0;
+
+    accumulatedTotalAngularKE = 0.0;
 
     accumulatedTotalPE = 0.0;
 
     accumulatedTotalrDotfSum = 0.0;
 
     accumulatedNMols = 0;
+
+    accumulatedDOFs = 0;
 }
 
+
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
index 068cc265e..5a113ac9a 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
@@ -30,11 +30,13 @@ Description
 
 \*---------------------------------------------------------------------------*/
 
-vector accumulatedTotalMomentum(vector::zero);
+vector accumulatedTotalLinearMomentum(vector::zero);
 
 scalar accumulatedTotalMass = 0.0;
 
-scalar accumulatedTotalKE = 0.0;
+scalar accumulatedTotalAngularKE = 0.0;
+
+scalar accumulatedTotalLinearKE = 0.0;
 
 scalar accumulatedTotalPE = 0.0;
 
@@ -42,6 +44,8 @@ scalar accumulatedTotalrDotfSum = 0.0;
 
 label accumulatedNMols = 0;
 
+label accumulatedDOFs = 0;
+
 scalar averageTemperature = 0.0;
 
 scalar averagePressure = 0.0;
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
index 747446b1d..806f06478 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.C
@@ -25,103 +25,245 @@ License
 \*----------------------------------------------------------------------------*/
 
 #include "moleculeCloud.H"
+#include "molecule.H"
 #include "Random.H"
 #include "Time.H"
 
-namespace Foam
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::tensor Foam::molecule::rotationTensorX(scalar phi) const
 {
+    return tensor
+    (
+        1, 0, 0,
+        0, Foam::cos(phi), -Foam::sin(phi),
+        0, Foam::sin(phi), Foam::cos(phi)
+    );
+}
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-bool molecule::move(molecule::trackData& td)
+Foam::tensor Foam::molecule::rotationTensorY(scalar phi) const
+{
+    return tensor
+    (
+        Foam::cos(phi), 0, Foam::sin(phi),
+        0, 1, 0,
+        -Foam::sin(phi), 0, Foam::cos(phi)
+    );
+}
+
+
+Foam::tensor Foam::molecule::rotationTensorZ(scalar phi) const
+{
+    return tensor
+    (
+        Foam::cos(phi), -Foam::sin(phi), 0,
+        Foam::sin(phi), Foam::cos(phi), 0,
+        0, 0, 1
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::molecule::trackData::trackData
+(
+    moleculeCloud& molCloud,
+    label part
+)
+:
+    Particle<molecule>::trackData(molCloud),
+    molCloud_(molCloud),
+    part_(part)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+
+bool Foam::molecule::move(molecule::trackData& td)
 {
     td.switchProcessor = false;
     td.keepParticle = true;
 
+    const constantProperties& constProps(td.molCloud().constProps(id_));
+
     scalar deltaT = cloud().pMesh().time().deltaT().value();
-    scalar tEnd = (1.0 - stepFraction())*deltaT;
-    scalar dtMax = tEnd;
 
-    moleculeCloud::integrationMethods method
-            = td.molCloud().integrationMethod();
-
-    if (method == moleculeCloud::imVerletLeapfrog)
+    if (td.part() == 0)
     {
-        if (td.part() == 1)  // Leapfrog 1st Part
-        {
-            if (stepFraction() < VSMALL)
-            {
-                U_ += 0.5*deltaT*A_;
-            }
+        // First leapfrog velocity adjust part, required before tracking+force
+        // part
 
-            while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
-            {
-                // set the lagrangian time-step
-                scalar dt = min(dtMax, tEnd);
+        v_ += 0.5*deltaT*a_;
 
-                dt *= trackToFace(position() + dt*U_, td);
+        pi_ += 0.5*deltaT*tau_;
+    }
+    else if (td.part() == 1)
+    {
+        // Leapfrog tracking part
 
-                tEnd -= dt;
-                stepFraction() = 1.0 - tEnd/deltaT;
-            }
-        }
-        else if (td.part() == 2)  // Leapfrog 2nd Part
+        scalar tEnd = (1.0 - stepFraction())*deltaT;
+        scalar dtMax = tEnd;
+
+        while (td.keepParticle && !td.switchProcessor && tEnd > ROOTVSMALL)
         {
-            U_ += 0.5*deltaT*A_;
-        }
-        else
-        {
-            FatalErrorIn("molecule::move(molecule::trackData& td)") << nl
-                << td.part()
-                << " is an invalid part of integration method: "
-                << method << nl
-                << abort(FatalError);
+            // set the lagrangian time-step
+            scalar dt = min(dtMax, tEnd);
+
+            dt *= trackToFace(position() + dt*v_, td);
+
+            tEnd -= dt;
+            stepFraction() = 1.0 - tEnd/deltaT;
         }
     }
-    else if (method == moleculeCloud::imPredictorCorrector)
+    else if (td.part() == 2)
     {
-        if (td.part() == 1) // Predictor Part
-        {
+        // Leapfrog orientation adjustment, carried out before force calculation
+        // but after tracking stage, i.e. rotation carried once linear motion
+        // complete.
 
-        }
-        else if (td.part() == 2) // Corrector Part
+        if (!constProps.pointMolecule())
         {
+            const diagTensor& momentOfInertia(constProps.momentOfInertia());
 
+            tensor R;
+
+            if (!constProps.linearMolecule())
+            {
+                R = rotationTensorX(0.5*deltaT*pi_.x()/momentOfInertia.xx());
+                pi_ = pi_ & R;
+                Q_ = Q_ & R;
+            }
+
+            R = rotationTensorY(0.5*deltaT*pi_.y()/momentOfInertia.yy());
+            pi_ = pi_ & R;
+            Q_ = Q_ & R;
+
+            R = rotationTensorZ(deltaT*pi_.z()/momentOfInertia.zz());
+            pi_ = pi_ & R;
+            Q_ = Q_ & R;
+
+            R = rotationTensorY(0.5*deltaT*pi_.y()/momentOfInertia.yy());
+            pi_ = pi_ & R;
+            Q_ = Q_ & R;
+
+            if (!constProps.linearMolecule())
+            {
+                R = rotationTensorX(0.5*deltaT*pi_.x()/momentOfInertia.xx());
+                pi_ = pi_ & R;
+                Q_ = Q_ & R;
+            }
         }
-        else
+
+        setSitePositions(constProps);
+    }
+    else if (td.part() == 3)
+    {
+        // Second leapfrog velocity adjust part, required after tracking+force
+        // part
+
+        scalar m = constProps.mass();
+
+        a_ = vector::zero;
+
+        tau_ = vector::zero;
+
+        forAll(siteForces_, s)
         {
-            FatalErrorIn("molecule::move(molecule::trackData& td)") << nl
-                << td.part() << " is an invalid part of integration method: "
-                << method
-                << abort(FatalError);
+            const vector& f = siteForces_[s];
+
+            a_ += f/m;
+
+            tau_ += (constProps.siteReferencePositions()[s] ^ (Q_.T() & f));
+        }
+
+        v_ += 0.5*deltaT*a_;
+
+        pi_ += 0.5*deltaT*tau_;
+
+        if (constProps.pointMolecule())
+        {
+            tau_ = vector::zero;
+
+            pi_ = vector::zero;
+        }
+
+        if (constProps.linearMolecule())
+        {
+            tau_.x() = 0.0;
+
+            pi_.x() = 0.0;
         }
     }
     else
     {
         FatalErrorIn("molecule::move(molecule::trackData& td)") << nl
-                << "Unknown integration method: "
-                << method
-                << abort(FatalError);
+            << td.part()
+            << " is an invalid part of the integration method."
+            << abort(FatalError);
     }
 
     return td.keepParticle;
 }
 
 
-void molecule::transformProperties(const tensor& T)
-{}
-
-
-void molecule::transformProperties(const vector& separation)
+void Foam::molecule::transformProperties(const tensor& T)
 {
-    if (tethered_)
+    Q_ = T & Q_;
+
+    sitePositions_ = position_ + (T & (sitePositions_ - position_));
+
+    siteForces_ = T & siteForces_;
+}
+
+
+void Foam::molecule::transformProperties(const vector& separation)
+{
+    if (special_ == SPECIAL_TETHERED)
     {
-        tetherPosition_ += separation;
+        specialPosition_ += separation;
     }
 }
 
 
-void molecule::hitProcessorPatch
+void Foam::molecule::setSitePositions(const constantProperties& constProps)
+{
+    sitePositions_ = position_ + (Q_ & constProps.siteReferencePositions());
+}
+
+
+void Foam::molecule::setSiteSizes(label size)
+{
+    sitePositions_.setSize(size);
+
+    siteForces_.setSize(size);
+}
+
+
+bool Foam::molecule::hitPatch
+(
+    const polyPatch&,
+    molecule::trackData&,
+    const label
+)
+{
+    return false;
+}
+
+
+bool Foam::molecule::hitPatch
+(
+    const polyPatch&,
+    int&,
+    const label
+)
+{
+    return false;
+}
+
+
+void Foam::molecule::hitProcessorPatch
 (
     const processorPolyPatch&,
     molecule::trackData& td
@@ -131,7 +273,7 @@ void molecule::hitProcessorPatch
 }
 
 
-void molecule::hitProcessorPatch
+void Foam::molecule::hitProcessorPatch
 (
     const processorPolyPatch&,
     int&
@@ -139,7 +281,7 @@ void molecule::hitProcessorPatch
 {}
 
 
-void molecule::hitWallPatch
+void Foam::molecule::hitWallPatch
 (
     const wallPolyPatch& wpp,
     molecule::trackData& td
@@ -148,43 +290,17 @@ void molecule::hitWallPatch
     vector nw = wpp.faceAreas()[wpp.whichFace(face())];
     nw /= mag(nw);
 
-    scalar Un = U_ & nw;
-//     vector Ut = U_ - Un*nw;
-
-//     Random rand(clock::getTime());
-
-//     scalar tmac = 0.8;
-
-//     scalar wallTemp = 2.5;
-
-//     if (rand.scalar01() < tmac)
-//     {
-//         // Diffuse reflection
-//
-//         vector tw1 = Ut/mag(Ut);
-//
-//         vector tw2 = nw ^ tw1;
-//
-//         U_ = sqrt(wallTemp/mass_)*rand.GaussNormal()*tw1
-//                 + sqrt(wallTemp/mass_)*rand.GaussNormal()*tw2
-//                 - mag(sqrt(wallTemp/mass_)*rand.GaussNormal())*nw;
-//     }
-
-//     else
-//     {
-        // Specular reflection
-
-        if (Un > 0)
-        {
-            U_ -= 2*Un*nw;
-        }
-
-//     }
+    scalar vn = v_ & nw;
 
+    // Specular reflection
+    if (vn > 0)
+    {
+        v_ -= 2*vn*nw;
+    }
 }
 
 
-void molecule::hitWallPatch
+void Foam::molecule::hitWallPatch
 (
     const wallPolyPatch&,
     int&
@@ -192,7 +308,7 @@ void molecule::hitWallPatch
 {}
 
 
-void molecule::hitPatch
+void Foam::molecule::hitPatch
 (
     const polyPatch&,
     molecule::trackData& td
@@ -202,14 +318,12 @@ void molecule::hitPatch
 }
 
 
-void molecule::hitPatch
+void Foam::molecule::hitPatch
 (
     const polyPatch&,
     int&
 )
 {}
 
-} // End namespace Foam
-
 
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
index 0cf942d76..830816035 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/molecule.H
@@ -23,9 +23,10 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    molecule
+    Foam::molecule
 
 Description
+    Foam::molecule
 
 SourceFiles
     moleculeI.H
@@ -40,6 +41,7 @@ SourceFiles
 #include "Particle.H"
 #include "IOstream.H"
 #include "autoPtr.H"
+#include "diagTensor.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,54 +59,105 @@ class molecule
 :
     public Particle<molecule>
 {
-    // Private data
-
-        //- Be careful with the ordering of data.  It has an impact on binary
-        //  transfer:
-        //  1) Put the largest data members 1st
-        //  2) Pair up labels,
-        //  3) Don't go scalar-label, scalar-label, becasue in 64bit mode,
-        //     the labels will be padded by 4bytes.
-
-        // - mass of molecule
-        scalar mass_;
-
-        // - Velocity of molecule
-        vector U_;
-
-        // - Acceleration of molecule
-        vector A_;
-
-        // - Tether position
-        vector tetherPosition_;
-
-        // - Potential energy that this molecules posseses
-        scalar potentialEnergy_;
-
-        // - r_ij f_ij, stress dyad
-        tensor rf_;
-
-        // - Is the molecule tethered?
-        label tethered_;
-
-        // - id (type) of molecule
-        label id_;
-
 
 public:
 
-    friend class Cloud<molecule>;
+    // Values of special that are less than zero are for built-in functionality.
+    // Values greater than zero are user specifiable/expandable (i.e. test
+    // special_ >= SPECIAL_USER)
+
+    enum specialTypes
+    {
+        SPECIAL_TETHERED = -1,
+        SPECIAL_FROZEN   = -2,
+        NOT_SPECIAL      = 0,
+        SPECIAL_USER     = 1
+    };
+
+    //- Class to hold molecule constant properties
+    class constantProperties
+    {
+
+        // Private data
+
+            Field<vector> siteReferencePositions_;
+
+            List<scalar> siteMasses_;
+
+            List<scalar> siteCharges_;
+
+            List<label> siteIds_;
+
+            List<bool> pairPotentialSites_;
+
+            List<bool> electrostaticSites_;
+
+            diagTensor momentOfInertia_;
+
+            scalar mass_;
+
+        // Private Member Functions
+
+            void checkSiteListSizes() const;
+
+            void setInteracionSiteBools
+            (
+                const List<word>& siteIds,
+                const List<word>& pairPotSiteIds
+            );
+
+            bool linearMoleculeTest() const;
+
+
+    public:
+
+        inline constantProperties();
+
+        //- Construct from dictionary
+        inline constantProperties(const dictionary& dict);
+
+        // Member functions
+
+        inline const Field<vector>& siteReferencePositions() const;
+
+        inline const List<scalar>& siteMasses() const;
+
+        inline const List<scalar>& siteCharges() const;
+
+        inline const List<label>& siteIds() const;
+
+        inline List<label>& siteIds();
+
+        inline const List<bool>& pairPotentialSites() const;
+
+        inline bool pairPotentialSite(label sId) const;
+
+        inline const List<bool>& electrostaticSites() const;
+
+        inline bool electrostaticSite(label sId) const;
+
+        inline const diagTensor& momentOfInertia() const;
+
+        inline bool linearMolecule() const;
+
+        inline bool pointMolecule() const;
+
+        inline label degreesOfFreedom() const;
+
+        inline scalar mass() const;
+
+        inline label nSites() const;
+    };
+
 
     //- Class used to pass tracking data to the trackToFace function
     class trackData
     :
         public Particle<molecule>::trackData
     {
-        //- Reference to the cloud containing this particle
         moleculeCloud& molCloud_;
 
         // label specifying which part of the integration algorithm is taking
-        // place (i.e. leapfrog 1 or leapfrog 2. Predictor or Corrector)
         label part_;
 
 
@@ -112,7 +165,7 @@ public:
 
         // Constructors
 
-            inline trackData
+            trackData
             (
                 moleculeCloud& molCloud,
                 label part
@@ -125,6 +178,57 @@ public:
             inline label part() const;
     };
 
+
+private:
+
+    // Private data
+
+        //- Be careful with the ordering of data.
+        //  It has an impact on binary transfer:
+        //    -# Put the largest data members 1st
+        //    -# Pair up labels,
+        //    -# Don't go scalar-label, scalar-label, because in 64bit mode,
+        //       the labels will be padded by 4bytes.
+
+        tensor Q_;
+
+        vector v_;
+
+        vector a_;
+
+        vector pi_;
+
+        vector tau_;
+
+        vector specialPosition_;
+
+        scalar potentialEnergy_;
+
+        // - r_ij f_ij, stress dyad
+        tensor rf_;
+
+        label special_;
+
+        label id_;
+
+        List<vector> siteForces_;
+
+        List<vector> sitePositions_;
+
+
+    // Private Member Functions
+
+        tensor rotationTensorX(scalar deltaT) const;
+
+        tensor rotationTensorY(scalar deltaT) const;
+
+        tensor rotationTensorZ(scalar deltaT) const;
+
+
+public:
+
+    friend class Cloud<molecule>;
+
     // Constructors
 
         //- Construct from components
@@ -133,11 +237,14 @@ public:
             const Cloud<molecule>& c,
             const vector& position,
             const label celli,
-            const scalar mass,
-            const vector& U,
-            const vector& A,
-            const vector& tetherPosition,
-            const label tethered,
+            const tensor& Q,
+            const vector& v,
+            const vector& a,
+            const vector& pi,
+            const vector& tau,
+            const vector& specialPosition,
+            const constantProperties& constProps,
+            const label special,
             const label id
         );
 
@@ -158,58 +265,87 @@ public:
 
     // Member Functions
 
-        void transformProperties(const tensor& T);
+        // Tracking
+
+            bool move(trackData&);
+
+            void transformProperties(const tensor& T);
+
+            void transformProperties(const vector& separation);
+
+            void setSitePositions(const constantProperties& constProps);
+
+            void setSiteSizes(label size);
 
-        void transformProperties(const vector& separation);
 
         // Access
 
-            //- Return id
-            inline label id() const;
+            inline const tensor& Q() const;
+            inline tensor& Q();
 
-            //- Return mass
-            inline scalar mass() const;
+            inline const vector& v() const;
+            inline vector& v();
 
-            //- Return velocity
-            inline const vector& U() const;
-            inline vector& U();
+            inline const vector& a() const;
+            inline vector& a();
 
-            //- Return acceleration
-            inline const vector& A() const;
-            inline vector& A();
+            inline const vector& pi() const;
+            inline vector& pi();
+
+            inline const vector& tau() const;
+            inline vector& tau();
+
+            inline const List<vector>& siteForces() const;
+            inline List<vector>& siteForces();
+
+            inline const List<vector>& sitePositions() const;
+            inline List<vector>& sitePositions();
+
+            inline const vector& specialPosition() const;
+            inline vector& specialPosition();
 
-            //- Return potential energy
             inline scalar potentialEnergy() const;
             inline scalar& potentialEnergy();
 
-            //- Return stress contribution
             inline const tensor& rf() const;
             inline tensor& rf();
 
-            //- Return tethered
-            inline label tethered() const;
+            inline label special() const;
 
-            //- Return tetherPosition
-            inline const vector& tetherPosition() const;
-            inline vector& tetherPosition();
+            inline bool tethered() const;
 
-
-        //- Tracking
-        bool move(trackData&);
+            inline label id() const;
 
 
     // Member Operators
 
-        //- Overridable function to handle the particle hitting a
-        //  processorPatch
+        //- Overridable function to handle the particle hitting a patch
+        //  Executed before other patch-hitting functions
+        bool hitPatch
+        (
+            const polyPatch&,
+            molecule::trackData& td,
+            const label patchI
+        );
+
+        //- Overridable function to handle the particle hitting a patch
+        //  Executed before other patch-hitting functions without trackData
+        bool hitPatch
+        (
+            const polyPatch& p,
+            int& td,
+            const label patchI
+        );
+
+        //- Overridable function to handle the particle hitting a processorPatch
         void hitProcessorPatch
         (
             const processorPolyPatch&,
             molecule::trackData& td
         );
 
-        //- Overridable function to handle the particle hitting a
-        //  processorPatch without trackData
+        //- Overridable function to handle the particle hitting a processorPatch
+        //  without trackData
         void hitProcessorPatch
         (
             const processorPolyPatch&,
@@ -224,7 +360,7 @@ public:
         );
 
         //- Overridable function to handle the particle hitting a wallPatch
-        //- without trackData
+        //  without trackData
         void hitWallPatch
         (
             const wallPolyPatch&,
@@ -239,16 +375,19 @@ public:
         );
 
         //- Overridable function to handle the particle hitting a polyPatch
-        //- without trackData
+        //  without trackData
         void hitPatch
         (
             const polyPatch&,
             int&
         );
 
-        static void readFields(moleculeCloud& mC);
 
-        static void writeFields(const moleculeCloud& mC);
+    // I-O
+
+        static void readFields(Cloud<molecule>& mC);
+
+        static void writeFields(const Cloud<molecule>& mC);
 
 
     // IOstream Operators
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
index 2db55bf8e..c8fd0ffb3 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeI.H
@@ -24,142 +24,595 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-inline molecule::molecule
+inline Foam::molecule::constantProperties::constantProperties()
+:
+    siteReferencePositions_(Field<vector>(0)),
+    siteMasses_(List<scalar>(0)),
+    siteCharges_(List<scalar>(0)),
+    siteIds_(List<label>(0)),
+    pairPotentialSites_(List<bool>(false)),
+    electrostaticSites_(List<bool>(false)),
+    momentOfInertia_(diagTensor(0, 0, 0)),
+    mass_(0)
+{}
+
+
+inline Foam::molecule::constantProperties::constantProperties
+(
+    const dictionary& dict
+)
+:
+    siteReferencePositions_(dict.lookup("siteReferencePositions")),
+    siteMasses_(dict.lookup("siteMasses")),
+    siteCharges_(dict.lookup("siteCharges")),
+    siteIds_(List<word>(dict.lookup("siteIds")).size(), -1),
+    pairPotentialSites_(),
+    electrostaticSites_(),
+    momentOfInertia_(),
+    mass_()
+{
+    checkSiteListSizes();
+
+    setInteracionSiteBools
+    (
+        List<word>(dict.lookup("siteIds")),
+        List<word>(dict.lookup("pairPotentialSiteIds"))
+    );
+
+    mass_ = sum(siteMasses_);
+
+    vector centreOfMass(vector::zero);
+
+    // Calculate the centre of mass of the body and subtract it from each
+    // position
+
+    forAll(siteReferencePositions_, i)
+    {
+        centreOfMass += siteReferencePositions_[i]*siteMasses_[i];
+    }
+
+    centreOfMass /= mass_;
+
+    siteReferencePositions_ -= centreOfMass;
+
+    if(siteIds_.size() == 1)
+    {
+        // Single site molecule - no rotational motion.
+
+        siteReferencePositions_[0] = vector::zero;
+
+        momentOfInertia_ = diagTensor(-1, -1, -1);
+    }
+    else if(linearMoleculeTest())
+    {
+        // Linear molecule.
+
+        Info<< nl << "Linear molecule." << endl;
+
+        vector dir = siteReferencePositions_[1] - siteReferencePositions_[0];
+
+        dir /= mag(dir);
+
+        tensor Q = rotationTensor(dir, vector(1,0,0));
+
+        siteReferencePositions_ = (Q & siteReferencePositions_);
+
+        // The rotation was around the centre of mass but remove any
+        // components that have crept in due to floating point errors
+
+        centreOfMass = vector::zero;
+
+        forAll(siteReferencePositions_, i)
+        {
+            centreOfMass += siteReferencePositions_[i]*siteMasses_[i];
+        }
+
+        centreOfMass /= mass_;
+
+        siteReferencePositions_ -= centreOfMass;
+
+        diagTensor momOfInertia = diagTensor::zero;
+
+        forAll(siteReferencePositions_, i)
+        {
+            const vector& p(siteReferencePositions_[i]);
+
+            momOfInertia +=
+                siteMasses_[i]*diagTensor(0, p.x()*p.x(), p.x()*p.x());
+        }
+
+        momentOfInertia_ = diagTensor
+         (
+             -1,
+             momOfInertia.yy(),
+             momOfInertia.zz()
+         );
+    }
+    else
+    {
+        // Fully 6DOF molecule
+
+        // Calculate the inertia tensor in the current orientation
+
+        tensor momOfInertia(tensor::zero);
+
+        forAll(siteReferencePositions_, i)
+        {
+            const vector& p(siteReferencePositions_[i]);
+
+            momOfInertia += siteMasses_[i]*tensor
+            (
+                p.y()*p.y() + p.z()*p.z(), -p.x()*p.y(), -p.x()*p.z(),
+                -p.y()*p.x(), p.x()*p.x() + p.z()*p.z(), -p.y()*p.z(),
+                -p.z()*p.x(), -p.z()*p.y(), p.x()*p.x() + p.y()*p.y()
+            );
+        }
+
+        if (eigenValues(momOfInertia).x() < VSMALL)
+        {
+            FatalErrorIn("molecule::constantProperties::constantProperties")
+                << "An eigenvalue of the inertia tensor is zero, the molecule "
+                << dict.name() << " is not a valid 6DOF shape."
+                << nl << abort(FatalError);
+        }
+
+        // Normalise the inertia tensor magnitude to avoid SMALL numbers in the
+        // components causing problems
+
+        momOfInertia /= eigenValues(momOfInertia).x();
+
+        tensor e = eigenVectors(momOfInertia);
+
+        // Calculate the transformation between the principle axes to the
+        // global axes
+
+        tensor Q =
+            vector(1,0,0)*e.x() + vector(0,1,0)*e.y() + vector(0,0,1)*e.z();
+
+        // Transform the site positions
+
+        siteReferencePositions_ = (Q & siteReferencePositions_);
+
+        // Recalculating the moment of inertia with the new site positions
+
+        // The rotation was around the centre of mass but remove any
+        // components that have crept in due to floating point errors
+
+        centreOfMass = vector::zero;
+
+        forAll(siteReferencePositions_, i)
+        {
+            centreOfMass += siteReferencePositions_[i]*siteMasses_[i];
+        }
+
+        centreOfMass /= mass_;
+
+        siteReferencePositions_ -= centreOfMass;
+
+        // Calculate the moment of inertia in the principle component
+        // reference frame
+
+        momOfInertia = tensor::zero;
+
+        forAll(siteReferencePositions_, i)
+        {
+            const vector& p(siteReferencePositions_[i]);
+
+            momOfInertia += siteMasses_[i]*tensor
+            (
+                p.y()*p.y() + p.z()*p.z(), -p.x()*p.y(), -p.x()*p.z(),
+                -p.y()*p.x(), p.x()*p.x() + p.z()*p.z(), -p.y()*p.z(),
+                -p.z()*p.x(), -p.z()*p.y(), p.x()*p.x() + p.y()*p.y()
+            );
+        }
+
+        momentOfInertia_ = diagTensor
+        (
+            momOfInertia.xx(),
+            momOfInertia.yy(),
+            momOfInertia.zz()
+        );
+    }
+}
+
+
+inline Foam::molecule::molecule
 (
     const Cloud<molecule>& c,
     const vector& position,
     const label celli,
-    const scalar mass,
-    const vector& U,
-    const vector& A,
-    const vector& tetherPosition,
-    const label tethered,
+    const tensor& Q,
+    const vector& v,
+    const vector& a,
+    const vector& pi,
+    const vector& tau,
+    const vector& specialPosition,
+    const constantProperties& constProps,
+    const label special,
     const label id
+
 )
 :
     Particle<molecule>(c, position, celli),
-    mass_(mass),
-    U_(U),
-    A_(A),
-    tetherPosition_(tetherPosition),
+    Q_(Q),
+    v_(v),
+    a_(a),
+    pi_(pi),
+    tau_(tau),
+    specialPosition_(specialPosition),
     potentialEnergy_(0.0),
     rf_(tensor::zero),
-    tethered_(tethered),
-    id_(id)
-{}
-
-
-inline molecule::trackData::trackData
-(
-    moleculeCloud& molCloud,
-    label part
-)
-:
-    Particle<molecule>::trackData(refCast<Cloud<molecule> >(molCloud)),
-    molCloud_(molCloud),
-    part_(part)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-inline label molecule::id() const
+    special_(special),
+    id_(id),
+    siteForces_(constProps.nSites(), vector::zero),
+    sitePositions_(constProps.nSites())
 {
-    return id_;
+    setSitePositions(constProps);
 }
 
 
-inline scalar molecule::mass() const
+// * * * constantProperties Private Member Functions * * * * * * * * * * * * //
+
+
+inline void Foam::molecule::constantProperties::checkSiteListSizes() const
+{
+    if
+    (
+        siteIds_.size() != siteReferencePositions_.size()
+     || siteIds_.size() != siteCharges_.size()
+    )
+    {
+        FatalErrorIn("molecule::constantProperties::checkSiteListSizes")
+            << "Sizes of site id, charge and "
+            << "referencePositions are not the same. "
+            << nl << abort(FatalError);
+    }
+}
+
+
+inline void Foam::molecule::constantProperties::setInteracionSiteBools
+(
+    const List<word>& siteIds,
+    const List<word>& pairPotSiteIds
+)
+{
+    pairPotentialSites_.setSize(siteIds_.size());
+
+    electrostaticSites_.setSize(siteIds_.size());
+
+    forAll(siteIds_, i)
+    {
+        const word& id(siteIds[i]);
+
+        pairPotentialSites_[i] = (findIndex(pairPotSiteIds, id) > -1);
+
+        electrostaticSites_[i] = (mag(siteCharges_[i]) > VSMALL);
+    }
+}
+
+
+inline bool Foam::molecule::constantProperties::linearMoleculeTest() const
+{
+    if (siteIds_.size() == 2)
+    {
+        return true;
+    }
+
+    vector refDir = siteReferencePositions_[1] - siteReferencePositions_[0];
+
+    refDir /= mag(refDir);
+
+    for
+    (
+        label i = 2;
+        i < siteReferencePositions_.size();
+        i++
+    )
+    {
+        vector dir = siteReferencePositions_[i] - siteReferencePositions_[i-1];
+
+        dir /= mag(dir);
+
+        if (mag(refDir & dir) < 1 - SMALL)
+        {
+            return false;
+        }
+    }
+
+    return true;
+}
+
+
+// * * * * * * * constantProperties Member Functions * * * * * * * * * * * * //
+
+inline const Foam::Field<Foam::vector>&
+Foam::molecule::constantProperties::siteReferencePositions() const
+{
+    return siteReferencePositions_;
+}
+
+
+inline const Foam::List<Foam::scalar>&
+Foam::molecule::constantProperties::siteMasses() const
+{
+    return siteMasses_;
+}
+
+
+inline const Foam::List<Foam::scalar>&
+Foam::molecule::constantProperties::siteCharges() const
+{
+    return siteCharges_;
+}
+
+
+inline const Foam::List<Foam::label>&
+Foam::molecule::constantProperties::siteIds() const
+{
+    return siteIds_;
+}
+
+
+inline Foam::List<Foam::label>&
+Foam::molecule::constantProperties::siteIds()
+{
+    return siteIds_;
+}
+
+
+inline const Foam::List<bool>&
+Foam::molecule::constantProperties::pairPotentialSites() const
+{
+    return pairPotentialSites_;
+}
+
+
+inline bool Foam::molecule::constantProperties::pairPotentialSite
+(
+    label sId
+) const
+{
+    label s = findIndex(siteIds_, sId);
+
+    if (s == -1)
+    {
+        FatalErrorIn("moleculeI.H") << nl
+            << sId << " site not found."
+            << nl << abort(FatalError);
+    }
+
+    return pairPotentialSites_[s];
+}
+
+
+inline const Foam::List<bool>&
+Foam::molecule::constantProperties::electrostaticSites() const
+{
+    return electrostaticSites_;
+}
+
+inline bool Foam::molecule::constantProperties::electrostaticSite
+(
+    label sId
+) const
+{
+    label s = findIndex(siteIds_, sId);
+
+    if (s == -1)
+    {
+        FatalErrorIn
+        (
+            "molecule::constantProperties::electrostaticSite(label)"
+        )   << sId << " site not found."
+            << nl << abort(FatalError);
+    }
+
+    return electrostaticSites_[s];
+}
+
+
+inline const Foam::diagTensor&
+Foam::molecule::constantProperties::momentOfInertia() const
+{
+    return momentOfInertia_;
+}
+
+
+inline bool Foam::molecule::constantProperties::linearMolecule() const
+{
+    return ((momentOfInertia_.xx() < 0) && (momentOfInertia_.yy() > 0));
+}
+
+
+inline bool Foam::molecule::constantProperties::pointMolecule() const
+{
+    return (momentOfInertia_.zz() < 0);
+}
+
+
+inline Foam::label Foam::molecule::constantProperties::degreesOfFreedom() const
+{
+    if (linearMolecule())
+    {
+        return 5;
+    }
+    else if (pointMolecule())
+    {
+        return 3;
+    }
+    else
+    {
+        return 6;
+    }
+}
+
+
+inline Foam::scalar Foam::molecule::constantProperties::mass() const
 {
     return mass_;
 }
 
 
-inline const vector& molecule::U() const
+inline Foam::label Foam::molecule::constantProperties::nSites() const
 {
-    return U_;
+    return siteIds_.size();
+
 }
 
+// * * * * * * * * * * *  trackData Member Functions * * * * * * * * * * * * //
 
-inline vector& molecule::U()
-{
-    return U_;
-}
-
-
-inline const vector& molecule::A() const
-{
-    return A_;
-}
-
-
-inline vector& molecule::A()
-{
-    return A_;
-}
-
-
-inline scalar molecule::potentialEnergy() const
-{
-    return potentialEnergy_;
-}
-
-
-inline scalar& molecule::potentialEnergy()
-{
-    return potentialEnergy_;
-}
-
-
-inline const tensor& molecule::rf() const
-{
-    return rf_;
-}
-
-
-inline tensor& molecule::rf()
-{
-    return rf_;
-}
-
-
-inline label molecule::tethered() const
-{
-    return tethered_;
-}
-
-
-inline const vector& molecule::tetherPosition() const
-{
-    return tetherPosition_;
-}
-
-
-inline vector& molecule::tetherPosition()
-{
-    return tetherPosition_;
-}
-
-
-inline moleculeCloud& molecule::trackData::molCloud()
+inline Foam::moleculeCloud& Foam::molecule::trackData::molCloud()
 {
     return molCloud_;
 }
 
 
-inline label molecule::trackData::part() const
+inline Foam::label Foam::molecule::trackData::part() const
 {
     return part_;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * molecule Member Functions * * * * * * * * * * * * //
+
+inline const Foam::tensor& Foam::molecule::Q() const
+{
+    return Q_;
+}
+
+
+inline Foam::tensor& Foam::molecule::Q()
+{
+    return Q_;
+}
+
+
+inline const Foam::vector& Foam::molecule::v() const
+{
+    return v_;
+}
+
+
+inline Foam::vector& Foam::molecule::v()
+{
+    return v_;
+}
+
+
+inline const Foam::vector& Foam::molecule::a() const
+{
+    return a_;
+}
+
+
+inline Foam::vector& Foam::molecule::a()
+{
+    return a_;
+}
+
+
+inline const Foam::vector& Foam::molecule::pi() const
+{
+    return pi_;
+}
+
+
+inline Foam::vector& Foam::molecule::pi()
+{
+    return pi_;
+}
+
+
+inline const Foam::vector& Foam::molecule::tau() const
+{
+    return tau_;
+}
+
+
+inline Foam::vector& Foam::molecule::tau()
+{
+    return tau_;
+}
+
+
+inline const Foam::List<Foam::vector>& Foam::molecule::siteForces() const
+{
+    return siteForces_;
+}
+
+
+inline Foam::List<Foam::vector>& Foam::molecule::siteForces()
+{
+    return siteForces_;
+}
+
+
+inline const Foam::List<Foam::vector>& Foam::molecule::sitePositions() const
+{
+    return sitePositions_;
+}
+
+
+inline Foam::List<Foam::vector>& Foam::molecule::sitePositions()
+{
+    return sitePositions_;
+}
+
+
+inline const Foam::vector& Foam::molecule::specialPosition() const
+{
+    return specialPosition_;
+}
+
+
+inline Foam::vector& Foam::molecule::specialPosition()
+{
+    return specialPosition_;
+}
+
+
+inline Foam::scalar Foam::molecule::potentialEnergy() const
+{
+    return potentialEnergy_;
+}
+
+
+inline Foam::scalar& Foam::molecule::potentialEnergy()
+{
+    return potentialEnergy_;
+}
+
+
+inline const Foam::tensor& Foam::molecule::rf() const
+{
+    return rf_;
+}
+
+
+inline Foam::tensor& Foam::molecule::rf()
+{
+    return rf_;
+}
+
+
+inline Foam::label Foam::molecule::special() const
+{
+    return special_;
+}
+
+
+inline bool Foam::molecule::tethered() const
+{
+    return special_ == SPECIAL_TETHERED;
+}
+
+
+inline Foam::label Foam::molecule::id() const
+{
+    return id_;
+}
 
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
index e31fb5895..575e5c378 100644
--- a/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/molecule/moleculeIO.C
@@ -26,7 +26,6 @@ License
 
 #include "molecule.H"
 #include "IOstreams.H"
-
 #include "moleculeCloud.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -38,125 +37,218 @@ Foam::molecule::molecule
     bool readFields
 )
 :
-    Particle<molecule>(cloud, is)
+    Particle<molecule>(cloud, is, readFields),
+    Q_(tensor::zero),
+    v_(vector::zero),
+    a_(vector::zero),
+    pi_(vector::zero),
+    tau_(vector::zero),
+    specialPosition_(vector::zero),
+    potentialEnergy_(0.0),
+    rf_(tensor::zero),
+    special_(0),
+    id_(0),
+    siteForces_(0),
+    sitePositions_(0)
 {
     if (readFields)
     {
         if (is.format() == IOstream::ASCII)
         {
+            is  >> Q_;
+            is  >> v_;
+            is  >> a_;
+            is  >> pi_;
+            is  >> tau_;
+            is  >> siteForces_;
+            is  >> sitePositions_;
+            is  >> specialPosition_;
+            potentialEnergy_ = readScalar(is);
+            is  >> rf_;
+            special_ = readLabel(is);
             id_ = readLabel(is);
-            mass_ = readScalar(is);
-            is >> U_;
-            is >> A_;
-            is >> potentialEnergy_;
-            is >> rf_;
-            is >> tethered_;
-            is >> tetherPosition_;
         }
         else
         {
             is.read
             (
-                reinterpret_cast<char*>(&mass_),
-                sizeof(mass_)
-                + sizeof(U_)
-                + sizeof(A_)
-                + sizeof(tetherPosition_)
-                + sizeof(potentialEnergy_)
-                + sizeof(rf_)
-                + sizeof(tethered_)
-                + sizeof(id_)
+                reinterpret_cast<char*>(&Q_),
+                sizeof(Q_)
+              + sizeof(v_)
+              + sizeof(a_)
+              + sizeof(pi_)
+              + sizeof(tau_)
+              + sizeof(specialPosition_)
+              + sizeof(potentialEnergy_)
+              + sizeof(rf_)
+              + sizeof(special_)
+              + sizeof(id_)
             );
+
+            is  >> siteForces_ >> sitePositions_;
         }
     }
 
     // Check state of Istream
-    is.check("Foam::molecule::molecule(Foam::Istream&)");
+    is.check
+    (
+        "Foam::molecule::molecule"
+        "(const Cloud<molecule>& cloud, Foam::Istream&), bool"
+    );
 }
 
 
-namespace Foam
-{
-
-void molecule::readFields(moleculeCloud& mC)
+void Foam::molecule::readFields(Cloud<molecule>& mC)
 {
     if (!mC.size())
     {
         return;
     }
 
-    IOField<label> id(mC.fieldIOobject("id"));
+    Particle<molecule>::readFields(mC);
+
+    IOField<tensor> Q(mC.fieldIOobject("Q", IOobject::MUST_READ));
+    mC.checkFieldIOobject(mC, Q);
+
+    IOField<vector> v(mC.fieldIOobject("v", IOobject::MUST_READ));
+    mC.checkFieldIOobject(mC, v);
+
+    IOField<vector> a(mC.fieldIOobject("a", IOobject::MUST_READ));
+    mC.checkFieldIOobject(mC, a);
+
+    IOField<vector> pi(mC.fieldIOobject("pi", IOobject::MUST_READ));
+    mC.checkFieldIOobject(mC, pi);
+
+    IOField<vector> tau(mC.fieldIOobject("tau", IOobject::MUST_READ));
+    mC.checkFieldIOobject(mC, tau);
+
+    IOField<vector> specialPosition
+    (
+        mC.fieldIOobject("specialPosition", IOobject::MUST_READ)
+    );
+    mC.checkFieldIOobject(mC, specialPosition);
+
+    IOField<label> special(mC.fieldIOobject("special", IOobject::MUST_READ));
+    mC.checkFieldIOobject(mC, special);
+
+    IOField<label> id(mC.fieldIOobject("id", IOobject::MUST_READ));
     mC.checkFieldIOobject(mC, id);
 
-    IOField<scalar> mass(mC.fieldIOobject("mass"));
-    mC.checkFieldIOobject(mC, mass);
-
-    IOField<vector> U(mC.fieldIOobject("U"));
-    mC.checkFieldIOobject(mC, U);
-
-    IOField<vector> A(mC.fieldIOobject("A"));
-    mC.checkFieldIOobject(mC, A);
-
-    IOField<label> tethered(mC.fieldIOobject("tethered"));
-    mC.checkFieldIOobject(mC, tethered);
-
-    IOField<vector> tetherPositions(mC.fieldIOobject("tetherPositions"));
-    mC.checkFieldIOobject(mC, tetherPositions);
-
     label i = 0;
     forAllIter(moleculeCloud, mC, iter)
     {
         molecule& mol = iter();
 
+        mol.Q_ = Q[i];
+        mol.v_ = v[i];
+        mol.a_ = a[i];
+        mol.pi_ = pi[i];
+        mol.tau_ = tau[i];
+        mol.specialPosition_ = specialPosition[i];
+        mol.special_ = special[i];
         mol.id_ = id[i];
-        mol.mass_ = mass[i];
-        mol.U_ = U[i];
-        mol.A_ = A[i];
-        mol.potentialEnergy_ = 0.0;
-        mol.rf_ = tensor::zero;
-        mol.tethered_ = tethered[i];
-        mol.tetherPosition_ = tetherPositions[i];
         i++;
     }
 }
 
 
-void molecule::writeFields(const moleculeCloud& mC)
+void Foam::molecule::writeFields(const Cloud<molecule>& mC)
 {
     Particle<molecule>::writeFields(mC);
 
-    label np =  mC.size();
+    label np = mC.size();
 
-    IOField<label> id(mC.fieldIOobject("id"), np);
-    IOField<scalar> mass(mC.fieldIOobject("mass"), np);
-    IOField<vector> U(mC.fieldIOobject("U"), np);
-    IOField<vector> A(mC.fieldIOobject("A"), np);
-    IOField<label> tethered(mC.fieldIOobject("tethered"), np);
-    IOField<vector> tetherPositions(mC.fieldIOobject("tetherPositions"), np);
+    IOField<tensor> Q(mC.fieldIOobject("Q", IOobject::NO_READ), np);
+    IOField<vector> v(mC.fieldIOobject("v", IOobject::NO_READ), np);
+    IOField<vector> a(mC.fieldIOobject("a", IOobject::NO_READ), np);
+    IOField<vector> pi(mC.fieldIOobject("pi", IOobject::NO_READ), np);
+    IOField<vector> tau(mC.fieldIOobject("tau", IOobject::NO_READ), np);
+    IOField<vector> specialPosition
+    (
+        mC.fieldIOobject("specialPosition", IOobject::NO_READ),
+        np
+    );
+    IOField<label> special(mC.fieldIOobject("special", IOobject::NO_READ), np);
+    IOField<label> id(mC.fieldIOobject("id", IOobject::NO_READ), np);
+
+    // Post processing fields
+
+    IOField<vector> piGlobal
+    (
+        mC.fieldIOobject("piGlobal", IOobject::NO_READ),
+        np
+    );
+
+    IOField<vector> tauGlobal
+    (
+        mC.fieldIOobject("tauGlobal", IOobject::NO_READ),
+        np
+    );
+
+    IOField<vector> orientation1
+    (
+        mC.fieldIOobject("orientation1", IOobject::NO_READ),
+        np
+    );
+
+    IOField<vector> orientation2
+    (
+        mC.fieldIOobject("orientation2", IOobject::NO_READ),
+        np
+    );
+
+    IOField<vector> orientation3
+    (
+        mC.fieldIOobject("orientation3", IOobject::NO_READ),
+        np
+    );
 
     label i = 0;
     forAllConstIter(moleculeCloud, mC, iter)
     {
         const molecule& mol = iter();
 
+        Q[i] = mol.Q_;
+        v[i] = mol.v_;
+        a[i] = mol.a_;
+        pi[i] = mol.pi_;
+        tau[i] = mol.tau_;
+        specialPosition[i] = mol.specialPosition_;
+        special[i] = mol.special_;
         id[i] = mol.id_;
-        mass[i] = mol.mass_;
-        U[i] = mol.U_;
-        A[i] = mol.A_;
-        tethered[i] = mol.tethered_;
-        tetherPositions[i] = mol.tetherPosition_;
+
+        piGlobal[i] = mol.Q_ & mol.pi_;
+        tauGlobal[i] = mol.Q_ & mol.tau_;
+
+        orientation1[i] = mol.Q_ & vector(1,0,0);
+        orientation2[i] = mol.Q_ & vector(0,1,0);
+        orientation3[i] = mol.Q_ & vector(0,0,1);
+
         i++;
     }
 
+    Q.write();
+    v.write();
+    a.write();
+    pi.write();
+    tau.write();
+    specialPosition.write();
+    special.write();
     id.write();
-    mass.write();
-    U.write();
-    A.write();
-    tethered.write();
-    tetherPositions.write();
-}
 
-};  // end of namespace Foam
+    piGlobal.write();
+    tauGlobal.write();
+
+    orientation1.write();
+    orientation2.write();
+    orientation3.write();
+
+    const moleculeCloud& m = dynamic_cast<const moleculeCloud&>(mC);
+    m.writeXYZ
+    (
+        m.mesh().time().timePath() + "/lagrangian" + "/moleculeCloud.xmol"
+    );
+}
 
 
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
@@ -165,33 +257,40 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const molecule& mol)
 {
     if (os.format() == IOstream::ASCII)
     {
-        os  << mol.id_
-                << token::SPACE << mol.mass_
-                << token::SPACE << static_cast<const Particle<molecule>&>(mol)
-                << token::SPACE << mol.face()
-                << token::SPACE << mol.stepFraction()
-                << token::SPACE << mol.U_
-                << token::SPACE << mol.A_
-                << token::SPACE << mol.potentialEnergy_
-                << token::SPACE << mol.rf_
-                << token::SPACE << mol.tethered_
-                << token::SPACE << mol.tetherPosition_;
+        os  << token::SPACE << static_cast<const Particle<molecule>&>(mol)
+            << token::SPACE << mol.face()
+            << token::SPACE << mol.stepFraction()
+            << token::SPACE << mol.Q_
+            << token::SPACE << mol.v_
+            << token::SPACE << mol.a_
+            << token::SPACE << mol.pi_
+            << token::SPACE << mol.tau_
+            << token::SPACE << mol.specialPosition_
+            << token::SPACE << mol.potentialEnergy_
+            << token::SPACE << mol.rf_
+            << token::SPACE << mol.special_
+            << token::SPACE << mol.id_
+            << token::SPACE << mol.siteForces_
+            << token::SPACE << mol.sitePositions_;
     }
     else
     {
         os  << static_cast<const Particle<molecule>&>(mol);
         os.write
         (
-            reinterpret_cast<const char*>(&mol.mass_),
-            sizeof(mol.mass_)
-            + sizeof(mol.U_)
-            + sizeof(mol.A_)
-            + sizeof(mol.tetherPosition_)
-            + sizeof(mol.potentialEnergy_)
-            + sizeof(mol.rf_)
-            + sizeof(mol.tethered_)
-            + sizeof(mol.id_)
+            reinterpret_cast<const char*>(&mol.Q_),
+            sizeof(mol.Q_)
+          + sizeof(mol.v_)
+          + sizeof(mol.a_)
+          + sizeof(mol.pi_)
+          + sizeof(mol.tau_)
+          + sizeof(mol.specialPosition_)
+          + sizeof(mol.potentialEnergy_)
+          + sizeof(mol.rf_)
+          + sizeof(mol.special_)
+          + sizeof(mol.id_)
         );
+        os  << mol.siteForces_ << mol.sitePositions_;
     }
 
     // Check state of Ostream
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index 3f0e4729a..fcac945b5 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -35,100 +35,1187 @@ namespace Foam
     defineTemplateTypeNameAndDebug(Cloud<molecule>, 0);
 };
 
-
-template<>
-const char* Foam::NamedEnum<Foam::moleculeCloud::
-integrationMethods, 2>::names[] =
-{
-    "verletLeapfrog",
-    "predictorCorrector"
-};
-
-const Foam::NamedEnum<Foam::moleculeCloud::integrationMethods, 2>
-        Foam::moleculeCloud::integrationMethodNames_;
-
-
-Foam::scalar Foam::moleculeCloud::transTol = 1e-12;
-
 Foam::scalar Foam::moleculeCloud::kb = 1.380650277e-23;
 
+Foam::scalar Foam::moleculeCloud::elementaryCharge = 1.602176487e-19;
+
+Foam::scalar Foam::moleculeCloud::vacuumPermittivity = 8.854187817e-12;
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::moleculeCloud::buildConstProps()
+{
+    Info<< nl << "Reading moleculeProperties dictionary." << endl;
+
+    const List<word>& idList(pot_.idList());
+
+    constPropList_.setSize(idList.size());
+
+    const List<word>& siteIdList(pot_.siteIdList());
+
+    IOdictionary moleculePropertiesDict
+    (
+        IOobject
+        (
+            "moleculeProperties",
+            mesh_.time().constant(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    forAll(idList, i)
+    {
+        const word& id(idList[i]);
+
+        const dictionary& molDict(moleculePropertiesDict.subDict(id));
+
+        List<word> siteIdNames = molDict.lookup("siteIds");
+
+        List<label> siteIds(siteIdNames.size());
+
+        forAll(siteIdNames, sI)
+        {
+            const word& siteId = siteIdNames[sI];
+
+            siteIds[sI] = findIndex(siteIdList, siteId);
+
+            if (siteIds[sI] == -1)
+            {
+                FatalErrorIn("moleculeCloud.C") << nl
+                    << siteId << " site not found."
+                    << nl << abort(FatalError);
+            }
+        }
+
+        molecule::constantProperties& constProp = constPropList_[i];
+
+        constProp = molecule::constantProperties(molDict);
+
+        constProp.siteIds() = siteIds;
+    }
+}
+
+
+void Foam::moleculeCloud::setSiteSizesAndPositions()
+{
+    iterator mol(this->begin());
+
+    for (mol = this->begin(); mol != this->end(); ++mol)
+    {
+        const molecule::constantProperties& cP = constProps(mol().id());
+
+        mol().setSiteSizes(cP.nSites());
+
+        mol().setSitePositions(cP);
+    }
+}
+
+
+void Foam::moleculeCloud::buildCellOccupancy()
+{
+    forAll(cellOccupancy_, cO)
+    {
+        cellOccupancy_[cO].clear();
+    }
+
+    iterator mol(this->begin());
+
+    for
+    (
+        mol = this->begin();
+        mol != this->end();
+        ++mol
+    )
+    {
+        cellOccupancy_[mol().cell()].append(&mol());
+    }
+
+    forAll(cellOccupancy_, cO)
+    {
+        cellOccupancy_[cO].shrink();
+    }
+
+    il_.ril().referMolecules(cellOccupancy());
+}
+
+
+void Foam::moleculeCloud::calculatePairForce()
+{
+    iterator mol(this->begin());
+
+    {
+        // Real-Real interactions
+
+        molecule* molI = &mol();
+
+        molecule* molJ = &mol();
+
+        const directInteractionList& dil(il_.dil());
+
+        forAll(dil, d)
+        {
+            forAll(cellOccupancy_[d],cellIMols)
+            {
+                molI = cellOccupancy_[d][cellIMols];
+
+                forAll(dil[d], interactingCells)
+                {
+                    List< molecule* > cellJ =
+                    cellOccupancy_[dil[d][interactingCells]];
+
+                    forAll(cellJ, cellJMols)
+                    {
+                        molJ = cellJ[cellJMols];
+
+                        evaluatePair(molI, molJ);
+                    }
+                }
+
+                forAll(cellOccupancy_[d],cellIOtherMols)
+                {
+                    molJ = cellOccupancy_[d][cellIOtherMols];
+
+                    if (molJ > molI)
+                    {
+                        evaluatePair(molI, molJ);
+                    }
+                }
+            }
+        }
+    }
+
+    {
+        // Real-Referred interactions
+
+        molecule* molK = &mol();
+
+        referredCellList& ril(il_.ril());
+
+        forAll(ril, r)
+        {
+            const List<label>& realCells = ril[r].realCellsForInteraction();
+
+            forAll(ril[r], refMols)
+            {
+                referredMolecule* molL(&(ril[r][refMols]));
+
+                forAll(realCells, rC)
+                {
+                    List<molecule*> cellK = cellOccupancy_[realCells[rC]];
+
+                    forAll(cellK, cellKMols)
+                    {
+                        molK = cellK[cellKMols];
+
+                        evaluatePair(molK, molL);
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+void Foam::moleculeCloud::calculateTetherForce()
+{
+    const tetherPotentialList& tetherPot(pot_.tetherPotentials());
+
+    iterator mol(this->begin());
+
+    for (mol = this->begin(); mol != this->end(); ++mol)
+    {
+        if (mol().tethered())
+        {
+            vector rIT = mol().position() - mol().specialPosition();
+
+            label idI = mol().id();
+
+            scalar massI = constProps(idI).mass();
+
+            vector fIT = tetherPot.force(idI, rIT);
+
+            mol().a() += fIT/massI;
+
+            mol().potentialEnergy() += tetherPot.energy(idI, rIT);
+
+            // What to do here?
+            // mol().rf() += rIT*fIT;
+        }
+    }
+}
+
+
+void Foam::moleculeCloud::calculateExternalForce()
+{
+    iterator mol(this->begin());
+
+    for (mol = this->begin(); mol != this->end(); ++mol)
+    {
+        mol().a() += pot_.gravity();
+    }
+}
+
+
+void Foam::moleculeCloud::removeHighEnergyOverlaps()
+{
+    Info<< nl << "Removing high energy overlaps, limit = "
+        << pot_.potentialEnergyLimit()
+        << nl << "Removal order:";
+
+    forAll(pot_.removalOrder(), rO)
+    {
+        Info<< ' ' << pot_.idList()[pot_.removalOrder()[rO]];
+    }
+
+    Info<< nl ;
+
+    label initialSize = this->size();
+
+    buildCellOccupancy();
+
+    // Real-Real interaction
+    iterator mol(this->begin());
+
+    {
+        mol = this->begin();
+
+        molecule* molI = &mol();
+
+        molecule* molJ = &mol();
+
+        DynamicList<molecule*> molsToDelete;
+
+        const directInteractionList& dil(il_.dil());
+
+        forAll(dil, d)
+        {
+            forAll(cellOccupancy_[d],cellIMols)
+            {
+                molI = cellOccupancy_[d][cellIMols];
+
+                forAll(dil[d], interactingCells)
+                {
+                    List< molecule* > cellJ =
+                    cellOccupancy_[dil[d][interactingCells]];
+
+                    forAll(cellJ, cellJMols)
+                    {
+                        molJ = cellJ[cellJMols];
+
+                        if (evaluatePotentialLimit(molI, molJ))
+                        {
+                            label idI = molI->id();
+
+                            label idJ = molJ->id();
+
+                            if
+                            (
+                                idI == idJ
+                             || findIndex(pot_.removalOrder(), idJ)
+                                < findIndex(pot_.removalOrder(), idI)
+                            )
+                            {
+                                if (findIndex(molsToDelete, molJ) == -1)
+                                {
+                                    molsToDelete.append(molJ);
+                                }
+                            }
+                            else if (findIndex(molsToDelete, molI) == -1)
+                            {
+                                molsToDelete.append(molI);
+                            }
+                        }
+                    }
+                }
+            }
+
+            forAll(cellOccupancy_[d],cellIOtherMols)
+            {
+                molJ = cellOccupancy_[d][cellIOtherMols];
+
+                if (molJ > molI)
+                {
+                    if (evaluatePotentialLimit(molI, molJ))
+                    {
+                        label idI = molI->id();
+
+                        label idJ = molJ->id();
+
+                        if
+                        (
+                            idI == idJ
+                         || findIndex(pot_.removalOrder(), idJ)
+                            < findIndex(pot_.removalOrder(), idI)
+                        )
+                        {
+                            if (findIndex(molsToDelete, molJ) == -1)
+                            {
+                                molsToDelete.append(molJ);
+                            }
+                        }
+                        else if (findIndex(molsToDelete, molI) == -1)
+                        {
+                            molsToDelete.append(molI);
+                        }
+                    }
+                }
+            }
+        }
+
+        forAll (molsToDelete, mTD)
+        {
+            deleteParticle(*(molsToDelete[mTD]));
+        }
+    }
+
+    buildCellOccupancy();
+
+    // Real-Referred interaction
+
+    {
+        molecule* molK = &mol();
+
+        DynamicList<molecule*> molsToDelete;
+
+        referredCellList& ril(il_.ril());
+
+        forAll(ril, r)
+        {
+            referredCell& refCell = ril[r];
+
+            forAll(refCell, refMols)
+            {
+                referredMolecule* molL = &(refCell[refMols]);
+
+                List <label> realCells = refCell.realCellsForInteraction();
+
+                forAll(realCells, rC)
+                {
+                    label cellK = realCells[rC];
+
+                    List<molecule*> cellKMols = cellOccupancy_[cellK];
+
+                    forAll(cellKMols, cKM)
+                    {
+                        molK = cellKMols[cKM];
+
+                        if (evaluatePotentialLimit(molK, molL))
+                        {
+                            label idK = molK->id();
+
+                            label idL = molL->id();
+
+                            if
+                            (
+                                findIndex(pot_.removalOrder(), idK)
+                                    < findIndex(pot_.removalOrder(), idL)
+                            )
+                            {
+                                if (findIndex(molsToDelete, molK) == -1)
+                                {
+                                    molsToDelete.append(molK);
+                                }
+                            }
+
+                            else if
+                            (
+                                findIndex(pot_.removalOrder(), idK)
+                                    == findIndex(pot_.removalOrder(), idL)
+                            )
+                            {
+                                if
+                                (
+                                    Pstream::myProcNo() == refCell.sourceProc()
+                                 && cellK <= refCell.sourceCell()
+                                )
+                                {
+                                    if (findIndex(molsToDelete, molK) == -1)
+                                    {
+                                        molsToDelete.append(molK);
+                                    }
+                                }
+
+                                else if
+                                (
+                                    Pstream::myProcNo() < refCell.sourceProc()
+                                )
+                                {
+                                    if (findIndex(molsToDelete, molK) == -1)
+                                    {
+                                        molsToDelete.append(molK);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+
+        forAll (molsToDelete, mTD)
+        {
+            deleteParticle(*(molsToDelete[mTD]));
+        }
+    }
+
+    buildCellOccupancy();
+
+    label molsRemoved = initialSize - this->size();
+
+    if (Pstream::parRun())
+    {
+        reduce(molsRemoved, sumOp<label>());
+    }
+
+    Info<< tab << molsRemoved << " molecules removed" << endl;
+}
+
+
+void Foam::moleculeCloud::initialiseMolecules
+(
+    const IOdictionary& mdInitialiseDict
+)
+{
+    Info<< nl
+        << "Initialising molecules in each zone specified in mdInitialiseDict."
+        << endl;
+
+    const cellZoneMesh& cellZones = mesh_.cellZones();
+
+    if (!cellZones.size())
+    {
+        FatalErrorIn("void Foam::moleculeCloud::initialiseMolecules")
+            << "No cellZones found in the mesh."
+            << abort(FatalError);
+    }
+
+    forAll (cellZones, z)
+    {
+        const cellZone& zone(cellZones[z]);
+
+        if (zone.size())
+        {
+            if (!mdInitialiseDict.found(zone.name()))
+            {
+                Info<< "No specification subDictionary for zone "
+                    << zone.name() << " found, skipping." << endl;
+            }
+            else
+            {
+                const dictionary& zoneDict =
+                    mdInitialiseDict.subDict(zone.name());
+
+                const scalar temperature
+                (
+                    readScalar(zoneDict.lookup("temperature"))
+                );
+
+                const vector bulkVelocity(zoneDict.lookup("bulkVelocity"));
+
+                List<word> latticeIds
+                (
+                    zoneDict.lookup("latticeIds")
+                );
+
+                List<vector> latticePositions
+                (
+                    zoneDict.lookup("latticePositions")
+                );
+
+                if(latticeIds.size() != latticePositions.size())
+                {
+                    FatalErrorIn("Foam::moleculeCloud::initialiseMolecules")
+                        << "latticeIds and latticePositions must be the same "
+                        << " size." << nl
+                        << abort(FatalError);
+                }
+
+                diagTensor latticeCellShape
+                (
+                    zoneDict.lookup("latticeCellShape")
+                );
+
+                scalar latticeCellScale = 0.0;
+
+                if (zoneDict.found("numberDensity"))
+                {
+                    scalar numberDensity = readScalar
+                    (
+                        zoneDict.lookup("numberDensity")
+                    );
+
+                    if (numberDensity < VSMALL)
+                    {
+                        WarningIn("moleculeCloud::initialiseMolecules")
+                            << "numberDensity too small, not filling zone "
+                            << zone.name() << endl;
+
+                        continue;
+                    }
+
+                    latticeCellScale = pow
+                    (
+                        latticeIds.size()/(det(latticeCellShape)*numberDensity),
+                        (1.0/3.0)
+                    );
+                }
+                else if (zoneDict.found("massDensity"))
+                {
+                    scalar unitCellMass = 0.0;
+
+                    forAll(latticeIds, i)
+                    {
+                        label id = findIndex(pot_.idList(), latticeIds[i]);
+
+                        const molecule::constantProperties& cP(constProps(id));
+
+                        unitCellMass += cP.mass();
+                    }
+
+                    scalar massDensity = readScalar
+                    (
+                        zoneDict.lookup("massDensity")
+                    );
+
+                    if (massDensity < VSMALL)
+                    {
+                        WarningIn("moleculeCloud::initialiseMolecules")
+                            << "massDensity too small, not filling zone "
+                            << zone.name() << endl;
+
+                        continue;
+                    }
+
+
+                    latticeCellScale = pow
+                    (
+                        unitCellMass/(det(latticeCellShape)*massDensity),
+                        (1.0/3.0)
+                    );
+                }
+                else
+                {
+                    FatalErrorIn("Foam::moleculeCloud::initialiseMolecules")
+                        << "massDensity or numberDensity not specified " << nl
+                        << abort(FatalError);
+                }
+
+                latticeCellShape *= latticeCellScale;
+
+                vector anchor(zoneDict.lookup("anchor"));
+
+                bool tethered = false;
+
+                if (zoneDict.found("tetherSiteIds"))
+                {
+                    tethered = bool
+                    (
+                        List<word>(zoneDict.lookup("tetherSiteIds")).size()
+                    );
+                }
+
+                const vector orientationAngles
+                (
+                    zoneDict.lookup("orientationAngles")
+                );
+
+                scalar phi
+                (
+                    orientationAngles.x()*mathematicalConstant::pi/180.0
+                );
+
+                scalar theta
+                (
+                    orientationAngles.y()*mathematicalConstant::pi/180.0
+                );
+
+                scalar psi
+                (
+                    orientationAngles.z()*mathematicalConstant::pi/180.0
+                );
+
+                const tensor R
+                (
+                    cos(psi)*cos(phi) - cos(theta)*sin(phi)*sin(psi),
+                    cos(psi)*sin(phi) + cos(theta)*cos(phi)*sin(psi),
+                    sin(psi)*sin(theta),
+                    - sin(psi)*cos(phi) - cos(theta)*sin(phi)*cos(psi),
+                    - sin(psi)*sin(phi) + cos(theta)*cos(phi)*cos(psi),
+                    cos(psi)*sin(theta),
+                    sin(theta)*sin(phi),
+                    - sin(theta)*cos(phi),
+                    cos(theta)
+                );
+
+                // Find the optimal anchor position.  Finding the approximate
+                // mid-point of the zone of cells and snapping to the nearest
+                // lattice location.
+
+                vector zoneMin = VGREAT*vector::one;
+
+                vector zoneMax = -VGREAT*vector::one;
+
+                forAll (zone, cell)
+                {
+                    const point cellCentre = mesh_.cellCentres()[zone[cell]];
+
+                    if (cellCentre.x() > zoneMax.x())
+                    {
+                        zoneMax.x() = cellCentre.x();
+                    }
+                    if (cellCentre.x() < zoneMin.x())
+                    {
+                        zoneMin.x() = cellCentre.x();
+                    }
+                    if (cellCentre.y() > zoneMax.y())
+                    {
+                        zoneMax.y() = cellCentre.y();
+                    }
+                    if (cellCentre.y() < zoneMin.y())
+                    {
+                        zoneMin.y() = cellCentre.y();
+                    }
+                    if (cellCentre.z() > zoneMax.z())
+                    {
+                        zoneMax.z() = cellCentre.z();
+                    }
+                    if (cellCentre.z() < zoneMin.z())
+                    {
+                        zoneMin.z() = cellCentre.z();
+                    }
+                }
+
+                point zoneMid = 0.5*(zoneMin + zoneMax);
+
+                point latticeMid = inv(latticeCellShape) & (R.T()
+                & (zoneMid - anchor));
+
+                point latticeAnchor
+                (
+                    label(latticeMid.x() + 0.5*sign(latticeMid.x())),
+                    label(latticeMid.y() + 0.5*sign(latticeMid.y())),
+                    label(latticeMid.z() + 0.5*sign(latticeMid.z()))
+                );
+
+                anchor += (R & (latticeCellShape & latticeAnchor));
+
+                // Continue trying to place molecules as long as at
+                // least one molecule is placed in each iteration.
+                // The "|| totalZoneMols == 0" condition means that the
+                // algorithm will continue if the origin is outside the
+                // zone.
+
+                label n = 0;
+
+                label totalZoneMols = 0;
+
+                label molsPlacedThisIteration = 0;
+
+                while
+                (
+                    molsPlacedThisIteration != 0
+                 || totalZoneMols == 0
+                )
+                {
+                    label sizeBeforeIteration = this->size();
+
+                    bool partOfLayerInBounds = false;
+
+                    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    // start of placement of molecules
+                    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                    if (n == 0)
+                    {
+                        // Special treatment is required for the first position,
+                        // i.e. iteration zero.
+
+                        labelVector unitCellLatticePosition(0,0,0);
+
+                        forAll(latticePositions, p)
+                        {
+                            label id = findIndex(pot_.idList(), latticeIds[p]);
+
+                            const vector& latticePosition =
+                            vector
+                            (
+                                unitCellLatticePosition.x(),
+                                unitCellLatticePosition.y(),
+                                unitCellLatticePosition.z()
+                            )
+                            + latticePositions[p];
+
+                            point globalPosition =
+                            anchor + (R & (latticeCellShape & latticePosition));
+
+                            partOfLayerInBounds =
+                            mesh_.bounds().contains(globalPosition);
+
+                            label cell = mesh_.findCell(globalPosition);
+
+                            if (findIndex(zone, cell) != -1)
+                            {
+                                createMolecule
+                                (
+                                    globalPosition,
+                                    cell,
+                                    id,
+                                    tethered,
+                                    temperature,
+                                    bulkVelocity
+                                );
+                            }
+                        }
+                    }
+                    else
+                    {
+                        // Place top and bottom caps.
+
+                        labelVector unitCellLatticePosition(0,0,0);
+
+                        for
+                        (
+                            unitCellLatticePosition.z() = -n;
+                            unitCellLatticePosition.z() <= n;
+                            unitCellLatticePosition.z() += 2*n
+                        )
+                        {
+                            for
+                            (
+                                unitCellLatticePosition.y() = -n;
+                                unitCellLatticePosition.y() <= n;
+                                unitCellLatticePosition.y()++
+                            )
+                            {
+                                for
+                                (
+                                    unitCellLatticePosition.x() = -n;
+                                    unitCellLatticePosition.x() <= n;
+                                    unitCellLatticePosition.x()++
+                                )
+                                {
+                                    forAll(latticePositions, p)
+                                    {
+                                        label id = findIndex
+                                        (
+                                            pot_.idList(),
+                                            latticeIds[p]
+                                        );
+
+                                        const vector& latticePosition =
+                                        vector
+                                        (
+                                            unitCellLatticePosition.x(),
+                                            unitCellLatticePosition.y(),
+                                            unitCellLatticePosition.z()
+                                        )
+                                        + latticePositions[p];
+
+                                        point globalPosition = anchor
+                                        + (R
+                                        &(latticeCellShape & latticePosition));
+
+                                        partOfLayerInBounds =
+                                        mesh_.bounds().contains(globalPosition);
+
+                                        label cell = mesh_.findCell
+                                        (
+                                            globalPosition
+                                        );
+
+                                        if (findIndex(zone, cell) != -1)
+                                        {
+                                            createMolecule
+                                            (
+                                                globalPosition,
+                                                cell,
+                                                id,
+                                                tethered,
+                                                temperature,
+                                                bulkVelocity
+                                            );
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
+                        for
+                        (
+                            unitCellLatticePosition.z() = -(n-1);
+                            unitCellLatticePosition.z() <= (n-1);
+                            unitCellLatticePosition.z()++
+                        )
+                        {
+                            for (label iR = 0; iR <= 2*n -1; iR++)
+                            {
+                                unitCellLatticePosition.x() = n;
+
+                                unitCellLatticePosition.y() = -n + (iR + 1);
+
+                                for (label iK = 0; iK < 4; iK++)
+                                {
+                                    forAll(latticePositions, p)
+                                    {
+                                        label id = findIndex
+                                        (
+                                            pot_.idList(),
+                                            latticeIds[p]
+                                        );
+
+                                        const vector& latticePosition =
+                                        vector
+                                        (
+                                            unitCellLatticePosition.x(),
+                                            unitCellLatticePosition.y(),
+                                            unitCellLatticePosition.z()
+                                        )
+                                        + latticePositions[p];
+
+                                        point globalPosition = anchor
+                                        + (R
+                                        &(latticeCellShape & latticePosition));
+
+                                        partOfLayerInBounds =
+                                        mesh_.bounds().contains(globalPosition);
+
+                                        label cell = mesh_.findCell
+                                        (
+                                            globalPosition
+                                        );
+
+                                        if (findIndex(zone, cell) != -1)
+                                        {
+                                            createMolecule
+                                            (
+                                                globalPosition,
+                                                cell,
+                                                id,
+                                                tethered,
+                                                temperature,
+                                                bulkVelocity
+                                            );
+                                        }
+                                    }
+
+                                    unitCellLatticePosition =
+                                    labelVector
+                                    (
+                                        - unitCellLatticePosition.y(),
+                                        unitCellLatticePosition.x(),
+                                        unitCellLatticePosition.z()
+                                    );
+                                }
+                            }
+                        }
+                    }
+
+                    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                    // end of placement of molecules
+                    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+                    if
+                    (
+                        totalZoneMols == 0
+                     && !partOfLayerInBounds
+                    )
+                    {
+                        WarningIn("Foam::moleculeCloud::initialiseMolecules()")
+                            << "A whole layer of unit cells was placed "
+                            << "outside the bounds of the mesh, but no "
+                            << "molecules have been placed in zone '"
+                            << zone.name()
+                            << "'.  This is likely to be because the zone "
+                            << "has few cells ("
+                            << zone.size()
+                            << " in this case) and no lattice position "
+                            << "fell inside them.  "
+                            << "Aborting filling this zone."
+                            << endl;
+
+                        break;
+                    }
+
+                    molsPlacedThisIteration =
+                    this->size() - sizeBeforeIteration;
+
+                    totalZoneMols += molsPlacedThisIteration;
+
+                    n++;
+                }
+            }
+        }
+    }
+}
+
+
+void Foam::moleculeCloud::createMolecule
+(
+    const point& position,
+    label cell,
+    label id,
+    bool tethered,
+    scalar temperature,
+    const vector& bulkVelocity
+)
+{
+    const Cloud<molecule>& cloud = *this;
+
+    if (cell == -1)
+    {
+        cell = mesh_.findCell(position);
+    }
+
+    if (cell == -1)
+    {
+        FatalErrorIn("Foam::moleculeCloud::createMolecule")
+            << "Position specified does not correspond to a mesh cell." << nl
+            << abort(FatalError);
+    }
+
+    point specialPosition(vector::zero);
+
+    label special = 0;
+
+    if (tethered)
+    {
+        specialPosition = position;
+
+        special = molecule::SPECIAL_TETHERED;
+    }
+
+    const molecule::constantProperties& cP(constProps(id));
+
+    vector v = equipartitionLinearVelocity(temperature, cP.mass());
+
+    v += bulkVelocity;
+
+    vector pi = vector::zero;
+
+    tensor Q = I;
+
+    if (!cP.pointMolecule())
+    {
+        pi = equipartitionAngularMomentum(temperature, cP);
+
+        scalar phi(rndGen_.scalar01()*mathematicalConstant::twoPi);
+
+        scalar theta(rndGen_.scalar01()*mathematicalConstant::twoPi);
+
+        scalar psi(rndGen_.scalar01()*mathematicalConstant::twoPi);
+
+        Q = tensor
+        (
+            cos(psi)*cos(phi) - cos(theta)*sin(phi)*sin(psi),
+            cos(psi)*sin(phi) + cos(theta)*cos(phi)*sin(psi),
+            sin(psi)*sin(theta),
+            - sin(psi)*cos(phi) - cos(theta)*sin(phi)*cos(psi),
+            - sin(psi)*sin(phi) + cos(theta)*cos(phi)*cos(psi),
+            cos(psi)*sin(theta),
+            sin(theta)*sin(phi),
+            - sin(theta)*cos(phi),
+            cos(theta)
+        );
+    }
+
+    addParticle
+    (
+        new molecule
+        (
+            cloud,
+            position,
+            cell,
+            Q,
+            v,
+            vector::zero,
+            pi,
+            vector::zero,
+            specialPosition,
+            constProps(id),
+            special,
+            id
+        )
+    );
+}
+
+
+Foam::label Foam::moleculeCloud::nSites() const
+{
+    label n = 0;
+
+    const_iterator mol(this->begin());
+
+    for (mol = this->begin(); mol != this->end(); ++mol)
+    {
+        n += constProps(mol().id()).nSites();
+    }
+
+    return n;
+}
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::moleculeCloud::moleculeCloud(const polyMesh& mesh)
+Foam::moleculeCloud::moleculeCloud
+(
+    const polyMesh& mesh,
+    const potential& pot,
+    bool readFields
+)
 :
     Cloud<molecule>(mesh, "moleculeCloud", false),
     mesh_(mesh),
-    referredInteractionList_(*this)
+    pot_(pot),
+    cellOccupancy_(mesh_.nCells()),
+    il_(mesh_, pot_.pairPotentials().rCutMaxSqr(), false),
+    constPropList_(),
+    rndGen_(clock::getTime())
 {
-    molecule::readFields(*this);
+    if (readFields)
+    {
+        molecule::readFields(*this);
+    }
 
-#   include "moleculeCloudReadMDParameters.H"
+    buildConstProps();
 
-    buildCellInteractionLists();
+    setSiteSizesAndPositions();
 
-    buildCellReferralLists();
+    removeHighEnergyOverlaps();
 
-    buildCellOccupancy();
+    calculateForce();
 }
 
 
 Foam::moleculeCloud::moleculeCloud
 (
     const polyMesh& mesh,
-    label nMol,
-    const labelField& id,
-    const scalarField& mass,
-    const vectorField& positions,
-    const labelField& cells,
-    const vectorField& U,
-    const vectorField& A,
-    const labelField& tethered,
-    const vectorField& tetherPositions
+    const potential& pot,
+    const IOdictionary& mdInitialiseDict,
+    bool readFields
 )
-:
+    :
     Cloud<molecule>(mesh, "moleculeCloud", false),
     mesh_(mesh),
-    referredInteractionList_(*this)
+    pot_(pot),
+    il_(mesh_),
+    constPropList_(),
+    rndGen_(clock::getTime())
 {
-    molecule::readFields(*this);
+    if (readFields)
+    {
+        molecule::readFields(*this);
+    }
 
     clear();
 
-    // This clear ()is here for the moment to stop existing files
-    // being appended to, this would be better accomplished by getting
-    // mesh.removeFiles(mesh.instance()); (or equivalent) to work.
+    buildConstProps();
 
-    int i;
-
-    const Cloud<molecule>& cloud = *this;
-
-    for (i=0; i<nMol; i++)
-    {
-        addParticle
-        (
-            new molecule
-            (
-                cloud,
-                positions[i],
-                cells[i],
-                mass[i],
-                U[i],
-                A[i],
-                tetherPositions[i],
-                tethered[i],
-                id[i]
-            )
-        );
-    }
-};
+    initialiseMolecules(mdInitialiseDict);
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::moleculeCloud::writeFields() const
+void Foam::moleculeCloud::evolve()
 {
-    molecule::writeFields(*this);
+    molecule::trackData td0(*this, 0);
+    Cloud<molecule>::move(td0);
+
+    molecule::trackData td1(*this, 1);
+    Cloud<molecule>::move(td1);
+
+    molecule::trackData td2(*this, 2);
+    Cloud<molecule>::move(td2);
+
+    calculateForce();
+
+    molecule::trackData td3(*this, 3);
+    Cloud<molecule>::move(td3);
+}
+
+
+void Foam::moleculeCloud::calculateForce()
+{
+    buildCellOccupancy();
+
+    iterator mol(this->begin());
+
+    // Set accumulated quantities to zero
+    for (mol = this->begin(); mol != this->end(); ++mol)
+    {
+        mol().siteForces() = vector::zero;
+
+        mol().potentialEnergy() = 0.0;
+
+        mol().rf() = tensor::zero;
+    }
+
+    calculatePairForce();
+
+    calculateTetherForce();
+
+    calculateExternalForce();
+}
+
+
+void Foam::moleculeCloud::applyConstraintsAndThermostats
+(
+    const scalar targetTemperature,
+    const scalar measuredTemperature
+)
+{
+    scalar temperatureCorrectionFactor =
+        sqrt(targetTemperature/measuredTemperature);
+
+    Info<< "----------------------------------------" << nl
+        << "Temperature equilibration" << nl
+        << "Target temperature = "
+        << targetTemperature << nl
+        << "Measured temperature = "
+        << measuredTemperature << nl
+        << "Temperature correction factor = "
+        << temperatureCorrectionFactor << nl
+        << "----------------------------------------"
+        << endl;
+
+    iterator mol(this->begin());
+
+    for (mol = this->begin(); mol != this->end(); ++mol)
+    {
+        mol().v() *= temperatureCorrectionFactor;
+
+        mol().pi() *= temperatureCorrectionFactor;
+    }
+}
+
+
+void Foam::moleculeCloud::writeXYZ(const fileName& fName) const
+{
+    OFstream str(fName);
+
+    str << nSites() << nl << "moleculeCloud site positions in angstroms" << nl;
+
+    const_iterator mol(this->begin());
+
+    for (mol = this->begin(); mol != this->end(); ++mol)
+    {
+        const molecule::constantProperties& cP = constProps(mol().id());
+
+        forAll(mol().sitePositions(), i)
+        {
+            const point& sP = mol().sitePositions()[i];
+
+            str << pot_.siteIdList()[cP.siteIds()[i]]
+                << ' ' << sP.x()*1e10
+                << ' ' << sP.y()*1e10
+                << ' ' << sP.z()*1e10
+                << nl;
+        }
+    }
 }
 
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
index 62b011172..ffeae142b 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.H
@@ -28,18 +28,8 @@ Class
 Description
 
 SourceFiles
-    moleculeCloudApplyConstraintsAndThermostats.C
-    moleculeCloudBuildCellInteractionLists.C
-    moleculeCloudBuildCellOccupancy.C
-    moleculeCloudBuildCellReferralLists.C
+    moleculeCloudI.H
     moleculeCloud.C
-    moleculeCloudCalculateAndAccumulateProperties.C
-    moleculeCloudCalculateExternalForce.C
-    moleculeCloudCalculateForce.C
-    moleculeCloudCalculatePairForce.C
-    moleculeCloudCalculateTetherForce.C
-    moleculeCloudIntegrateEquationsOfMotion.C
-    moleculeCloudRemoveHighEnergyOverlaps.C
 
 
 \*---------------------------------------------------------------------------*/
@@ -50,14 +40,11 @@ SourceFiles
 #include "Cloud.H"
 #include "molecule.H"
 #include "IOdictionary.H"
-#include "vector2D.H"
-
-#include "pairPotentialList.H"
-#include "tetherPotentialList.H"
-
-#include "receivingReferralList.H"
-#include "sendingReferralList.H"
-#include "referredCellList.H"
+#include "potential.H"
+#include "interactionLists.H"
+#include "labelVector.H"
+#include "Random.H"
+#include "fileName.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,7 +52,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class moleculeCloud Declaration
+                       Class moleculeCloud Declaration
 \*---------------------------------------------------------------------------*/
 
 class moleculeCloud
@@ -73,243 +60,167 @@ class moleculeCloud
     public Cloud<molecule>
 {
 
-public:
-
-    enum integrationMethods
-    {
-        imVerletLeapfrog,
-        imPredictorCorrector
-    };
-
-
 private:
 
     // Private data
 
         const polyMesh& mesh_;
 
-            // MD solution parameters
+        const potential& pot_;
 
-            static const NamedEnum<integrationMethods, 2>
-                integrationMethodNames_;
+        List<DynamicList<molecule*> > cellOccupancy_;
 
-            integrationMethods integrationMethod_;
+        interactionLists il_;
 
-            scalar potentialEnergyLimit_;
+        List<molecule::constantProperties> constPropList_;
 
-            labelList removalOrder_;
-
-            labelListList directInteractionList_;
-
-            referredCellList referredInteractionList_;
-
-            labelList realCellsWithinRCutMaxOfAnyReferringPatch_;
-
-            labelList realFacesWithinRCutMaxOfAnyReferringPatch_;
-
-            labelList realEdgesWithinRCutMaxOfAnyReferringPatch_;
-
-            labelList realPointsWithinRCutMaxOfAnyReferringPatch_;
-
-            List<sendingReferralList> cellSendingReferralLists_;
-
-            List<receivingReferralList> cellReceivingReferralLists_;
-
-            pairPotentialList pairPotentials_;
-
-            tetherPotentialList tetherPotentials_;
-
-            vector gravity_;
-
-            List< DynamicList<molecule*> > cellOccupancy_;
+        Random rndGen_;
 
 
-        // Private Member Functions
+    // Private Member Functions
 
-            //- Disallow default bitwise copy construct
-            moleculeCloud(const moleculeCloud&);
+        void buildConstProps();
 
-            //- Disallow default bitwise assignment
-            void operator=(const moleculeCloud&);
+        void setSiteSizesAndPositions();
+
+        //- Determine which molecules are in which cells
+        void buildCellOccupancy();
+
+        void calculatePairForce();
+
+        inline void evaluatePair
+        (
+            molecule* molI,
+            molecule* molJ
+        );
+
+        inline void evaluatePair
+        (
+            molecule* molReal,
+            referredMolecule* molRef
+        );
+
+        inline bool evaluatePotentialLimit
+        (
+            molecule* molI,
+            molecule* molJ
+        ) const;
+
+        inline bool evaluatePotentialLimit
+        (
+            molecule* molReal,
+            referredMolecule* molRef
+        ) const;
+
+        void calculateTetherForce();
+
+        void calculateExternalForce();
+
+        void removeHighEnergyOverlaps();
+
+        void initialiseMolecules
+        (
+            const IOdictionary& mdInitialiseDict
+        );
+
+        void createMolecule
+        (
+            const point& position,
+            label cell,
+            label id,
+            bool tethered,
+            scalar temperature,
+            const vector& bulkVelocity
+        );
+
+        label nSites() const;
+
+        inline vector equipartitionLinearVelocity
+        (
+            scalar temperature,
+            scalar mass
+        );
+
+        inline vector equipartitionAngularMomentum
+        (
+            scalar temperature,
+            const molecule::constantProperties& cP
+        );
+
+        //- Disallow default bitwise copy construct
+        moleculeCloud(const moleculeCloud&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const moleculeCloud&);
 
 
 public:
 
     // Static data members
 
-        //- Tolerance for checking that faces on a patch segment
-        static scalar transTol;
-
         static scalar kb;
 
+        static scalar elementaryCharge;
+
+        static scalar vacuumPermittivity;
+
 
     // Constructors
 
-        //- Construct given mesh
-        moleculeCloud(const polyMesh&);
-
-        //- Construct given polyMesh and fields of position, cell, mass,
-        //- id, U ands A.  Intended for use by the molConfig utility
+        //- Construct given mesh and potential references
         moleculeCloud
         (
             const polyMesh& mesh,
-            label nMol,
-            const labelField& id,
-            const scalarField& mass,
-            const vectorField& positions,
-            const labelField& cells,
-            const vectorField& U,
-            const vectorField& A,
-            const labelField& tethered,
-            const vectorField& tetherPositions
+            const potential& pot,
+            bool readFields = true
+        );
+
+        //- Construct given mesh, potential and mdInitialiseDict
+        moleculeCloud
+        (
+            const polyMesh& mesh,
+            const potential& pot,
+            const IOdictionary& mdInitialiseDict,
+            bool readFields = true
         );
 
 
     // Member Functions
 
+        //- Evolve the molecules (move, calculate forces, control state etc)
+        void evolve();
+
+        void calculateForce();
+
+        void applyConstraintsAndThermostats
+        (
+            const scalar targetTemperature,
+            const scalar measuredTemperature
+        );
+
+
         // Access
 
             inline const polyMesh& mesh() const;
 
-        // MD solution parameters
+            inline const potential& pot() const;
 
-            inline const integrationMethods& integrationMethod() const;
+            inline const List<DynamicList<molecule*> >& cellOccupancy() const;
 
-            inline scalar potentialEnergyLimit() const;
+            inline const interactionLists& il() const;
 
-            inline const labelList& removalOrder() const;
+            inline const List<molecule::constantProperties> constProps() const;
 
-            inline label nPairPotentials() const;
+            inline const molecule::constantProperties&
+                constProps(label id) const;
 
-            inline const labelListList& directInteractionList() const;
-
-            inline const referredCellList& referredInteractionList() const;
-
-            inline const labelList&
-                realCellsWithinRCutMaxOfAnyReferringPatch() const;
-
-            inline const labelList&
-                realFacesWithinRCutMaxOfAnyReferringPatch() const;
-
-            inline const labelList&
-                realEdgesWithinRCutMaxOfAnyReferringPatch() const;
-
-            inline const labelList&
-                realPointsWithinRCutMaxOfAnyReferringPatch() const;
-
-            inline const List<sendingReferralList>&
-                cellSendingReferralLists() const;
-
-            inline const List<receivingReferralList>&
-                cellReceivingReferralLists() const;
-
-            inline label nInteractingProcs() const;
-
-            inline const pairPotentialList& pairPotentials() const;
-
-            inline const tetherPotentialList& tetherPotentials() const;
-
-            inline const vector& gravity() const;
-
-            inline const List< DynamicList<molecule*> >& cellOccupancy() const;
-
-            void buildCellInteractionLists();
-
-            //- Build referralLists which define how to send information
-            // to referredCells to source cells
-            void buildCellReferralLists();
-
-            bool testPointFaceDistance
-            (
-                const label p,
-                const label faceNo
-            ) const;
-
-            bool testPointFaceDistance
-            (
-                const label p,
-                const referredCell& refCell
-            ) const;
-
-            bool testPointFaceDistance
-            (
-                const vectorList& pointsToTest,
-                const label faceNo
-            ) const;
-
-            bool testPointFaceDistance
-            (
-                const vector& p,
-                const label faceNo
-            ) const;
-
-            bool testPointFaceDistance
-            (
-                const vector& p,
-                const labelList& faceToTest,
-                const vectorList& points,
-                const vector& faceC,
-                const vector& faceA
-            ) const;
-
-            bool testEdgeEdgeDistance
-            (
-                const edge& eI,
-                const edge& eJ
-            ) const;
-
-            bool testEdgeEdgeDistance
-            (
-                const edge& eI,
-                const vector& eJs,
-                const vector& eJe
-            ) const;
-
-            const labelList realCellsInRangeOfSegment
-            (
-                const labelList& segmentFaces,
-                const labelList& segmentEdges,
-                const labelList& segmentPoints
-            ) const;
-
-            const labelList referredCellsInRangeOfSegment
-            (
-                const List<referredCell>& referredInteractionList,
-                const labelList& segmentFaces,
-                const labelList& segmentEdges,
-                const labelList& segmentPoints
-            ) const;
-
-            //- Determine which molecules are in which cells
-            void buildCellOccupancy();
-
-            //- Integrate the equations of motion using algorithm selected at
-            //  runtime from a dictionary. This will also call the function
-            //  to calculate the intermolecular forces (calculatePairForce()).
-
-            void integrateEquationsOfMotion();
-
-            void applyConstraintsAndThermostats
-            (
-                const scalar targetTemperature,
-                const scalar measuredTemperature
-            );
-
-            void calculateForce();
-
-            void calculatePairForce();
-
-            void calculateTetherForce();
-
-            void calculateExternalForce();
-
-            void removeHighEnergyOverlaps();
+            inline Random& rndGen();
 
 
     // Member Operators
 
-        //- Write fields
-        void writeFields() const;
+        //- Write molecule sites in XYZ format
+        void writeXYZ(const fileName& fName) const;
 };
 
 
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
index d5c2fdd8d..ed9fde446 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
@@ -24,131 +24,642 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-namespace Foam
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+inline void Foam::moleculeCloud::evaluatePair
+(
+    molecule* molI,
+    molecule* molJ
+)
 {
+    const pairPotentialList& pairPot = pot_.pairPotentials();
+
+    const pairPotential& electrostatic = pairPot.electrostatic();
+
+    label idI = molI->id();
+
+    label idJ = molJ->id();
+
+    const molecule::constantProperties& constPropI(constProps(idI));
+
+    const molecule::constantProperties& constPropJ(constProps(idJ));
+
+    List<label> siteIdsI = constPropI.siteIds();
+
+    List<label> siteIdsJ = constPropJ.siteIds();
+
+    List<bool> pairPotentialSitesI = constPropI.pairPotentialSites();
+
+    List<bool> electrostaticSitesI = constPropI.electrostaticSites();
+
+    List<bool> pairPotentialSitesJ = constPropJ.pairPotentialSites();
+
+    List<bool> electrostaticSitesJ = constPropJ.electrostaticSites();
+
+    forAll(siteIdsI, sI)
+    {
+        label idsI(siteIdsI[sI]);
+
+        forAll(siteIdsJ, sJ)
+        {
+            label idsJ(siteIdsJ[sJ]);
+
+            if (pairPotentialSitesI[sI] && pairPotentialSitesJ[sJ])
+            {
+                vector rsIsJ =
+                    molI->sitePositions()[sI] - molJ->sitePositions()[sJ];
+
+                scalar rsIsJMagSq = magSqr(rsIsJ);
+
+                if(pairPot.rCutSqr(idsI, idsJ, rsIsJMagSq))
+                {
+                    scalar rsIsJMag = mag(rsIsJ);
+
+                    vector fsIsJ =
+                        (rsIsJ/rsIsJMag)
+                       *pairPot.force(idsI, idsJ, rsIsJMag);
+
+                    molI->siteForces()[sI] += fsIsJ;
+
+                    molJ->siteForces()[sJ] += -fsIsJ;
+
+                    scalar potentialEnergy
+                    (
+                        pairPot.energy(idsI, idsJ, rsIsJMag)
+                    );
+
+                    molI->potentialEnergy() += 0.5*potentialEnergy;
+
+                    molJ->potentialEnergy() += 0.5*potentialEnergy;
+
+                    vector rIJ = molI->position() - molJ->position();
+
+                    tensor virialContribution =
+                        (rsIsJ*fsIsJ)*(rsIsJ & rIJ)/rsIsJMagSq;
+
+                    molI->rf() += virialContribution;
+
+                    molJ->rf() += virialContribution;
+
+                    // molI->rf() += rsIsJ * fsIsJ;
+
+                    // molJ->rf() += rsIsJ * fsIsJ;
+                }
+            }
+
+            if (electrostaticSitesI[sI] && electrostaticSitesJ[sJ])
+            {
+                vector rsIsJ =
+                molI->sitePositions()[sI] - molJ->sitePositions()[sJ];
+
+                scalar rsIsJMagSq = magSqr(rsIsJ);
+
+                if(rsIsJMagSq <= electrostatic.rCutSqr())
+                {
+                    scalar rsIsJMag = mag(rsIsJ);
+
+                    scalar chargeI = constPropI.siteCharges()[sI];
+
+                    scalar chargeJ = constPropJ.siteCharges()[sJ];
+
+                    vector fsIsJ =
+                        (rsIsJ/rsIsJMag)
+                       *chargeI*chargeJ*electrostatic.force(rsIsJMag);
+
+                    molI->siteForces()[sI] += fsIsJ;
+
+                    molJ->siteForces()[sJ] += -fsIsJ;
+
+                    scalar potentialEnergy =
+                        chargeI*chargeJ
+                       *electrostatic.energy(rsIsJMag);
+
+                    molI->potentialEnergy() += 0.5*potentialEnergy;
+
+                    molJ->potentialEnergy() += 0.5*potentialEnergy;
+
+                    vector rIJ = molI->position() - molJ->position();
+
+                    tensor virialContribution =
+                        (rsIsJ*fsIsJ)*(rsIsJ & rIJ)/rsIsJMagSq;
+
+                    molI->rf() += virialContribution;
+
+                    molJ->rf() += virialContribution;
+
+                    // molI->rf() += rsIsJ * fsIsJ;
+
+                    // molJ->rf() += rsIsJ * fsIsJ;
+                }
+            }
+        }
+    }
+}
+
+
+inline void Foam::moleculeCloud::evaluatePair
+(
+    molecule* molReal,
+    referredMolecule* molRef
+)
+{
+    const pairPotentialList& pairPot = pot_.pairPotentials();
+
+    const pairPotential& electrostatic = pairPot.electrostatic();
+
+    label idReal = molReal->id();
+
+    label idRef = molRef->id();
+
+    const molecule::constantProperties& constPropReal(constProps(idReal));
+
+    const molecule::constantProperties& constPropRef(constProps(idRef));
+
+    List<label> siteIdsReal = constPropReal.siteIds();
+
+    List<label> siteIdsRef = constPropRef.siteIds();
+
+    List<bool> pairPotentialSitesReal = constPropReal.pairPotentialSites();
+
+    List<bool> electrostaticSitesReal = constPropReal.electrostaticSites();
+
+    List<bool> pairPotentialSitesRef = constPropRef.pairPotentialSites();
+
+    List<bool> electrostaticSitesRef = constPropRef.electrostaticSites();
+
+    forAll(siteIdsReal, sReal)
+    {
+        label idsReal(siteIdsReal[sReal]);
+
+        forAll(siteIdsRef, sRef)
+        {
+            label idsRef(siteIdsRef[sRef]);
+
+            if (pairPotentialSitesReal[sReal] && pairPotentialSitesRef[sRef])
+            {
+                vector rsRealsRef =
+                    molReal->sitePositions()[sReal]
+                  - molRef->sitePositions()[sRef];
+
+                scalar rsRealsRefMagSq = magSqr(rsRealsRef);
+
+                if (pairPot.rCutSqr(idsReal, idsRef, rsRealsRefMagSq))
+                {
+                    scalar rsRealsRefMag = mag(rsRealsRef);
+
+                    vector fsRealsRef =
+                        (rsRealsRef/rsRealsRefMag)
+                       *pairPot.force(idsReal, idsRef, rsRealsRefMag);
+
+                    molReal->siteForces()[sReal] += fsRealsRef;
+
+                    scalar potentialEnergy
+                    (
+                        pairPot.energy(idsReal, idsRef, rsRealsRefMag)
+                    );
+
+                    molReal->potentialEnergy() += 0.5*potentialEnergy;
+
+                    vector rRealRef = molReal->position() - molRef->position();
+
+                    molReal->rf() +=
+                        (rsRealsRef*fsRealsRef)
+                       *(rsRealsRef & rRealRef)
+                       /rsRealsRefMagSq;
+
+                    // molReal->rf() += rsRealsRef * fsRealsRef;
+
+                }
+            }
+
+            if (electrostaticSitesReal[sReal] && electrostaticSitesRef[sRef])
+            {
+                vector rsRealsRef =
+                    molReal->sitePositions()[sReal]
+                  - molRef->sitePositions()[sRef];
+
+                scalar rsRealsRefMagSq = magSqr(rsRealsRef);
+
+                if (rsRealsRefMagSq <= electrostatic.rCutSqr())
+                {
+                    scalar rsRealsRefMag = mag(rsRealsRef);
+
+                    scalar chargeReal = constPropReal.siteCharges()[sReal];
+
+                    scalar chargeRef = constPropRef.siteCharges()[sRef];
+
+                    vector fsRealsRef =
+                        (rsRealsRef/rsRealsRefMag)
+                       *chargeReal*chargeRef
+                       *electrostatic.force(rsRealsRefMag);
+
+                    molReal->siteForces()[sReal] += fsRealsRef;
+
+                    scalar potentialEnergy =
+                        chargeReal*chargeRef
+                       *electrostatic.energy(rsRealsRefMag);
+
+                    molReal->potentialEnergy() += 0.5*potentialEnergy;
+
+                    vector rRealRef = molReal->position() - molRef->position();
+
+                    molReal->rf() +=
+                        (rsRealsRef*fsRealsRef)
+                       *(rsRealsRef & rRealRef)
+                       /rsRealsRefMagSq;
+
+                    // molReal->rf() += rsRealsRef * fsRealsRef;
+                }
+            }
+        }
+    }
+}
+
+
+inline bool Foam::moleculeCloud::evaluatePotentialLimit
+(
+    molecule* molI,
+    molecule* molJ
+) const
+{
+    const pairPotentialList& pairPot = pot_.pairPotentials();
+
+    const pairPotential& electrostatic = pairPot.electrostatic();
+
+    label idI = molI->id();
+
+    label idJ = molJ->id();
+
+    const molecule::constantProperties& constPropI(constProps(idI));
+
+    const molecule::constantProperties& constPropJ(constProps(idJ));
+
+    List<label> siteIdsI = constPropI.siteIds();
+
+    List<label> siteIdsJ = constPropJ.siteIds();
+
+    List<bool> pairPotentialSitesI = constPropI.pairPotentialSites();
+
+    List<bool> electrostaticSitesI = constPropI.electrostaticSites();
+
+    List<bool> pairPotentialSitesJ = constPropJ.pairPotentialSites();
+
+    List<bool> electrostaticSitesJ = constPropJ.electrostaticSites();
+
+    forAll(siteIdsI, sI)
+    {
+        label idsI(siteIdsI[sI]);
+
+        forAll(siteIdsJ, sJ)
+        {
+            label idsJ(siteIdsJ[sJ]);
+
+            if (pairPotentialSitesI[sI] && pairPotentialSitesJ[sJ])
+            {
+                vector rsIsJ =
+                    molI->sitePositions()[sI] - molJ->sitePositions()[sJ];
+
+                scalar rsIsJMagSq = magSqr(rsIsJ);
+
+                if (pairPot.rCutSqr(idsI, idsJ, rsIsJMagSq))
+                {
+                    scalar rsIsJMag = mag(rsIsJ);
+
+                    // Guard against pairPot.energy being evaluated
+                    // if rIJMag < SMALL. A floating point exception will
+                    // happen otherwise.
+
+                    if (rsIsJMag < SMALL)
+                    {
+                        WarningIn("moleculeCloud::removeHighEnergyOverlaps()")
+                            << "Molecule site pair closer than "
+                            << SMALL
+                            << ": mag separation = " << rsIsJMag
+                            << ". These may have been placed on top of each"
+                            << " other by a rounding error in mdInitialise in"
+                            << " parallel or a block filled with molecules"
+                            << " twice. Removing one of the molecules."
+                            << endl;
+
+                        return true;
+                    }
+
+                    // Guard against pairPot.energy being evaluated if rIJMag <
+                    // rMin.  A tabulation lookup error will occur otherwise.
+
+                    if (rsIsJMag < pairPot.rMin(idsI, idsJ))
+                    {
+                        return true;
+                    }
+
+                    if
+                    (
+                        mag(pairPot.energy(idsI, idsJ, rsIsJMag))
+                      > pot_.potentialEnergyLimit()
+                    )
+                    {
+                        return true;
+                    };
+                }
+            }
+
+            if (electrostaticSitesI[sI] && electrostaticSitesJ[sJ])
+            {
+                vector rsIsJ =
+                    molI->sitePositions()[sI] - molJ->sitePositions()[sJ];
+
+                scalar rsIsJMagSq = magSqr(rsIsJ);
+
+                if (pairPot.rCutMaxSqr(rsIsJMagSq))
+                {
+                    scalar rsIsJMag = mag(rsIsJ);
+
+                    // Guard against pairPot.energy being evaluated
+                    // if rIJMag < SMALL. A floating point exception will
+                    // happen otherwise.
+
+                    if (rsIsJMag < SMALL)
+                    {
+                        WarningIn("moleculeCloud::removeHighEnergyOverlaps()")
+                            << "Molecule site pair closer than "
+                            << SMALL
+                            << ": mag separation = " << rsIsJMag
+                            << ". These may have been placed on top of each"
+                            << " other by a rounding error in mdInitialise in"
+                            << " parallel or a block filled with molecules"
+                            << " twice. Removing one of the molecules."
+                            << endl;
+
+                        return true;
+                    }
+
+                    if (rsIsJMag < electrostatic.rMin())
+                    {
+                        return true;
+                    }
+
+                    scalar chargeI = constPropI.siteCharges()[sI];
+
+                    scalar chargeJ = constPropJ.siteCharges()[sJ];
+
+                    if
+                    (
+                        mag(chargeI*chargeJ*electrostatic.energy(rsIsJMag))
+                      > pot_.potentialEnergyLimit()
+                    )
+                    {
+                        return true;
+                    };
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
+
+inline bool Foam::moleculeCloud::evaluatePotentialLimit
+(
+    molecule* molReal,
+    referredMolecule* molRef
+) const
+{
+    const pairPotentialList& pairPot = pot_.pairPotentials();
+
+    const pairPotential& electrostatic = pairPot.electrostatic();
+
+    label idReal = molReal->id();
+
+    label idRef = molRef->id();
+
+    const molecule::constantProperties& constPropReal(constProps(idReal));
+
+    const molecule::constantProperties& constPropRef(constProps(idRef));
+
+    List<label> siteIdsReal = constPropReal.siteIds();
+
+    List<label> siteIdsRef = constPropRef.siteIds();
+
+    List<bool> pairPotentialSitesReal = constPropReal.pairPotentialSites();
+
+    List<bool> electrostaticSitesReal = constPropReal.electrostaticSites();
+
+    List<bool> pairPotentialSitesRef = constPropRef.pairPotentialSites();
+
+    List<bool> electrostaticSitesRef = constPropRef.electrostaticSites();
+
+    forAll(siteIdsReal, sReal)
+    {
+        label idsReal(siteIdsReal[sReal]);
+
+        forAll(siteIdsRef, sRef)
+        {
+            label idsRef(siteIdsRef[sRef]);
+
+            if (pairPotentialSitesReal[sReal] && pairPotentialSitesRef[sRef])
+            {
+                vector rsRealsRef =
+                    molReal->sitePositions()[sReal]
+                  - molRef->sitePositions()[sRef];
+
+                scalar rsRealsRefMagSq = magSqr(rsRealsRef);
+
+                if (pairPot.rCutSqr(idsReal, idsRef, rsRealsRefMagSq))
+                {
+                    scalar rsRealsRefMag = mag(rsRealsRef);
+
+                    // Guard against pairPot.energy being evaluated
+                    // if rRealRefMag < SMALL. A floating point exception will
+                    // happen otherwise.
+
+                    if (rsRealsRefMag < SMALL)
+                    {
+                        WarningIn("moleculeCloud::removeHighEnergyOverlaps()")
+                            << "Molecule site pair closer than "
+                            << SMALL
+                            << ": mag separation = " << rsRealsRefMag
+                            << ". These may have been placed on top of each"
+                            << " other by a rounding error in mdInitialise in"
+                            << " parallel or a block filled with molecules"
+                            << " twice. Removing one of the molecules."
+                            << endl;
+
+                        return true;
+                    }
+
+                    // Guard against pairPot.energy being evaluated if
+                    // rRealRefMag < rMin.  A tabulation lookup error will occur
+                    // otherwise.
+
+                    if (rsRealsRefMag < pairPot.rMin(idsReal, idsRef))
+                    {
+                        return true;
+                    }
+
+                    if
+                    (
+                        mag(pairPot.energy(idsReal, idsRef, rsRealsRefMag))
+                      > pot_.potentialEnergyLimit()
+                    )
+                    {
+                        return true;
+                    };
+                }
+            }
+
+            if (electrostaticSitesReal[sReal] && electrostaticSitesRef[sRef])
+            {
+                vector rsRealsRef =
+                    molReal->sitePositions()[sReal]
+                  - molRef->sitePositions()[sRef];
+
+                scalar rsRealsRefMagSq = magSqr(rsRealsRef);
+
+                if (pairPot.rCutMaxSqr(rsRealsRefMagSq))
+                {
+                    scalar rsRealsRefMag = mag(rsRealsRef);
+
+                    // Guard against pairPot.energy being evaluated
+                    // if rRealRefMag < SMALL. A floating point exception will
+                    // happen otherwise.
+
+                    if (rsRealsRefMag < SMALL)
+                    {
+                        WarningIn("moleculeCloud::removeHighEnergyOverlaps()")
+                            << "Molecule site pair closer than "
+                            << SMALL
+                            << ": mag separation = " << rsRealsRefMag
+                            << ". These may have been placed on top of each"
+                            << " other by a rounding error in mdInitialise in"
+                            << " parallel or a block filled with molecules"
+                            << " twice. Removing one of the molecules."
+                            << endl;
+
+                        return true;
+                    }
+
+                    if (rsRealsRefMag < electrostatic.rMin())
+                    {
+                        return true;
+                    }
+
+                    scalar chargeReal = constPropReal.siteCharges()[sReal];
+
+                    scalar chargeRef = constPropRef.siteCharges()[sRef];
+
+                    if
+                    (
+                        mag
+                        (
+                            chargeReal
+                           *chargeRef
+                           *electrostatic.energy(rsRealsRefMag)
+                        )
+                      > pot_.potentialEnergyLimit()
+                    )
+                    {
+                        return true;
+                    };
+                }
+            }
+        }
+    }
+
+    return false;
+}
+
+
+inline Foam::vector Foam::moleculeCloud::equipartitionLinearVelocity
+(
+    scalar temperature,
+    scalar mass
+)
+{
+    return sqrt(kb*temperature/mass)*vector
+    (
+        rndGen_.GaussNormal(),
+        rndGen_.GaussNormal(),
+        rndGen_.GaussNormal()
+    );
+}
+
+
+inline Foam::vector Foam::moleculeCloud::equipartitionAngularMomentum
+(
+    scalar temperature,
+    const molecule::constantProperties& cP
+)
+{
+    scalar sqrtKbT = sqrt(kb*temperature);
+
+    if (cP.linearMolecule())
+    {
+        return sqrtKbT*vector
+        (
+            0.0,
+            sqrt(cP.momentOfInertia().yy())*rndGen_.GaussNormal(),
+            sqrt(cP.momentOfInertia().zz())*rndGen_.GaussNormal()
+        );
+    }
+    else
+    {
+        return sqrtKbT*vector
+        (
+            sqrt(cP.momentOfInertia().xx())*rndGen_.GaussNormal(),
+            sqrt(cP.momentOfInertia().yy())*rndGen_.GaussNormal(),
+            sqrt(cP.momentOfInertia().zz())*rndGen_.GaussNormal()
+        );
+    }
+}
+
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline const polyMesh& moleculeCloud::mesh() const
+inline const Foam::polyMesh& Foam::moleculeCloud::mesh() const
 {
     return mesh_;
 }
 
 
-// MD solution parameters
-
-inline const moleculeCloud::integrationMethods&
-    moleculeCloud::integrationMethod() const
+inline const Foam::potential& Foam::moleculeCloud::pot() const
 {
-    return integrationMethod_;
+    return pot_;
 }
 
 
-inline scalar moleculeCloud::potentialEnergyLimit() const
-{
-    return potentialEnergyLimit_;
-}
-
-
-inline label moleculeCloud::nPairPotentials() const
-{
-    return pairPotentials_.size();
-}
-
-
-inline const labelList& moleculeCloud::removalOrder() const
-{
-    return removalOrder_;
-}
-
-
-inline const labelListList& moleculeCloud::directInteractionList() const
-{
-    return directInteractionList_;
-}
-
-
-inline const referredCellList& moleculeCloud::referredInteractionList() const
-{
-    return referredInteractionList_;
-}
-
-
-inline const labelList&
-    moleculeCloud::realCellsWithinRCutMaxOfAnyReferringPatch() const
-{
-    return realCellsWithinRCutMaxOfAnyReferringPatch_;
-}
-
-
-inline const labelList&
-    moleculeCloud::realFacesWithinRCutMaxOfAnyReferringPatch() const
-{
-    return realFacesWithinRCutMaxOfAnyReferringPatch_;
-}
-
-
-inline const labelList&
-    moleculeCloud::realEdgesWithinRCutMaxOfAnyReferringPatch() const
-{
-    return realEdgesWithinRCutMaxOfAnyReferringPatch_;
-}
-
-
-inline const labelList&
-    moleculeCloud::realPointsWithinRCutMaxOfAnyReferringPatch() const
-{
-    return realPointsWithinRCutMaxOfAnyReferringPatch_;
-}
-
-
-inline const List<sendingReferralList>&
-    moleculeCloud::cellSendingReferralLists() const
-{
-    return cellSendingReferralLists_;
-}
-
-
-inline const List<receivingReferralList>&
-    moleculeCloud::cellReceivingReferralLists() const
-{
-    return cellReceivingReferralLists_;
-}
-
-
-inline label moleculeCloud::nInteractingProcs() const
-{
-    return cellReceivingReferralLists_.size();
-}
-
-
-inline const pairPotentialList& moleculeCloud::pairPotentials() const
-{
-    return pairPotentials_;
-}
-
-
-inline const tetherPotentialList& moleculeCloud::tetherPotentials() const
-{
-    return tetherPotentials_;
-}
-
-
-inline const vector& moleculeCloud::gravity() const
-{
-    return gravity_;
-}
-
-
-inline const List< DynamicList<molecule*> >&
-    moleculeCloud::cellOccupancy() const
+inline const Foam::List<Foam::DynamicList<Foam::molecule*> >&
+    Foam::moleculeCloud::cellOccupancy() const
 {
     return cellOccupancy_;
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+inline const Foam::interactionLists&
+    Foam::moleculeCloud::il() const
+{
+    return il_;
+}
+
+
+inline const Foam::List<Foam::molecule::constantProperties>
+    Foam::moleculeCloud::constProps() const
+{
+    return constPropList_;
+}
+
+
+inline const Foam::molecule::constantProperties&
+    Foam::moleculeCloud::constProps(label id) const
+{
+    return constPropList_[id];
+}
+
+
+inline Foam::Random& Foam::moleculeCloud::rndGen()
+{
+    return rndGen_;
+}
 
-}  // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
index cd4108d33..f1ca12e1e 100644
--- a/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
+++ b/src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H
@@ -46,7 +46,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class reducedUnits Declaration
+                         Class reducedUnits Declaration
 \*---------------------------------------------------------------------------*/
 
 class reducedUnits
diff --git a/src/lagrangian/molecularDynamics/potential/Make/files b/src/lagrangian/molecularDynamics/potential/Make/files
index 43cf0bb73..4afe4de3d 100644
--- a/src/lagrangian/molecularDynamics/potential/Make/files
+++ b/src/lagrangian/molecularDynamics/potential/Make/files
@@ -1,3 +1,7 @@
+potential = potential
+
+$(potential)/potential.C
+
 pairPotential = pairPotential
 
 $(pairPotential)/pairPotentialList/pairPotentialList.C
@@ -9,6 +13,10 @@ $(pairPotential)/basic/newPairPotential.C
 $(pairPotential)/derived/lennardJones/lennardJones.C
 $(pairPotential)/derived/maitlandSmith/maitlandSmith.C
 $(pairPotential)/derived/azizChen/azizChen.C
+$(pairPotential)/derived/exponentialRepulsion/exponentialRepulsion.C
+$(pairPotential)/derived/coulomb/coulomb.C
+$(pairPotential)/derived/dampedCoulomb/dampedCoulomb.C
+$(pairPotential)/derived/noInteraction/noInteraction.C
 
 energyScalingFunction = energyScalingFunction
 
@@ -30,6 +38,10 @@ $(tetherPotential)/basic/newTetherPotential.C
 
 $(tetherPotential)/derived/harmonicSpring/harmonicSpring.C
 $(tetherPotential)/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
+$(tetherPotential)/derived/pitchForkRing/pitchForkRing.C
 
-LIB = $(FOAM_LIBBIN)/libpotential
+electrostaticPotential = electrostaticPotential
 
+$(electrostaticPotential)/electrostaticPotential.C
+
+LIB = $(FOAM_LIBBIN)/libpotential
\ No newline at end of file
diff --git a/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.C b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.C
new file mode 100644
index 000000000..3db003a90
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.C
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "electrostaticPotential.H"
+#include "mathematicalConstants.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::electrostaticPotential::electrostaticPotential()
+:
+    prefactor(1.0/(4.0 * mathematicalConstant::pi * 8.854187817e-12))
+{}
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::scalar Foam::electrostaticPotential::energy(const scalar r) const
+{
+    return prefactor/r;
+}
+
+
+Foam::scalar Foam::electrostaticPotential::force(const scalar r) const
+{
+    return prefactor/(r*r);
+}
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/newDelta.C b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
similarity index 66%
rename from src/turbulenceModels/LES/LESdeltas/LESdelta/newDelta.C
rename to src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
index 619cb9053..f871ddc93 100644
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/newDelta.C
+++ b/src/lagrangian/molecularDynamics/potential/electrostaticPotential/electrostaticPotential.H
@@ -22,49 +22,66 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
+Class
+    Foam::pairPotentials::electrostaticPotential
+
+Description
+
+
+SourceFiles
+    electrostaticPotential.C
+
 \*---------------------------------------------------------------------------*/
 
-#include "LESdelta.H"
+#ifndef electrostaticPotential_H
+#define electrostaticPotential_H
+
+#include "scalar.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+/*---------------------------------------------------------------------------*\
+                   Class electrostaticPotential Declaration
+\*---------------------------------------------------------------------------*/
 
-autoPtr<LESdelta> LESdelta::New
-(
-    const word& name,
-    const fvMesh& mesh,
-    const dictionary& LESdeltaDict
-)
+class electrostaticPotential
 {
-    word LESdeltaType
-    (
-        LESdeltaDict.lookup("delta")
-    );
+    // Private data
 
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(LESdeltaType);
+    scalar prefactor;
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESdelta::New(const fvMesh& mesh, dictionary LESdeltaDict)"
-        )   << "Unknown LESdelta type " << LESdeltaType << endl << endl
-            << "Valid LESdelta types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
 
-    return autoPtr<LESdelta>(cstrIter()(name, mesh, LESdeltaDict));
-}
+public:
+
+    // Constructors
+
+        //- Construct and set prefactor
+        electrostaticPotential();
+
+
+    // Destructor
+
+        ~electrostaticPotential()
+        {}
+
+
+    // Member Functions
+
+        scalar energy(const scalar r) const;
+
+        scalar force(const scalar r) const;
+};
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.C
index c5b261d44..dfec0a3f4 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    energyScalingFunction
-
 \*---------------------------------------------------------------------------*/
 
 #include "energyScalingFunction.H"
@@ -39,8 +36,6 @@ namespace Foam
 defineTypeNameAndDebug(energyScalingFunction, 0);
 defineRunTimeSelectionTable(energyScalingFunction, dictionary);
 
-// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::energyScalingFunction::energyScalingFunction
@@ -69,6 +64,7 @@ bool Foam::energyScalingFunction::read
     return true;
 }
 
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
index d646b1cd9..067379fba 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/energyScalingFunction.H
@@ -48,7 +48,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                Class energyScalingFunction Declaration
+                   Class energyScalingFunction Declaration
 \*---------------------------------------------------------------------------*/
 
 class energyScalingFunction
@@ -144,8 +144,6 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C
index 3013caec8..ae1025fc4 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/basic/newEnergyScalingFunction.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    energyScalingFunction
-
 \*---------------------------------------------------------------------------*/
 
 #include "energyScalingFunction.H"
@@ -61,8 +58,8 @@ autoPtr<energyScalingFunction> energyScalingFunction::New
         (
             "energyScalingFunction::New()"
         )   << "Unknown energyScalingFunction type "
-            << energyScalingFunctionTypeName << endl << endl
-            << "Valid  energyScalingFunctions are : " << endl
+            << energyScalingFunctionTypeName << nl << nl
+            << "Valid  energyScalingFunctions are: " << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C
index ca628e4fc..955792fca 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.C
@@ -57,6 +57,7 @@ scalar doubleSigmoid::sigmoidScale
     return 1.0 / (1.0 + exp( scale * (r - shift)));
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 doubleSigmoid::doubleSigmoid
@@ -67,13 +68,17 @@ doubleSigmoid::doubleSigmoid
 )
 :
     energyScalingFunction(name, energyScalingFunctionProperties, pairPot),
-    doubleSigmoidCoeffs_(energyScalingFunctionProperties.subDict(typeName + "Coeffs")),
+    doubleSigmoidCoeffs_
+    (
+        energyScalingFunctionProperties.subDict(typeName + "Coeffs")
+    ),
     shift1_(readScalar(doubleSigmoidCoeffs_.lookup("shift1"))),
     scale1_(readScalar(doubleSigmoidCoeffs_.lookup("scale1"))),
     shift2_(readScalar(doubleSigmoidCoeffs_.lookup("shift2"))),
     scale2_(readScalar(doubleSigmoidCoeffs_.lookup("scale2")))
 {}
 
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void doubleSigmoid::scaleEnergy(scalar& e, const scalar r) const
@@ -81,17 +86,19 @@ void doubleSigmoid::scaleEnergy(scalar& e, const scalar r) const
     e *= sigmoidScale(r, shift1_, scale1_) * sigmoidScale(r, shift2_, scale2_);
 }
 
+
 bool doubleSigmoid::read(const dictionary& energyScalingFunctionProperties)
 {
     energyScalingFunction::read(energyScalingFunctionProperties);
 
-    doubleSigmoidCoeffs_ = energyScalingFunctionProperties.subDict(typeName + "Coeffs");
+    doubleSigmoidCoeffs_ =
+        energyScalingFunctionProperties.subDict(typeName + "Coeffs");
 
     doubleSigmoidCoeffs_.lookup("shift1") >> shift1_;
     doubleSigmoidCoeffs_.lookup("scale1") >> scale1_;
     doubleSigmoidCoeffs_.lookup("shift2") >> shift2_;
     doubleSigmoidCoeffs_.lookup("scale2") >> scale2_;
-    
+
     return true;
 }
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
index 5b07d2d56..6bf0cdb89 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/doubleSigmoid/doubleSigmoid.H
@@ -46,7 +46,7 @@ namespace energyScalingFunctions
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class doubleSigmoid Declaration
+                        Class doubleSigmoid Declaration
 \*---------------------------------------------------------------------------*/
 
 class doubleSigmoid
@@ -62,6 +62,7 @@ class doubleSigmoid
         scalar shift2_;
         scalar scale2_;
 
+
     // Private Member Functions
 
         scalar sigmoidScale
@@ -98,7 +99,7 @@ public:
 
         void scaleEnergy(scalar& e, const scalar r) const;
 
-        //- Read transportProperties dictionary
+        //- Read dictionary
         bool read(const dictionary& energyScalingFunctionProperties);
 };
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.C
index a437193d0..3f0292032 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.C
@@ -45,8 +45,6 @@ addToRunTimeSelectionTable
     dictionary
 );
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -60,15 +58,17 @@ noScaling::noScaling
     energyScalingFunction(name, energyScalingFunctionProperties, pairPot)
 {}
 
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void noScaling::scaleEnergy(scalar& e, const scalar r) const
 {}
 
+
 bool noScaling::read(const dictionary& energyScalingFunctionProperties)
 {
     energyScalingFunction::read(energyScalingFunctionProperties);
-    
+
     return true;
 }
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
index 9206a728f..17cc2ae91 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/noScaling/noScaling.H
@@ -80,7 +80,7 @@ public:
 
         void scaleEnergy(scalar& e, const scalar r) const;
 
-        //- Read transportProperties dictionary
+        //- Read dictionary
         bool read(const dictionary& energyScalingFunctionProperties);
 };
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.C
index bb656edfe..5c98cb013 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.C
@@ -45,8 +45,6 @@ addToRunTimeSelectionTable
     dictionary
 );
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -61,6 +59,7 @@ shifted::shifted
     e_at_rCut_(pairPot.unscaledEnergy(pairPot.rCut()))
 {}
 
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void shifted::scaleEnergy(scalar& e, const scalar r) const
@@ -68,10 +67,11 @@ void shifted::scaleEnergy(scalar& e, const scalar r) const
     e -= e_at_rCut_;
 }
 
+
 bool shifted::read(const dictionary& energyScalingFunctionProperties)
 {
     energyScalingFunction::read(energyScalingFunctionProperties);
-    
+
     return true;
 }
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
index b98c5d1b8..54689a99f 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
@@ -57,6 +57,7 @@ class shifted
 
         scalar e_at_rCut_;
 
+
 public:
 
     //- Runtime type information
@@ -79,11 +80,12 @@ public:
         ~shifted()
         {}
 
+
     // Member Functions
 
         void scaleEnergy(scalar& e, const scalar r) const;
 
-        //- Read transportProperties dictionary
+        //- Read dictionary
         bool read(const dictionary& energyScalingFunctionProperties);
 };
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.C
index 146719f85..fcd1453e5 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.C
@@ -45,8 +45,6 @@ addToRunTimeSelectionTable
     dictionary
 );
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -63,6 +61,7 @@ shiftedForce::shiftedForce
     de_dr_at_rCut_(pairPot.energyDerivative(rCut_, false))
 {}
 
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void shiftedForce::scaleEnergy(scalar& e, const scalar r) const
@@ -70,10 +69,11 @@ void shiftedForce::scaleEnergy(scalar& e, const scalar r) const
     e -= ( e_at_rCut_ + de_dr_at_rCut_ * (r - rCut_) );
 }
 
+
 bool shiftedForce::read(const dictionary& energyScalingFunctionProperties)
 {
     energyScalingFunction::read(energyScalingFunctionProperties);
-    
+
     return true;
 }
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
index 01ec8f0ab..ed3d972cb 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shiftedForce/shiftedForce.H
@@ -46,7 +46,7 @@ namespace energyScalingFunctions
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class shiftedForce Declaration
+                       Class shiftedForce Declaration
 \*---------------------------------------------------------------------------*/
 
 class shiftedForce
@@ -89,7 +89,7 @@ public:
 
         void scaleEnergy(scalar& e, const scalar r) const;
 
-        //- Read transportProperties dictionary
+        //- Read dictionary
         bool read(const dictionary& energyScalingFunctionProperties);
 };
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C
index 33f451c89..1dfa38f70 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.C
@@ -45,6 +45,7 @@ addToRunTimeSelectionTable
     dictionary
 );
 
+
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
 scalar sigmoid::sigmoidScale
@@ -57,6 +58,7 @@ scalar sigmoid::sigmoidScale
     return 1.0 / (1.0 + exp( scale * (r - shift)));
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 sigmoid::sigmoid
@@ -67,11 +69,15 @@ sigmoid::sigmoid
 )
 :
     energyScalingFunction(name, energyScalingFunctionProperties, pairPot),
-    sigmoidCoeffs_(energyScalingFunctionProperties.subDict(typeName + "Coeffs")),
+    sigmoidCoeffs_
+    (
+        energyScalingFunctionProperties.subDict(typeName + "Coeffs")
+    ),
     shift_(readScalar(sigmoidCoeffs_.lookup("shift"))),
     scale_(readScalar(sigmoidCoeffs_.lookup("scale")))
 {}
 
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 void sigmoid::scaleEnergy(scalar& e, const scalar r) const
@@ -79,15 +85,17 @@ void sigmoid::scaleEnergy(scalar& e, const scalar r) const
     e *= sigmoidScale(r, shift_, scale_);
 }
 
+
 bool sigmoid::read(const dictionary& energyScalingFunctionProperties)
 {
     energyScalingFunction::read(energyScalingFunctionProperties);
 
-    sigmoidCoeffs_ = energyScalingFunctionProperties.subDict(typeName + "Coeffs");
+    sigmoidCoeffs_ =
+        energyScalingFunctionProperties.subDict(typeName + "Coeffs");
 
     sigmoidCoeffs_.lookup("shift") >> shift_;
     sigmoidCoeffs_.lookup("scale") >> shift_;
-    
+
     return true;
 }
 
diff --git a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
index 89c66ad86..16ef09193 100644
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/sigmoid/sigmoid.H
@@ -98,7 +98,7 @@ public:
 
         void scaleEnergy(scalar& e, const scalar r) const;
 
-        //- Read transportProperties dictionary
+        //- Read dictionary
         bool read(const dictionary& energyScalingFunctionProperties);
 };
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C
index f4a1a94c9..4697a9883 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/newPairPotential.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    pairPotential
-
 \*---------------------------------------------------------------------------*/
 
 #include "pairPotential.H"
@@ -57,8 +54,8 @@ autoPtr<pairPotential> pairPotential::New
         (
             "pairPotential::New()"
         )   << "Unknown pairPotential type "
-            << pairPotentialTypeName << endl << endl
-            << "Valid  pairPotentials are : " << endl
+            << pairPotentialTypeName << nl << nl
+            << "Valid  pairPotentials are: " << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
index 1e2fedb82..457d0e82e 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.C
@@ -22,23 +22,19 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    pairPotential
-
 \*---------------------------------------------------------------------------*/
 
 #include "pairPotential.H"
 #include "energyScalingFunction.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(pairPotential, 0);
+    defineRunTimeSelectionTable(pairPotential, dictionary);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(pairPotential, 0);
-defineRunTimeSelectionTable(pairPotential, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -97,16 +93,16 @@ void Foam::pairPotential::setLookupTables()
 }
 
 
-Foam::scalar Foam::pairPotential::forceLookup(const scalar r) const
+Foam::scalar Foam::pairPotential::force(const scalar r) const
 {
     scalar k_rIJ = (r - rMin_)/dr_;
 
-    label k(k_rIJ);
+    label k = label(k_rIJ);
 
     if (k < 0)
     {
         FatalErrorIn("pairPotential.C") << nl
-            << "r less than rMin" << nl
+            << "r less than rMin in pair potential " << name_ << nl
             << abort(FatalError);
     }
 
@@ -134,16 +130,16 @@ Foam::pairPotential::forceTable() const
 }
 
 
-Foam::scalar Foam::pairPotential::energyLookup(const scalar r) const
+Foam::scalar Foam::pairPotential::energy(const scalar r) const
 {
     scalar k_rIJ = (r - rMin_)/dr_;
 
-    label k(k_rIJ);
+    label k = label(k_rIJ);
 
     if (k < 0)
     {
         FatalErrorIn("pairPotential.C") << nl
-            << "r less than rMin" << nl
+            << "r less than rMin in pair potential " << name_ << nl
             << abort(FatalError);
     }
 
@@ -233,8 +229,4 @@ bool Foam::pairPotential::read(const dictionary& pairPotentialProperties)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
index 13584f05c..7f00308f0 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotential.H
@@ -43,6 +43,7 @@ SourceFiles
 #include "List.H"
 #include "Pair.H"
 #include "Switch.H"
+#include "mathematicalConstants.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -53,7 +54,7 @@ namespace Foam
 class energyScalingFunction;
 
 /*---------------------------------------------------------------------------*\
-                Class pairPotential Declaration
+                     Class pairPotential Declaration
 \*---------------------------------------------------------------------------*/
 
 class pairPotential
@@ -79,6 +80,7 @@ protected:
 
         bool writeTables_;
 
+
     // Private Member Functions
 
         void scaleEnergy(scalar& e, const scalar r) const;
@@ -93,7 +95,7 @@ protected:
 public:
 
     //- Runtime type information
-    TypeName("pairPotential");
+        TypeName("pairPotential");
 
 
     // Declare run-time constructor selection table
@@ -149,9 +151,9 @@ public:
 
         inline scalar rCutSqr() const;
 
-        scalar energyLookup (const scalar r) const;
+        scalar energy (const scalar r) const;
 
-        scalar forceLookup (const scalar r) const;
+        scalar force (const scalar r) const;
 
         List<Pair<scalar> > energyTable() const;
 
@@ -159,7 +161,7 @@ public:
 
         inline bool writeTables() const;
 
-        virtual scalar unscaledEnergy (const scalar r) const = 0;
+        virtual scalar unscaledEnergy(const scalar r) const = 0;
 
         scalar scaledEnergy(const scalar r) const;
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
index 74056a8a6..53f361019 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/basic/pairPotentialIO.C
@@ -38,12 +38,12 @@ bool Foam::pairPotential::writeEnergyAndForceTables(Ostream& os) const
 
     forAll(eTab, e)
     {
-        os<< eTab[e].first()
-          << token::SPACE
-          << eTab[e].second()
-          << token::SPACE
-          << fTab[e].second()
-          << nl;
+        os  << eTab[e].first()
+            << token::SPACE
+            << eTab[e].second()
+            << token::SPACE
+            << fTab[e].second()
+            << nl;
     }
 
     return os.good();
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C
index 69d1ee266..2c97c7092 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.C
@@ -45,8 +45,6 @@ addToRunTimeSelectionTable
     dictionary
 );
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -71,6 +69,7 @@ azizChen::azizChen
     setLookupTables();
 }
 
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 scalar azizChen::unscaledEnergy(const scalar r) const
@@ -84,15 +83,16 @@ scalar azizChen::unscaledEnergy(const scalar r) const
         F = exp(-pow(((D_ / x) - 1.0),2));
     }
 
-    return epsilon_ *
-    (
-        A_ * Foam::pow(x, gamma_) * exp(-alpha_ * x)
-      - (
-            (C6_/ Foam::pow(x, 6))
-          + (C8_/ Foam::pow(x, 8))
-          + (C10_/ Foam::pow(x, 10))
-        )
-      * F
+    return
+        epsilon_
+       *(
+            A_ * Foam::pow(x, gamma_)*exp(-alpha_*x)
+          - (
+                (C6_/ Foam::pow(x, 6))
+              + (C8_/ Foam::pow(x, 8))
+              + (C10_/ Foam::pow(x, 10))
+            )
+           *F
     );
 }
 
@@ -112,7 +112,7 @@ bool azizChen::read(const dictionary& azizChen)
     azizChenCoeffs_.lookup("C10") >> C10_;
     azizChenCoeffs_.lookup("D") >> D_;
     azizChenCoeffs_.lookup("gamma") >> gamma_;
-    
+
     return true;
 }
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
index c9693b5e6..60aae63c5 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/azizChen/azizChen.H
@@ -26,22 +26,24 @@ Class
     Foam::pairPotentials::azizChen
 
 Description
+    Foam::pairPotentials::azizChen
 
     From:
-
-    @article{MA_Aziz_Chen,
-    author = {R. A. Aziz and H. H. Chen},
-    collaboration = {},
-    title = {An accurate intermolecular potential for argon},
-    publisher = {AIP},
-    year = {1977},
-    journal = {The Journal of Chemical Physics},
-    volume = {67},
-    number = {12},
-    pages = {5719-5726},
-    url = {http://link.aip.org/link/?JCP/67/5719/1},
-    doi = {10.1063/1.434827}
-    }
+    @verbatim
+        @article{MA_Aziz_Chen,
+        author = {R. A. Aziz and H. H. Chen},
+        collaboration = {},
+        title = {An accurate intermolecular potential for argon},
+        publisher = {AIP},
+        year = {1977},
+        journal = {The Journal of Chemical Physics},
+        volume = {67},
+        number = {12},
+        pages = {5719-5726},
+        url = {http://link.aip.org/link/?JCP/67/5719/1},
+        doi = {10.1063/1.434827}
+        }
+    @endverbatim
 
 SourceFiles
     azizChen.C
@@ -83,6 +85,7 @@ class azizChen
         scalar D_;
         scalar gamma_;
 
+
 public:
 
     //- Runtime type information
@@ -109,7 +112,7 @@ public:
 
         scalar unscaledEnergy(const scalar r) const;
 
-        //- Read transportProperties dictionary
+        //- Read dictionary
         bool read(const dictionary& pairPotentialProperties);
 };
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.C
new file mode 100644
index 000000000..ec6336f56
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "coulomb.H"
+#include "mathematicalConstants.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace pairPotentials
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(coulomb, 0);
+
+addToRunTimeSelectionTable
+(
+    pairPotential,
+    coulomb,
+    dictionary
+);
+
+scalar coulomb::oneOverFourPiEps0 =
+    1.0/(4.0 * mathematicalConstant::pi * 8.854187817e-12);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+coulomb::coulomb
+(
+    const word& name,
+    const dictionary& pairPotentialProperties
+)
+:
+    pairPotential(name, pairPotentialProperties)
+{
+    setLookupTables();
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+scalar coulomb::unscaledEnergy(const scalar r) const
+{
+    return oneOverFourPiEps0/r;
+}
+
+
+bool coulomb::read(const dictionary& pairPotentialProperties)
+{
+    pairPotential::read(pairPotentialProperties);
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace pairPotentials
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
new file mode 100644
index 000000000..a8df914b5
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/coulomb/coulomb.H
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::pairPotentials::electrostatic
+
+Description
+
+
+SourceFiles
+    coulomb.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef coulomb_H
+#define coulomb_H
+
+#include "pairPotential.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace pairPotentials
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class coulomb Declaration
+\*---------------------------------------------------------------------------*/
+
+class coulomb
+:
+    public pairPotential
+{
+public:
+
+    //- Runtime type information
+    TypeName("coulomb");
+
+
+    // Static data members
+
+        static scalar oneOverFourPiEps0;
+
+    // Constructors
+
+        //- Construct from components
+        coulomb
+        (
+            const word& name,
+            const dictionary& pairPotentialProperties
+        );
+
+
+    // Destructor
+
+        ~coulomb()
+        {}
+
+
+    // Member Functions
+
+        scalar unscaledEnergy(const scalar r) const;
+
+        //- Read dictionary
+        bool read(const dictionary& pairPotentialProperties);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace pairPotentials
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C
new file mode 100644
index 000000000..1b9fc9163
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.C
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "dampedCoulomb.H"
+#include "mathematicalConstants.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace pairPotentials
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(dampedCoulomb, 0);
+
+addToRunTimeSelectionTable
+(
+    pairPotential,
+    dampedCoulomb,
+    dictionary
+);
+
+scalar dampedCoulomb::oneOverFourPiEps0 =
+    1.0/(4.0 * mathematicalConstant::pi * 8.854187817e-12);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+dampedCoulomb::dampedCoulomb
+(
+    const word& name,
+    const dictionary& pairPotentialProperties
+)
+:
+    pairPotential(name, pairPotentialProperties),
+    dampedCoulombCoeffs_
+    (
+        pairPotentialProperties.subDict(typeName + "Coeffs")
+    ),
+    alpha_(readScalar(dampedCoulombCoeffs_.lookup("alpha")))
+{
+    setLookupTables();
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+scalar dampedCoulomb::unscaledEnergy(const scalar r) const
+{
+    return oneOverFourPiEps0*erfc(alpha_*r)/r;
+}
+
+
+bool dampedCoulomb::read(const dictionary& pairPotentialProperties)
+{
+    pairPotential::read(pairPotentialProperties);
+
+    dampedCoulombCoeffs_ =
+        pairPotentialProperties.subDict(typeName + "Coeffs");
+
+    dampedCoulombCoeffs_.lookup("alpha") >> alpha_;
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace pairPotentials
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
new file mode 100644
index 000000000..50edfe864
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/dampedCoulomb/dampedCoulomb.H
@@ -0,0 +1,108 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::pairPotentials::electrostatic
+
+Description
+
+
+SourceFiles
+    dampedCoulomb.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef dampedCoulomb_H
+#define dampedCoulomb_H
+
+#include "pairPotential.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace pairPotentials
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class dampedCoulomb Declaration
+\*---------------------------------------------------------------------------*/
+
+class dampedCoulomb
+:
+    public pairPotential
+{
+    // Private data
+
+        dictionary dampedCoulombCoeffs_;
+
+        scalar alpha_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("dampedCoulomb");
+
+
+    // Static data members
+
+        static scalar oneOverFourPiEps0;
+
+
+    // Constructors
+
+        //- Construct from components
+        dampedCoulomb
+        (
+            const word& name,
+            const dictionary& pairPotentialProperties
+        );
+
+
+    // Destructor
+
+        ~dampedCoulomb()
+        {}
+
+
+    // Member Functions
+
+        scalar unscaledEnergy(const scalar r) const;
+
+        //- Read dictionary
+        bool read(const dictionary& pairPotentialProperties);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace pairPotentials
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C
new file mode 100644
index 000000000..98596a043
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.C
@@ -0,0 +1,96 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "exponentialRepulsion.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace pairPotentials
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(exponentialRepulsion, 0);
+
+addToRunTimeSelectionTable
+(
+    pairPotential,
+    exponentialRepulsion,
+    dictionary
+);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+exponentialRepulsion::exponentialRepulsion
+(
+    const word& name,
+    const dictionary& exponentialRepulsion
+)
+:
+    pairPotential(name, exponentialRepulsion),
+    exponentialRepulsionCoeffs_
+    (
+        exponentialRepulsion.subDict(typeName + "Coeffs")
+    ),
+    rm_(readScalar(exponentialRepulsionCoeffs_.lookup("rm"))),
+    epsilon_(readScalar(exponentialRepulsionCoeffs_.lookup("epsilon")))
+{
+    setLookupTables();
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+scalar exponentialRepulsion::unscaledEnergy(const scalar r) const
+{
+    return epsilon_ * exp(-r/rm_);
+}
+
+
+bool exponentialRepulsion::read(const dictionary& exponentialRepulsion)
+{
+    pairPotential::read(exponentialRepulsion);
+
+    exponentialRepulsionCoeffs_ =
+        exponentialRepulsion.subDict(typeName + "Coeffs");
+
+    exponentialRepulsionCoeffs_.lookup("rm") >> rm_;
+    exponentialRepulsionCoeffs_.lookup("epsilon") >> epsilon_;
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace pairPotentials
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
new file mode 100644
index 000000000..626d65a9d
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/exponentialRepulsion/exponentialRepulsion.H
@@ -0,0 +1,104 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::pairPotentials::exponentialRepulsion
+
+Description
+
+SourceFiles
+    exponentialRepulsion.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef exponentialRepulsion_H
+#define exponentialRepulsion_H
+
+#include "pairPotential.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+namespace pairPotentials
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class exponentialRepulsion Declaration
+\*---------------------------------------------------------------------------*/
+
+class exponentialRepulsion
+:
+    public pairPotential
+{
+    // Private data
+
+        dictionary exponentialRepulsionCoeffs_;
+
+        scalar rm_;
+        scalar epsilon_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("exponentialRepulsion");
+
+
+    // Constructors
+
+        //- Construct from components
+        exponentialRepulsion
+        (
+            const word& name,
+            const dictionary& pairPotentialProperties
+        );
+
+
+    // Destructor
+
+        ~exponentialRepulsion()
+        {}
+
+
+    // Member Functions
+
+        scalar unscaledEnergy(const scalar r) const;
+
+        //- Read dictionary
+        bool read(const dictionary& pairPotentialProperties);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace pairPotentials
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C
index ba9bf6e68..64961d902 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.C
@@ -45,8 +45,6 @@ addToRunTimeSelectionTable
     dictionary
 );
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -64,6 +62,7 @@ lennardJones::lennardJones
     setLookupTables();
 }
 
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 scalar lennardJones::unscaledEnergy(const scalar r) const
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
index 4ff408470..9292a2847 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/lennardJones/lennardJones.H
@@ -46,7 +46,7 @@ namespace pairPotentials
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class lennardJones Declaration
+                         Class lennardJones Declaration
 \*---------------------------------------------------------------------------*/
 
 class lennardJones
@@ -60,6 +60,7 @@ class lennardJones
         scalar sigma_;
         scalar epsilon_;
 
+
 public:
 
     //- Runtime type information
@@ -86,7 +87,7 @@ public:
 
         scalar unscaledEnergy(const scalar r) const;
 
-        //- Read transportProperties dictionary
+        //- Read dictionary
         bool read(const dictionary& pairPotentialProperties);
 };
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C
index 100d48206..d7fd27891 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.C
@@ -45,8 +45,6 @@ addToRunTimeSelectionTable
     dictionary
 );
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -66,6 +64,7 @@ maitlandSmith::maitlandSmith
     setLookupTables();
 }
 
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 scalar maitlandSmith::unscaledEnergy(const scalar r) const
@@ -90,7 +89,7 @@ bool maitlandSmith::read(const dictionary& maitlandSmith)
     maitlandSmithCoeffs_.lookup("gamma") >> gamma_;
     maitlandSmithCoeffs_.lookup("rm") >> rm_;
     maitlandSmithCoeffs_.lookup("epsilon") >> epsilon_;
-    
+
     return true;
 }
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
index ae4c77564..e8ef9d5d7 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/maitlandSmith/maitlandSmith.H
@@ -26,28 +26,32 @@ Class
     Foam::pairPotentials::maitlandSmith
 
 Description
+    Foam::pairPotentials::maitlandSmith
 
     From:
-
-    @ARTICLE{MA_Maitland_Smith,
-    author = {{Maitland}, G.~C. and {Smith}, E.~B.},
-    title = {A simplified representation of intermolecular potential energy},
-    journal = {Chemical Physics Letters},
-    year = 1973,
-    month = oct,
-    volume = 22,
-    pages = {443-446},
-    adsurl = {http://adsabs.harvard.edu/abs/1973CPL....22..443M},
-    adsnote = {Provided by the SAO/NASA Astrophysics Data System}
-    }
+    @verbatim
+        @ARTICLE{MA_Maitland_Smith,
+        author = {{Maitland}, G.~C. and {Smith}, E.~B.},
+        title = {A simplified representation of intermolecular potential energy},
+        journal = {Chemical Physics Letters},
+        year = 1973,
+        month = oct,
+        volume = 22,
+        pages = {443-446},
+        adsurl = {http://adsabs.harvard.edu/abs/1973CPL....22..443M},
+        adsnote = {Provided by the SAO/NASA Astrophysics Data System}
+        }
+    @endverbatim
 
     Parameters for other monoatomics from:
-    @BOOK{MD_Maitland_Rigby_Smith_Wakeham,
-    AUTHOR =       {Geoffrey C. Maitland and Maurice Rigby and E. Brian Smith and William A. Wakeham},
-    TITLE =        {Intermolecular Forces: Their Origin and Determination},
-    PUBLISHER =    {Oxford University Press},
-    YEAR =         {1981}
-    }
+    @verbatim
+        @BOOK{MD_Maitland_Rigby_Smith_Wakeham,
+        AUTHOR =       {Geoffrey C. Maitland and Maurice Rigby and E. Brian Smith and William A. Wakeham},
+        TITLE =        {Intermolecular Forces: Their Origin and Determination},
+        PUBLISHER =    {Oxford University Press},
+        YEAR =         {1981}
+        }
+    @endverbatim
 
 SourceFiles
     maitlandSmith.C
@@ -68,7 +72,7 @@ namespace pairPotentials
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class maitlandSmith Declaration
+                       Class maitlandSmith Declaration
 \*---------------------------------------------------------------------------*/
 
 class maitlandSmith
@@ -84,6 +88,7 @@ class maitlandSmith
         scalar rm_;
         scalar epsilon_;
 
+
 public:
 
     //- Runtime type information
@@ -110,7 +115,7 @@ public:
 
         scalar unscaledEnergy(const scalar r) const;
 
-        //- Read transportProperties dictionary
+        //- Read dictionary
         bool read(const dictionary& pairPotentialProperties);
 };
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.C b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.C
new file mode 100644
index 000000000..48edd0878
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.C
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "noInteraction.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace pairPotentials
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(noInteraction, 0);
+
+addToRunTimeSelectionTable
+(
+    pairPotential,
+    noInteraction,
+    dictionary
+);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+noInteraction::noInteraction
+(
+    const word& name,
+    const dictionary& pairPotentialProperties
+)
+:
+    pairPotential(name, pairPotentialProperties)
+{
+    setLookupTables();
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+scalar noInteraction::unscaledEnergy(const scalar r) const
+{
+    return 0.0;
+}
+
+
+bool noInteraction::read(const dictionary& pairPotentialProperties)
+{
+    pairPotential::read(pairPotentialProperties);
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace pairPotentials
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
new file mode 100644
index 000000000..bccffe718
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/derived/noInteraction/noInteraction.H
@@ -0,0 +1,97 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::pairPotentials::noInteraction
+
+Description
+
+
+SourceFiles
+    noInteraction.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef noInteraction_H
+#define noInteraction_H
+
+#include "pairPotential.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace pairPotentials
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class noInteraction Declaration
+\*---------------------------------------------------------------------------*/
+
+class noInteraction
+:
+    public pairPotential
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("noInteraction");
+
+
+    // Constructors
+
+        //- Construct from components
+        noInteraction
+        (
+            const word& name,
+            const dictionary& pairPotentialProperties
+        );
+
+
+    // Destructor
+
+        ~noInteraction()
+        {}
+
+
+    // Member Functions
+
+        scalar unscaledEnergy(const scalar r) const;
+
+        //- Read dictionary
+        bool read(const dictionary& pairPotentialProperties);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace pairPotentials
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
index ac5256390..b5c62d8f2 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.C
@@ -32,6 +32,7 @@ License
 
 void Foam::pairPotentialList::readPairPotentialDict
 (
+    const List<word>& idList,
     const dictionary& pairPotentialDict,
     const polyMesh& mesh
 )
@@ -40,13 +41,13 @@ void Foam::pairPotentialList::readPairPotentialDict
 
     rCutMax_ = 0.0;
 
-    for (label a = 0; a < nIds(); ++a)
+    for (label a = 0; a < nIds_; ++a)
     {
-        word idA = idList_[a];
+        word idA = idList[a];
 
-        for (label b = a; b < nIds(); ++b)
+        for (label b = a; b < nIds_; ++b)
         {
-            word idB = idList_[b];
+            word idB = idList[b];
 
             word pairPotentialName;
 
@@ -59,9 +60,9 @@ void Foam::pairPotentialList::readPairPotentialDict
                 else
                 {
                     FatalErrorIn("pairPotentialList::buildPotentials") << nl
-                            << "Pair pairPotential specification subDict "
-                            << idA << "-" << idB << " not found"
-                            << nl << abort(FatalError);
+                        << "Pair pairPotential specification subDict "
+                        << idA << "-" << idB << " not found"
+                        << nl << abort(FatalError);
                 }
             }
             else
@@ -87,8 +88,8 @@ void Foam::pairPotentialList::readPairPotentialDict
 
                 if
                 (
-                    pairPotentialDict.found(idA + "-" + idB)
-                 && pairPotentialDict.found(idB + "-" + idA)
+                    pairPotentialDict.found(idA+"-"+idB)
+                 && pairPotentialDict.found(idB+"-"+idA)
                 )
                 {
                     FatalErrorIn("pairPotentialList::buildPotentials") << nl
@@ -135,29 +136,59 @@ void Foam::pairPotentialList::readPairPotentialDict
         }
     }
 
+    if (!pairPotentialDict.found("electrostatic"))
+    {
+        FatalErrorIn("pairPotentialList::buildPotentials") << nl
+            << "Pair pairPotential specification subDict electrostatic"
+            << nl << abort(FatalError);
+    }
+
+    electrostaticPotential_ = pairPotential::New
+    (
+        "electrostatic",
+        pairPotentialDict.subDict("electrostatic")
+    );
+
+    if (electrostaticPotential_->rCut() > rCutMax_)
+    {
+        rCutMax_ = electrostaticPotential_->rCut();
+    }
+
+    if (electrostaticPotential_->writeTables())
+    {
+        OFstream ppTabFile(mesh.time().path()/"electrostatic");
+
+        if(!electrostaticPotential_->writeEnergyAndForceTables(ppTabFile))
+        {
+            FatalErrorIn("pairPotentialList::readPairPotentialDict")
+                << "Failed writing to "
+                << ppTabFile.name() << nl
+                << abort(FatalError);
+        }
+    }
+
     rCutMaxSqr_ = rCutMax_*rCutMax_;
 }
 
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::pairPotentialList::pairPotentialList()
 :
-    PtrList<pairPotential>(),
-    idList_()
+    PtrList<pairPotential>()
 {}
 
 
 Foam::pairPotentialList::pairPotentialList
 (
-    const dictionary& idListDict,
+    const List<word>& idList,
     const dictionary& pairPotentialDict,
     const polyMesh& mesh
 )
 :
-    PtrList<pairPotential>(),
-    idList_()
+    PtrList<pairPotential>()
 {
-    buildPotentials(idListDict, pairPotentialDict, mesh);
+    buildPotentials(idList, pairPotentialDict, mesh);
 }
 
 
@@ -171,16 +202,16 @@ Foam::pairPotentialList::~pairPotentialList()
 
 void Foam::pairPotentialList::buildPotentials
 (
-    const dictionary& idListDict,
+    const List<word>& idList,
     const dictionary& pairPotentialDict,
     const polyMesh& mesh
 )
 {
-    idList_ = List<word>(idListDict.lookup("idList"));
+    setSize(((idList.size()*(idList.size() + 1))/2));
 
-    setSize(((idList_.size()*(idList_.size() + 1))/2));
+    nIds_ = idList.size();
 
-    readPairPotentialDict(pairPotentialDict, mesh);
+    readPairPotentialDict(idList, pairPotentialDict, mesh);
 }
 
 
@@ -194,6 +225,19 @@ const Foam::pairPotential& Foam::pairPotentialList::pairPotentialFunction
 }
 
 
+bool Foam::pairPotentialList::rCutMaxSqr(const scalar rIJMagSqr) const
+{
+    if (rIJMagSqr < rCutMaxSqr_)
+    {
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
 bool Foam::pairPotentialList::rCutSqr
 (
     const label a,
@@ -259,7 +303,7 @@ Foam::scalar Foam::pairPotentialList::force
     const scalar rIJMag
 ) const
 {
-    scalar f = (*this)[pairPotentialIndex(a, b)].forceLookup(rIJMag);
+    scalar f = (*this)[pairPotentialIndex(a, b)].force(rIJMag);
 
     return f;
 }
@@ -272,7 +316,7 @@ Foam::scalar Foam::pairPotentialList::energy
     const scalar rIJMag
 ) const
 {
-    scalar e = (*this)[pairPotentialIndex(a, b)].energyLookup(rIJMag);
+    scalar e = (*this)[pairPotentialIndex(a, b)].energy(rIJMag);
 
     return e;
 }
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
index 7ec633fc5..2afa46f9a 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialList.H
@@ -47,7 +47,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class pairPotentialList Declaration
+                      Class pairPotentialList Declaration
 \*---------------------------------------------------------------------------*/
 
 class pairPotentialList
@@ -56,12 +56,15 @@ class pairPotentialList
 {
     // Private data
 
-        List<word> idList_;
-        
+        label nIds_;
+
         scalar rCutMax_;
 
         scalar rCutMaxSqr_;
 
+        autoPtr<pairPotential> electrostaticPotential_;
+
+
     // Private Member Functions
 
         inline label pairPotentialIndex
@@ -72,6 +75,7 @@ class pairPotentialList
 
         void readPairPotentialDict
         (
+            const List<word>& idList,
             const dictionary& pairPotentialDict,
             const polyMesh& mesh
         );
@@ -82,6 +86,7 @@ class pairPotentialList
         //- Disallow default bitwise copy construct
         pairPotentialList(const pairPotentialList&);
 
+
 public:
 
     // Constructors
@@ -91,34 +96,35 @@ public:
         //- Construct from idList and potental dictionaries
         pairPotentialList
         (
-            const dictionary& idListDict,
+            const List<word>& idList,
             const dictionary& pairPotentialDict,
             const polyMesh& mesh
         );
 
+
     // Destructor
 
         ~pairPotentialList();
 
+
     // Member Functions
-        
+
         void buildPotentials
         (
-            const dictionary& idListDict,
+            const List<word>& idList,
             const dictionary& pairPotentialDict,
             const polyMesh& mesh
         );
 
+
         // Access
 
-            inline const List<word>& idList() const;
-
-            inline label nIds() const;
-
             inline scalar rCutMax() const;
 
             inline scalar rCutMaxSqr() const;
 
+            bool rCutMaxSqr(scalar rIJMagSqr) const;
+
             const pairPotential& pairPotentialFunction
             (
                 const label a,
@@ -133,13 +139,13 @@ public:
                 const scalar rIJMagSqr
             ) const;
 
-            scalar rMin (const label a, const label b) const;
+            scalar rMin(const label a, const label b) const;
 
-            scalar dr (const label a, const label b) const;
+            scalar dr(const label a, const label b) const;
 
-            scalar rCutSqr (const label a, const label b) const;
+            scalar rCutSqr(const label a, const label b) const;
 
-            scalar rCut (const label a, const label b) const;
+            scalar rCut(const label a, const label b) const;
 
             scalar force
             (
@@ -154,6 +160,8 @@ public:
                 const label b,
                 const scalar rIJMag
             ) const;
+
+            inline const pairPotential& electrostatic() const;
 };
 
 
diff --git a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
index 176e5f71e..5832f4556 100644
--- a/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
+++ b/src/lagrangian/molecularDynamics/potential/pairPotential/pairPotentialList/pairPotentialListI.H
@@ -36,12 +36,12 @@ inline Foam::label Foam::pairPotentialList::pairPotentialIndex
 
     if (a < b)
     {
-        index = a*(2*nIds() - a - 1)/2 + b;
+        index = a*(2*nIds_ - a - 1)/2 + b;
     }
 
     else
     {
-        index = b*(2*nIds() - b - 1)/2 + a;
+        index = b*(2*nIds_ - b - 1)/2 + a;
     }
 
     if (index > size() - 1)
@@ -56,20 +56,9 @@ inline Foam::label Foam::pairPotentialList::pairPotentialIndex
     return index;
 }
 
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::label Foam::pairPotentialList::nIds() const
-{
-    return idList_.size();
-}
-
-
-inline const Foam::List<Foam::word>& Foam::pairPotentialList::idList() const
-{
-    return idList_;
-}
-
-
 inline Foam::scalar Foam::pairPotentialList::rCutMax() const
 {
     return rCutMax_;
@@ -82,4 +71,10 @@ inline Foam::scalar Foam::pairPotentialList::rCutMaxSqr() const
 }
 
 
+inline const Foam::pairPotential& Foam::pairPotentialList::electrostatic() const
+{
+    return electrostaticPotential_;
+}
+
+
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.C b/src/lagrangian/molecularDynamics/potential/potential/potential.C
new file mode 100644
index 000000000..5cc3399a4
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.C
@@ -0,0 +1,392 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "potential.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::potential::setSiteIdList(const IOdictionary& moleculePropertiesDict)
+{
+    DynamicList<word> siteIdList;
+
+    DynamicList<word> pairPotentialSiteIdList;
+
+    forAll(idList_, i)
+    {
+        const word& id(idList_[i]);
+
+        if (!moleculePropertiesDict.found(id))
+        {
+            FatalErrorIn("potential.C") << nl
+                << id << " molecule subDict not found"
+                << nl << abort(FatalError);
+        }
+
+        const dictionary& molDict(moleculePropertiesDict.subDict(id));
+
+        List<word> siteIdNames = molDict.lookup("siteIds");
+
+        forAll(siteIdNames, sI)
+        {
+            const word& siteId = siteIdNames[sI];
+
+            if(findIndex(siteIdList, siteId) == -1)
+            {
+                siteIdList.append(siteId);
+            }
+        }
+
+        List<word> pairPotSiteIds = molDict.lookup("pairPotentialSiteIds");
+
+        forAll(pairPotSiteIds, sI)
+        {
+            const word& siteId = pairPotSiteIds[sI];
+
+            if(findIndex(siteIdNames, siteId) == -1)
+            {
+                FatalErrorIn("potential.C") << nl
+                    << siteId << " in pairPotentialSiteIds is not in siteIds: "
+                    << siteIdNames << nl << abort(FatalError);
+            }
+
+            if(findIndex(pairPotentialSiteIdList, siteId) == -1)
+            {
+                pairPotentialSiteIdList.append(siteId);
+            }
+        }
+    }
+
+    nPairPotIds_ = pairPotentialSiteIdList.size();
+
+    forAll(siteIdList, aSIN)
+    {
+        const word& siteId = siteIdList[aSIN];
+
+        if(findIndex(pairPotentialSiteIdList, siteId) == -1)
+        {
+            pairPotentialSiteIdList.append(siteId);
+        }
+    }
+
+    siteIdList_.transfer(pairPotentialSiteIdList.shrink());
+}
+
+
+void Foam::potential::potential::readPotentialDict()
+{
+    Info<< nl <<  "Reading potential dictionary:" << endl;
+
+    IOdictionary idListDict
+    (
+        IOobject
+        (
+            "idList",
+            mesh_.time().constant(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    );
+
+    idList_ = List<word>(idListDict.lookup("idList"));
+
+    IOdictionary moleculePropertiesDict
+    (
+        IOobject
+        (
+            "moleculeProperties",
+            mesh_.time().constant(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    setSiteIdList(moleculePropertiesDict);
+
+    List<word> pairPotentialSiteIdList
+    (
+        SubList<word>(siteIdList_, nPairPotIds_)
+    );
+
+    Info<< nl << "Unique site ids found: " << siteIdList_
+        << nl << "Site Ids requiring a pair potential: "
+        << pairPotentialSiteIdList
+        << endl;
+
+    List<word> tetherSiteIdList(0);
+
+    if (idListDict.found("tetherSiteIdList"))
+    {
+        tetherSiteIdList = List<word>(idListDict.lookup("tetherSiteIdList"));
+    }
+
+    IOdictionary potentialDict
+    (
+        IOobject
+        (
+            "potentialDict",
+            mesh_.time().system(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    );
+
+    potentialEnergyLimit_ = readScalar
+    (
+        potentialDict.lookup("potentialEnergyLimit")
+    );
+
+    if (potentialDict.found("removalOrder"))
+    {
+        List<word> remOrd = potentialDict.lookup("removalOrder");
+
+        removalOrder_.setSize(remOrd.size());
+
+        forAll(removalOrder_, rO)
+        {
+            removalOrder_[rO] = findIndex(idList_, remOrd[rO]);
+
+            if (removalOrder_[rO] == -1)
+            {
+                FatalErrorIn("potentials.C") << nl
+                    << "removalOrder entry: " << remOrd[rO]
+                    << " not found in idList."
+                    << nl << abort(FatalError);
+            }
+        }
+    }
+
+    // *************************************************************************
+    // Pair potentials
+
+    if (!potentialDict.found("pair"))
+    {
+        FatalErrorIn("potentials.C") << nl
+            << "pair potential specification subDict not found"
+            << abort(FatalError);
+    }
+
+    const dictionary& pairDict = potentialDict.subDict("pair");
+
+    pairPotentials_.buildPotentials
+    (
+        pairPotentialSiteIdList,
+        pairDict,
+        mesh_
+    );
+
+    // *************************************************************************
+    // Tether potentials
+
+    if (tetherSiteIdList.size())
+    {
+        if (!potentialDict.found("tether"))
+        {
+            FatalErrorIn("potential.C") << nl
+                << "tether potential specification subDict not found"
+                << abort(FatalError);
+        }
+
+        const dictionary& tetherDict = potentialDict.subDict("tether");
+
+        tetherPotentials_.buildPotentials
+        (
+            siteIdList_,
+            tetherDict,
+            tetherSiteIdList
+        );
+    }
+
+    // *************************************************************************
+    // External Forces
+
+    gravity_ = vector::zero;
+
+    if (potentialDict.found("external"))
+    {
+
+        Info << nl << "Reading external forces:" << endl;
+
+        const dictionary& externalDict = potentialDict.subDict("external");
+
+        // *********************************************************************
+        // gravity
+
+        if (externalDict.found("gravity"))
+        {
+            gravity_ = externalDict.lookup("gravity");
+        }
+    }
+
+    Info << nl << tab << "gravity = " << gravity_ << endl;
+}
+
+
+void Foam::potential::potential::readMdInitialiseDict
+(
+    const IOdictionary& mdInitialiseDict,
+    IOdictionary& idListDict
+)
+{
+    IOdictionary moleculePropertiesDict
+    (
+        IOobject
+        (
+            "moleculeProperties",
+            mesh_.time().constant(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        )
+    );
+
+    DynamicList<word> idList;
+
+    DynamicList<word> tetherSiteIdList;
+
+    forAll(mdInitialiseDict.toc(), zone)
+    {
+        const dictionary& zoneDict = mdInitialiseDict.subDict
+        (
+            mdInitialiseDict.toc()[zone]
+        );
+
+        List<word> latticeIds
+        (
+            zoneDict.lookup("latticeIds")
+        );
+
+        forAll(latticeIds, i)
+        {
+            const word& id = latticeIds[i];
+
+            if(!moleculePropertiesDict.found(id))
+            {
+                FatalErrorIn("potential.C") << nl
+                    << "Molecule type "
+                    << id
+                    << " not found in moleculeProperties dictionary."
+                    << nl
+                    << abort(FatalError);
+            }
+
+            if (findIndex(idList,id) == -1)
+            {
+                idList.append(id);
+            }
+        }
+
+        List<word> tetherSiteIds
+        (
+            zoneDict.lookup("tetherSiteIds")
+        );
+
+        forAll(tetherSiteIds, t)
+        {
+            const word& tetherSiteId = tetherSiteIds[t];
+
+            bool idFound = false;
+
+            forAll(latticeIds, i)
+            {
+                if (idFound)
+                {
+                    break;
+                }
+
+                const word& id = latticeIds[i];
+
+                List<word> siteIds
+                (
+                    moleculePropertiesDict.subDict(id).lookup("siteIds")
+                );
+
+                if (findIndex(siteIds, tetherSiteId) != -1)
+                {
+                    idFound = true;
+                }
+            }
+
+            if (idFound)
+            {
+                tetherSiteIdList.append(tetherSiteId);
+            }
+            else
+            {
+                FatalErrorIn("potential.C") << nl
+                    << "Tether id  "
+                    << tetherSiteId
+                    << " not found as a site of any molecule in zone."
+                    << nl
+                    << abort(FatalError);
+            }
+        }
+    }
+
+    idList_.transfer(idList);
+
+    tetherSiteIdList.shrink();
+
+    idListDict.add("idList", idList_);
+
+    idListDict.add("tetherSiteIdList", tetherSiteIdList);
+
+    setSiteIdList(moleculePropertiesDict);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::potential::potential(const polyMesh& mesh)
+:
+    mesh_(mesh)
+{
+    readPotentialDict();
+}
+
+
+Foam::potential::potential
+(
+    const polyMesh& mesh,
+    const IOdictionary& mdInitialiseDict,
+    IOdictionary& idListDict
+)
+:
+    mesh_(mesh)
+{
+    readMdInitialiseDict(mdInitialiseDict, idListDict);
+}
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::potential::~potential()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potential.H b/src/lagrangian/molecularDynamics/potential/potential/potential.H
new file mode 100644
index 000000000..be3db2acc
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/potential/potential.H
@@ -0,0 +1,154 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::potential
+
+Description
+
+SourceFiles
+    potentialI.H
+    potential.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef potential_H
+#define potential_H
+
+#include "polyMesh.H"
+#include "IOdictionary.H"
+#include "Time.H"
+#include "pairPotentialList.H"
+#include "electrostaticPotential.H"
+#include "tetherPotentialList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class potential Declaration
+\*---------------------------------------------------------------------------*/
+
+class potential
+{
+    // Private data
+
+        const polyMesh& mesh_;
+
+        List<word> idList_;
+
+        List<word> siteIdList_;
+
+        label nPairPotIds_;
+
+        scalar potentialEnergyLimit_;
+
+        labelList removalOrder_;
+
+        pairPotentialList pairPotentials_;
+
+        tetherPotentialList tetherPotentials_;
+
+        vector gravity_;
+
+
+    // Private Member Functions
+
+        void setSiteIdList(const IOdictionary& moleculePropertiesDict);
+
+        void readPotentialDict();
+
+        void readMdInitialiseDict
+        (
+            const IOdictionary& mdInitialiseDict,
+            IOdictionary& idListDict
+        );
+
+        //- Disallow default bitwise copy construct
+        potential(const potential&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const potential&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from mesh reference
+        potential(const polyMesh& mesh);
+
+        //- Construct from mdInitialiseDict
+        potential
+        (
+            const polyMesh& mesh,
+            const IOdictionary& mdInitialiseDict,
+            IOdictionary& idListDict
+        );
+
+
+    // Destructor
+
+        ~potential();
+
+
+    // Member Functions
+
+        // Access
+
+            inline label nIds() const;
+
+            inline const List<word>& idList() const;
+
+            inline const List<word>& siteIdList() const;
+
+            inline scalar potentialEnergyLimit() const;
+
+            inline label nPairPotentials() const;
+
+            inline const labelList& removalOrder() const;
+
+            inline const pairPotentialList& pairPotentials() const;
+
+            inline const tetherPotentialList& tetherPotentials() const;
+
+            inline const vector& gravity() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#include "potentialI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/potential/potentialI.H b/src/lagrangian/molecularDynamics/potential/potential/potentialI.H
new file mode 100644
index 000000000..6ff98c828
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/potential/potentialI.H
@@ -0,0 +1,84 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+inline Foam::label Foam::potential::nIds() const
+{
+    return idList_.size();
+}
+
+
+inline const Foam::List<Foam::word>& Foam::potential::idList() const
+{
+    return idList_;
+}
+
+
+inline const Foam::List<Foam::word>& Foam::potential::siteIdList() const
+{
+    return siteIdList_;
+}
+
+
+inline Foam::scalar Foam::potential::potentialEnergyLimit() const
+{
+    return potentialEnergyLimit_;
+}
+
+
+inline Foam::label Foam::potential::nPairPotentials() const
+{
+    return pairPotentials_.size();
+}
+
+
+inline const Foam::labelList& Foam::potential::removalOrder() const
+{
+    return removalOrder_;
+}
+
+
+inline const Foam::pairPotentialList& Foam::potential::pairPotentials() const
+{
+    return pairPotentials_;
+}
+
+
+inline const Foam::tetherPotentialList&
+Foam::potential::tetherPotentials() const
+{
+    return tetherPotentials_;
+}
+
+
+inline const Foam::vector& Foam::potential::gravity() const
+{
+    return gravity_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C
index 50831b255..1decf41d8 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/newTetherPotential.C
@@ -22,9 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Class
-    tetherPotential
-
 \*---------------------------------------------------------------------------*/
 
 #include "tetherPotential.H"
@@ -42,7 +39,11 @@ autoPtr<tetherPotential> tetherPotential::New
     const dictionary& tetherPotentialProperties
 )
 {
-    word tetherPotentialTypeName(tetherPotentialProperties.lookup("tetherPotential"));
+    word
+        tetherPotentialTypeName
+        (
+            tetherPotentialProperties.lookup("tetherPotential")
+        );
 
     Info<< nl << "Selecting tether potential "
         << tetherPotentialTypeName << " for "
@@ -57,8 +58,8 @@ autoPtr<tetherPotential> tetherPotential::New
         (
             "tetherPotential::New()"
         )   << "Unknown tetherPotential type "
-            << tetherPotentialTypeName << endl << endl
-            << "Valid  tetherPotentials are : " << endl
+            << tetherPotentialTypeName << nl << nl
+            << "Valid  tetherPotentials are: " << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
     }
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.C
index 113aef558..8a5c2d4e7 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.C
@@ -26,15 +26,14 @@ License
 
 #include "tetherPotential.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
+    defineTypeNameAndDebug(tetherPotential, 0);
+    defineRunTimeSelectionTable(tetherPotential, dictionary);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(tetherPotential, 0);
-defineRunTimeSelectionTable(tetherPotential, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -60,8 +59,4 @@ bool Foam::tetherPotential::read(const dictionary& tetherPotentialProperties)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
index 23e69d04e..3b26cf0f5 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/basic/tetherPotential.H
@@ -40,6 +40,7 @@ SourceFiles
 #include "typeInfo.H"
 #include "runTimeSelectionTables.H"
 #include "autoPtr.H"
+#include "vector.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -47,7 +48,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                Class tetherPotential Declaration
+                      Class tetherPotential Declaration
 \*---------------------------------------------------------------------------*/
 
 class tetherPotential
@@ -119,9 +120,9 @@ public:
 
     // Member Functions
 
-        virtual scalar energy (const scalar r) const = 0;
+        virtual scalar energy (const vector r) const = 0;
 
-        virtual scalar force (const scalar r) const = 0;
+        virtual vector force (const vector r) const = 0;
 
         const dictionary& tetherPotentialProperties() const
         {
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C
index dc23c4bc5..3c458fad0 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.C
@@ -65,13 +65,13 @@ harmonicSpring::harmonicSpring
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-scalar harmonicSpring::energy(const scalar r) const
+scalar harmonicSpring::energy(const vector r) const
 {
-    return 0.5*springConstant_*r*r;
+    return 0.5*springConstant_*magSqr(r);
 }
 
 
-scalar harmonicSpring::force(const scalar r) const
+vector harmonicSpring::force(const vector r) const
 {
     return -springConstant_*r;
 }
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
index 0326cf093..dee2e9aa5 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/harmonicSpring/harmonicSpring.H
@@ -46,7 +46,7 @@ namespace tetherPotentials
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class harmonicSpring Declaration
+                       Class harmonicSpring Declaration
 \*---------------------------------------------------------------------------*/
 
 class harmonicSpring
@@ -84,11 +84,11 @@ public:
 
     // Member Functions
 
-        scalar energy(const scalar r) const;
+        scalar energy(const vector r) const;
 
-        scalar force(const scalar r) const;
+        vector force(const vector r) const;
 
-        //- Read transportProperties dictionary
+        //- Read dictionary
         bool read(const dictionary& tetherPotentialProperties);
 };
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C
new file mode 100644
index 000000000..591a57e3d
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.C
@@ -0,0 +1,117 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "pitchForkRing.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace tetherPotentials
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(pitchForkRing, 0);
+
+addToRunTimeSelectionTable
+(
+    tetherPotential,
+    pitchForkRing,
+    dictionary
+);
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+pitchForkRing::pitchForkRing
+(
+    const word& name,
+    const dictionary& tetherPotentialProperties
+)
+:
+    tetherPotential(name, tetherPotentialProperties),
+    pitchForkRingCoeffs_
+    (
+        tetherPotentialProperties.subDict(typeName + "Coeffs")
+    ),
+    mu_(readScalar(pitchForkRingCoeffs_.lookup("mu"))),
+    alpha_(readScalar(pitchForkRingCoeffs_.lookup("alpha"))),
+    rOrbit_(readScalar(pitchForkRingCoeffs_.lookup("rOrbit")))
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+scalar pitchForkRing::energy(const vector r) const
+{
+    scalar p = sqrt(r.x()*r.x() + r.y()*r.y());
+
+    scalar pMinusRSqr = (p - rOrbit_)*(p - rOrbit_);
+
+    return -0.5 * mu_ * pMinusRSqr
+      + 0.25 * pMinusRSqr * pMinusRSqr
+      + 0.5 * alpha_ * r.z() * r.z();
+}
+
+
+vector pitchForkRing::force(const vector r) const
+{
+    scalar p = sqrt(r.x()*r.x() + r.y()*r.y());
+
+    scalar pMinusR = (p - rOrbit_);
+
+    return vector
+    (
+        (mu_ - pMinusR * pMinusR) * pMinusR * r.x()/p,
+        (mu_ - pMinusR * pMinusR) * pMinusR * r.y()/p,
+        -alpha_ * r.z()
+    );
+}
+
+
+bool pitchForkRing::read(const dictionary& tetherPotentialProperties)
+{
+    tetherPotential::read(tetherPotentialProperties);
+
+    pitchForkRingCoeffs_ =
+        tetherPotentialProperties.subDict(typeName + "Coeffs");
+
+    pitchForkRingCoeffs_.lookup("mu") >> mu_;
+    pitchForkRingCoeffs_.lookup("alpha") >> alpha_;
+    pitchForkRingCoeffs_.lookup("rOrbit") >> rOrbit_;
+
+    return true;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace tetherPotentials
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
new file mode 100644
index 000000000..6c16c3f79
--- /dev/null
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/pitchForkRing/pitchForkRing.H
@@ -0,0 +1,107 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::tetherPotentials::pitchForkRing
+
+Description
+
+
+SourceFiles
+    pitchForkRing.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef pitchForkRing_H
+#define pitchForkRing_H
+
+#include "tetherPotential.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace tetherPotentials
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class pitchForkRing Declaration
+\*---------------------------------------------------------------------------*/
+
+class pitchForkRing
+:
+    public tetherPotential
+{
+    // Private data
+
+        dictionary pitchForkRingCoeffs_;
+
+        scalar mu_;
+        scalar alpha_;
+        scalar rOrbit_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("pitchForkRing");
+
+
+    // Constructors
+
+        //- Construct from components
+        pitchForkRing
+        (
+            const word& name,
+            const dictionary& tetherPotentialProperties
+        );
+
+
+    // Destructor
+
+        ~pitchForkRing()
+        {}
+
+
+    // Member Functions
+
+        scalar energy(const vector r) const;
+
+        vector force(const vector r) const;
+
+        //- Read dictionary
+        bool read(const dictionary& tetherPotentialProperties);
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace tetherPotentials
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
index f084293d2..36c341dd8 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.C
@@ -45,8 +45,6 @@ addToRunTimeSelectionTable
     dictionary
 );
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -73,33 +71,41 @@ restrainedHarmonicSpring::restrainedHarmonicSpring
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-scalar restrainedHarmonicSpring::energy(const scalar r) const
+scalar restrainedHarmonicSpring::energy(const vector r) const
 {
-    if (r < rR_)
+    scalar magR = mag(r);
+
+    if (magR < rR_)
     {
-        return 0.5 * springConstant_ * r * r;
+        return 0.5 * springConstant_ * magSqr(r);
     }
     else
     {
         return 0.5 * springConstant_ * rR_ * rR_
-            + springConstant_ * rR_ * (r - rR_);
+          + springConstant_ * rR_ * (magR - rR_);
     }
 }
 
-scalar restrainedHarmonicSpring::force(const scalar r) const
+
+vector restrainedHarmonicSpring::force(const vector r) const
 {
-    if (r < rR_)
+    scalar magR = mag(r);
+
+    if (magR < rR_)
     {
         return -springConstant_ * r;
     }
     else
     {
-        return -springConstant_ * rR_;
+        return -springConstant_ * rR_ * r / magR;
     }
-    
 }
 
-bool restrainedHarmonicSpring::read(const dictionary& tetherPotentialProperties)
+
+bool restrainedHarmonicSpring::read
+(
+    const dictionary& tetherPotentialProperties
+)
 {
     tetherPotential::read(tetherPotentialProperties);
 
@@ -108,7 +114,7 @@ bool restrainedHarmonicSpring::read(const dictionary& tetherPotentialProperties)
 
     restrainedHarmonicSpringCoeffs_.lookup("springConstant") >> springConstant_;
     restrainedHarmonicSpringCoeffs_.lookup("rR") >> rR_;
-    
+
     return true;
 }
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
index d5ba8146f..6eb30ee9c 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/derived/restrainedHarmonicSpring/restrainedHarmonicSpring.H
@@ -46,7 +46,7 @@ namespace tetherPotentials
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class restrainedHarmonicSpring Declaration
+                  Class restrainedHarmonicSpring Declaration
 \*---------------------------------------------------------------------------*/
 
 class restrainedHarmonicSpring
@@ -86,11 +86,11 @@ public:
 
     // Member Functions
 
-        scalar energy(const scalar r) const;
+        scalar energy(const vector r) const;
 
-        scalar force(const scalar r) const;
+        vector force(const vector r) const;
 
-        //- Read transportProperties dictionary
+        //- Read dictionary
         bool read(const dictionary& tetherPotentialProperties);
 };
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
index b48cabe5f..09694d01c 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.C
@@ -30,39 +30,40 @@ License
 
 void Foam::tetherPotentialList::readTetherPotentialDict
 (
+    const List<word>& siteIdList,
     const dictionary& tetherPotentialDict,
-    const List<word>& idList,
-    const List<label>& tetherIds
+    const List<word>& tetherSiteIdList
 )
 {
-    if (!tetherIds.size())
+
+    Info<< nl << "Building tether potentials." << endl;
+
+    idMap_ = List<label>(siteIdList.size(), -1);
+
+    label tetherMapIndex = 0;
+
+    forAll(tetherSiteIdList, t)
     {
-        Info<< nl << "No tethered molecules found." << endl;
+        word tetherPotentialName = tetherSiteIdList[t];
 
-        idMap_.setSize(0);
-    }
-    else
-    {
-        Info<< nl << "Building tether potentials." << endl;
+        label tetherId = findIndex(siteIdList, tetherPotentialName);
 
-        idMap_ = List<label>(idList.size(), -1);
-
-        label tetherMapIndex = 0;
-
-        forAll(tetherIds, t)
+        if (tetherId == -1)
+        {
+            FatalErrorIn("tetherPotentialList::readTetherPotentialDict")
+                << nl << "No matching entry found in siteIdList for tether name "
+                << tetherPotentialName
+                << abort(FatalError);
+        }
+        else if (!tetherPotentialDict.found(tetherPotentialName))
+        {
+            FatalErrorIn("tetherPotentialList::readTetherPotentialDict")
+                << nl << "tether potential specification subDict "
+                << tetherPotentialName << " not found"
+                << abort(FatalError);
+        }
+        else
         {
-            const label tetherId = tetherIds[t];
-
-            word tetherPotentialName = idList[tetherId];
-
-            if (!tetherPotentialDict.found(tetherPotentialName))
-            {
-                FatalErrorIn("tetherPotentialList::readTetherPotentialDict")
-                    << "tether potential specification subDict "
-                    << tetherPotentialName << " not found" << nl
-                    << abort(FatalError);
-            }
-
             this->set
             (
                 tetherMapIndex,
@@ -72,11 +73,11 @@ void Foam::tetherPotentialList::readTetherPotentialDict
                     tetherPotentialDict.subDict(tetherPotentialName)
                 )
             );
-
-            idMap_[tetherId] = tetherMapIndex;
-
-            tetherMapIndex++;
         }
+
+        idMap_[tetherId] = tetherMapIndex;
+
+        tetherMapIndex++;
     }
 }
 
@@ -92,15 +93,15 @@ Foam::tetherPotentialList::tetherPotentialList()
 
 Foam::tetherPotentialList::tetherPotentialList
 (
-    const dictionary& idListDict,
+    const List<word>& siteIdList,
     const dictionary& tetherPotentialDict,
-    const List<label>& tetherIds
+    const List<word>& tetherSiteIdList
 )
 :
     PtrList<tetherPotential>(),
     idMap_()
 {
-    buildPotentials(idListDict, tetherPotentialDict, tetherIds);
+    buildPotentials(siteIdList, tetherPotentialDict, tetherSiteIdList);
 }
 
 
@@ -114,16 +115,14 @@ Foam::tetherPotentialList::~tetherPotentialList()
 
 void Foam::tetherPotentialList::buildPotentials
 (
-    const dictionary& idListDict,
+    const List<word>& siteIdList,
     const dictionary& tetherPotentialDict,
-    const List<label>& tetherIds
+    const List<word>& tetherSiteIdList
 )
 {
-    setSize(tetherIds.size());
+    setSize(tetherSiteIdList.size());
 
-    List<word> idList(idListDict.lookup("idList"));
-
-    readTetherPotentialDict(tetherPotentialDict, idList, tetherIds);
+    readTetherPotentialDict(siteIdList, tetherPotentialDict, tetherSiteIdList);
 }
 
 
@@ -136,27 +135,23 @@ const Foam::tetherPotential& Foam::tetherPotentialList::tetherPotentialFunction
 }
 
 
-Foam::scalar Foam::tetherPotentialList::force
+Foam::vector Foam::tetherPotentialList::force
 (
     const label a,
-    const scalar rITMag
+    const vector rIT
 ) const
 {
-    scalar f = (*this)[tetherPotentialIndex(a)].force(rITMag);
-
-    return f;
+    return (*this)[tetherPotentialIndex(a)].force(rIT);
 }
 
 
 Foam::scalar Foam::tetherPotentialList::energy
 (
     const label a,
-    const scalar rITMag
+    const vector rIT
 ) const
 {
-    scalar e = (*this)[tetherPotentialIndex(a)].energy(rITMag);
-
-    return e;
+    return (*this)[tetherPotentialIndex(a)].energy(rIT);
 }
 
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
index 05e5d3efd..2efd1148b 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialList.H
@@ -35,6 +35,7 @@ SourceFiles
 #ifndef tetherPotentialList_H
 #define tetherPotentialList_H
 
+#include "ListOps.H"
 #include "PtrList.H"
 #include "word.H"
 #include "tetherPotential.H"
@@ -56,6 +57,7 @@ class tetherPotentialList
 
         List<label> idMap_;
 
+
     // Private Member Functions
 
         inline label tetherPotentialIndex
@@ -65,9 +67,9 @@ class tetherPotentialList
 
         void readTetherPotentialDict
         (
+            const List<word>& siteIdList,
             const dictionary& tetherPotentialDict,
-            const List<word>& idList,
-            const List<label>& tetherIds
+            const List<word>& tetherSiteIdList
         );
 
         //- Disallow default bitwise assignment
@@ -83,47 +85,38 @@ public:
 
         tetherPotentialList();
 
-        //- Construct from idList and potental dictionaries
+        //- Construct from siteIdList and potental dictionaries
         tetherPotentialList
         (
-            const dictionary& idListDict,
+            const List<word>& siteIdList,
             const dictionary& tetherPotentialDict,
-            const List<label>& tetherIds
+            const List<word>& tetherSiteIdList
         );
 
+
     // Destructor
 
         ~tetherPotentialList();
 
+
     // Member Functions
 
         void buildPotentials
         (
-            const dictionary& idListDict,
+            const List<word>& siteIdList,
             const dictionary& tetherPotentialDict,
-            const List<label>& tetherIds
+            const List<word>& tetherSiteIdList
         );
 
         // Access
 
             inline const List<word>& idMap() const;
 
-            const tetherPotential& tetherPotentialFunction
-            (
-                const label a
-            ) const;
+            const tetherPotential& tetherPotentialFunction(const label a) const;
 
-            scalar force
-            (
-                const label a,
-                const scalar rIJMag
-            ) const;
+            vector force(const label a, const vector rIT) const;
 
-            scalar energy
-            (
-                const label a,
-                const scalar rIJMag
-            ) const;
+            scalar energy (const label a, const vector rIT) const;
 };
 
 
diff --git a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H
index f8f617c67..0812dc25d 100644
--- a/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H
+++ b/src/lagrangian/molecularDynamics/potential/tetherPotential/tetherPotentialList/tetherPotentialListI.H
@@ -39,8 +39,8 @@ inline Foam::label Foam::tetherPotentialList::tetherPotentialIndex
         (
             "Foam::tetherPotentialList::tetherPotentialIndex(const label a)"
         )
-            << "Attempting to access an undefined tetherPotential."
-            << abort(FatalError);
+        << "Attempting to access an undefined tetherPotential."
+        << abort(FatalError);
 
         return -1;
     }
diff --git a/src/lagrangian/solidParticle/solidParticle.C b/src/lagrangian/solidParticle/solidParticle.C
index a427f99ed..2afdaf1c7 100644
--- a/src/lagrangian/solidParticle/solidParticle.C
+++ b/src/lagrangian/solidParticle/solidParticle.C
@@ -84,6 +84,7 @@ bool Foam::solidParticle::move(solidParticle::trackData& td)
 
         if (onBoundary() && td.keepParticle)
         {
+            // Bug fix.  HJ, 25/Aug/2010
             if (face() > -1)
             {
                 if (isType<processorPolyPatch>(pbMesh[patch(face())]))
@@ -92,12 +93,33 @@ bool Foam::solidParticle::move(solidParticle::trackData& td)
                 }
             }
         }
-    }
 
     return td.keepParticle;
 }
 
 
+bool Foam::solidParticle::hitPatch
+(
+    const polyPatch&,
+    solidParticle::trackData&,
+    const label
+)
+{
+    return false;
+}
+
+
+bool Foam::solidParticle::hitPatch
+(
+    const polyPatch&,
+    int&,
+    const label
+)
+{
+    return false;
+}
+
+
 void Foam::solidParticle::hitProcessorPatch
 (
     const processorPolyPatch&,
diff --git a/src/lagrangian/solidParticle/solidParticle.H b/src/lagrangian/solidParticle/solidParticle.H
index e4f49a4d2..92ec07203 100644
--- a/src/lagrangian/solidParticle/solidParticle.H
+++ b/src/lagrangian/solidParticle/solidParticle.H
@@ -163,68 +163,91 @@ public:
             inline scalar wallImpactDistance(const vector& n) const;
 
 
-        //- Tracking
-        bool move(trackData&);
+        // Tracking
+
+            //- Move
+            bool move(trackData&);
 
 
-        //- Overridable function to handle the particle hitting a processorPatch
-        void hitProcessorPatch
-        (
-            const processorPolyPatch&,
-            solidParticle::trackData& td
-        );
+        // Patch interactions
 
-        //- Overridable function to handle the particle hitting a processorPatch
-        //- without trackData
-        void hitProcessorPatch
-        (
-            const processorPolyPatch&,
-            int&
-        );
+            //- Overridable function to handle the particle hitting a patch
+            //  Executed before other patch-hitting functions
+            bool hitPatch
+            (
+                const polyPatch&,
+                solidParticle::trackData& td,
+                const label patchI
+            );
 
-        //- Overridable function to handle the particle hitting a wallPatch
-        void hitWallPatch
-        (
-            const wallPolyPatch&,
-            solidParticle::trackData& td
-        );
+            //- Overridable function to handle the particle hitting a patch
+            //  Executed before other patch-hitting functions without trackData
+            bool hitPatch
+            (
+                const polyPatch& p,
+                int& td,
+                const label patchI
+            );
 
-        //- Overridable function to handle the particle hitting a wallPatch
-        //- without trackData
-        void hitWallPatch
-        (
-            const wallPolyPatch&,
-            int&
-        );
+            //- Overridable function to handle the particle hitting a
+            //  processorPatch
+            void hitProcessorPatch
+            (
+                const processorPolyPatch&,
+                solidParticle::trackData& td
+            );
 
-        //- Overridable function to handle the particle hitting a polyPatch
-        void hitPatch
-        (
-            const polyPatch&,
-            solidParticle::trackData& td
-        );
+            //- Overridable function to handle the particle hitting a
+            //  processorPatch without trackData
+            void hitProcessorPatch
+            (
+                const processorPolyPatch&,
+                int&
+            );
 
-        //- Overridable function to handle the particle hitting a polyPatch
-        //- without trackData
-        void hitPatch
-        (
-            const polyPatch&,
-            int&
-        );
+            //- Overridable function to handle the particle hitting a wallPatch
+            void hitWallPatch
+            (
+                const wallPolyPatch&,
+                solidParticle::trackData& td
+            );
 
-        //- Transform the physical properties of the particle
-        //  according to the given transformation tensor
-        void transformProperties
-        (
-            const tensor& T
-        );
+            //- Overridable function to handle the particle hitting a wallPatch
+            //- without trackData
+            void hitWallPatch
+            (
+                const wallPolyPatch&,
+                int&
+            );
 
-        //- Transform the physical properties of the particle
-        //  according to the given separation vector
-        void transformProperties
-        (
-            const vector& separation
-        );
+            //- Overridable function to handle the particle hitting a polyPatch
+            void hitPatch
+            (
+                const polyPatch&,
+                solidParticle::trackData& td
+            );
+
+            //- Overridable function to handle the particle hitting a polyPatch
+            //- without trackData
+            void hitPatch
+            (
+                const polyPatch&,
+                int&
+            );
+
+            //- Transform the physical properties of the particle
+            //  according to the given transformation tensor
+            void transformProperties
+            (
+                const tensor& T
+            );
+
+            //- Transform the physical properties of the particle
+            //  according to the given separation vector
+            void transformProperties
+            (
+                const vector& separation
+            );
 
 
     // I-O
diff --git a/src/lagrangian/solidParticle/solidParticleCloud.C b/src/lagrangian/solidParticle/solidParticleCloud.C
index 10c8839e2..1857788f4 100644
--- a/src/lagrangian/solidParticle/solidParticleCloud.C
+++ b/src/lagrangian/solidParticle/solidParticleCloud.C
@@ -28,7 +28,6 @@ License
 #include "fvMesh.H"
 #include "volFields.H"
 #include "interpolationCellPoint.H"
-#include "volPointInterpolation.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -43,7 +42,8 @@ namespace Foam
 Foam::solidParticleCloud::solidParticleCloud
 (
     const fvMesh& mesh,
-    const word& cloudName
+    const word& cloudName,
+    bool readFields
 )
 :
     Cloud<solidParticle>(mesh, cloudName, false),
@@ -63,7 +63,10 @@ Foam::solidParticleCloud::solidParticleCloud
     e_(dimensionedScalar(particleProperties_.lookup("e")).value()),
     mu_(dimensionedScalar(particleProperties_.lookup("mu")).value())
 {
-    solidParticle::readFields(*this);
+    if (readFields)
+    {
+        solidParticle::readFields(*this);
+    }
 }
 
 
@@ -75,12 +78,9 @@ void Foam::solidParticleCloud::move(const dimensionedVector& g)
     const volVectorField& U = mesh_.lookupObject<const volVectorField>("U");
     const volScalarField& nu = mesh_.lookupObject<const volScalarField>("nu");
 
-    pointMesh pMesh(U.mesh());
-    volPointInterpolation vpi(U.mesh(), pMesh);
-
-    interpolationCellPoint<scalar> rhoInterp(vpi, rho);
-    interpolationCellPoint<vector> UInterp(vpi, U);
-    interpolationCellPoint<scalar> nuInterp(vpi, nu);
+    interpolationCellPoint<scalar> rhoInterp(rho);
+    interpolationCellPoint<vector> UInterp(U);
+    interpolationCellPoint<scalar> nuInterp(nu);
 
     solidParticle::trackData td(*this, rhoInterp, UInterp, nuInterp, g.value());
 
@@ -88,10 +88,4 @@ void Foam::solidParticleCloud::move(const dimensionedVector& g)
 }
 
 
-void Foam::solidParticleCloud::writeFields() const
-{
-    solidParticle::writeFields(*this);
-}
-
-
 // ************************************************************************* //
diff --git a/src/lagrangian/solidParticle/solidParticleCloud.H b/src/lagrangian/solidParticle/solidParticleCloud.H
index ba4f949e6..cc69cf221 100644
--- a/src/lagrangian/solidParticle/solidParticleCloud.H
+++ b/src/lagrangian/solidParticle/solidParticleCloud.H
@@ -86,7 +86,8 @@ public:
         solidParticleCloud
         (
             const fvMesh&,
-            const word& cloudName = "defaultCloud"
+            const word& cloudName = "defaultCloud",
+            bool readFields = true
         );
 
 
@@ -106,12 +107,6 @@ public:
             //- Move the particles under the influence of the given
             //  gravitational acceleration
             void move(const dimensionedVector& g);
-
-
-        // I-O
-
-            //- Write fields
-            void writeFields() const;
 };
 
 
diff --git a/src/lagrangian/solidParticle/solidParticleIO.C b/src/lagrangian/solidParticle/solidParticleIO.C
index ee99b8516..d21a07cfc 100644
--- a/src/lagrangian/solidParticle/solidParticleIO.C
+++ b/src/lagrangian/solidParticle/solidParticleIO.C
@@ -66,14 +66,14 @@ void Foam::solidParticle::readFields(Cloud<solidParticle>& c)
     {
         return;
     }
-    IOField<scalar> d(c.fieldIOobject("d"));
+    IOField<scalar> d(c.fieldIOobject("d", IOobject::MUST_READ));
     c.checkFieldIOobject(c, d);
 
-    IOField<vector> U(c.fieldIOobject("U"));
+    IOField<vector> U(c.fieldIOobject("U", IOobject::MUST_READ));
     c.checkFieldIOobject(c, U);
 
     label i = 0;
-    forAllIter(Cloud<solidParticle>::iterator, c, iter)
+    forAllIter(Cloud<solidParticle>, c, iter)
     {
         solidParticle& p = iter();
 
@@ -90,8 +90,8 @@ void Foam::solidParticle::writeFields(const Cloud<solidParticle>& c)
 
     label np = c.size();
 
-    IOField<scalar> d(c.fieldIOobject("d"), np);
-    IOField<vector> U(c.fieldIOobject("U"), np);
+    IOField<scalar> d(c.fieldIOobject("d", IOobject::NO_READ), np);
+    IOField<vector> U(c.fieldIOobject("U", IOobject::NO_READ), np);
 
     label i = 0;
     forAllConstIter(Cloud<solidParticle>, c, iter)
diff --git a/src/thermophysicalModels/Allwmake b/src/thermophysicalModels/Allwmake
index 69a99a09a..7fbee6903 100755
--- a/src/thermophysicalModels/Allwmake
+++ b/src/thermophysicalModels/Allwmake
@@ -1,4 +1,5 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wmake libso specie
@@ -9,10 +10,11 @@ wmake libso solids
 wmake libso solidMixture
 
 wmake libso basic
-wmake libso combustion
+wmake libso reactionThermo
 wmake libso laminarFlameSpeed
 wmake libso chemistryModel
 wmake libso pdfs
 wmake libso radiation
 wmake libso barotropicCompressibilityModel
 
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.C b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
index e80a57414..930af1748 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.C
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.C
@@ -31,21 +31,20 @@ License
 #include "fixedEnthalpyFvPatchScalarField.H"
 #include "gradientEnthalpyFvPatchScalarField.H"
 #include "mixedEnthalpyFvPatchScalarField.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "fixedInternalEnergyFvPatchScalarField.H"
+#include "gradientInternalEnergyFvPatchScalarField.H"
+#include "mixedInternalEnergyFvPatchScalarField.H"
 
 /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
 
-defineTypeNameAndDebug(basicThermo, 0);
-defineRunTimeSelectionTable(basicThermo, fvMesh);
-
+namespace Foam
+{
+    defineTypeNameAndDebug(basicThermo, 0);
+}
 
 // * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-wordList basicThermo::hBoundaryTypes()
+Foam::wordList Foam::basicThermo::hBoundaryTypes()
 {
     const volScalarField::GeometricBoundaryField& tbf = T_.boundaryField();
 
@@ -74,9 +73,10 @@ wordList basicThermo::hBoundaryTypes()
     return hbt;
 }
 
-void basicThermo::hBoundaryCorrection(volScalarField& h_)
+
+void Foam::basicThermo::hBoundaryCorrection(volScalarField& h)
 {
-    volScalarField::GeometricBoundaryField& hbf = h_.boundaryField();
+    volScalarField::GeometricBoundaryField& hbf = h.boundaryField();
 
     forAll(hbf, patchi)
     {
@@ -94,9 +94,58 @@ void basicThermo::hBoundaryCorrection(volScalarField& h_)
 }
 
 
+Foam::wordList Foam::basicThermo::eBoundaryTypes()
+{
+    const volScalarField::GeometricBoundaryField& tbf = T_.boundaryField();
+
+    wordList ebt = tbf.types();
+
+    forAll(tbf, patchi)
+    {
+        if (isA<fixedValueFvPatchScalarField>(tbf[patchi]))
+        {
+            ebt[patchi] = fixedInternalEnergyFvPatchScalarField::typeName;
+        }
+        else if
+        (
+            isA<zeroGradientFvPatchScalarField>(tbf[patchi])
+         || isA<fixedGradientFvPatchScalarField>(tbf[patchi])
+        )
+        {
+            ebt[patchi] = gradientInternalEnergyFvPatchScalarField::typeName;
+        }
+        else if (isA<mixedFvPatchScalarField>(tbf[patchi]))
+        {
+            ebt[patchi] = mixedInternalEnergyFvPatchScalarField::typeName;
+        }
+    }
+
+    return ebt;
+}
+
+
+void Foam::basicThermo::eBoundaryCorrection(volScalarField& e)
+{
+    volScalarField::GeometricBoundaryField& ebf = e.boundaryField();
+
+    forAll(ebf, patchi)
+    {
+        if (isA<gradientInternalEnergyFvPatchScalarField>(ebf[patchi]))
+        {
+            refCast<gradientInternalEnergyFvPatchScalarField>(ebf[patchi])
+                .gradient() = ebf[patchi].fvPatchField::snGrad();
+        }
+        else if (isA<mixedInternalEnergyFvPatchScalarField>(ebf[patchi]))
+        {
+            refCast<mixedInternalEnergyFvPatchScalarField>(ebf[patchi])
+                .refGrad() = ebf[patchi].fvPatchField::snGrad();
+        }
+    }
+}
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-basicThermo::basicThermo(const fvMesh& mesh)
+Foam::basicThermo::basicThermo(const fvMesh& mesh)
 :
     IOdictionary
     (
@@ -123,19 +172,6 @@ basicThermo::basicThermo(const fvMesh& mesh)
         mesh
     ),
 
-    T_
-    (
-        IOobject
-        (
-            "T",
-            mesh.time().timeName(),
-            mesh,
-            IOobject::MUST_READ,
-            IOobject::AUTO_WRITE
-        ),
-        mesh
-    ),
-
     psi_
     (
         IOobject
@@ -150,6 +186,19 @@ basicThermo::basicThermo(const fvMesh& mesh)
         dimensionSet(0, -2, 2, 0, 0)
     ),
 
+    T_
+    (
+        IOobject
+        (
+            "T",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    ),
+
     mu_
     (
         IOobject
@@ -182,20 +231,235 @@ basicThermo::basicThermo(const fvMesh& mesh)
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-basicThermo::~basicThermo()
+Foam::basicThermo::~basicThermo()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-bool basicThermo::read()
+Foam::volScalarField& Foam::basicThermo::p()
+{
+    return p_;
+}
+
+
+const Foam::volScalarField& Foam::basicThermo::p() const
+{
+    return p_;
+}
+
+
+const Foam::volScalarField& Foam::basicThermo::psi() const
+{
+    return psi_;
+}
+
+
+Foam::volScalarField& Foam::basicThermo::h()
+{
+    notImplemented("basicThermo::h()");
+    return const_cast<volScalarField&>(volScalarField::null());
+}
+
+
+const Foam::volScalarField& Foam::basicThermo::h() const
+{
+    notImplemented("basicThermo::h() const");
+    return volScalarField::null();
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::basicThermo::h
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    notImplemented
+    (
+        "basicThermo::h"
+        "(const scalarField& T, const labelList& cells) const"
+    );
+    return tmp<scalarField>(NULL);
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::basicThermo::h
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    notImplemented
+    (
+        "basicThermo::h"
+        "(const scalarField& T, const label patchi) const"
+    );
+    return tmp<scalarField>(NULL);
+}
+
+
+Foam::volScalarField& Foam::basicThermo::hs()
+{
+    notImplemented("basicThermo::hs()");
+    return const_cast<volScalarField&>(volScalarField::null());
+}
+
+
+const Foam::volScalarField& Foam::basicThermo::hs() const
+{
+    notImplemented("basicThermo::hs() const");
+    return volScalarField::null();
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::basicThermo::hs
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    notImplemented
+    (
+        "basicThermo::hs"
+        "(const scalarField& T, const labelList& cells) const"
+    );
+    return tmp<scalarField>(NULL);
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::basicThermo::hs
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    notImplemented
+    (
+        "basicThermo::hs"
+        "(const scalarField& T, const label patchi) const"
+    );
+    return tmp<scalarField>(NULL);
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::basicThermo::hc() const
+{
+    notImplemented("basicThermo::hc()");
+    return volScalarField::null();
+}
+
+
+Foam::volScalarField& Foam::basicThermo::e()
+{
+    notImplemented("basicThermo::e()");
+    return const_cast<volScalarField&>(volScalarField::null());
+}
+
+
+const Foam::volScalarField& Foam::basicThermo::e() const
+{
+    notImplemented("basicThermo::e()");
+    return volScalarField::null();
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::basicThermo::e
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    notImplemented
+    (
+        "basicThermo::e"
+        "(const scalarField& T, const labelList& cells) const"
+    );
+    return tmp<scalarField>(NULL);
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::basicThermo::e
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    notImplemented
+    (
+        "basicThermo::e"
+        "(const scalarField& T, const label patchi) const"
+    );
+    return tmp<scalarField>(NULL);
+}
+
+
+const Foam::volScalarField& Foam::basicThermo::T() const
+{
+    return T_;
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::basicThermo::Cp
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    notImplemented
+    (
+        "basicThermo::Cp"
+        "(const scalarField& T, const label patchi) const"
+    );
+    return tmp<scalarField>(NULL);
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::basicThermo::Cp() const
+{
+    notImplemented("basicThermo::Cp() const");
+    return volScalarField::null();
+}
+
+
+Foam::tmp<Foam::scalarField> Foam::basicThermo::Cv
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    notImplemented
+    (
+        "basicThermo::Cv"
+        "(const scalarField& T, const label patchi) const"
+    );
+    return tmp<scalarField>(NULL);
+}
+
+
+Foam::tmp<Foam::volScalarField> Foam::basicThermo::Cv() const
+{
+    notImplemented("basicThermo::Cv() const");
+    return volScalarField::null();
+}
+
+
+const Foam::volScalarField& Foam::basicThermo::mu() const
+{
+    return mu_;
+}
+
+
+const Foam::volScalarField& Foam::basicThermo::alpha() const
+{
+    return alpha_;
+}
+
+
+bool Foam::basicThermo::read()
 {
     return regIOobject::read();
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermo.H b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
index 94bdb05d4..6cd428a41 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermo.H
+++ b/src/thermophysicalModels/basic/basicThermo/basicThermo.H
@@ -41,7 +41,6 @@ SourceFiles
 #include "typeInfo.H"
 #include "IOdictionary.H"
 #include "autoPtr.H"
-#include "runTimeSelectionTables.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,7 +48,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class basicThermo Declaration
+                        Class basicThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicThermo
@@ -61,18 +60,45 @@ protected:
 
     // Protected data
 
-        volScalarField p_;
-        volScalarField T_;
-        volScalarField psi_;
+        // Fields
 
-        volScalarField mu_;
-        volScalarField alpha_;
+            //- Pressure [Pa]
+            volScalarField p_;
+
+            //- Compressibility [s^2/m^2]
+            volScalarField psi_;
+
+            //- Temperature [K]
+            volScalarField T_;
+
+            //- Laminar dynamic viscosity [kg/m/s]
+            volScalarField mu_;
+
+            //- Laminar thermal diffusuvity [kg/m/s]
+            volScalarField alpha_;
 
 
     // Protected member functions
 
-        wordList hBoundaryTypes();
-        void hBoundaryCorrection(volScalarField& h);
+        // Enthalpy
+
+            //- Return the enthalpy field boundary types by interrogating the
+            //  temperature field boundary types
+            wordList hBoundaryTypes();
+
+            //- Correct the enthalpy field boundaries
+            void hBoundaryCorrection(volScalarField& h);
+
+
+        // Internal energy
+
+            //- Return the internal energy  field boundary types by
+            //  interrogating the temperature field boundary types
+            wordList eBoundaryTypes();
+
+            //- Correct the internal energy field boundaries
+            void eBoundaryCorrection(volScalarField& e);
+
 
         //- Construct as copy (not implemented)
         basicThermo(const basicThermo&);
@@ -84,32 +110,14 @@ public:
     TypeName("basicThermo");
 
 
-    // Declare run-time constructor selection table
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            basicThermo,
-            fvMesh,
-            (const fvMesh& mesh),
-            (mesh)
-        );
-
-
     // Constructors
 
         //- Construct from mesh
         basicThermo(const fvMesh&);
 
 
-    // Selectors
-
-        static autoPtr<basicThermo> New(const fvMesh&);
-
-
-    // Destructor
-
-        virtual ~basicThermo();
+    //- Destructor
+    virtual ~basicThermo();
 
 
     // Member functions
@@ -118,164 +126,125 @@ public:
         virtual void correct() = 0;
 
 
-        // Access to thermodynamic state variables.
+        // Access to thermodynamic state variables
 
             //- Pressure [Pa]
             //  Non-const access allowed for transport equations
-            volScalarField& p()
-            {
-                return p_;
-            }
+            virtual volScalarField& p();
 
             //- Pressure [Pa]
-            const volScalarField& p() const
-            {
-                return p_;
-            }
+            virtual const volScalarField& p() const;
 
-            //- Enthalpy [J/kg]
+            //- Density [kg/m^3]
+            virtual tmp<volScalarField> rho() const = 0;
+
+            //- Compressibility [s^2/m^2]
+            virtual const volScalarField& psi() const;
+
+            //- Total enthalpy [J/kg]
             //  Non-const access allowed for transport equations
-            virtual volScalarField& h()
-            {
-                notImplemented("basicThermo::h()");
-                return const_cast<volScalarField&>(volScalarField::null());
-            }
+            virtual volScalarField& h();
 
-            //- Enthalpy [J/kg]
-            virtual const volScalarField& h() const
-            {
-                notImplemented("basicThermo::h() const");
-                return volScalarField::null();
-            }
+            //- Total enthalpy [J/kg]
+            virtual const volScalarField& h() const;
 
-            //- Enthalpy for cell-set [J/kg]
+            //- Total enthalpy for cell-set [J/kg]
             virtual tmp<scalarField> h
             (
                 const scalarField& T,
                 const labelList& cells
-            ) const
-            {
-                notImplemented
-                (
-                    "basicThermo::h"
-                    "(const scalarField& T, const labelList& cells) const"
-                );
-                return tmp<scalarField>(NULL);
-            }
+            ) const;
 
-            //- Enthalpy for patch [J/kg]
+            //- Total enthalpy for patch [J/kg]
             virtual tmp<scalarField> h
             (
                 const scalarField& T,
                 const label patchi
-            ) const
-            {
-                notImplemented
-                (
-                    "basicThermo::h"
-                    "(const scalarField& T, const label patchi) const"
-                );
-                return tmp<scalarField>(NULL);
-            }
+            ) const;
+
+            //- Sensible enthalpy [J/kg]
+            //  Non-const access allowed for transport equations
+            virtual volScalarField& hs();
+
+            //- Sensible enthalpy [J/kg]
+            virtual const volScalarField& hs() const;
+
+            //- Sensible enthalpy for cell-set [J/kg]
+            virtual tmp<scalarField> hs
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
+            //- Sensible enthalpy for patch [J/kg]
+            virtual tmp<scalarField> hs
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Chemical enthalpy [J/kg]
+            virtual tmp<volScalarField> hc() const;
 
             //- Internal energy [J/kg]
             //  Non-const access allowed for transport equations
-            virtual volScalarField& e()
-            {
-                notImplemented("basicThermo::e()");
-                return const_cast<volScalarField&>(volScalarField::null());
-            }
+            virtual volScalarField& e();
 
             //- Internal energy [J/kg]
-            virtual const volScalarField& e() const
-            {
-                notImplemented("basicThermo::e()");
-                return volScalarField::null();
-            }
+            virtual const volScalarField& e() const;
+
+            //- Internal energy for cell-set [J/kg]
+            virtual tmp<scalarField> e
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
+            //- Internal energy for patch [J/kg]
+            virtual tmp<scalarField> e
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
 
 
         // Fields derived from thermodynamic state variables
 
             //- Temperature [K]
-            const volScalarField& T() const
-            {
-                return T_;
-            }
-
-            //- Density [kg/m^3]
-            virtual tmp<volScalarField> rho() const
-            {
-                return p_*psi();
-            }
-
-            //- Compressibility [s^2/m^2]
-            const volScalarField& psi() const
-            {
-                return psi_;
-            }
+            virtual const volScalarField& T() const;
 
             //- Heat capacity at constant pressure for patch [J/kg/K]
             virtual tmp<scalarField> Cp
             (
                 const scalarField& T,
                 const label patchi
-            ) const
-            {
-                notImplemented
-                (
-                    "basicThermo::Cp"
-                    "(const scalarField& T, const label patchi) const"
-                );
-                return tmp<scalarField>(NULL);
-            }
+            ) const;
 
             //- Heat capacity at constant pressure [J/kg/K]
-            virtual tmp<volScalarField> Cp() const
-            {
-                notImplemented("basicThermo::Cp() const");
-                return volScalarField::null();
-            }
+            virtual tmp<volScalarField> Cp() const;
 
-            //- Heat capacity at constant voluve for patch [J/kg/K]
+            //- Heat capacity at constant volume for patch [J/kg/K]
             virtual tmp<scalarField> Cv
             (
                 const scalarField& T,
                 const label patchi
-            ) const
-            {
-                notImplemented
-                (
-                    "basicThermo::Cv"
-                    "(const scalarField& T, const label patchi) const"
-                );
-                return tmp<scalarField>(NULL);
-            }
+            ) const;
 
             //- Heat capacity at constant volume [J/kg/K]
-            virtual tmp<volScalarField> Cv() const
-            {
-                notImplemented("basicThermo::Cv() const");
-                return volScalarField::null();
-            }
+            virtual tmp<volScalarField> Cv() const;
 
 
         // Access to transport state variables
 
-            //- Dynamic viscosity of mixture [kg/ms]
-            const volScalarField& mu() const
-            {
-                return mu_;
-            }
+            //- Dynamic viscosity of mixture [kg/m/s]
+            virtual const volScalarField& mu() const;
 
-            //- Thermal diffusivity for enthalpy of mixture [kg/ms]
-            const volScalarField& alpha() const
-            {
-                return alpha_;
-            }
+            //- Thermal diffusivity for enthalpy of mixture [kg/m/s]
+            virtual const volScalarField& alpha() const;
 
 
         //- Read thermophysicalProperties dictionary
-        virtual bool read() = 0;
+        virtual bool read();
 };
 
 
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
index 5b33f0de3..3fc4a2b47 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedEnthalpy/fixedEnthalpyFvPatchScalarField.C
@@ -30,14 +30,9 @@ License
 #include "volFields.H"
 #include "basicThermo.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
+Foam::fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -47,7 +42,7 @@ fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
 {}
 
 
-fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
+Foam::fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
 (
     const fixedEnthalpyFvPatchScalarField& ptf,
     const fvPatch& p,
@@ -59,7 +54,7 @@ fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
 {}
 
 
-fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
+Foam::fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -70,7 +65,7 @@ fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
 {}
 
 
-fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
+Foam::fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
 (
     const fixedEnthalpyFvPatchScalarField& tppsf
 )
@@ -79,7 +74,7 @@ fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
 {}
 
 
-fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
+Foam::fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
 (
     const fixedEnthalpyFvPatchScalarField& tppsf,
     const DimensionedField<scalar, volMesh>& iF
@@ -91,7 +86,7 @@ fixedEnthalpyFvPatchScalarField::fixedEnthalpyFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void fixedEnthalpyFvPatchScalarField::updateCoeffs()
+void Foam::fixedEnthalpyFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
@@ -102,13 +97,21 @@ void fixedEnthalpyFvPatchScalarField::updateCoeffs()
     (
         "thermophysicalProperties"
     );
-    
+
     const label patchi = patch().index();
 
-    fvPatchScalarField& Tw = 
+    fvPatchScalarField& Tw =
         const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
     Tw.evaluate();
-    operator==(thermo.h(Tw, patchi));
+
+    if (dimensionedInternalField().name() == "h")
+    {
+        operator==(thermo.h(Tw, patchi));
+    }
+    else
+    {
+        operator==(thermo.hs(Tw, patchi));
+    }
 
     fixedValueFvPatchScalarField::updateCoeffs();
 }
@@ -116,10 +119,14 @@ void fixedEnthalpyFvPatchScalarField::updateCoeffs()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, fixedEnthalpyFvPatchScalarField);
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        fixedEnthalpyFvPatchScalarField
+    );
+}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C
new file mode 100644
index 000000000..57bf5e6d0
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.C
@@ -0,0 +1,125 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "fixedInternalEnergyFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF)
+{}
+
+
+fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField
+(
+    const fixedInternalEnergyFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict)
+{}
+
+
+fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField
+(
+    const fixedInternalEnergyFvPatchScalarField& tppsf
+)
+:
+    fixedValueFvPatchScalarField(tppsf)
+{}
+
+
+fixedInternalEnergyFvPatchScalarField::fixedInternalEnergyFvPatchScalarField
+(
+    const fixedInternalEnergyFvPatchScalarField& tppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(tppsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void fixedInternalEnergyFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const basicThermo& thermo = db().lookupObject<basicThermo>
+    (
+        "thermophysicalProperties"
+    );
+    
+    const label patchi = patch().index();
+
+    fvPatchScalarField& Tw = 
+        const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
+    Tw.evaluate();
+    operator==(thermo.e(Tw, patchi));
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, fixedInternalEnergyFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H
new file mode 100644
index 000000000..50ccb3a62
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/fixedInternalEnergy/fixedInternalEnergyFvPatchScalarField.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::fixedInternalEnergyFvPatchScalarField
+
+Description
+    A fixed boundary condition for internal energy
+
+SourceFiles
+    fixedInternalEnergyFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef fixedInternalEnergyFvPatchScalarField_H
+#define fixedInternalEnergyFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                Class fixedInternalEnergyFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class fixedInternalEnergyFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("fixedInternalEnergy");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        fixedInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        fixedInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given fixedInternalEnergyFvPatchScalarField
+        // onto a new patch
+        fixedInternalEnergyFvPatchScalarField
+        (
+            const fixedInternalEnergyFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        fixedInternalEnergyFvPatchScalarField
+        (
+            const fixedInternalEnergyFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new fixedInternalEnergyFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        fixedInternalEnergyFvPatchScalarField
+        (
+            const fixedInternalEnergyFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new fixedInternalEnergyFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C
index f2ae76999..97bb4672e 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.C
@@ -30,14 +30,9 @@ License
 #include "volFields.H"
 #include "basicThermo.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
+Foam::gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -47,7 +42,7 @@ gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
 {}
 
 
-gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
+Foam::gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
 (
     const gradientEnthalpyFvPatchScalarField& ptf,
     const fvPatch& p,
@@ -59,7 +54,7 @@ gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
 {}
 
 
-gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
+Foam::gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -70,7 +65,7 @@ gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
 {}
 
 
-gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
+Foam::gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
 (
     const gradientEnthalpyFvPatchScalarField& tppsf
 )
@@ -79,7 +74,7 @@ gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
 {}
 
 
-gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
+Foam::gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
 (
     const gradientEnthalpyFvPatchScalarField& tppsf,
     const DimensionedField<scalar, volMesh>& iF
@@ -91,7 +86,7 @@ gradientEnthalpyFvPatchScalarField::gradientEnthalpyFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void gradientEnthalpyFvPatchScalarField::updateCoeffs()
+void Foam::gradientEnthalpyFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
@@ -102,37 +97,47 @@ void gradientEnthalpyFvPatchScalarField::updateCoeffs()
     (
         "thermophysicalProperties"
     );
-    
+
     const label patchi = patch().index();
 
-    fvPatchScalarField& Tw = 
+    fvPatchScalarField& Tw =
         const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
 
     Tw.evaluate();
 
-    gradient() = thermo.Cp(Tw, patchi)*Tw.snGrad()
-      + patch().deltaCoeffs()*
+    if (dimensionedInternalField().name() == "h")
+    {
+        gradient() = thermo.Cp(Tw, patchi)*Tw.snGrad()
+        + patch().deltaCoeffs()*
         (
             thermo.h(Tw, patchi)
           - thermo.h(Tw, patch().faceCells())
         );
+    }
+    else
+    {
+        gradient() = thermo.Cp(Tw, patchi)*Tw.snGrad()
+        + patch().deltaCoeffs()*
+        (
+            thermo.hs(Tw, patchi)
+          - thermo.hs(Tw, patch().faceCells())
+        );
+    }
 
     fixedGradientFvPatchScalarField::updateCoeffs();
 }
 
 
-void gradientEnthalpyFvPatchScalarField::write(Ostream& os) const
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
 {
-    fixedGradientFvPatchScalarField::write(os);
-    writeEntry("value", os);
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        gradientEnthalpyFvPatchScalarField
+    );
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField(fvPatchScalarField, gradientEnthalpyFvPatchScalarField);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.H
index 0faccae19..191d76746 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.H
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientEnthalpy/gradientEnthalpyFvPatchScalarField.H
@@ -126,10 +126,6 @@ public:
 
             //- Update the coefficients associated with the patch field
             virtual void updateCoeffs();
-
-
-        //- Write
-        virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C
new file mode 100644
index 000000000..ef3fe19fe
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.C
@@ -0,0 +1,132 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "gradientInternalEnergyFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedGradientFvPatchScalarField(p, iF)
+{}
+
+
+gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+(
+    const gradientInternalEnergyFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedGradientFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedGradientFvPatchScalarField(p, iF, dict)
+{}
+
+
+gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+(
+    const gradientInternalEnergyFvPatchScalarField& tppsf
+)
+:
+    fixedGradientFvPatchScalarField(tppsf)
+{}
+
+
+gradientInternalEnergyFvPatchScalarField::gradientInternalEnergyFvPatchScalarField
+(
+    const gradientInternalEnergyFvPatchScalarField& tppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedGradientFvPatchScalarField(tppsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void gradientInternalEnergyFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const basicThermo& thermo = db().lookupObject<basicThermo>
+    (
+        "thermophysicalProperties"
+    );
+    
+    const label patchi = patch().index();
+
+    fvPatchScalarField& Tw = 
+        const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi]);
+
+    Tw.evaluate();
+
+    gradient() = thermo.Cv(Tw, patchi)*Tw.snGrad()
+      + patch().deltaCoeffs()*
+        (
+            thermo.e(Tw, patchi)
+          - thermo.e(Tw, patch().faceCells())
+        );
+
+    fixedGradientFvPatchScalarField::updateCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, gradientInternalEnergyFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H
new file mode 100644
index 000000000..59b97eea5
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/gradientInternalEnergy/gradientInternalEnergyFvPatchScalarField.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::gradientInternalEnergyFvPatchScalarField
+
+Description
+    Gradient boundary condition for internal energy
+
+SourceFiles
+    gradientInternalEnergyFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef gradientInternalEnergyFvPatchScalarField_H
+#define gradientInternalEnergyFvPatchScalarField_H
+
+#include "fixedGradientFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class gradientInternalEnergyFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class gradientInternalEnergyFvPatchScalarField
+:
+    public fixedGradientFvPatchScalarField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("gradientInternalEnergy");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        gradientInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        gradientInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given gradientInternalEnergyFvPatchScalarField
+        // onto a new patch
+        gradientInternalEnergyFvPatchScalarField
+        (
+            const gradientInternalEnergyFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        gradientInternalEnergyFvPatchScalarField
+        (
+            const gradientInternalEnergyFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new gradientInternalEnergyFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        gradientInternalEnergyFvPatchScalarField
+        (
+            const gradientInternalEnergyFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new gradientInternalEnergyFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C
index 64404ac9a..a679413d5 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedEnthalpy/mixedEnthalpyFvPatchScalarField.C
@@ -30,14 +30,9 @@ License
 #include "volFields.H"
 #include "basicThermo.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
+Foam::mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -51,7 +46,7 @@ mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
 }
 
 
-mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
+Foam::mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
 (
     const mixedEnthalpyFvPatchScalarField& ptf,
     const fvPatch& p,
@@ -63,7 +58,7 @@ mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
 {}
 
 
-mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
+Foam::mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -74,7 +69,7 @@ mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
 {}
 
 
-mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
+Foam::mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
 (
     const mixedEnthalpyFvPatchScalarField& tppsf
 )
@@ -83,7 +78,7 @@ mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
 {}
 
 
-mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
+Foam::mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
 (
     const mixedEnthalpyFvPatchScalarField& tppsf,
     const DimensionedField<scalar, volMesh>& iF
@@ -95,7 +90,7 @@ mixedEnthalpyFvPatchScalarField::mixedEnthalpyFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void mixedEnthalpyFvPatchScalarField::updateCoeffs()
+void Foam::mixedEnthalpyFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
@@ -106,7 +101,7 @@ void mixedEnthalpyFvPatchScalarField::updateCoeffs()
     (
         "thermophysicalProperties"
     );
-    
+
     const label patchi = patch().index();
 
     mixedFvPatchScalarField& Tw = refCast<mixedFvPatchScalarField>
@@ -117,13 +112,27 @@ void mixedEnthalpyFvPatchScalarField::updateCoeffs()
     Tw.evaluate();
 
     valueFraction() = Tw.valueFraction();
-    refValue() = thermo.h(Tw.refValue(), patchi);
-    refGrad() = thermo.Cp(Tw, patchi)*Tw.refGrad()
-      + patch().deltaCoeffs()*
-        (
+
+    if (dimensionedInternalField().name() == "h")
+    {
+        refValue() = thermo.h(Tw.refValue(), patchi);
+        refGrad() = thermo.Cp(Tw, patchi)*Tw.refGrad()
+        + patch().deltaCoeffs()*
+         (
             thermo.h(Tw, patchi)
           - thermo.h(Tw, patch().faceCells())
-        );
+         );
+    }
+    else
+    {
+        refValue() = thermo.hs(Tw.refValue(), patchi);
+        refGrad() = thermo.Cp(Tw, patchi)*Tw.refGrad()
+        + patch().deltaCoeffs()*
+         (
+            thermo.hs(Tw, patchi)
+          - thermo.hs(Tw, patch().faceCells())
+         );
+    }
 
     mixedFvPatchScalarField::updateCoeffs();
 }
@@ -131,10 +140,14 @@ void mixedEnthalpyFvPatchScalarField::updateCoeffs()
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, mixedEnthalpyFvPatchScalarField);
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        mixedEnthalpyFvPatchScalarField
+    );
+}
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C
new file mode 100644
index 000000000..a2b061f1c
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.C
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "mixedInternalEnergyFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "basicThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(p, iF)
+{
+    valueFraction() = 0.0;
+    refValue() = 0.0;
+    refGrad() = 0.0;
+}
+
+
+mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField
+(
+    const mixedInternalEnergyFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchScalarField(p, iF, dict)
+{}
+
+
+mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField
+(
+    const mixedInternalEnergyFvPatchScalarField& tppsf
+)
+:
+    mixedFvPatchScalarField(tppsf)
+{}
+
+
+mixedInternalEnergyFvPatchScalarField::mixedInternalEnergyFvPatchScalarField
+(
+    const mixedInternalEnergyFvPatchScalarField& tppsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(tppsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void mixedInternalEnergyFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const basicThermo& thermo = db().lookupObject<basicThermo>
+    (
+        "thermophysicalProperties"
+    );
+    
+    const label patchi = patch().index();
+
+    mixedFvPatchScalarField& Tw = refCast<mixedFvPatchScalarField>
+    (
+        const_cast<fvPatchScalarField&>(thermo.T().boundaryField()[patchi])
+    );
+
+    Tw.evaluate();
+
+    valueFraction() = Tw.valueFraction();
+    refValue() = thermo.e(Tw.refValue(), patchi);
+    refGrad() = thermo.Cv(Tw, patchi)*Tw.refGrad()
+      + patch().deltaCoeffs()*
+        (
+            thermo.e(Tw, patchi)
+          - thermo.e(Tw, patch().faceCells())
+        );
+
+    mixedFvPatchScalarField::updateCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, mixedInternalEnergyFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H
new file mode 100644
index 000000000..00882ca60
--- /dev/null
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/mixedInternalEnergy/mixedInternalEnergyFvPatchScalarField.H
@@ -0,0 +1,140 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::mixedInternalEnergyFvPatchScalarField
+
+Description
+    Mixed boundary conditions for internal energy
+
+SourceFiles
+    mixedInternalEnergyFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef mixedInternalEnergyFvPatchScalarField_H
+#define mixedInternalEnergyFvPatchScalarField_H
+
+#include "mixedFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+               Class mixedInternalEnergyFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class mixedInternalEnergyFvPatchScalarField
+:
+    public mixedFvPatchScalarField
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("mixedInternalEnergy");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        mixedInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        mixedInternalEnergyFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given mixedInternalEnergyFvPatchScalarField
+        // onto a new patch
+        mixedInternalEnergyFvPatchScalarField
+        (
+            const mixedInternalEnergyFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        mixedInternalEnergyFvPatchScalarField
+        (
+            const mixedInternalEnergyFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mixedInternalEnergyFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        mixedInternalEnergyFvPatchScalarField
+        (
+            const mixedInternalEnergyFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mixedInternalEnergyFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C b/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
index 5a9a9fc98..86cbbf0fc 100644
--- a/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
+++ b/src/thermophysicalModels/basic/derivedFvPatchFields/wallHeatTransfer/wallHeatTransferFvPatchScalarField.C
@@ -30,14 +30,9 @@ License
 #include "volFields.H"
 #include "basicThermo.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -53,7 +48,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 }
 
 
-wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 (
     const wallHeatTransferFvPatchScalarField& ptf,
     const fvPatch& p,
@@ -67,7 +62,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 {}
 
 
-wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -96,7 +91,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 }
 
 
-wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 (
     const wallHeatTransferFvPatchScalarField& tppsf
 )
@@ -107,7 +102,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 {}
 
 
-wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
+Foam::wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 (
     const wallHeatTransferFvPatchScalarField& tppsf,
     const DimensionedField<scalar, volMesh>& iF
@@ -121,7 +116,7 @@ wallHeatTransferFvPatchScalarField::wallHeatTransferFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void wallHeatTransferFvPatchScalarField::autoMap
+void Foam::wallHeatTransferFvPatchScalarField::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -132,7 +127,7 @@ void wallHeatTransferFvPatchScalarField::autoMap
 }
 
 
-void wallHeatTransferFvPatchScalarField::rmap
+void Foam::wallHeatTransferFvPatchScalarField::rmap
 (
     const fvPatchScalarField& ptf,
     const labelList& addr
@@ -148,7 +143,7 @@ void wallHeatTransferFvPatchScalarField::rmap
 }
 
 
-void wallHeatTransferFvPatchScalarField::updateCoeffs()
+void Foam::wallHeatTransferFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
@@ -159,13 +154,13 @@ void wallHeatTransferFvPatchScalarField::updateCoeffs()
     (
         "thermophysicalProperties"
     );
-    
+
     const label patchi = patch().index();
 
     const scalarField& Tw = thermo.T().boundaryField()[patchi];
     scalarField Cpw = thermo.Cp(Tw, patchi);
 
-    valueFraction() = 
+    valueFraction() =
         1.0/
         (
             1.0
@@ -177,7 +172,7 @@ void wallHeatTransferFvPatchScalarField::updateCoeffs()
 }
 
 
-void wallHeatTransferFvPatchScalarField::write(Ostream& os) const
+void Foam::wallHeatTransferFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchScalarField::write(os);
     Tinf_.writeEntry("Tinf", os);
@@ -188,10 +183,9 @@ void wallHeatTransferFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, wallHeatTransferFvPatchScalarField);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeField(fvPatchScalarField, wallHeatTransferFvPatchScalarField);
+}
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.C b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.C
index 2da0dbfcf..f9974cd1c 100644
--- a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.C
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.C
@@ -22,8 +22,6 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.H b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.H
index ef7fca38d..3733e5a8f 100644
--- a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.H
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixture.H
@@ -47,7 +47,7 @@ class fvMesh;
 class dictionary;
 
 /*---------------------------------------------------------------------------*\
-                           Class basicMixture Declaration
+                        Class basicMixture Declaration
 \*---------------------------------------------------------------------------*/
 
 class basicMixture
diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H b/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H
new file mode 100644
index 000000000..c497aa9c9
--- /dev/null
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/makeBasicMixture.H
@@ -0,0 +1,52 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+InClass
+    Foam::basicMixture
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeBasicMixture_H
+#define makeBasicMixture_H
+
+#include "basicMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeBasicMixture(Mixture,Transport,Thermo,EqnOfState)                 \
+                                                                              \
+typedef Mixture<Transport<specieThermo<Thermo<EqnOfState> > > >               \
+    Mixture##Transport##Thermo##EqnOfState;                                   \
+                                                                              \
+defineTemplateTypeNameAndDebugWithName                                        \
+    (Mixture##Transport##Thermo##EqnOfState,                                  \
+    #Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>", 0)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/applications/test/dimensionedType/dimensionedTypeTest.C b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.C
similarity index 76%
rename from applications/test/dimensionedType/dimensionedTypeTest.C
rename to src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.C
index 64118e006..a9a0cca13 100644
--- a/applications/test/dimensionedType/dimensionedTypeTest.C
+++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.C
@@ -22,30 +22,31 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "dimensionedTensor.H"
-using namespace Foam;
+#include "basicPsiThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main(int argc, char *argv[])
+namespace Foam
 {
-    dimensionedTensor dt("dt", dimless, tensor(0, 1, 2, 3, 4, 5, 6, 7, 8));
-
-    Info<< dt.component(tensor::XX) << endl;
-
-    dimensionedScalar ds("ds", dimless, 1.0);
-
-    Info<< ds*dt << " " << dt*ds << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
+    defineTypeNameAndDebug(basicPsiThermo, 0);
+    defineRunTimeSelectionTable(basicPsiThermo, fvMesh);
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::basicPsiThermo::basicPsiThermo(const fvMesh& mesh)
+:
+    basicThermo(mesh)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::basicPsiThermo::~basicPsiThermo()
+{}
+
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H
new file mode 100644
index 000000000..e085cfcf8
--- /dev/null
+++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/basicPsiThermo.H
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::basicPsiThermo
+
+Description
+    Basic thermodynamic properties based on compressibility
+
+SourceFiles
+    basicPsiThermo.C
+    newBasicPsiThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef basicPsiThermo_H
+#define basicPsiThermo_H
+
+#include "basicThermo.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class basicPsiThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+class basicPsiThermo
+:
+    public basicThermo
+{
+
+protected:
+
+    // Protected member functions
+
+        //- Construct as copy (not implemented)
+        basicPsiThermo(const basicPsiThermo&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("basicPsiThermo");
+
+
+    //- Declare run-time constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        basicPsiThermo,
+        fvMesh,
+        (const fvMesh& mesh),
+        (mesh)
+    );
+
+    // Constructors
+
+        //- Construct from mesh
+        basicPsiThermo(const fvMesh&);
+
+
+    //- Selector
+    static autoPtr<basicPsiThermo> New(const fvMesh&);
+
+    //- Destructor
+    virtual ~basicPsiThermo();
+
+
+    // Member functions
+
+        // Fields derived from thermodynamic state variables
+
+            //- Density [kg/m^3] - uses current value of pressure
+            virtual tmp<volScalarField> rho() const
+            {
+                return p_*psi();
+            }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/basicThermo/makeBasicThermo.H b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/makeBasicPsiThermo.H
similarity index 73%
rename from src/thermophysicalModels/basic/basicThermo/makeBasicThermo.H
rename to src/thermophysicalModels/basic/psiThermo/basicPsiThermo/makeBasicPsiThermo.H
index c513198fe..f75af4ab2 100644
--- a/src/thermophysicalModels/basic/basicThermo/makeBasicThermo.H
+++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/makeBasicPsiThermo.H
@@ -23,39 +23,37 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 InClass
-    Foam::basicThermo
+    Foam::basicPsiThermo
 
 Description
+    Macros for creating 'basic' compresibility-based thermo packages
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef makeBasicThermo_H
-#define makeBasicThermo_H
+#ifndef makeBasicPsiThermo_H
+#define makeBasicPsiThermo_H
 
-#include "basicThermo.H"
+#include "basicPsiThermo.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeBasicThermo(Cthermo,Mixture,Transport,Thermo,EqnOfState)          \
-                                                                              \
-typedef Mixture<Transport<specieThermo<Thermo<EqnOfState> > > >               \
-    Mixture##Transport##Thermo##EqnOfState;                                   \
-                                                                              \
-defineTemplateTypeNameAndDebugWithName                                        \
-    (Mixture##Transport##Thermo##EqnOfState,                                  \
-    #Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>", 0)      \
+#define makeBasicPsiThermo(Cthermo,Mixture,Transport,Thermo,EqnOfState)       \
                                                                               \
 typedef Cthermo<Mixture<Transport<specieThermo<Thermo<EqnOfState> > > > >     \
     Cthermo##Mixture##Transport##Thermo##EqnOfState;                          \
                                                                               \
 defineTemplateTypeNameAndDebugWithName                                        \
-    (Cthermo##Mixture##Transport##Thermo##EqnOfState,                         \
+(                                                                             \
+    Cthermo##Mixture##Transport##Thermo##EqnOfState,                          \
     #Cthermo                                                                  \
-    "<"#Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>>", 0)  \
+        "<"#Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>>", \
+    0                                                                         \
+);                                                                            \
                                                                               \
 addToRunTimeSelectionTable                                                    \
 (                                                                             \
-    basicThermo,                                                              \
+    basicPsiThermo,                                                           \
     Cthermo##Mixture##Transport##Thermo##EqnOfState,                          \
     fvMesh                                                                    \
 )
diff --git a/src/thermophysicalModels/combustion/hCombustionThermo/newhCombustionThermo.C b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C
similarity index 68%
rename from src/thermophysicalModels/combustion/hCombustionThermo/newhCombustionThermo.C
rename to src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C
index ec1d2ad60..4f42a20ba 100644
--- a/src/thermophysicalModels/combustion/hCombustionThermo/newhCombustionThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/basicPsiThermo/newBasicPsiThermo.C
@@ -24,19 +24,16 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "hCombustionThermo.H"
-#include "fvMesh.H"
+#include "basicPsiThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+Foam::autoPtr<Foam::basicPsiThermo> Foam::basicPsiThermo::New
+(
+    const fvMesh& mesh
+)
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-autoPtr<hCombustionThermo> hCombustionThermo::New(const fvMesh& mesh)
-{
-    word hCombustionThermoTypeName;
+    word thermoTypeName;
 
     // Enclose the creation of the thermophysicalProperties to ensure it is
     // deleted before the turbulenceModel is created otherwise the dictionary
@@ -54,31 +51,25 @@ autoPtr<hCombustionThermo> hCombustionThermo::New(const fvMesh& mesh)
             )
         );
 
-        thermoDict.lookup("thermoType") >> hCombustionThermoTypeName;
+        thermoDict.lookup("thermoType") >> thermoTypeName;
     }
 
-    Info<< "Selecting thermodynamics package "
-        << hCombustionThermoTypeName << endl;
+    Info<< "Selecting thermodynamics package " << thermoTypeName << endl;
 
     fvMeshConstructorTable::iterator cstrIter =
-        fvMeshConstructorTablePtr_->find(hCombustionThermoTypeName);
+        fvMeshConstructorTablePtr_->find(thermoTypeName);
 
     if (cstrIter == fvMeshConstructorTablePtr_->end())
     {
-        FatalErrorIn("hCombustionThermo::New(const fvMesh&)")
-            << "Unknown hCombustionThermo type "
-            << hCombustionThermoTypeName << endl << endl
-            << "Valid hCombustionThermo types are :" << endl
-            << fvMeshConstructorTablePtr_->toc()
+        FatalErrorIn("basicPsiThermo::New(const fvMesh&)")
+            << "Unknown basicPsiThermo type " << thermoTypeName << nl << nl
+            << "Valid basicPsiThermo types are:" << nl
+            << fvMeshConstructorTablePtr_->toc() << nl
             << exit(FatalError);
     }
 
-    return autoPtr<hCombustionThermo>(cstrIter()(mesh));
+    return autoPtr<basicPsiThermo>(cstrIter()(mesh));
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
new file mode 100644
index 000000000..91d1d0a38
--- /dev/null
+++ b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.C
@@ -0,0 +1,348 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "ePsiThermo.H"
+#include "fvMesh.H"
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::ePsiThermo<MixtureType>::calculate()
+{
+    const scalarField& eCells = e_.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_.TE(eCells[celli], TCells[celli]);
+        psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
+
+        muCells[celli] = mixture_.mu(TCells[celli]);
+        alphaCells[celli] = mixture_.alpha(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& pe = e_.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);
+
+                pe[facei] = mixture_.E(pT[facei]);
+
+                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
+                pmu[facei] = mixture_.mu(pT[facei]);
+                palpha[facei] = mixture_.alpha(pT[facei]);
+            }
+        }
+        else
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture_ =
+                    this->patchFaceMixture(patchi, facei);
+
+                pT[facei] = mixture_.TE(pe[facei], pT[facei]);
+
+                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
+                pmu[facei] = mixture_.mu(pT[facei]);
+                palpha[facei] = mixture_.alpha(pT[facei]);
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::ePsiThermo<MixtureType>::ePsiThermo(const fvMesh& mesh)
+:
+    basicPsiThermo(mesh),
+    MixtureType(*this, mesh),
+
+    e_
+    (
+        IOobject
+        (
+            "e",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimensionSet(0, 2, -2, 0, 0),
+        this->eBoundaryTypes()
+    )
+{
+    scalarField& eCells = e_.internalField();
+    const scalarField& TCells = this->T_.internalField();
+
+    forAll(eCells, celli)
+    {
+        eCells[celli] = this->cellMixture(celli).E(TCells[celli]);
+    }
+
+    forAll(e_.boundaryField(), patchi)
+    {
+        e_.boundaryField()[patchi] ==
+            e(this->T_.boundaryField()[patchi], patchi);
+    }
+
+    this->eBoundaryCorrection(e_);
+
+    calculate();
+
+    // Switch on saving old time
+    this->psi_.oldTime();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::ePsiThermo<MixtureType>::~ePsiThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::ePsiThermo<MixtureType>::correct()
+{
+    if (debug)
+    {
+        Info<< "entering ePsiThermo<MixtureType>::correct()" << endl;
+    }
+
+    // force the saving of the old-time values
+    this->psi_.oldTime();
+
+    calculate();
+
+    if (debug)
+    {
+        Info<< "exiting ePsiThermo<MixtureType>::correct()" << endl;
+    }
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::ePsiThermo<MixtureType>::e
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    tmp<scalarField> te(new scalarField(T.size()));
+    scalarField& h = te();
+
+    forAll(T, celli)
+    {
+        h[celli] = this->cellMixture(cells[celli]).E(T[celli]);
+    }
+
+    return te;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::ePsiThermo<MixtureType>::e
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> te(new scalarField(T.size()));
+    scalarField& h = te();
+
+    forAll(T, facei)
+    {
+        h[facei] = this->patchFaceMixture(patchi, facei).E(T[facei]);
+    }
+
+    return te;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::ePsiThermo<MixtureType>::Cp
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCp(new scalarField(T.size()));
+    scalarField& cp = tCp();
+
+    forAll(T, facei)
+    {
+        cp[facei] = this->patchFaceMixture(patchi, facei).Cp(T[facei]);
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField> Foam::ePsiThermo<MixtureType>::Cp() const
+{
+    const fvMesh& mesh = this->T_.mesh();
+
+    tmp<volScalarField> tCp
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cp",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionSet(0, 2, -2, -1, 0)
+        )
+    );
+
+    volScalarField& cp = tCp();
+
+    forAll(this->T_, celli)
+    {
+        cp[celli] = this->cellMixture(celli).Cp(this->T_[celli]);
+    }
+
+    forAll(this->T_.boundaryField(), patchi)
+    {
+        const fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
+        fvPatchScalarField& pCp = cp.boundaryField()[patchi];
+
+        forAll(pT, facei)
+        {
+            pCp[facei] = this->patchFaceMixture(patchi, facei).Cp(pT[facei]);
+        }
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::ePsiThermo<MixtureType>::Cv
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCv(new scalarField(T.size()));
+    scalarField& cv = tCv();
+
+    forAll(T, facei)
+    {
+        cv[facei] = this->patchFaceMixture(patchi, facei).Cv(T[facei]);
+    }
+
+    return tCv;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField> Foam::ePsiThermo<MixtureType>::Cv() const
+{
+    const fvMesh& mesh = this->T_.mesh();
+
+    tmp<volScalarField> tCv
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cv",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionSet(0, 2, -2, -1, 0)
+        )
+    );
+
+    volScalarField& cv = tCv();
+
+    forAll(this->T_, celli)
+    {
+        cv[celli] = this->cellMixture(celli).Cv(this->T_[celli]);
+    }
+
+    forAll(this->T_.boundaryField(), patchi)
+    {
+        cv.boundaryField()[patchi] =
+            Cv(this->T_.boundaryField()[patchi], patchi);
+    }
+
+    return tCv;
+}
+
+
+template<class MixtureType>
+bool Foam::ePsiThermo<MixtureType>::read()
+{
+    if (basicPsiThermo::read())
+    {
+        MixtureType::read(*this);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.H b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.H
new file mode 100644
index 000000000..f457af89d
--- /dev/null
+++ b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermo.H
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::ePsiThermo
+
+Description
+    Internal energy for a mixture based on compressibility
+
+SourceFiles
+    ePsiThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef ePsiThermo_H
+#define ePsiThermo_H
+
+#include "basicPsiThermo.H"
+#include "basicMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class ePsiThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MixtureType>
+class ePsiThermo
+:
+    public basicPsiThermo,
+    public MixtureType
+{
+    // Private data
+
+        //- Internal energy field
+        volScalarField e_;
+
+
+    // Private member functions
+
+        //- Calculate the thermo variables
+        void calculate();
+
+        //- Construct as copy (not implemented)
+        ePsiThermo(const ePsiThermo<MixtureType>&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("ePsiThermo");
+
+
+    // Constructors
+
+        //- Construct from mese
+        ePsiThermo(const fvMesh&);
+
+
+    //- Destructor
+    virtual ~ePsiThermo();
+
+
+    // Member functions
+
+        //- Return the compostion of the mixture
+        virtual basicMixture& composition()
+        {
+            return *this;
+        }
+
+        //- Return the compostion of the mixture
+        virtual const basicMixture& composition() const
+        {
+            return *this;
+        }
+
+        //- Update properties
+        virtual void correct();
+
+
+        // Access to thermodynamic state variables
+
+            //- Internal energy [J/kg]
+            //  Non-const access allowed for transport equations
+            virtual volScalarField& e()
+            {
+                return e_;
+            }
+
+            //- Internal energy [J/kg]
+            virtual const volScalarField& e() const
+            {
+                return e_;
+            }
+
+
+        // Fields derived from thermodynamic state variables
+
+            //- Internal energy for cell-set [J/kg]
+            virtual tmp<scalarField> e
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
+            //- Internal energy for patch [J/kg]
+            virtual tmp<scalarField> e
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure for patch [J/kg/K]
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure [J/kg/K]
+            virtual tmp<volScalarField> Cp() const;
+
+            //- Heat capacity at constant volume for patch [J/kg/K]
+            virtual tmp<scalarField> Cv
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant volume [J/kg/K]
+            virtual tmp<volScalarField> Cv() const;
+
+
+        //- Read thermophysicalProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+#ifdef NoRepository
+#   include "ePsiThermo.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermos.C b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermos.C
new file mode 100644
index 000000000..76d02de50
--- /dev/null
+++ b/src/thermophysicalModels/basic/psiThermo/ePsiThermo/ePsiThermos.C
@@ -0,0 +1,99 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "makeBasicPsiThermo.H"
+
+#include "perfectGas.H"
+
+#include "eConstThermo.H"
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "specieThermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "ePsiThermo.H"
+#include "pureMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
+
+makeBasicPsiThermo
+(
+    ePsiThermo,
+    pureMixture,
+    constTransport,
+    eConstThermo,
+    perfectGas
+);
+
+makeBasicPsiThermo
+(
+    ePsiThermo,
+    pureMixture,
+    sutherlandTransport,
+    eConstThermo,
+    perfectGas
+);
+
+makeBasicPsiThermo
+(
+    ePsiThermo,
+    pureMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicPsiThermo
+(
+    ePsiThermo,
+    pureMixture,
+    sutherlandTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicPsiThermo
+(
+    ePsiThermo,
+    pureMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/hThermo/hThermo.C b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
similarity index 71%
rename from src/thermophysicalModels/basic/hThermo/hThermo.C
rename to src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
index fb9c2078f..06ae12059 100644
--- a/src/thermophysicalModels/basic/hThermo/hThermo.C
+++ b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.C
@@ -24,72 +24,20 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "hThermo.H"
-#include "fvMesh.H"
-#include "fixedValueFvPatchFields.H"
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-template<class MixtureType>
-Foam::hThermo<MixtureType>::hThermo(const fvMesh& mesh)
-:
-    basicThermo(mesh),
-    MixtureType(*this, mesh),
-
-    h_
-    (
-        IOobject
-        (
-            "h",
-            mesh.time().timeName(),
-            mesh,
-            IOobject::NO_READ,
-            IOobject::NO_WRITE
-        ),
-        mesh,
-        dimensionSet(0, 2, -2, 0, 0),
-        hBoundaryTypes()
-    )
-{
-    scalarField& hCells = h_.internalField();
-    const scalarField& TCells = T_.internalField();
-
-    forAll(hCells, celli)
-    {
-        hCells[celli] = this->cellMixture(celli).H(TCells[celli]);
-    }
-
-    forAll(h_.boundaryField(), patchi)
-    {
-        h_.boundaryField()[patchi] == h(T_.boundaryField()[patchi], patchi);
-    }
-
-    hBoundaryCorrection(h_);
-
-    calculate();
-    psi_.oldTime();   // Switch on saving old time
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class MixtureType>
-Foam::hThermo<MixtureType>::~hThermo()
-{}
-
+#include "hPsiThermo.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class MixtureType>
-void Foam::hThermo<MixtureType>::calculate()
+void Foam::hPsiThermo<MixtureType>::calculate()
 {
     const scalarField& hCells = h_.internalField();
-    const scalarField& pCells = p_.internalField();
+    const scalarField& pCells = this->p_.internalField();
 
-    scalarField& TCells = T_.internalField();
-    scalarField& psiCells = psi_.internalField();
-    scalarField& muCells = mu_.internalField();
-    scalarField& alphaCells = alpha_.internalField();
+    scalarField& TCells = this->T_.internalField();
+    scalarField& psiCells = this->psi_.internalField();
+    scalarField& muCells = this->mu_.internalField();
+    scalarField& alphaCells = this->alpha_.internalField();
 
     forAll(TCells, celli)
     {
@@ -105,14 +53,14 @@ void Foam::hThermo<MixtureType>::calculate()
 
     forAll(T_.boundaryField(), patchi)
     {
-        fvPatchScalarField& pp = p_.boundaryField()[patchi];
-        fvPatchScalarField& pT = T_.boundaryField()[patchi];
-        fvPatchScalarField& ppsi = psi_.boundaryField()[patchi];
+        fvPatchScalarField& pp = this->p_.boundaryField()[patchi];
+        fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
+        fvPatchScalarField& ppsi = this->psi_.boundaryField()[patchi];
 
         fvPatchScalarField& ph = h_.boundaryField()[patchi];
 
-        fvPatchScalarField& pmu = mu_.boundaryField()[patchi];
-        fvPatchScalarField& palpha = alpha_.boundaryField()[patchi];
+        fvPatchScalarField& pmu = this->mu_.boundaryField()[patchi];
+        fvPatchScalarField& palpha = this->alpha_.boundaryField()[patchi];
 
         if (pT.fixesValue())
         {
@@ -146,30 +94,83 @@ void Foam::hThermo<MixtureType>::calculate()
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hPsiThermo<MixtureType>::hPsiThermo(const fvMesh& mesh)
+:
+    basicPsiThermo(mesh),
+    MixtureType(*this, mesh),
+
+    h_
+    (
+        IOobject
+        (
+            "h",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimensionSet(0, 2, -2, 0, 0),
+        this->hBoundaryTypes()
+    )
+{
+    scalarField& hCells = h_.internalField();
+    const scalarField& TCells = this->T_.internalField();
+
+    forAll(hCells, celli)
+    {
+        hCells[celli] = this->cellMixture(celli).H(TCells[celli]);
+    }
+
+    forAll(h_.boundaryField(), patchi)
+    {
+        h_.boundaryField()[patchi] ==
+            h(this->T_.boundaryField()[patchi], patchi);
+    }
+
+    hBoundaryCorrection(h_);
+
+    calculate();
+
+    // Switch on saving old time
+    this->psi_.oldTime();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hPsiThermo<MixtureType>::~hPsiThermo()
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class MixtureType>
-void Foam::hThermo<MixtureType>::correct()
+void Foam::hPsiThermo<MixtureType>::correct()
 {
     if (debug)
     {
-        Info<< "entering hThermo<MixtureType>::correct()" << endl;
+        Info<< "entering hPsiThermo<MixtureType>::correct()" << endl;
     }
 
     // force the saving of the old-time values
-    psi_.oldTime();
+    this->psi_.oldTime();
 
     calculate();
 
     if (debug)
     {
-        Info<< "exiting hThermo<MixtureType>::correct()" << endl;
+        Info<< "exiting hPsiThermo<MixtureType>::correct()" << endl;
     }
 }
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::h
+Foam::tmp<Foam::scalarField> Foam::hPsiThermo<MixtureType>::h
 (
     const scalarField& T,
     const labelList& cells
@@ -188,7 +189,7 @@ Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::h
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::h
+Foam::tmp<Foam::scalarField> Foam::hPsiThermo<MixtureType>::h
 (
     const scalarField& T,
     const label patchi
@@ -207,7 +208,7 @@ Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::h
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::Cp
+Foam::tmp<Foam::scalarField> Foam::hPsiThermo<MixtureType>::Cp
 (
     const scalarField& T,
     const label patchi
@@ -226,9 +227,9 @@ Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::Cp
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cp() const
+Foam::tmp<Foam::volScalarField> Foam::hPsiThermo<MixtureType>::Cp() const
 {
-    const fvMesh& mesh = T_.mesh();
+    const fvMesh& mesh = this->T_.mesh();
 
     tmp<volScalarField> tCp
     (
@@ -249,14 +250,20 @@ Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cp() const
 
     volScalarField& cp = tCp();
 
-    forAll(T_, celli)
+    forAll(this->T_, celli)
     {
-        cp[celli] = this->cellMixture(celli).Cp(T_[celli]);
+        cp[celli] = this->cellMixture(celli).Cp(this->T_[celli]);
     }
 
-    forAll(T_.boundaryField(), patchi)
+    forAll(this->T_.boundaryField(), patchi)
     {
-        cp.boundaryField()[patchi] = Cp(T_.boundaryField()[patchi], patchi);
+        const fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
+        fvPatchScalarField& pCp = cp.boundaryField()[patchi];
+
+        forAll(pT, facei)
+        {
+            pCp[facei] = this->patchFaceMixture(patchi, facei).Cp(pT[facei]);
+        }
     }
 
     return tCp;
@@ -264,7 +271,7 @@ Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cp() const
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::Cv
+Foam::tmp<Foam::scalarField> Foam::hPsiThermo<MixtureType>::Cv
 (
     const scalarField& T,
     const label patchi
@@ -283,9 +290,9 @@ Foam::tmp<Foam::scalarField> Foam::hThermo<MixtureType>::Cv
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cv() const
+Foam::tmp<Foam::volScalarField> Foam::hPsiThermo<MixtureType>::Cv() const
 {
-    const fvMesh& mesh = T_.mesh();
+    const fvMesh& mesh = this->T_.mesh();
 
     tmp<volScalarField> tCv
     (
@@ -300,27 +307,21 @@ Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cv() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0),
-            T_.boundaryField().types()
+            dimensionSet(0, 2, -2, -1, 0)
         )
     );
 
     volScalarField& cv = tCv();
 
-    forAll(T_, celli)
+    forAll(this->T_, celli)
     {
-        cv[celli] = this->cellMixture(celli).Cv(T_[celli]);
+        cv[celli] = this->cellMixture(celli).Cv(this->T_[celli]);
     }
 
-    forAll(T_.boundaryField(), patchi)
+    forAll(this->T_.boundaryField(), patchi)
     {
-        const fvPatchScalarField& pT = T_.boundaryField()[patchi];
-        fvPatchScalarField& pCv = cv.boundaryField()[patchi];
-
-        forAll(pT, facei)
-        {
-            pCv[facei] = this->patchFaceMixture(patchi, facei).Cv(pT[facei]);
-        }
+        cv.boundaryField()[patchi] =
+            Cv(this->T_.boundaryField()[patchi], patchi);
     }
 
     return tCv;
@@ -328,9 +329,9 @@ Foam::tmp<Foam::volScalarField> Foam::hThermo<MixtureType>::Cv() const
 
 
 template<class MixtureType>
-bool Foam::hThermo<MixtureType>::read()
+bool Foam::hPsiThermo<MixtureType>::read()
 {
-    if (basicThermo::read())
+    if (basicPsiThermo::read())
     {
         MixtureType::read(*this);
         return true;
diff --git a/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.H b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.H
new file mode 100644
index 000000000..826e50a9b
--- /dev/null
+++ b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermo.H
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::hPsiThermo
+
+Description
+    Enthalpy for a mixture based on compressibility
+
+SourceFiles
+    hPsiThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hPsiThermo_H
+#define hPsiThermo_H
+
+#include "basicPsiThermo.H"
+#include "basicMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class hPsiThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MixtureType>
+class hPsiThermo
+:
+    public basicPsiThermo,
+    public MixtureType
+{
+    // Private data
+
+        //- Enthalpy field
+        volScalarField h_;
+
+
+    // Private member functions
+
+        //- Calculate the thermo variables
+        void calculate();
+
+        //- Construct as copy (not implemented)
+        hPsiThermo(const hPsiThermo<MixtureType>&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("hPsiThermo");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        hPsiThermo(const fvMesh&);
+
+
+    //- Destructor
+    virtual ~hPsiThermo();
+
+
+    // Member functions
+
+        //- Return the compostion of the mixture
+        virtual basicMixture& composition()
+        {
+            return *this;
+        }
+
+        //- Return the compostion of the mixture
+        virtual const basicMixture& composition() const
+        {
+            return *this;
+        }
+
+        //- Update properties
+        virtual void correct();
+
+
+        // Access to thermodynamic state variables
+
+            //- Enthalpy [J/kg]
+            //  Non-const access allowed for transport equations
+            virtual volScalarField& h()
+            {
+                return h_;
+            }
+
+            //- Enthalpy [J/kg]
+            virtual const volScalarField& h() const
+            {
+                return h_;
+            }
+
+
+        // Fields derived from thermodynamic state variables
+
+            //- Enthalpy for cell-set [J/kg]
+            virtual tmp<scalarField> h
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
+            //- Enthalpy for patch [J/kg]
+            virtual tmp<scalarField> h
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure for patch [J/kg/K]
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure [J/kg/K]
+            virtual tmp<volScalarField> Cp() const;
+
+            //- Heat capacity at constant volume for patch [J/kg/K]
+            virtual tmp<scalarField> Cv
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant volume [J/kg/K]
+            virtual tmp<volScalarField> Cv() const;
+
+
+        //- Read thermophysicalProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+#ifdef NoRepository
+#   include "hPsiThermo.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/basicThermo/basicThermos.C b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermos.C
similarity index 86%
rename from src/thermophysicalModels/basic/basicThermo/basicThermos.C
rename to src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermos.C
index ba40f7928..b2e8cc79e 100644
--- a/src/thermophysicalModels/basic/basicThermo/basicThermos.C
+++ b/src/thermophysicalModels/basic/psiThermo/hPsiThermo/hPsiThermos.C
@@ -22,15 +22,9 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-    Selection function for internal energy based thermodynamics package.
-
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
-#include "basicThermo.H"
-#include "makeBasicThermo.H"
+#include "makeBasicPsiThermo.H"
 
 #include "perfectGas.H"
 
@@ -41,11 +35,9 @@ Description
 #include "constTransport.H"
 #include "sutherlandTransport.H"
 
-#include "hThermo.H"
+#include "hPsiThermo.H"
 #include "pureMixture.H"
 
-#include "addToRunTimeSelectionTable.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -53,27 +45,27 @@ namespace Foam
 
 /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
 
-makeBasicThermo
+makeBasicPsiThermo
 (
-    hThermo,
+    hPsiThermo,
     pureMixture,
     constTransport,
     hConstThermo,
     perfectGas
 );
 
-makeBasicThermo
+makeBasicPsiThermo
 (
-    hThermo,
+    hPsiThermo,
     pureMixture,
     sutherlandTransport,
     hConstThermo,
     perfectGas
 );
 
-makeBasicThermo
+makeBasicPsiThermo
 (
-    hThermo,
+    hPsiThermo,
     pureMixture,
     sutherlandTransport,
     janafThermo,
diff --git a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
new file mode 100644
index 000000000..ca7c67abb
--- /dev/null
+++ b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.C
@@ -0,0 +1,346 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hsPsiThermo.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hsPsiThermo<MixtureType>::calculate()
+{
+    const scalarField& hsCells = hs_.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_.THs(hsCells[celli], TCells[celli]);
+        psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
+
+        muCells[celli] = mixture_.mu(TCells[celli]);
+        alphaCells[celli] = mixture_.alpha(TCells[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        fvPatchScalarField& pp = this->p_.boundaryField()[patchi];
+        fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
+        fvPatchScalarField& ppsi = this->psi_.boundaryField()[patchi];
+
+        fvPatchScalarField& phs = hs_.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);
+
+                phs[facei] = mixture_.Hs(pT[facei]);
+
+                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
+                pmu[facei] = mixture_.mu(pT[facei]);
+                palpha[facei] = mixture_.alpha(pT[facei]);
+            }
+        }
+        else
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture_ =
+                    this->patchFaceMixture(patchi, facei);
+
+                pT[facei] = mixture_.THs(phs[facei], pT[facei]);
+
+                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
+                pmu[facei] = mixture_.mu(pT[facei]);
+                palpha[facei] = mixture_.alpha(pT[facei]);
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hsPsiThermo<MixtureType>::hsPsiThermo(const fvMesh& mesh)
+:
+    basicPsiThermo(mesh),
+    MixtureType(*this, mesh),
+
+    hs_
+    (
+        IOobject
+        (
+            "hs",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimEnergy/dimMass,
+        this->hBoundaryTypes()
+    )
+{
+    scalarField& hsCells = hs_.internalField();
+    const scalarField& TCells = this->T_.internalField();
+
+    forAll(hsCells, celli)
+    {
+        hsCells[celli] = this->cellMixture(celli).Hs(TCells[celli]);
+    }
+
+    forAll(hs_.boundaryField(), patchi)
+    {
+        hs_.boundaryField()[patchi] ==
+            hs(this->T_.boundaryField()[patchi], patchi);
+    }
+
+    hBoundaryCorrection(hs_);
+
+    calculate();
+
+    // Switch on saving old time
+    this->psi_.oldTime();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hsPsiThermo<MixtureType>::~hsPsiThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hsPsiThermo<MixtureType>::correct()
+{
+    if (debug)
+    {
+        Info<< "entering hsPsiThermo<MixtureType>::correct()" << endl;
+    }
+
+    // force the saving of the old-time values
+    this->psi_.oldTime();
+
+    calculate();
+
+    if (debug)
+    {
+        Info<< "exiting hsPsiThermo<MixtureType>::correct()" << endl;
+    }
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hsPsiThermo<MixtureType>::hs
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    tmp<scalarField> ths(new scalarField(T.size()));
+    scalarField& hs = ths();
+
+    forAll(T, celli)
+    {
+        hs[celli] = this->cellMixture(cells[celli]).Hs(T[celli]);
+    }
+
+    return ths;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hsPsiThermo<MixtureType>::hs
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> ths(new scalarField(T.size()));
+    scalarField& hs = ths();
+
+    forAll(T, facei)
+    {
+        hs[facei] = this->patchFaceMixture(patchi, facei).Hs(T[facei]);
+    }
+
+    return ths;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hsPsiThermo<MixtureType>::Cp
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCp(new scalarField(T.size()));
+    scalarField& cp = tCp();
+
+    forAll(T, facei)
+    {
+        cp[facei] = this->patchFaceMixture(patchi, facei).Cp(T[facei]);
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField> Foam::hsPsiThermo<MixtureType>::Cp() const
+{
+    const fvMesh& mesh = this->T_.mesh();
+
+    tmp<volScalarField> tCp
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cp",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionSet(0, 2, -2, -1, 0)
+        )
+    );
+
+    volScalarField& cp = tCp();
+
+    forAll(this->T_, celli)
+    {
+        cp[celli] = this->cellMixture(celli).Cp(this->T_[celli]);
+    }
+
+    forAll(this->T_.boundaryField(), patchi)
+    {
+        const fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
+        fvPatchScalarField& pCp = cp.boundaryField()[patchi];
+
+        forAll(pT, facei)
+        {
+            pCp[facei] = this->patchFaceMixture(patchi, facei).Cp(pT[facei]);
+        }
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hsPsiThermo<MixtureType>::Cv
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCv(new scalarField(T.size()));
+    scalarField& cv = tCv();
+
+    forAll(T, facei)
+    {
+        cv[facei] = this->patchFaceMixture(patchi, facei).Cv(T[facei]);
+    }
+
+    return tCv;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField> Foam::hsPsiThermo<MixtureType>::Cv() const
+{
+    const fvMesh& mesh = this->T_.mesh();
+
+    tmp<volScalarField> tCv
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cv",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimEnergy/dimMass/dimTemperature
+        )
+    );
+
+    volScalarField& cv = tCv();
+
+    forAll(this->T_, celli)
+    {
+        cv[celli] = this->cellMixture(celli).Cv(this->T_[celli]);
+    }
+
+    forAll(this->T_.boundaryField(), patchi)
+    {
+        cv.boundaryField()[patchi] =
+            Cv(this->T_.boundaryField()[patchi], patchi);
+    }
+
+    return tCv;
+}
+
+
+template<class MixtureType>
+bool Foam::hsPsiThermo<MixtureType>::read()
+{
+    if (basicPsiThermo::read())
+    {
+        MixtureType::read(*this);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.H b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.H
new file mode 100644
index 000000000..e6000718a
--- /dev/null
+++ b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermo.H
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::hsPsiThermo
+
+Description
+    Sensible enthalpy for a mixture based on compressibility
+
+SourceFiles
+    hsPsiThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hsPsiThermo_H
+#define hsPsiThermo_H
+
+#include "basicPsiThermo.H"
+#include "basicMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class hsPsiThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MixtureType>
+class hsPsiThermo
+:
+    public basicPsiThermo,
+    public MixtureType
+{
+    // Private data
+
+        //- Sensible enthalpy field [J/kg]
+        volScalarField hs_;
+
+
+    // Private member functions
+
+        //- Calculate the thermo variables
+        void calculate();
+
+        //- Construct as copy (not implemented)
+        hsPsiThermo(const hsPsiThermo<MixtureType>&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("hsPsiThermo");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        hsPsiThermo(const fvMesh&);
+
+
+    //- Destructor
+    virtual ~hsPsiThermo();
+
+
+    // Member functions
+
+        //- Return the compostion of the mixture
+        virtual basicMixture& composition()
+        {
+            return *this;
+        }
+
+        //- Return the compostion of the mixture
+        virtual const basicMixture& composition() const
+        {
+            return *this;
+        }
+
+        //- Update properties
+        virtual void correct();
+
+
+        // Access to thermodynamic state variables
+
+            //- Sensible enthalpy [J/kg]
+            //  Non-const access allowed for transport equations
+            virtual volScalarField& hs()
+            {
+                return hs_;
+            }
+
+            //- Sensible enthalpy [J/kg]
+            virtual const volScalarField& hs() const
+            {
+                return hs_;
+            }
+
+
+        // Fields derived from thermodynamic state variables
+
+            //- Enthalpy for cell-set [J/kg]
+            virtual tmp<scalarField> hs
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
+            //- Enthalpy for patch [J/kg]
+            virtual tmp<scalarField> hs
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure for patch [J/kg/K]
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure [J/kg/K]
+            virtual tmp<volScalarField> Cp() const;
+
+            //- Heat capacity at constant volume for patch [J/kg/K]
+            virtual tmp<scalarField> Cv
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant volume [J/kg/K]
+            virtual tmp<volScalarField> Cv() const;
+
+
+        //- Read thermophysicalProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+#ifdef NoRepository
+#   include "hsPsiThermo.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudThermoTypes.H b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermos.C
similarity index 71%
rename from src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudThermoTypes.H
rename to src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermos.C
index e25375c7b..8c16a141d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/ReactingCloud/ReactingCloudThermoTypes.H
+++ b/src/thermophysicalModels/basic/psiThermo/hsPsiThermo/hsPsiThermos.C
@@ -22,44 +22,59 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Typedefs
-    Foam::cloudThermoTypes
-
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#ifndef ReactingCloudThermoTypes_H
-#define ReactingCloudThermoTypes_H
+#include "makeBasicPsiThermo.H"
+
+#include "perfectGas.H"
 
-#include "sutherlandTransport.H"
-#include "multiComponentMixture.H"
-#include "specie.H"
-#include "constTransport.H"
-#include "specieThermo.H"
 #include "hConstThermo.H"
 #include "janafThermo.H"
-#include "perfectGas.H"
+#include "specieThermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "hsPsiThermo.H"
+#include "pureMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-//    typedef multiComponentMixture<constTransport<specieThermo<hConstThermo<perfectGas> > > > specieProperties;
-//    typedef hConstThermo<perfectGas> specieProperties;
 
-//    typedef sutherlandTransport<specieThermo<janafThermo<perfectGas> > >
-//        specieProperties;
+/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
 
-    typedef sutherlandTransport<specieThermo<janafThermo<perfectGas> > >
-        specieReactingProperties;
+makeBasicPsiThermo
+(
+    hsPsiThermo,
+    pureMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicPsiThermo
+(
+    hsPsiThermo,
+    pureMixture,
+    sutherlandTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicPsiThermo
+(
+    hsPsiThermo,
+    pureMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
 
-    typedef constTransport<specieThermo<hConstThermo<perfectGas> > >
-        specieConstProperties;
-}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#endif
+} // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermo.C
new file mode 100644
index 000000000..9ddcd4b67
--- /dev/null
+++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermo.C
@@ -0,0 +1,79 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "basicRhoThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(basicRhoThermo, 0);
+    defineRunTimeSelectionTable(basicRhoThermo, fvMesh);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::basicRhoThermo::basicRhoThermo(const fvMesh& mesh)
+:
+    basicThermo(mesh),
+    rho_
+    (
+        IOobject
+        (
+            "rhoThermo",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimDensity
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::basicRhoThermo::~basicRhoThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::volScalarField> Foam::basicRhoThermo::rho() const
+{
+    return rho_;
+}
+
+
+Foam::volScalarField& Foam::basicRhoThermo::rho()
+{
+    return rho_;
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermo.H
new file mode 100644
index 000000000..728c74da2
--- /dev/null
+++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/basicRhoThermo.H
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::basicRhoThermo
+
+Description
+    Basic thermodynamic properties based on density
+
+SourceFiles
+    basicRhoThermo.C
+    newBasicRhoThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef basicRhoThermo_H
+#define basicRhoThermo_H
+
+#include "basicThermo.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class basicRhoThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+class basicRhoThermo
+:
+    public basicThermo
+{
+
+protected:
+
+    // Protected data
+
+        //- Density field [kg/m^3]
+        //  Named 'rhoThermo' to avoid (potential) conflict with solver density
+        volScalarField rho_;
+
+
+    // Protected member functions
+
+        //- Construct as copy (not implemented)
+        basicRhoThermo(const basicRhoThermo&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("basicRhoThermo");
+
+
+    //- Declare run-time constructor selection table
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        basicRhoThermo,
+        fvMesh,
+        (const fvMesh& mesh),
+        (mesh)
+    );
+
+
+    // Constructors
+
+        //- Construct from mesh
+        basicRhoThermo(const fvMesh&);
+
+
+    //- Selector
+    static autoPtr<basicRhoThermo> New(const fvMesh&);
+
+
+    //- Destructor
+    virtual ~basicRhoThermo();
+
+
+    // Member functions
+
+        // Fields derived from thermodynamic state variables
+
+            //- Density [kg/m^3]
+            virtual tmp<volScalarField> rho() const;
+
+            //- Return non-const access to the local density field [kg/m^3]
+            virtual volScalarField& rho();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/hCombustionThermo/makeCombustionThermo.H b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/makeBasicRhoThermo.H
similarity index 67%
rename from src/thermophysicalModels/combustion/hCombustionThermo/makeCombustionThermo.H
rename to src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/makeBasicRhoThermo.H
index c44a1bb70..35af8bf58 100644
--- a/src/thermophysicalModels/combustion/hCombustionThermo/makeCombustionThermo.H
+++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/makeBasicRhoThermo.H
@@ -23,39 +23,38 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 InClass
-    Foam::hCombustionThermo
+    Foam::basicRhoThermo
 
 Description
+    Macros for creating 'basic' density-based thermo packages
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef makeCombustionThermo_H
-#define makeCombustionThermo_H
+#ifndef makeBasicRhoThermo_H
+#define makeBasicRhoThermo_H
+
+#include "basicRhoThermo.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define makeCombustionThermo(CThermo,MixtureThermo,Mixture,Transport,Thermo,EqnOfState)  \
+#define makeBasicRhoThermo(Cthermo,Mixture,Transport,Thermo,EqnOfState)       \
                                                                               \
-typedef MixtureThermo                                                         \
-    <Mixture<Transport<specieThermo<Thermo<EqnOfState> > > > >                \
-    MixtureThermo##Mixture##Transport##Thermo##EqnOfState;                    \
+typedef Cthermo<Mixture<Transport<specieThermo<Thermo<EqnOfState> > > > >     \
+    Cthermo##Mixture##Transport##Thermo##EqnOfState;                          \
                                                                               \
 defineTemplateTypeNameAndDebugWithName                                        \
-    (MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                   \
-    #MixtureThermo                                                            \
-    "<"#Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>>", 0)  \
-                                                                              \
-addToRunTimeSelectionTable                                                    \
 (                                                                             \
-    basicThermo,                                                              \
-    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
-    fvMesh                                                                    \
+    Cthermo##Mixture##Transport##Thermo##EqnOfState,                          \
+    #Cthermo                                                                  \
+        "<"#Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>>", \
+    0                                                                         \
 );                                                                            \
                                                                               \
 addToRunTimeSelectionTable                                                    \
 (                                                                             \
-    CThermo,                                                                  \
-    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    basicRhoThermo,                                                           \
+    Cthermo##Mixture##Transport##Thermo##EqnOfState,                          \
     fvMesh                                                                    \
 )
 
diff --git a/src/thermophysicalModels/basic/basicThermo/newBasicThermo.C b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
similarity index 68%
rename from src/thermophysicalModels/basic/basicThermo/newBasicThermo.C
rename to src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
index 752dd53cc..2bd8c686a 100644
--- a/src/thermophysicalModels/basic/basicThermo/newBasicThermo.C
+++ b/src/thermophysicalModels/basic/rhoThermo/basicRhoThermo/newBasicRhoThermo.C
@@ -23,23 +23,20 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Description
-    Selection function for internal energy based thermodynamics package.
+    Selection function for 'basic' density-based thermodynamics
 
 \*---------------------------------------------------------------------------*/
 
-#include "basicThermo.H"
-#include "fvMesh.H"
+#include "basicRhoThermo.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-namespace Foam
+Foam::autoPtr<Foam::basicRhoThermo> Foam::basicRhoThermo::New
+(
+    const fvMesh& mesh
+)
 {
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-autoPtr<basicThermo> basicThermo::New(const fvMesh& mesh)
-{
-    word basicThermoTypeName;
+    word thermoTypeName;
 
     // Enclose the creation of the thermophysicalProperties to ensure it is
     // deleted before the turbulenceModel is created otherwise the dictionary
@@ -57,30 +54,25 @@ autoPtr<basicThermo> basicThermo::New(const fvMesh& mesh)
             )
         );
 
-        thermoDict.lookup("thermoType") >> basicThermoTypeName;
+        thermoDict.lookup("thermoType") >> thermoTypeName;
     }
 
-    Info<< "Selecting thermodynamics package " << basicThermoTypeName << endl;
+    Info<< "Selecting thermodynamics package " << thermoTypeName << endl;
 
     fvMeshConstructorTable::iterator cstrIter =
-        fvMeshConstructorTablePtr_->find(basicThermoTypeName);
+        fvMeshConstructorTablePtr_->find(thermoTypeName);
 
     if (cstrIter == fvMeshConstructorTablePtr_->end())
     {
-        FatalErrorIn("basicThermo::New(const fvMesh&)")
-            << "Unknown basicThermo type " << basicThermoTypeName
-            << endl << endl
-            << "Valid basicThermo types are :" << endl
-            << fvMeshConstructorTablePtr_->toc()
+        FatalErrorIn("basicRhoThermo::New(const fvMesh&)")
+            << "Unknown basicRhoThermo type " << thermoTypeName << nl << nl
+            << "Valid basicRhoThermo types are:" << nl
+            << fvMeshConstructorTablePtr_->toc() << nl
             << exit(FatalError);
     }
 
-    return autoPtr<basicThermo>(cstrIter()(mesh));
+    return autoPtr<basicRhoThermo>(cstrIter()(mesh));
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
new file mode 100644
index 000000000..c3fb03559
--- /dev/null
+++ b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.C
@@ -0,0 +1,345 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hRhoThermo.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hRhoThermo<MixtureType>::calculate()
+{
+    const scalarField& hCells = this->h_.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_.TH(hCells[celli], TCells[celli]);
+        psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
+        rhoCells[celli] = mixture_.rho(pCells[celli], TCells[celli]);
+
+        muCells[celli] = mixture_.mu(TCells[celli]);
+        alphaCells[celli] = mixture_.alpha(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->h_.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_.H(pT[facei]);
+
+                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
+                prho[facei] = mixture_.rho(pp[facei], pT[facei]);
+                pmu[facei] = mixture_.mu(pT[facei]);
+                palpha[facei] = mixture_.alpha(pT[facei]);
+            }
+        }
+        else
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture_ =
+                    this->patchFaceMixture(patchi, facei);
+
+                pT[facei] = mixture_.TH(ph[facei], pT[facei]);
+
+                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
+                prho[facei] = mixture_.rho(pp[facei], pT[facei]);
+                pmu[facei] = mixture_.mu(pT[facei]);
+                palpha[facei] = mixture_.alpha(pT[facei]);
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hRhoThermo<MixtureType>::hRhoThermo(const fvMesh& mesh)
+:
+    basicRhoThermo(mesh),
+    MixtureType(*this, mesh),
+
+    h_
+    (
+        IOobject
+        (
+            "h",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimensionSet(0, 2, -2, 0, 0),
+        this->hBoundaryTypes()
+    )
+{
+    scalarField& hCells = h_.internalField();
+    const scalarField& TCells = this->T_.internalField();
+
+    forAll(hCells, celli)
+    {
+        hCells[celli] = this->cellMixture(celli).H(TCells[celli]);
+    }
+
+    forAll(h_.boundaryField(), patchi)
+    {
+        h_.boundaryField()[patchi] ==
+            h(this->T_.boundaryField()[patchi], patchi);
+    }
+
+    hBoundaryCorrection(h_);
+
+    calculate();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hRhoThermo<MixtureType>::~hRhoThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hRhoThermo<MixtureType>::correct()
+{
+    if (debug)
+    {
+        Info<< "entering hRhoThermo<MixtureType>::correct()" << endl;
+    }
+
+    calculate();
+
+    if (debug)
+    {
+        Info<< "exiting hRhoThermo<MixtureType>::correct()" << endl;
+    }
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hRhoThermo<MixtureType>::h
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    tmp<scalarField> th(new scalarField(T.size()));
+    scalarField& h = th();
+
+    forAll(T, celli)
+    {
+        h[celli] = this->cellMixture(cells[celli]).H(T[celli]);
+    }
+
+    return th;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hRhoThermo<MixtureType>::h
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> th(new scalarField(T.size()));
+    scalarField& h = th();
+
+    forAll(T, facei)
+    {
+        h[facei] = this->patchFaceMixture(patchi, facei).H(T[facei]);
+    }
+
+    return th;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hRhoThermo<MixtureType>::Cp
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCp(new scalarField(T.size()));
+    scalarField& cp = tCp();
+
+    forAll(T, facei)
+    {
+        cp[facei] = this->patchFaceMixture(patchi, facei).Cp(T[facei]);
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField> Foam::hRhoThermo<MixtureType>::Cp() const
+{
+    const fvMesh& mesh = this->T_.mesh();
+
+    tmp<volScalarField> tCp
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cp",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionSet(0, 2, -2, -1, 0)
+        )
+    );
+
+    volScalarField& cp = tCp();
+
+    forAll(this->T_, celli)
+    {
+        cp[celli] = this->cellMixture(celli).Cp(this->T_[celli]);
+    }
+
+    forAll(this->T_.boundaryField(), patchi)
+    {
+        const fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
+        fvPatchScalarField& pCp = cp.boundaryField()[patchi];
+
+        forAll(pT, facei)
+        {
+            pCp[facei] = this->patchFaceMixture(patchi, facei).Cp(pT[facei]);
+        }
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hRhoThermo<MixtureType>::Cv
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCv(new scalarField(T.size()));
+    scalarField& cv = tCv();
+
+    forAll(T, facei)
+    {
+        cv[facei] = this->patchFaceMixture(patchi, facei).Cv(T[facei]);
+    }
+
+    return tCv;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField> Foam::hRhoThermo<MixtureType>::Cv() const
+{
+    const fvMesh& mesh = this->T_.mesh();
+
+    tmp<volScalarField> tCv
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cv",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionSet(0, 2, -2, -1, 0)
+        )
+    );
+
+    volScalarField& cv = tCv();
+
+    forAll(this->T_, celli)
+    {
+        cv[celli] = this->cellMixture(celli).Cv(this->T_[celli]);
+    }
+
+    forAll(this->T_.boundaryField(), patchi)
+    {
+        cv.boundaryField()[patchi] =
+            Cv(this->T_.boundaryField()[patchi], patchi);
+    }
+
+    return tCv;
+}
+
+
+template<class MixtureType>
+bool Foam::hRhoThermo<MixtureType>::read()
+{
+    if (basicRhoThermo::read())
+    {
+        MixtureType::read(*this);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/hThermo/hThermo.H b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.H
similarity index 84%
rename from src/thermophysicalModels/basic/hThermo/hThermo.H
rename to src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.H
index 4557478ae..dae410840 100644
--- a/src/thermophysicalModels/basic/hThermo/hThermo.H
+++ b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermo.H
@@ -23,20 +23,20 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::hThermo
+    Foam::hPsiThermo
 
 Description
-    Enthalpy for a mixture
+    Enthalpy for a mixture based on density
 
 SourceFiles
-    hThermo.C
+    hRhoThermo.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef hThermo_H
-#define hThermo_H
+#ifndef hRhoThermo_H
+#define hRhoThermo_H
 
-#include "basicThermo.H"
+#include "basicRhoThermo.H"
 #include "basicMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,61 +45,62 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class hThermo Declaration
+                         Class hRhoThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class MixtureType>
-class hThermo
+class hRhoThermo
 :
-    public basicThermo,
+    public basicRhoThermo,
     public MixtureType
 {
     // Private data
 
+        //- Enthalpy field
         volScalarField h_;
 
 
     // Private member functions
 
+        //- Calculate the thermo variables
         void calculate();
 
         //- Construct as copy (not implemented)
-        hThermo(const hThermo<MixtureType>&);
+        hRhoThermo(const hRhoThermo<MixtureType>&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("hThermo");
+    TypeName("hRhoThermo");
 
 
     // Constructors
 
         //- Construct from mesh
-        hThermo(const fvMesh&);
+        hRhoThermo(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~hThermo();
+    //- Destructor
+    virtual ~hRhoThermo();
 
 
     // Member functions
 
         //- Return the compostion of the combustion mixture
-        basicMixture& composition()
+        virtual basicMixture& composition()
         {
             return *this;
         }
 
         //- Return the compostion of the combustion mixture
-        const basicMixture& composition() const
+        virtual const basicMixture& composition() const
         {
             return *this;
         }
 
         //- Update properties
-        void correct();
+        virtual void correct();
 
 
         // Access to thermodynamic state variables
@@ -144,7 +145,7 @@ public:
             //- Heat capacity at constant pressure [J/kg/K]
             virtual tmp<volScalarField> Cp() const;
 
-            //- Heat capacity at constant voluve for patch [J/kg/K]
+            //- Heat capacity at constant volume for patch [J/kg/K]
             virtual tmp<scalarField> Cv
             (
                 const scalarField& T,
@@ -156,7 +157,7 @@ public:
 
 
         //- Read thermophysicalProperties dictionary
-        bool read();
+        virtual bool read();
 };
 
 
@@ -167,7 +168,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
-#   include "hThermo.C"
+#   include "hRhoThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermos.C
new file mode 100644
index 000000000..7c7829cc7
--- /dev/null
+++ b/src/thermophysicalModels/basic/rhoThermo/hRhoThermo/hRhoThermos.C
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "makeBasicRhoThermo.H"
+
+#include "perfectGas.H"
+
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "specieThermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "hRhoThermo.H"
+#include "pureMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
+
+makeBasicRhoThermo
+(
+    hRhoThermo,
+    pureMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicRhoThermo
+(
+    hRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicRhoThermo
+(
+    hRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
new file mode 100644
index 000000000..fb48babcf
--- /dev/null
+++ b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.C
@@ -0,0 +1,345 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hsRhoThermo.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hsRhoThermo<MixtureType>::calculate()
+{
+    const scalarField& hsCells = this->hs_.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_.THs(hsCells[celli], TCells[celli]);
+        psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
+        rhoCells[celli] = mixture_.rho(pCells[celli], TCells[celli]);
+
+        muCells[celli] = mixture_.mu(TCells[celli]);
+        alphaCells[celli] = mixture_.alpha(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& phs = this->hs_.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);
+
+                phs[facei] = mixture_.Hs(pT[facei]);
+
+                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
+                prho[facei] = mixture_.rho(pp[facei], pT[facei]);
+                pmu[facei] = mixture_.mu(pT[facei]);
+                palpha[facei] = mixture_.alpha(pT[facei]);
+            }
+        }
+        else
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture_ =
+                    this->patchFaceMixture(patchi, facei);
+
+                pT[facei] = mixture_.THs(phs[facei], pT[facei]);
+
+                ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
+                prho[facei] = mixture_.rho(pp[facei], pT[facei]);
+                pmu[facei] = mixture_.mu(pT[facei]);
+                palpha[facei] = mixture_.alpha(pT[facei]);
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hsRhoThermo<MixtureType>::hsRhoThermo(const fvMesh& mesh)
+:
+    basicRhoThermo(mesh),
+    MixtureType(*this, mesh),
+
+    hs_
+    (
+        IOobject
+        (
+            "hs",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimEnergy/dimMass,
+        this->hBoundaryTypes()
+    )
+{
+    scalarField& hsCells = hs_.internalField();
+    const scalarField& TCells = this->T_.internalField();
+
+    forAll(hsCells, celli)
+    {
+        hsCells[celli] = this->cellMixture(celli).Hs(TCells[celli]);
+    }
+
+    forAll(hs_.boundaryField(), patchi)
+    {
+        hs_.boundaryField()[patchi] ==
+            hs(this->T_.boundaryField()[patchi], patchi);
+    }
+
+    hBoundaryCorrection(hs_);
+
+    calculate();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hsRhoThermo<MixtureType>::~hsRhoThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hsRhoThermo<MixtureType>::correct()
+{
+    if (debug)
+    {
+        Info<< "entering hsRhoThermo<MixtureType>::correct()" << endl;
+    }
+
+    calculate();
+
+    if (debug)
+    {
+        Info<< "exiting hsRhoThermo<MixtureType>::correct()" << endl;
+    }
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hsRhoThermo<MixtureType>::hs
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    tmp<scalarField> ths(new scalarField(T.size()));
+    scalarField& hs = ths();
+
+    forAll(T, celli)
+    {
+        hs[celli] = this->cellMixture(cells[celli]).Hs(T[celli]);
+    }
+
+    return ths;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hsRhoThermo<MixtureType>::hs
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> ths(new scalarField(T.size()));
+    scalarField& hs = ths();
+
+    forAll(T, facei)
+    {
+        hs[facei] = this->patchFaceMixture(patchi, facei).Hs(T[facei]);
+    }
+
+    return ths;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hsRhoThermo<MixtureType>::Cp
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCp(new scalarField(T.size()));
+    scalarField& cp = tCp();
+
+    forAll(T, facei)
+    {
+        cp[facei] = this->patchFaceMixture(patchi, facei).Cp(T[facei]);
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField> Foam::hsRhoThermo<MixtureType>::Cp() const
+{
+    const fvMesh& mesh = this->T_.mesh();
+
+    tmp<volScalarField> tCp
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cp",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimEnergy/dimMass/dimTemperature
+        )
+    );
+
+    volScalarField& cp = tCp();
+
+    forAll(this->T_, celli)
+    {
+        cp[celli] = this->cellMixture(celli).Cp(this->T_[celli]);
+    }
+
+    forAll(this->T_.boundaryField(), patchi)
+    {
+        const fvPatchScalarField& pT = this->T_.boundaryField()[patchi];
+        fvPatchScalarField& pCp = cp.boundaryField()[patchi];
+
+        forAll(pT, facei)
+        {
+            pCp[facei] = this->patchFaceMixture(patchi, facei).Cp(pT[facei]);
+        }
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField> Foam::hsRhoThermo<MixtureType>::Cv
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCv(new scalarField(T.size()));
+    scalarField& cv = tCv();
+
+    forAll(T, facei)
+    {
+        cv[facei] = this->patchFaceMixture(patchi, facei).Cv(T[facei]);
+    }
+
+    return tCv;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField> Foam::hsRhoThermo<MixtureType>::Cv() const
+{
+    const fvMesh& mesh = this->T_.mesh();
+
+    tmp<volScalarField> tCv
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cv",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimEnergy/dimMass/dimTemperature
+        )
+    );
+
+    volScalarField& cv = tCv();
+
+    forAll(this->T_, celli)
+    {
+        cv[celli] = this->cellMixture(celli).Cv(this->T_[celli]);
+    }
+
+    forAll(this->T_.boundaryField(), patchi)
+    {
+        cv.boundaryField()[patchi] =
+            Cv(this->T_.boundaryField()[patchi], patchi);
+    }
+
+    return tCv;
+}
+
+
+template<class MixtureType>
+bool Foam::hsRhoThermo<MixtureType>::read()
+{
+    if (basicRhoThermo::read())
+    {
+        MixtureType::read(*this);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.H b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.H
new file mode 100644
index 000000000..47514a8b9
--- /dev/null
+++ b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermo.H
@@ -0,0 +1,178 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::hsRhoThermo
+
+Description
+    Sensible enthalpy for a mixture based on density
+
+SourceFiles
+    hsRhoThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hsRhoThermo_H
+#define hsRhoThermo_H
+
+#include "basicRhoThermo.H"
+#include "basicMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class hsRhoThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MixtureType>
+class hsRhoThermo
+:
+    public basicRhoThermo,
+    public MixtureType
+{
+    // Private data
+
+        //- Sensible enthalpy field [J/kg]
+        volScalarField hs_;
+
+
+    // Private member functions
+
+        //- Calculate the thermo variables
+        void calculate();
+
+        //- Construct as copy (not implemented)
+        hsRhoThermo(const hsRhoThermo<MixtureType>&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("hsRhoThermo");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        hsRhoThermo(const fvMesh&);
+
+
+    //- Destructor
+    virtual ~hsRhoThermo();
+
+
+    // Member functions
+
+        //- Return the compostion of the combustion mixture
+        virtual basicMixture& composition()
+        {
+            return *this;
+        }
+
+        //- Return the compostion of the combustion mixture
+        virtual const basicMixture& composition() const
+        {
+            return *this;
+        }
+
+        //- Update properties
+        virtual void correct();
+
+
+        // Access to thermodynamic state variables
+
+            //- Sensible enthalpy [J/kg]
+            //  Non-const access allowed for transport equations
+            virtual volScalarField& hs()
+            {
+                return hs_;
+            }
+
+            //- Sensible enthalpy [J/kg]
+            virtual const volScalarField& hs() const
+            {
+                return hs_;
+            }
+
+
+        // Fields derived from thermodynamic state variables
+
+            //- Sensible enthalpy for cell-set [J/kg]
+            virtual tmp<scalarField> hs
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
+            //- Sensible enthalpy for patch [J/kg]
+            virtual tmp<scalarField> hs
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure for patch [J/kg/K]
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure [J/kg/K]
+            virtual tmp<volScalarField> Cp() const;
+
+            //- Heat capacity at constant volume for patch [J/kg/K]
+            virtual tmp<scalarField> Cv
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant volume [J/kg/K]
+            virtual tmp<volScalarField> Cv() const;
+
+
+        //- Read thermophysicalProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+
+#ifdef NoRepository
+#   include "hsRhoThermo.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermos.C
new file mode 100644
index 000000000..c5a0e455c
--- /dev/null
+++ b/src/thermophysicalModels/basic/rhoThermo/hsRhoThermo/hsRhoThermos.C
@@ -0,0 +1,80 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "makeBasicRhoThermo.H"
+
+#include "perfectGas.H"
+
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "specieThermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "hsRhoThermo.H"
+#include "pureMixture.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
+
+makeBasicRhoThermo
+(
+    hsRhoThermo,
+    pureMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicRhoThermo
+(
+    hsRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicRhoThermo
+(
+    hsRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/chemistryModel/Make/files b/src/thermophysicalModels/chemistryModel/Make/files
index fd0eac47f..653d1be89 100644
--- a/src/thermophysicalModels/chemistryModel/Make/files
+++ b/src/thermophysicalModels/chemistryModel/Make/files
@@ -1,29 +1,26 @@
-binaryNode = binaryNode
-binaryTree = binaryTree
-chemPoint = chemPoint
-chemistryModel = chemistryModel
-chemistrySolver = chemistrySolver
-chemistryOnlineLibrary = chemistryOnlineLibrary
+binaryNode/binaryNode.C
 
-$(binaryNode)/binaryNode.C
+binaryTree/binaryTreeAdd.C
+binaryTree/binaryTree.C
+binaryTree/binaryTreeClean.C
+binaryTree/binaryTreeInsert.C
+binaryTree/binaryTreeScan.C
+binaryTree/binaryTreeSearch.C
 
-$(binaryTree)/binaryTreeAdd.C
-$(binaryTree)/binaryTree.C
-$(binaryTree)/binaryTreeClean.C
-$(binaryTree)/binaryTreeInsert.C
-$(binaryTree)/binaryTreeScan.C
-$(binaryTree)/binaryTreeSearch.C
+chemPoint/chemPoint.C
 
-$(chemPoint)/chemPoint.C
+chemistryOnlineLibrary/chemistryOnlineLibrary.C
 
-$(chemistryModel)/chemistryModel.C
+chemistryModel/basicChemistryModel/basicChemistryModel.C
 
-$(chemistrySolver)/chemistrySolver/chemistrySolver.C
-$(chemistrySolver)/chemistrySolver/newChemistrySolver.C
-$(chemistrySolver)/sequential/sequential.C
-$(chemistrySolver)/EulerImplicit/EulerImplicit.C
-$(chemistrySolver)/ode/ode.C
+chemistryModel/psiChemistryModel/psiChemistryModel.C
+chemistryModel/psiChemistryModel/newPsiChemistryModel.C
+chemistryModel/psiChemistryModel/psiChemistryModels.C
 
-$(chemistryOnlineLibrary)/chemistryOnlineLibrary.C
+chemistryModel/rhoChemistryModel/rhoChemistryModel.C
+chemistryModel/rhoChemistryModel/newRhoChemistryModel.C
+chemistryModel/rhoChemistryModel/rhoChemistryModels.C
+
+chemistrySolver/chemistrySolver/makeChemistrySolvers.C
 
 LIB = $(FOAM_LIBBIN)/libchemistryModel
diff --git a/src/thermophysicalModels/chemistryModel/Make/options b/src/thermophysicalModels/chemistryModel/Make/options
index 59d90c6e3..3cdfbc22a 100644
--- a/src/thermophysicalModels/chemistryModel/Make/options
+++ b/src/thermophysicalModels/chemistryModel/Make/options
@@ -1,15 +1,16 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/functions/Polynomial \
+    -I$(LIB_SRC)/thermophysicalModels/thermophysicalFunctions/lnInclude \
     -I$(LIB_SRC)/turbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/ODE/lnInclude
 
 LIB_LIBS = \
     -lbasicThermophysicalModels \
-    -lcombustionThermophysicalModels \
-    -lthermophysicalFunctions \
+    -lreactionThermophysicalModels \
     -lspecie \
+    -lthermophysicalFunctions \
     -lODE
diff --git a/src/thermophysicalModels/chemistryModel/binaryTree/nodelist b/src/thermophysicalModels/chemistryModel/binaryTree/nodelist
deleted file mode 100644
index b8a72a9cf..000000000
--- a/src/thermophysicalModels/chemistryModel/binaryTree/nodelist
+++ /dev/null
@@ -1,68 +0,0 @@
-binaryTreeClean.C:    PtrList<binaryNode>& nodeList
-binaryTreeClean.C:    forAll(nodeList, nodei)
-binaryTreeClean.C:        if(nodeList[nodei].elementLeft_ != NULL)
-binaryTreeClean.C:            if(nodeList[nodei].elementLeft_->nUsed() <= nLessUsed)
-binaryTreeClean.C:                nLessUsed = nodeList[nodei].elementLeft_->nUsed();
-binaryTreeClean.C:                Info << nodeList[nodei].elementLeft_->v0() << endl;
-binaryTreeClean.C:                Info << nodeList[nodei].elementLeft_->nUsed() << endl;
-binaryTreeClean.C:        if(nodeList[nodei].elementRight_ != NULL)
-binaryTreeClean.C:            if(nodeList[nodei].elementRight_->nUsed() <= nLessUsed)
-binaryTreeClean.C:                nLessUsed = nodeList[nodei].elementRight_->nUsed();
-binaryTreeClean.C:                Info << nodeList[nodei].elementRight_->v0() << endl;
-binaryTreeClean.C:                Info << nodeList[nodei].elementRight_->nUsed() << endl;
-binaryTreeClean.C:        Info  << "value RIGHT "<< nodeList[nodeLessUsed].elementRight_->v0() << endl;
-binaryTreeClean.C:        return *nodeList[nodeLessUsed].elementRight_;
-binaryTreeClean.C:        Info << "value LEFT " << nodeList[nodeLessUsed].elementLeft_->v0() << endl;
-binaryTreeClean.C:        return *nodeList[nodeLessUsed].elementLeft_;
-binaryTreeClean.C:    PtrList<binaryNode>& nodeList
-binaryTreeClean.C:    forAll(nodeList, nodei)
-binaryTreeClean.C:        if(nodeList[nodei].elementLeft_ != NULL)
-binaryTreeClean.C:            if(nodeList[nodei].elementLeft_->nUsed() <= nLessUsed)
-binaryTreeClean.C:                nLessUsed = nodeList[nodei].elementLeft_->nUsed();
-binaryTreeClean.C:                Info << nodeList[nodei].elementLeft_->v0() << endl;
-binaryTreeClean.C:                Info << nodeList[nodei].elementLeft_->nUsed() << endl;
-binaryTreeClean.C:        if(nodeList[nodei].elementRight_ != NULL)
-binaryTreeClean.C:            if(nodeList[nodei].elementRight_->nUsed() <= nLessUsed)
-binaryTreeClean.C:                nLessUsed = nodeList[nodei].elementRight_->nUsed();
-binaryTreeClean.C:                Info << nodeList[nodei].elementRight_->v0() << endl;
-binaryTreeClean.C:                Info << nodeList[nodei].elementRight_->nUsed() << endl;
-binaryTreeClean.C:        Info  << "value RIGHT "<< nodeList[nodeLessUsed].elementRight_->v0() << endl;
-binaryTreeClean.C:        return *nodeList[nodeLessUsed].elementRight_;
-binaryTreeClean.C:        Info << "value LEFT " << nodeList[nodeLessUsed].elementLeft_->v0() << endl;
-binaryTreeClean.C:        return *nodeList[nodeLessUsed].elementLeft_;
-binaryTreeClean.C:    Info << "Cleaning Chemistry Library: number of nodes " << nodeList_.size() << endl;
-binaryTreeClean.C:    forAll(nodeList_, nodeI)
-binaryTreeClean.C:        nodeList_[nodeI].clearData();
-binaryTreeClean.C:    nodeList_.clear();
-binaryTreeInsert.C:        chemPoint &p = findLessUsed(nodeList_);
-binaryTreeInsert.C:        label m = nodeList_.size();
-binaryTreeInsert.C:        nodeList_.setSize(m+1);
-binaryTreeInsert.C://        nodeList_.hook(new binaryNode(t->elementLeft(), NULL, NULL, NULL, NULL));
-binaryTreeInsert.C:        nodeList_.hook(new binaryNode(NULL, NULL, NULL, NULL, NULL));
-binaryTreeInsert.C:        binaryNode* node = &nodeList_[m];
-binaryTreeInsert.C://        chemPointList_.hook(new chemPoint(x,&nodeList_[m]));
-binaryTreeInsert.C://        binaryNode* node = &nodeList_[m];
-binaryTreeInsert.C://        node->elementLeft_->node_ = &nodeList_[m];
-binaryTreeInsert.C://        node->elementRight_->node_ = &nodeList_[m];
-binaryTreeInsert.C:        chemPoint &p = findLessUsed(nodeList_);
-binaryTreeInsert.C:        label m = nodeList_.size();
-binaryTreeInsert.C:        nodeList_.setSize(m+1);
-binaryTreeInsert.C:        nodeList_.hook(new binaryNode(NULL, NULL, NULL, NULL, NULL));
-binaryTreeInsert.C:        binaryNode *node = &nodeList_[m];
-binaryTreeInsert.C://        chemPointList_.hook(new chemPoint(x,&nodeList_[m]));
-binaryTreeInsert.C://        chemPointList_[n].node_ = &nodeList_[m];
-binaryTreeInsert.C://        binaryNode *node = &nodeList_[m];
-binaryTreeInsert.C://        node->elementLeft_->node_ = &nodeList_[m];
-binaryTreeInsert.C://        node->elementRight_->node_ = &nodeList_[m];
-binaryTreeScan.C:    forAll(nodeList_,nodei)
-binaryTreeScan.C:        if(nodeList_[nodei].elementLeft_ !=NULL)
-binaryTreeScan.C:            Info << "nodeList_["<< nodei << "].elementLeft_() =" << nodeList_[nodei].elementLeft_->v0() << endl;
-binaryTreeScan.C:            if(nodeList_[nodei].elementLeft_->node_ ==NULL)
-binaryTreeScan.C:                Info << "nodeList_["<< nodei << "].elementLeft_() = " << nodeList_[nodei].elementLeft_->v0() << " doesn't point to any node" << endl;
-binaryTreeScan.C:        if(nodeList_[nodei].elementRight_ !=NULL)
-binaryTreeScan.C:            Info << "nodeList_["<< nodei << "].elementRight_() =" << nodeList_[nodei].elementRight_->v0() << endl;
-binaryTreeScan.C:            if(nodeList_[nodei].elementRight_->node_ ==NULL)
-binaryTreeScan.C:                Info << "nodeList_["<< nodei << "].elementRight_() =" << nodeList_[nodei].elementRight_->v0() << " doesn't point to any node" << endl;            }
-binaryTree.H:        PtrList<binaryNode> nodeList_;
-binaryTree.H:        chemPoint& findLessUsed(PtrList<binaryNode>& nodeList);
-binaryTree.H:        chemPoint& findLessUsed(const chemPoint& p, PtrList<binaryNode>& nodeList);
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
index 9e5eb7874..bcfafc092 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.C
@@ -28,30 +28,17 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "simpleMatrix.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(EulerImplicit, 0);
-    addToRunTimeSelectionTable
-    (
-        chemistrySolver,
-        EulerImplicit,
-        dictionary
-    );
-};
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::EulerImplicit::EulerImplicit
+template<class CompType, class ThermoType>
+Foam::EulerImplicit<CompType, ThermoType>::EulerImplicit
 (
-    const Foam::dictionary& dict,
-    Foam::chemistryModel& chemistry
+    ODEChemistryModel<CompType, ThermoType>& model,
+    const word& modelName
 )
 :
-    chemistrySolver(dict, chemistry),
-    coeffsDict_(dict.subDict(typeName + "Coeffs")),
+    chemistrySolver<CompType, ThermoType>(model, modelName),
+    coeffsDict_(model.subDict(modelName + "Coeffs")),
     cTauChem_(readScalar(coeffsDict_.lookup("cTauChem"))),
     equil_(coeffsDict_.lookup("equilibriumRateLimiter"))
 {}
@@ -59,13 +46,15 @@ Foam::EulerImplicit::EulerImplicit
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::EulerImplicit::~EulerImplicit()
+template<class CompType, class ThermoType>
+Foam::EulerImplicit<CompType, ThermoType>::~EulerImplicit()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::EulerImplicit::solve
+template<class CompType, class ThermoType>
+Foam::scalar Foam::EulerImplicit<CompType, ThermoType>::solve
 (
     scalarField &c,
     const scalar T,
@@ -74,28 +63,27 @@ Foam::scalar Foam::EulerImplicit::solve
     const scalar dt
 ) const
 {
-
     scalar pf, cf, pr, cr;
     label lRef, rRef;
 
-    label Ns = chemistry_.Ns();
-    simpleMatrix<scalar> RR(Ns);
-    
-    for(label i=0; i<Ns; i++)
+    label nSpecie = this->model_.nSpecie();
+    simpleMatrix<scalar> RR(nSpecie);
+
+    for (label i=0; i<nSpecie; i++)
     {
         c[i] = max(0.0, c[i]);
     }
 
-    for(label i=0; i<Ns; i++)
+    for (label i=0; i<nSpecie; i++)
     {
         RR.source()[i] = c[i]/dt;
     }
 
-    for(label i=0; i<chemistry_.reactions().size(); i++)
+    for (label i=0; i<this->model_.reactions().size(); i++)
     {
-        const chemistryModel::reaction& R = chemistry_.reactions()[i];
+        const Reaction<ThermoType>& R = this->model_.reactions()[i];
 
-        scalar omegai = chemistry_.omega
+        scalar omegai = this->model_.omega
         (
             R, c, T, p, pf, cf, lRef, pr, cr, rRef
         );
@@ -113,59 +101,59 @@ Foam::scalar Foam::EulerImplicit::solve
             }
         }
 
-        for(label s=0; s<R.lhs().size(); s++)
+        for (label s=0; s<R.lhs().size(); s++)
         {
             label si = R.lhs()[s].index;
             scalar sl = R.lhs()[s].stoichCoeff;
             RR[si][rRef] -= sl*pr*corr;
             RR[si][lRef] += sl*pf*corr;
         }
-            
-        for(label s=0; s<R.rhs().size(); s++)
+
+        for (label s=0; s<R.rhs().size(); s++)
         {
             label si = R.rhs()[s].index;
             scalar sr = R.rhs()[s].stoichCoeff;
             RR[si][lRef] -= sr*pf*corr;
             RR[si][rRef] += sr*pr*corr;
         }
-        
+
     } // end for(label i...
 
-    
-    for(label i=0; i<Ns; i++)
+
+    for (label i=0; i<nSpecie; i++)
     {
         RR[i][i] += 1.0/dt;
     }
 
     c = RR.LUsolve();
-    for(label i=0; i<Ns; i++)
+    for (label i=0; i<nSpecie; i++)
     {
         c[i] = max(0.0, c[i]);
     }
 
     // estimate the next time step
     scalar tMin = GREAT;
-    label n = chemistry_.nEqns();
-    scalarField c1(n, 0.0);
+    label nEqns = this->model_.nEqns();
+    scalarField c1(nEqns, 0.0);
 
-    for(label i=0; i<Ns; i++)
+    for (label i=0; i<nSpecie; i++)
     {
         c1[i] = c[i];
     }
-    c1[Ns] = T;
-    c1[Ns+1] = p;
+    c1[nSpecie] = T;
+    c1[nSpecie+1] = p;
+
+    scalarField dcdt(nEqns, 0.0);
+    this->model_.derivatives(0.0, c1, dcdt);
 
-    scalarField dcdt(n, 0.0);
-    chemistry_.derivatives(0.0, c1, dcdt);
-    
     scalar sumC = sum(c);
 
-    for(label i=0; i<Ns; i++)
+    for (label i=0; i<nSpecie; i++)
     {
         scalar d = dcdt[i];
         if (d < -SMALL)
         {
-            tMin = min(tMin, -(c[i]+SMALL)/d);
+            tMin = min(tMin, -(c[i] + SMALL)/d);
         }
         else
         {
@@ -173,10 +161,9 @@ Foam::scalar Foam::EulerImplicit::solve
             scalar cm = max(sumC - c[i], 1.0e-5);
             tMin = min(tMin, cm/d);
         }
-    }    
+    }
 
     return cTauChem_*tMin;
-
 }
 
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
index 2d33ce480..6e2f6bc02 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/EulerImplicit/EulerImplicit.H
@@ -43,20 +43,25 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
+template<class CompType, class ThermoType>
+class EulerImplicit;
+
 /*---------------------------------------------------------------------------*\
                        Class EulerImplicit Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class CompType, class ThermoType>
 class EulerImplicit
 :
-    public chemistrySolver
+    public chemistrySolver<CompType, ThermoType>
 {
     // Private data
 
         dictionary coeffsDict_;
 
-        // model constants
-    
+        // Model constants
+
             scalar cTauChem_;
             Switch equil_;
 
@@ -72,14 +77,14 @@ public:
         //- Construct from components
         EulerImplicit
         (
-            const dictionary& dict,
-            chemistryModel& chemistry
+            ODEChemistryModel<CompType, ThermoType>& model,
+            const word& modelName
         );
 
 
     // Destructor
 
-        ~EulerImplicit();
+       virtual ~EulerImplicit();
 
 
     // Member Functions
@@ -102,6 +107,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "EulerImplicit.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C
index 8719165af..4e7e5fed5 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.C
@@ -29,29 +29,24 @@ License
 namespace Foam
 {
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(chemistrySolver, 0);
-defineRunTimeSelectionTable(chemistrySolver, dictionary);
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-Foam::chemistrySolver::chemistrySolver
+template<class CompType, class ThermoType>
+Foam::chemistrySolver<CompType, ThermoType>::chemistrySolver
 (
-    const Foam::dictionary& dict,
-    Foam::chemistryModel& chemistry
+    ODEChemistryModel<CompType, ThermoType>& model,
+    const word& modelName
 )
 :
-    dict_(dict),
-    chemistry_(chemistry)
+    model_(model),
+    name_(modelName)
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::chemistrySolver::~chemistrySolver()
+template<class CompType, class ThermoType>
+Foam::chemistrySolver<CompType, ThermoType>::~chemistrySolver()
 {}
 
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
index 7676d861d..fb85c0570 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/chemistrySolver.H
@@ -26,7 +26,7 @@ Class
     Foam::chemistrySolver
 
 Description
-    An abstract class for solving chemistry
+    An abstract base class for solving chemistry
 
 SourceFiles
     chemistrySolver.C
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef chemistrySolver_H
 #define chemistrySolver_H
 
-#include "chemistryModel.H"
+#include "ODEChemistryModel.H"
 #include "IOdictionary.H"
 #include "scalarField.H"
 #include "autoPtr.H"
@@ -47,17 +47,26 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
+template<class CompType, class ThermoType>
+class chemistrySolver;
+
 /*---------------------------------------------------------------------------*\
-                           Class chemistrySolver Declaration
+                      Class chemistrySolver Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class CompType, class ThermoType>
 class chemistrySolver
 {
-
 protected:
 
-        const dictionary& dict_;
-        chemistryModel& chemistry_;
+    // Protected data
+
+        //- Reference to the chemistry model
+        ODEChemistryModel<CompType, ThermoType>& model_;
+
+        //- Name of the chemistry solver
+        const word name_;
 
 
 public:
@@ -73,10 +82,10 @@ public:
             chemistrySolver,
             dictionary,
             (
-                const dictionary& dict,
-                chemistryModel& chemistry
+                ODEChemistryModel<CompType, ThermoType>& model,
+                const word& modelName
             ),
-            (dict, chemistry)
+            (model, modelName)
         );
 
 
@@ -85,23 +94,22 @@ public:
         //- Construct from components
         chemistrySolver
         (
-            const dictionary& dict,
-            chemistryModel& chemistry
+            ODEChemistryModel<CompType, ThermoType>& model,
+            const word& modelName
         );
 
 
-    // Selectors
-
-        static autoPtr<chemistrySolver> New
-        (
-            const dictionary& dict,
-            chemistryModel& chemistry
-        );
+    //- Selector
+    static autoPtr<chemistrySolver> New
+    (
+        ODEChemistryModel<CompType, ThermoType>& model,
+        const word& compTypeName,
+        const word& thermoTypeName
+    );
 
 
-    // Destructor
-
-        virtual ~chemistrySolver();
+    //- Destructor
+    virtual ~chemistrySolver();
 
 
     // Member Functions
@@ -124,6 +132,50 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#define makeChemistrySolver(Comp, Thermo)                                     \
+                                                                              \
+    typedef chemistrySolver<Comp, Thermo>                                     \
+        chemistrySolver##Comp##Thermo;                                        \
+                                                                              \
+    defineTemplateTypeNameAndDebugWithName                                    \
+    (                                                                         \
+        chemistrySolver##Comp##Thermo,                                        \
+        "chemistryModel<"#Comp","#Thermo">",                                  \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    defineTemplateRunTimeSelectionTable                                       \
+    (                                                                         \
+        chemistrySolver##Comp##Thermo,                                        \
+        dictionary                                                            \
+    );
+
+
+#define makeChemistrySolverType(SS, Comp, Thermo)                             \
+                                                                              \
+    typedef SS<Comp, Thermo> SS##Comp##Thermo;                                \
+                                                                              \
+    defineTemplateTypeNameAndDebugWithName                                    \
+    (                                                                         \
+        SS##Comp##Thermo,                                                     \
+        #SS"<"#Comp","#Thermo">",                                             \
+        0                                                                     \
+    );                                                                        \
+                                                                              \
+    chemistrySolver<Comp, Thermo>::                                           \
+        adddictionaryConstructorToTable<SS<Comp, Thermo> >                    \
+            add##SS##Comp##Thermo##ConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "chemistrySolver.C"
+#   include "newChemistrySolver.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C
new file mode 100644
index 000000000..5e6b8ec99
--- /dev/null
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/makeChemistrySolvers.C
@@ -0,0 +1,83 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "thermoPhysicsTypes.H"
+#include "chemistrySolver.H"
+
+#include "psiChemistryModel.H"
+#include "rhoChemistryModel.H"
+
+#include "EulerImplicit.H"
+#include "ode.H"
+#include "sequential.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    makeChemistrySolver(psiChemistryModel, gasThermoPhysics)
+    makeChemistrySolverType(EulerImplicit, psiChemistryModel, gasThermoPhysics)
+    makeChemistrySolverType(ode, psiChemistryModel, gasThermoPhysics)
+    makeChemistrySolverType(sequential, psiChemistryModel, gasThermoPhysics)
+
+    makeChemistrySolver(psiChemistryModel, icoPoly8ThermoPhysics)
+    makeChemistrySolverType
+    (
+        EulerImplicit,
+        psiChemistryModel,
+        icoPoly8ThermoPhysics
+    )
+    makeChemistrySolverType(ode, psiChemistryModel, icoPoly8ThermoPhysics)
+    makeChemistrySolverType
+    (
+        sequential,
+        psiChemistryModel,
+        icoPoly8ThermoPhysics
+    )
+
+    makeChemistrySolver(rhoChemistryModel, gasThermoPhysics)
+    makeChemistrySolverType(EulerImplicit, rhoChemistryModel, gasThermoPhysics)
+    makeChemistrySolverType(ode, rhoChemistryModel, gasThermoPhysics)
+    makeChemistrySolverType(sequential, rhoChemistryModel, gasThermoPhysics)
+
+    makeChemistrySolver(rhoChemistryModel, icoPoly8ThermoPhysics)
+    makeChemistrySolverType
+    (
+        EulerImplicit,
+        rhoChemistryModel,
+        icoPoly8ThermoPhysics
+    )
+    makeChemistrySolverType(ode, rhoChemistryModel, icoPoly8ThermoPhysics)
+    makeChemistrySolverType
+    (
+        sequential,
+        rhoChemistryModel,
+        icoPoly8ThermoPhysics
+    )
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
index 05cf2bee2..94d76e74e 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/chemistrySolver/newChemistrySolver.C
@@ -26,33 +26,54 @@ License
 
 #include "chemistrySolver.H"
 
-
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::chemistrySolver> Foam::chemistrySolver::New
+template<class CompType, class ThermoType>
+Foam::autoPtr<Foam::chemistrySolver<CompType, ThermoType> >
+Foam::chemistrySolver<CompType, ThermoType>::New
 (
-    const dictionary& dict,
-    chemistryModel& chemistry
+    ODEChemistryModel<CompType, ThermoType>& model,
+    const word& compTypeName,
+    const word& thermoTypeName
 )
 {
-    word chemistrySolverType(dict.lookup("chemistrySolver"));
+    word modelName(model.lookup("chemistrySolver"));
 
-    dictionaryConstructorTable::iterator cstrIter =
+    word chemistrySolverType =
+        modelName + '<' + compTypeName + ',' + thermoTypeName + '>';
+
+    Info<< "Selecting chemistrySolver " << modelName << endl;
+
+    typename dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(chemistrySolverType);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
+        wordList models = dictionaryConstructorTablePtr_->toc();
+        forAll(models, i)
+        {
+            models[i] = models[i].replace
+            (
+                '<' + compTypeName + ',' + thermoTypeName + '>',
+                ""
+            );
+        }
+
         FatalErrorIn
         (
-            "chemistrySolver::New(const dictionary&, const chemistryModel&)"
-        )   << "Unknown chemistrySolverType type " << chemistrySolverType
-            << endl << endl
-            << "Valid chemistrySolverType types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
+            "chemistrySolver::New"
+            "("
+                "const ODEChemistryModel&, "
+                "const word&, "
+                "const word&"
+            ")"
+        )   << "Unknown chemistrySolver type " << modelName
+            << nl << nl << "Valid chemistrySolver types are:" << nl
+            << models << nl << exit(FatalError);
     }
 
-    return autoPtr<chemistrySolver>(cstrIter()(dict, chemistry));
+    return autoPtr<chemistrySolver<CompType, ThermoType> >
+        (cstrIter()(model, modelName));
 }
 
 
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
index 2ab74e700..62d5bdaec 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.C
@@ -25,36 +25,21 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "ode.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(ode, 0);
-    addToRunTimeSelectionTable
-    (
-        chemistrySolver,
-        ode,
-        dictionary
-    );
-}
-
+#include "ODEChemistryModel.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-Foam::ode::ode
+template<class CompType, class ThermoType>
+Foam::ode<CompType, ThermoType>::ode
 (
-    const Foam::dictionary& dict,
-    Foam::chemistryModel& chemistry
+    ODEChemistryModel<CompType, ThermoType>& model,
+    const word& modelName
 )
 :
-    chemistrySolver(dict, chemistry),
-    chemistry_(chemistry),
-    coeffsDict_(dict.subDict(typeName + "Coeffs")),
+    chemistrySolver<CompType, ThermoType>(model, modelName),
+    coeffsDict_(model.subDict(modelName + "Coeffs")),
     solverName_(coeffsDict_.lookup("ODESolver")),
-    odeSolver_(ODESolver::New(solverName_, chemistry)),
+    odeSolver_(ODESolver::New(solverName_, model)),
     eps_(readScalar(coeffsDict_.lookup("eps"))),
     scale_(readScalar(coeffsDict_.lookup("scale")))
 {}
@@ -62,14 +47,15 @@ Foam::ode::ode
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::ode::~ode()
+template<class CompType, class ThermoType>
+Foam::ode<CompType, ThermoType>::~ode()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
-Foam::scalar Foam::ode::solve
+template<class CompType, class ThermoType>
+Foam::scalar Foam::ode<CompType, ThermoType>::solve
 (
     scalarField& c,
     const scalar T,
@@ -78,28 +64,30 @@ Foam::scalar Foam::ode::solve
     const scalar dt
 ) const
 {
-    label Ns = chemistry_.Ns();
-    scalarField& c1 = chemistry_.coeffs();
+    label nSpecie = this->model_.nSpecie();
+    scalarField c1(this->model_.nEqns(), 0.0);
 
     // copy the concentration, T and P to the total solve-vector
-    for(label i=0; i<Ns; i++)
+    for (label i=0; i<nSpecie; i++)
     {
         c1[i] = c[i];
     }
-    c1[Ns] = T;
-    c1[Ns+1] = p;
+    c1[nSpecie] = T;
+    c1[nSpecie+1] = p;
 
     scalar dtEst = dt;
 
     odeSolver_->solve
     (
+        this->model_,
         t0,
         t0 + dt,
+        c1,
         eps_,
         dtEst
     );
 
-    for(label i=0; i<c.size(); i++)
+    for (label i=0; i<c.size(); i++)
     {
         c[i] = max(0.0, c1[i]);
     }
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
index 591e2d7cb..7193aea00 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/ode/ode.H
@@ -44,24 +44,27 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
+template<class CompType, class ThermoType>
+class ode;
+
 /*---------------------------------------------------------------------------*\
-                           Class ode Declaration
+                            Class ode Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class CompType, class ThermoType>
 class ode
 :
-    public chemistrySolver
+    public chemistrySolver<CompType, ThermoType>
 {
     // Private data
 
-        chemistryModel& chemistry_;
-
         dictionary coeffsDict_;
         const word solverName_;
         autoPtr<ODESolver> odeSolver_;
 
-        // model constants
-    
+        // Model constants
+
             scalar eps_;
             scalar scale_;
 
@@ -77,14 +80,13 @@ public:
         //- Construct from components
         ode
         (
-            const dictionary& dict,
-            chemistryModel& chemistry
+            ODEChemistryModel<CompType, ThermoType>& model,
+            const word& modelName
         );
 
 
-    // Destructor
-
-        ~ode();
+    //- Destructor
+    virtual ~ode();
 
 
     // Member Functions
@@ -106,6 +108,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "ode.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
index 4a4a6be82..5ff4c737b 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.C
@@ -27,31 +27,17 @@ License
 #include "sequential.H"
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(sequential, 0);
-    addToRunTimeSelectionTable
-    (
-        chemistrySolver,
-        sequential,
-        dictionary
-    );
-};
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
-Foam::sequential::sequential
+template<class CompType, class ThermoType>
+Foam::sequential<CompType, ThermoType>::sequential
 (
-    const Foam::dictionary& dict,
-    Foam::chemistryModel& chemistry
+    ODEChemistryModel<CompType, ThermoType>& model,
+    const word& modelName
 )
 :
-    chemistrySolver(dict, chemistry),
-    coeffsDict_(dict.subDict(typeName + "Coeffs")),
+    chemistrySolver<CompType, ThermoType>(model, modelName),
+    coeffsDict_(model.subDict(modelName + "Coeffs")),
     cTauChem_(readScalar(coeffsDict_.lookup("cTauChem"))),
     equil_(coeffsDict_.lookup("equilibriumRateLimiter"))
 {}
@@ -59,13 +45,15 @@ Foam::sequential::sequential
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::sequential::~sequential()
+template<class CompType, class ThermoType>
+Foam::sequential<CompType, ThermoType>::~sequential()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::scalar Foam::sequential::solve
+template<class CompType, class ThermoType>
+Foam::scalar Foam::sequential<CompType, ThermoType>::solve
 (
     scalarField &c,
     const scalar T,
@@ -79,11 +67,11 @@ Foam::scalar Foam::sequential::solve
     scalar pf, cf, pb, cb;
     label lRef, rRef;
 
-    for(label i=0; i<chemistry_.reactions().size(); i++)
+    for (label i=0; i<this->model_.reactions().size(); i++)
     {
-        const chemistryModel::reaction& R = chemistry_.reactions()[i];
+        const Reaction<ThermoType>& R = this->model_.reactions()[i];
 
-        scalar om0 = chemistry_.omega
+        scalar om0 = this->model_.omega
         (
             R, c, T, p, pf, cf, lRef, pb, cb, rRef
         );
@@ -108,23 +96,23 @@ Foam::scalar Foam::sequential::solve
 
 
         // update species
-        for(label s=0; s<R.lhs().size(); s++)
+        for (label s=0; s<R.lhs().size(); s++)
         {
             label si = R.lhs()[s].index;
             scalar sl = R.lhs()[s].stoichCoeff;
             c[si] -= dt*sl*omeg;
             c[si] = max(0.0, c[si]);
-        }        
+        }
 
-        for(label s=0; s<R.rhs().size(); s++)
+        for (label s=0; s<R.rhs().size(); s++)
         {
             label si = R.rhs()[s].index;
             scalar sr = R.rhs()[s].stoichCoeff;
             c[si] += dt*sr*omeg;
             c[si] = max(0.0, c[si]);
-        }        
+        }
 
-    } // end for(label i...
+    } // end for (label i...
 
     return cTauChem_/tChemInv;
 }
diff --git a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H
index 252369009..ece24400b 100644
--- a/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H
+++ b/src/thermophysicalModels/chemistryModel/chemistrySolver/sequential/sequential.H
@@ -45,19 +45,24 @@ SourceFiles
 namespace Foam
 {
 
+// Forward declaration of classes
+template<class CompType, class ThermoType>
+class sequential;
+
 /*---------------------------------------------------------------------------*\
-                           Class sequential Declaration
+                         Class sequential Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class CompType, class ThermoType>
 class sequential
 :
-    public chemistrySolver
+    public chemistrySolver<CompType, ThermoType>
 {
     // Private data
 
         dictionary coeffsDict_;
 
-        // model constants
+        // Model constants
 
             scalar cTauChem_;
             Switch equil_;
@@ -75,14 +80,13 @@ public:
         //- Construct from components
         sequential
         (
-            const dictionary& dict,
-            chemistryModel& chemistry
+            ODEChemistryModel<CompType, ThermoType>& model,
+            const word& modelName
         );
 
 
-    // Destructor
-
-        ~sequential();
+    //- Destructor
+    virtual ~sequential();
 
 
     // Member Functions
@@ -105,6 +109,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "sequential.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/Make/files b/src/thermophysicalModels/combustion/Make/files
deleted file mode 100644
index fb7defdcb..000000000
--- a/src/thermophysicalModels/combustion/Make/files
+++ /dev/null
@@ -1,33 +0,0 @@
-hCombustionThermo   = hCombustionThermo
-hhuCombustionThermo = hhuCombustionThermo
-hThermo             = hThermo
-
-chemistryReader     = chemistryReaders/chemistryReader
-foamChemistryReader = chemistryReaders/foamChemistryReader
-chemkinReader       = chemistryReaders/chemkinReader
-
-mixtures            = mixtureThermos/mixtures
-combustionMixture   = $(mixtures)/combustionMixture
-reactingMixture     = $(mixtures)/reactingMixture
-
-$(chemistryReader)/chemistryReader.C
-$(foamChemistryReader)/foamChemistryReader.C
-$(chemkinReader)/chemkinReader.C
-$(chemkinReader)/chemkinLexer.C
-
-$(combustionMixture)/combustionMixture.C
-$(reactingMixture)/reactingMixture.C
-
-$(hCombustionThermo)/hCombustionThermo.C
-$(hCombustionThermo)/newhCombustionThermo.C
-$(hCombustionThermo)/hCombustionThermos.C
-
-$(hhuCombustionThermo)/hhuCombustionThermo.C
-$(hhuCombustionThermo)/newhhuCombustionThermo.C
-$(hhuCombustionThermo)/hhuCombustionThermos.C
-
-derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C
-derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C
-derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
-
-LIB = $(FOAM_LIBBIN)/libcombustionThermophysicalModels
diff --git a/src/thermophysicalModels/laminarFlameSpeed/Make/options b/src/thermophysicalModels/laminarFlameSpeed/Make/options
index d3f9e6993..fe682daba 100644
--- a/src/thermophysicalModels/laminarFlameSpeed/Make/options
+++ b/src/thermophysicalModels/laminarFlameSpeed/Make/options
@@ -2,7 +2,7 @@ EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/specie/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/combustion/lnInclude
+    -I$(LIB_SRC)/thermophysicalModels/reactionThermo/lnInclude
 
 LIB_LIBS = \
     -lfiniteVolume
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
index 93d562af7..8f62bc388 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.C
@@ -34,7 +34,6 @@ const Foam::scalar Foam::liquidMixture::TrMax = 0.999;
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 Foam::liquidMixture::liquidMixture
 (
     const dictionary& thermophysicalProperties
@@ -72,6 +71,7 @@ Foam::liquidMixture::liquidMixture
     }
 }
 
+
 // * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
 
 Foam::autoPtr<Foam::liquidMixture> Foam::liquidMixture::New
@@ -85,7 +85,6 @@ Foam::autoPtr<Foam::liquidMixture> Foam::liquidMixture::New
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Critical Temperature
 Foam::scalar Foam::liquidMixture::Tc
 (
     const scalarField& x
@@ -104,9 +103,8 @@ Foam::scalar Foam::liquidMixture::Tc
 
     return vTc/vc;
 }
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Pseudocritical temperature
+
 Foam::scalar Foam::liquidMixture::Tpc
 (
     const scalarField& x
@@ -121,9 +119,7 @@ Foam::scalar Foam::liquidMixture::Tpc
     return Tpc;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Pseudocritical pressure
 Foam::scalar Foam::liquidMixture::Ppc
 (
     const scalarField& x
@@ -140,7 +136,6 @@ Foam::scalar Foam::liquidMixture::Ppc
     return specie::RR*Zc*Tpc(x)/Vc;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Foam::scalar Foam::liquidMixture::omega
 (
@@ -156,7 +151,6 @@ Foam::scalar Foam::liquidMixture::omega
     return omega;
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 Foam::scalarField Foam::liquidMixture::Xs
 (
@@ -178,9 +172,6 @@ Foam::scalarField Foam::liquidMixture::Xs
     return xs;
 }
 
-//-----------------------------------------------------------------------------
-// Physical properties
-//-----------------------------------------------------------------------------
 
 Foam::scalar Foam::liquidMixture::W
 (
@@ -196,6 +187,7 @@ Foam::scalar Foam::liquidMixture::W
     return W;
 }
 
+
 Foam::scalarField Foam::liquidMixture::Y
 (
     const scalarField& X
@@ -211,6 +203,7 @@ Foam::scalarField Foam::liquidMixture::Y
     return Y;
 }
 
+
 Foam::scalarField Foam::liquidMixture::X
 (
     const scalarField& Y
@@ -250,6 +243,7 @@ Foam::scalar Foam::liquidMixture::rho
     return W(x)/v;
 }
 
+
 Foam::scalar Foam::liquidMixture::pv
 (
     const scalar p,
@@ -271,6 +265,7 @@ Foam::scalar Foam::liquidMixture::pv
     return pv/W(x);
 }
 
+
 Foam::scalar Foam::liquidMixture::hl
 (
     const scalar p,
@@ -292,6 +287,7 @@ Foam::scalar Foam::liquidMixture::hl
     return hl/W(x);
 }
 
+
 Foam::scalar Foam::liquidMixture::cp
 (
     const scalar p,
@@ -306,13 +302,14 @@ Foam::scalar Foam::liquidMixture::cp
         if (x[i] > SMALL)
         {
             scalar Ti = min(TrMax*properties_[i].Tc(), T);
-            cp += x[i]*properties_[i].cp(p, Ti)*properties_[i].W();;
+            cp += x[i]*properties_[i].cp(p, Ti)*properties_[i].W();
         }
     }
 
     return cp/W(x);
 }
 
+
 Foam::scalar Foam::liquidMixture::sigma
 (
     const scalar p,
@@ -346,6 +343,7 @@ Foam::scalar Foam::liquidMixture::sigma
     return sigma;
 }
 
+
 Foam::scalar Foam::liquidMixture::mu
 (
     const scalar p,
@@ -367,6 +365,7 @@ Foam::scalar Foam::liquidMixture::mu
     return exp(mu);
 }
 
+
 Foam::scalar Foam::liquidMixture::K
 (
     const scalar p,
@@ -402,7 +401,12 @@ Foam::scalar Foam::liquidMixture::K
         {
             scalar Tj = min(TrMax*properties_[j].Tc(), T);
 
-            scalar Kij = 2.0/(1.0/properties_[i].K(p, Ti) + 1.0/properties_[j].K(p, Tj));
+            scalar Kij =
+                2.0
+               /(
+                    1.0/properties_[i].K(p, Ti)
+                  + 1.0/properties_[j].K(p, Tj)
+                );
             K += phii[i]*phii[j]*Kij;
         }
     }
@@ -410,6 +414,7 @@ Foam::scalar Foam::liquidMixture::K
     return K;
 }
 
+
 Foam::scalar Foam::liquidMixture::D
 (
     const scalar p,
@@ -432,4 +437,5 @@ Foam::scalar Foam::liquidMixture::D
     return 1.0/Dinv;
 }
 
+
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
index 60d1e44e2..261c46623 100644
--- a/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
+++ b/src/thermophysicalModels/liquidMixture/liquidMixture/liquidMixture.H
@@ -167,7 +167,7 @@ public:
         ) const;
 
 
-        //- Calculate the mean molecular weigth [kg/kmol]
+        //- Calculate the mean molecular weight [kg/kmol]
         // from mole fractions
         scalar W(const scalarField& x) const;
 
diff --git a/src/thermophysicalModels/reactionThermo/Make/files b/src/thermophysicalModels/reactionThermo/Make/files
new file mode 100644
index 000000000..471dbb114
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/Make/files
@@ -0,0 +1,31 @@
+chemistryReaders/chemkinReader/chemkinReader.C
+chemistryReaders/chemkinReader/chemkinLexer.C
+chemistryReaders/chemistryReader/makeChemistryReaders.C
+
+mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
+
+combustionThermo/hCombustionThermo/hCombustionThermo.C
+combustionThermo/hCombustionThermo/newhCombustionThermo.C
+combustionThermo/hCombustionThermo/hCombustionThermos.C
+
+combustionThermo/hsCombustionThermo/hsCombustionThermo.C
+combustionThermo/hsCombustionThermo/newhsCombustionThermo.C
+combustionThermo/hsCombustionThermo/hsCombustionThermos.C
+
+combustionThermo/hhuCombustionThermo/hhuCombustionThermo.C
+combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
+combustionThermo/hhuCombustionThermo/hhuCombustionThermos.C
+
+reactionThermo/hReactionThermo/hReactionThermo.C
+reactionThermo/hReactionThermo/newhReactionThermo.C
+reactionThermo/hReactionThermo/hReactionThermos.C
+
+reactionThermo/hsReactionThermo/hsReactionThermo.C
+reactionThermo/hsReactionThermo/newhsReactionThermo.C
+reactionThermo/hsReactionThermo/hsReactionThermos.C
+
+derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C
+derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C
+derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
+
+LIB = $(FOAM_LIBBIN)/libreactionThermophysicalModels
diff --git a/src/thermophysicalModels/combustion/Make/options b/src/thermophysicalModels/reactionThermo/Make/options
similarity index 100%
rename from src/thermophysicalModels/combustion/Make/options
rename to src/thermophysicalModels/reactionThermo/Make/options
diff --git a/src/thermophysicalModels/combustion/chemistryReaders/chemistryReader/chemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
similarity index 73%
rename from src/thermophysicalModels/combustion/chemistryReaders/chemistryReader/chemistryReader.C
rename to src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
index 2b99ff44d..7c30550fd 100644
--- a/src/thermophysicalModels/combustion/chemistryReaders/chemistryReader/chemistryReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.C
@@ -26,17 +26,11 @@ License
 
 #include "chemistryReader.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-namespace Foam
-{
-    defineTypeNameAndDebug(chemistryReader, 0);
-    defineRunTimeSelectionTable(chemistryReader, dictionary);
-};
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::autoPtr<Foam::chemistryReader> Foam::chemistryReader::New
+template<class ThermoType>
+Foam::autoPtr<Foam::chemistryReader<ThermoType> >
+Foam::chemistryReader<ThermoType>::New
 (
     const dictionary& thermoDict
 )
@@ -46,16 +40,12 @@ Foam::autoPtr<Foam::chemistryReader> Foam::chemistryReader::New
     word chemistryReaderTypeName("chemkinReader");
 
     // otherwise use the specified reader
-    if (thermoDict.found("chemistryReader"))
-    {
-        thermoDict.lookup("chemistryReader") >> chemistryReaderTypeName;
-    }
+    thermoDict.readIfPresent("chemistryReader", chemistryReaderTypeName);
 
     Info<< "Selecting chemistryReader " << chemistryReaderTypeName << endl;
 
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_
-        ->find(chemistryReaderTypeName);
+    typename dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(chemistryReaderTypeName);
 
     if (cstrIter == dictionaryConstructorTablePtr_->end())
     {
@@ -63,13 +53,13 @@ Foam::autoPtr<Foam::chemistryReader> Foam::chemistryReader::New
         (
             "chemistryReader::New(const dictionary& thermoDict)"
         )   << "Unknown chemistryReader type "
-            << chemistryReaderTypeName << endl << endl
-            << "Valid  chemistryReaders are : " << endl
+            << chemistryReaderTypeName << nl << nl
+            << "Valid  chemistryReaders are: " << nl
             << dictionaryConstructorTablePtr_->toc()
             << exit(FatalError);
     }
 
-    return autoPtr<chemistryReader>(cstrIter()(thermoDict));
+    return autoPtr<chemistryReader<ThermoType> >(cstrIter()(thermoDict));
 }
 
 
diff --git a/src/thermophysicalModels/combustion/chemistryReaders/chemistryReader/chemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
similarity index 57%
rename from src/thermophysicalModels/combustion/chemistryReaders/chemistryReader/chemistryReader.H
rename to src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
index d43db87fb..d1bf6759c 100644
--- a/src/thermophysicalModels/combustion/chemistryReaders/chemistryReader/chemistryReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/chemistryReader.H
@@ -39,10 +39,6 @@ SourceFiles
 #include "typeInfo.H"
 #include "runTimeSelectionTables.H"
 #include "Reaction.H"
-#include "sutherlandTransport.H"
-#include "specieThermo.H"
-#include "janafThermo.H"
-#include "perfectGas.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,23 +46,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class chemistryReader Declaration
+                      Class chemistryReader Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class ThermoType>
 class chemistryReader
 {
-
-public:
-
-    // Public data types
-
-        typedef sutherlandTransport<specieThermo<janafThermo<perfectGas> > >
-            reactionThermo;
-
-        typedef Reaction<reactionThermo> reaction;
-
-private:
-
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
@@ -81,6 +66,9 @@ public:
     //- Runtime type information
     TypeName("chemistryReader");
 
+    //- The type of thermo package the reader was instantiated for
+    typedef ThermoType thermoType;
+
 
     // Constructors
 
@@ -109,17 +97,18 @@ public:
         static autoPtr<chemistryReader> New(const dictionary& thermoDict);
 
 
-    // Destructor
-
-        virtual ~chemistryReader()
-        {}
+    //- Destructor
+    virtual ~chemistryReader()
+    {}
 
 
     // Member Functions
 
         virtual const speciesTable& species() const = 0;
-        virtual const HashPtrTable<reactionThermo>& sThermo() const = 0;
-        virtual const SLPtrList<reaction>& reactions() const = 0;
+
+        virtual const HashPtrTable<ThermoType>& speciesThermo() const = 0;
+
+        virtual const SLPtrList<Reaction<ThermoType> >& reactions() const = 0;
 };
 
 
@@ -129,6 +118,41 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#define makeChemistryReader(Thermo)                                           \
+                                                                              \
+defineTemplateTypeNameAndDebug                                                \
+(                                                                             \
+    chemistryReader<Thermo>,                                                  \
+    0                                                                         \
+);                                                                            \
+                                                                              \
+defineTemplateRunTimeSelectionTable(chemistryReader<Thermo>, dictionary);
+
+
+#define makeChemistryReaderType(SS, Thermo)                                   \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(SS<Thermo>, 0);                       \
+                                                                              \
+    chemistryReader<Thermo>::adddictionaryConstructorToTable<SS<Thermo> >     \
+        add##SS##Thermo##ConstructorToTable_;
+
+
+#define addChemistryReaderType(SS, Thermo)                                    \
+                                                                              \
+    defineNamedTemplateTypeNameAndDebug(SS, 0);                               \
+                                                                              \
+    chemistryReader<Thermo>::adddictionaryConstructorToTable<SS>              \
+        add##SS##Thermo##ConstructorToTable_;
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "chemistryReader.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/makeChemistryReaders.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/makeChemistryReaders.C
new file mode 100644
index 000000000..6246203b9
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemistryReader/makeChemistryReaders.C
@@ -0,0 +1,50 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "makeReactionThermo.H"
+#include "thermoPhysicsTypes.H"
+
+#include "chemistryReader.H"
+#include "foamChemistryReader.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeChemistryReader(gasThermoPhysics);
+makeChemistryReader(icoPoly8ThermoPhysics);
+
+makeChemistryReaderType(foamChemistryReader, gasThermoPhysics);
+makeChemistryReaderType(foamChemistryReader, icoPoly8ThermoPhysics);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
similarity index 98%
rename from src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L
rename to src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
index 418e0bc54..fa2a2e115 100644
--- a/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinLexer.L
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinLexer.L
@@ -32,11 +32,14 @@ License
 
 #include "error.H"
 #include "IStringStream.H"
+// For EOF only
+#include <cstdio>
 
 // flex input buffer size
 int Foam::chemkinReader::yyBufSize = YY_BUF_SIZE;
 
 // Dummy yyFlexLexer::yylex() to keep the linker happy. It is not called
+//! @cond dummy
 int yyFlexLexer::yylex()
 {
     Foam::FatalErrorIn("yyFlexLexer::yylex()")
@@ -45,11 +48,13 @@ int yyFlexLexer::yylex()
 
     return 0;
 }
+//! @endcond dummy
 
 
 // Dummy yywrap to keep yylex happy at compile time.
 // It is called by yylex but is not used as the mechanism to change file.
 // See <<EOF>>
+//! @cond dummy
 #if YY_FLEX_SUBMINOR_VERSION < 34
 extern "C" int yywrap()
 #else
@@ -58,12 +63,15 @@ int yyFlexLexer::yywrap()
 {
     return 1;
 }
+//! @endcond dummy
+
 
 Foam::string foamSpecieString(const char* YYText)
 {
     Foam::string specieString(YYText);
-    specieString.replaceAll('(', '<');
-    specieString.replaceAll(')', '>');
+    // Transforming parentheses is no longer necessary
+    //specieString.replaceAll('(', '<');
+    //specieString.replaceAll(')', '>');
     return specieString;
 }
 
@@ -301,13 +309,13 @@ List<specieElement> currentSpecieComposition(5);
 scalar currentLowT = 0;
 scalar currentHighT = 0;
 scalar currentCommonT = 0;
-reactionThermo::coeffArray highCpCoeffs;
-reactionThermo::coeffArray lowCpCoeffs;
+gasThermoPhysics::coeffArray highCpCoeffs;
+gasThermoPhysics::coeffArray lowCpCoeffs;
 
-reaction::specieCoeffs currentSpecieCoeff;
+gasReaction::specieCoeffs currentSpecieCoeff;
 
-DynamicList<reaction::specieCoeffs> lhs;
-DynamicList<reaction::specieCoeffs> rhs;
+DynamicList<gasReaction::specieCoeffs> lhs;
+DynamicList<gasReaction::specieCoeffs> rhs;
 
 scalarList ArrheniusCoeffs(3);
 DynamicList<scalar> reactionCoeffs;
@@ -317,7 +325,7 @@ label currentThirdBodyIndex = -1;
 word reactionCoeffsName = word::null;
 HashTable<scalarList> reactionCoeffsTable;
 
-DynamicList<reaction::specieCoeffs> *lrhsPtr = &lhs;
+DynamicList<gasReaction::specieCoeffs> *lrhsPtr = &lhs;
 
 reactionType rType = unknownReactionType;
 reactionRateType rrType = Arrhenius;
@@ -609,7 +617,7 @@ bool finishReaction = false;
 
 <readThermoLineLabel4>{thermoLineLabel4} {
 
-        HashPtrTable<reactionThermo>::iterator specieThermoIter
+        HashPtrTable<gasThermoPhysics>::iterator specieThermoIter
         (
             speciesThermo_.find(currentSpecieName)
         );
@@ -622,7 +630,7 @@ bool finishReaction = false;
         speciesThermo_.insert
         (
             currentSpecieName,
-            new reactionThermo
+            new gasThermoPhysics
             (
                 janafThermo<perfectGas>
                 (
@@ -799,7 +807,7 @@ bool finishReaction = false;
         }
         else
         {
-            currentSpecieName = keyword;
+            currentSpecieName = foamName(foamSpecieString(YYText()));
 
             HashTable<label>::iterator specieIndexIter
             (
@@ -1429,7 +1437,7 @@ bool finishReaction = false;
 
 <readReactionOrder>{reactionCoeff}{endReactionCoeffs} {
 
-        DynamicList<reaction::specieCoeffs>& lrhs = *lrhsPtr;
+        DynamicList<gasReaction::specieCoeffs>& lrhs = *lrhsPtr;
 
         bool found = false;
 
@@ -1530,5 +1538,5 @@ bool finishReaction = false;
 %%
 
  /* ------------------------------------------------------------------------- *\
-    ------ End of STLToFoam.L
+    ------ End of chemkinLexer.L
  \* ------------------------------------------------------------------------- */
diff --git a/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
similarity index 96%
rename from src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinReader.C
rename to src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
index 06267ba40..f6927aaee 100644
--- a/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.C
@@ -46,8 +46,7 @@ License
 
 namespace Foam
 {
-    defineTypeNameAndDebug(chemkinReader, 0);
-    addToRunTimeSelectionTable(chemistryReader, chemkinReader, dictionary);
+    addChemistryReaderType(chemkinReader, gasThermoPhysics);
 };
 
 /* * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * */
@@ -164,8 +163,8 @@ template<class ReactionRateType>
 void Foam::chemkinReader::addReactionType
 (
     const reactionType rType,
-    DynamicList<reaction::specieCoeffs>& lhs,
-    DynamicList<reaction::specieCoeffs>& rhs,
+    DynamicList<gasReaction::specieCoeffs>& lhs,
+    DynamicList<gasReaction::specieCoeffs>& rhs,
     const ReactionRateType& rr
 )
 {
@@ -175,9 +174,9 @@ void Foam::chemkinReader::addReactionType
         {
             reactions_.append
             (
-                new IrreversibleReaction<reactionThermo, ReactionRateType>
+                new IrreversibleReaction<gasThermoPhysics, ReactionRateType>
                 (
-                    Reaction<reactionThermo>
+                    Reaction<gasThermoPhysics>
                     (
                         speciesTable_,
                         lhs.shrink(),
@@ -194,9 +193,9 @@ void Foam::chemkinReader::addReactionType
         {
             reactions_.append
             (
-                new ReversibleReaction<reactionThermo, ReactionRateType>
+                new ReversibleReaction<gasThermoPhysics, ReactionRateType>
                 (
-                    Reaction<reactionThermo>
+                    Reaction<gasThermoPhysics>
                     (
                         speciesTable_,
                         lhs.shrink(),
@@ -234,8 +233,8 @@ void Foam::chemkinReader::addPressureDependentReaction
 (
     const reactionType rType,
     const fallOffFunctionType fofType,
-    DynamicList<reaction::specieCoeffs>& lhs,
-    DynamicList<reaction::specieCoeffs>& rhs,
+    DynamicList<gasReaction::specieCoeffs>& lhs,
+    DynamicList<gasReaction::specieCoeffs>& rhs,
     const scalarList& efficiencies,
     const scalarList& k0Coeffs,
     const scalarList& kInfCoeffs,
@@ -417,8 +416,8 @@ void Foam::chemkinReader::addPressureDependentReaction
 
 void Foam::chemkinReader::addReaction
 (
-    DynamicList<reaction::specieCoeffs>& lhs,
-    DynamicList<reaction::specieCoeffs>& rhs,
+    DynamicList<gasReaction::specieCoeffs>& lhs,
+    DynamicList<gasReaction::specieCoeffs>& rhs,
     const scalarList& efficiencies,
     const reactionType rType,
     const reactionRateType rrType,
@@ -493,9 +492,9 @@ void Foam::chemkinReader::addReaction
                 reactions_.append
                 (
                     new NonEquilibriumReversibleReaction
-                        <reactionThermo, ArrheniusReactionRate>
+                        <gasThermoPhysics, ArrheniusReactionRate>
                     (
-                        Reaction<reactionThermo>
+                        Reaction<gasThermoPhysics>
                         (
                             speciesTable_,
                             lhs.shrink(),
@@ -546,9 +545,9 @@ void Foam::chemkinReader::addReaction
                 reactions_.append
                 (
                     new NonEquilibriumReversibleReaction
-                        <reactionThermo, thirdBodyArrheniusReactionRate>
+                        <gasThermoPhysics, thirdBodyArrheniusReactionRate>
                     (
-                        Reaction<reactionThermo>
+                        Reaction<gasThermoPhysics>
                         (
                             speciesTable_,
                             lhs.shrink(),
@@ -651,9 +650,9 @@ void Foam::chemkinReader::addReaction
                 reactions_.append
                 (
                     new NonEquilibriumReversibleReaction
-                        <reactionThermo, LandauTellerReactionRate>
+                        <gasThermoPhysics, LandauTellerReactionRate>
                     (
-                        Reaction<reactionThermo>
+                        Reaction<gasThermoPhysics>
                         (
                             speciesTable_,
                             lhs.shrink(),
diff --git a/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
similarity index 93%
rename from src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinReader.H
rename to src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
index 45415c450..0d5cd90c3 100644
--- a/src/thermophysicalModels/combustion/chemistryReaders/chemkinReader/chemkinReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/chemkinReader/chemkinReader.H
@@ -47,6 +47,8 @@ SourceFiles
 #include "speciesTable.H"
 #include "atomicWeights.H"
 
+#include "reactionTypes.H"
+
 #include <FlexLexer.h>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -55,12 +57,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class chemkin Declaration
+                       Class chemkinReader Declaration
 \*---------------------------------------------------------------------------*/
 
 class chemkinReader
 :
-    public chemistryReader,
+    public chemistryReader<gasThermoPhysics>,
     public yyFlexLexer
 {
 
@@ -198,13 +200,13 @@ private:
         HashTable<phase> speciePhase_;
 
         //- Table of the thermodynamic data given in the CHEMKIN file
-        HashPtrTable<reactionThermo> speciesThermo_;
+        HashPtrTable<gasThermoPhysics> speciesThermo_;
 
         //- Table of species composition
         HashTable<List<specieElement> > specieComposition_;
 
         //- List of the reactions
-        SLPtrList<reaction> reactions_;
+        SLPtrList<gasReaction> reactions_;
 
 
     // Private Member Functions
@@ -256,8 +258,8 @@ private:
         void addReactionType
         (
             const reactionType rType,
-            DynamicList<reaction::specieCoeffs>& lhs,
-            DynamicList<reaction::specieCoeffs>& rhs,
+            DynamicList<gasReaction::specieCoeffs>& lhs,
+            DynamicList<gasReaction::specieCoeffs>& rhs,
             const ReactionRateType& rr
         );
 
@@ -266,8 +268,8 @@ private:
         (
             const reactionType rType,
             const fallOffFunctionType fofType,
-            DynamicList<reaction::specieCoeffs>& lhs,
-            DynamicList<reaction::specieCoeffs>& rhs,
+            DynamicList<gasReaction::specieCoeffs>& lhs,
+            DynamicList<gasReaction::specieCoeffs>& rhs,
             const scalarList& thirdBodyEfficiencies,
             const scalarList& k0Coeffs,
             const scalarList& kInfCoeffs,
@@ -279,8 +281,8 @@ private:
 
         void addReaction
         (
-            DynamicList<reaction::specieCoeffs>& lhs,
-            DynamicList<reaction::specieCoeffs>& rhs,
+            DynamicList<gasReaction::specieCoeffs>& lhs,
+            DynamicList<gasReaction::specieCoeffs>& rhs,
             const scalarList& thirdBodyEfficiencies,
             const reactionType rType,
             const reactionRateType rrType,
@@ -363,7 +365,7 @@ public:
         }
 
         //- Table of the thermodynamic data given in the CHEMKIN file
-        const HashPtrTable<reactionThermo>& sThermo() const
+        const HashPtrTable<gasThermoPhysics>& speciesThermo() const
         {
             return speciesThermo_;
         }
@@ -375,7 +377,7 @@ public:
         }
 
         //- List of the reactions
-        const SLPtrList<reaction>& reactions() const
+        const SLPtrList<gasReaction>& reactions() const
         {
             return reactions_;
         }
diff --git a/src/thermophysicalModels/combustion/chemistryReaders/foamChemistryReader/foamChemistryReader.C b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C
similarity index 81%
rename from src/thermophysicalModels/combustion/chemistryReaders/foamChemistryReader/foamChemistryReader.C
rename to src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C
index 0fdd6fa31..0d0189a28 100644
--- a/src/thermophysicalModels/combustion/chemistryReaders/foamChemistryReader/foamChemistryReader.C
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.C
@@ -28,36 +28,33 @@ License
 #include "IFstream.H"
 #include "addToRunTimeSelectionTable.H"
 
-/* * * * * * * * * * * * * * * * * Static data * * * * * * * * * * * * * * * */
-
-namespace Foam
-{
-    defineTypeNameAndDebug(foamChemistryReader, 0);
-    addToRunTimeSelectionTable(chemistryReader, foamChemistryReader, dictionary);
-};
-
 // * * * * * * * * * * * * * * * * Constructor * * * * * * * * * * * * * * * //
 
-// Construct from components
-Foam::foamChemistryReader::foamChemistryReader
+template<class ThermoType>
+Foam::foamChemistryReader<ThermoType>::foamChemistryReader
 (
     const fileName& reactionsFileName,
     const fileName& thermoFileName
 )
 :
+    chemistryReader<ThermoType>(),
     speciesThermo_(IFstream(thermoFileName)()),
     speciesTable_(dictionary(IFstream(reactionsFileName)()).lookup("species")),
     reactions_
     (
         dictionary(IFstream(reactionsFileName)()).lookup("reactions"),
-        reaction::iNew(speciesTable_, speciesThermo_)
+        Reaction<ThermoType>::iNew(speciesTable_, speciesThermo_)
     )
 {}
 
 
-// Construct from components
-Foam::foamChemistryReader::foamChemistryReader(const dictionary& thermoDict)
+template<class ThermoType>
+Foam::foamChemistryReader<ThermoType>::foamChemistryReader
+(
+    const dictionary& thermoDict
+)
 :
+    chemistryReader<ThermoType>(),
     speciesThermo_
     (
         IFstream
@@ -84,7 +81,7 @@ Foam::foamChemistryReader::foamChemistryReader(const dictionary& thermoDict)
                 fileName(thermoDict.lookup("foamChemistryFile")).expand()
             )()
         ).lookup("reactions"),
-        reaction::iNew(speciesTable_, speciesThermo_)
+        typename Reaction<ThermoType>::iNew(speciesTable_, speciesThermo_)
     )
 {}
 
diff --git a/src/thermophysicalModels/combustion/chemistryReaders/foamChemistryReader/foamChemistryReader.H b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
similarity index 86%
rename from src/thermophysicalModels/combustion/chemistryReaders/foamChemistryReader/foamChemistryReader.H
rename to src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
index c5f711f6c..6a1326610 100644
--- a/src/thermophysicalModels/combustion/chemistryReaders/foamChemistryReader/foamChemistryReader.H
+++ b/src/thermophysicalModels/reactionThermo/chemistryReaders/foamChemistryReader/foamChemistryReader.H
@@ -41,7 +41,6 @@ SourceFiles
 #include "typeInfo.H"
 #include "HashPtrTable.H"
 #include "SLPtrList.H"
-#include "DynamicList.H"
 #include "labelList.H"
 #include "speciesTable.H"
 #include "atomicWeights.H"
@@ -52,21 +51,22 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class foamChemistry Declaration
+                       Class foamChemistry Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class ThermoType>
 class foamChemistryReader
 :
-    public chemistryReader
+    public chemistryReader<ThermoType>
 {
         //- Table of the thermodynamic data given in the foamChemistry file
-        HashPtrTable<reactionThermo> speciesThermo_;
+        HashPtrTable<ThermoType> speciesThermo_;
 
         //- Table of species
         speciesTable speciesTable_;
 
         //- List of the reactions
-        SLPtrList<reaction> reactions_;
+        SLPtrList<Reaction<ThermoType> > reactions_;
 
 
     // Private Member Functions
@@ -98,10 +98,9 @@ public:
         foamChemistryReader(const dictionary& thermoDict);
 
 
-    // Destructor
-
-        virtual ~foamChemistryReader()
-        {}
+    //- Destructor
+    virtual ~foamChemistryReader()
+    {}
 
 
     // Member functions
@@ -113,13 +112,13 @@ public:
         }
 
         //- Table of the thermodynamic data given in the foamChemistry file
-        const HashPtrTable<reactionThermo>& sThermo() const
+        const HashPtrTable<ThermoType>& speciesThermo() const
         {
             return speciesThermo_;
         }
 
         //- List of the reactions
-        const SLPtrList<reaction>& reactions() const
+        const SLPtrList<Reaction<ThermoType> >& reactions() const
         {
             return reactions_;
         }
@@ -132,6 +131,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "foamChemistryReader.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.C
similarity index 81%
rename from src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermo.C
rename to src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.C
index b1f738e43..f13d686d6 100644
--- a/src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.C
@@ -31,17 +31,15 @@ License
 
 namespace Foam
 {
-
-/* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
-
-defineTypeNameAndDebug(hCombustionThermo, 0);
-defineRunTimeSelectionTable(hCombustionThermo, fvMesh);
+    defineTypeNameAndDebug(hCombustionThermo, 0);
+    defineRunTimeSelectionTable(hCombustionThermo, fvMesh);
+}
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-hCombustionThermo::hCombustionThermo(const fvMesh& mesh)
+Foam::hCombustionThermo::hCombustionThermo(const fvMesh& mesh)
 :
-    basicThermo(mesh),
+    basicPsiThermo(mesh),
 
     h_
     (
@@ -55,19 +53,15 @@ hCombustionThermo::hCombustionThermo(const fvMesh& mesh)
         ),
         mesh,
         dimensionSet(0, 2, -2, 0, 0),
-        hBoundaryTypes()
+        this->hBoundaryTypes()
     )
 {}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-hCombustionThermo::~hCombustionThermo()
+Foam::hCombustionThermo::~hCombustionThermo()
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermo.H b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.H
similarity index 73%
rename from src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermo.H
rename to src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.H
index 202553483..1e63cc883 100644
--- a/src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermo.H
@@ -30,15 +30,14 @@ Description
 
 SourceFiles
     hCombustionThermo.C
-    newhCombustionThermo.C
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef hCombustionThermo_H
 #define hCombustionThermo_H
 
-#include "basicThermo.H"
-#include "combustionMixture.H"
+#include "basicPsiThermo.H"
+#include "basicMultiComponentMixture.H"
 #include "autoPtr.H"
 #include "runTimeSelectionTables.H"
 
@@ -48,18 +47,19 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                      Class hCombustionThermo Declaration
+                     Class hCombustionThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 class hCombustionThermo
 :
-    public basicThermo
+    public basicPsiThermo
 {
 
 protected:
 
     // Protected data
 
+        //- Enthalpy field
         volScalarField h_;
 
 
@@ -69,16 +69,15 @@ public:
     TypeName("hCombustionThermo");
 
 
-    // Declare run-time constructor selection tables
-
-        declareRunTimeSelectionTable
-        (
-            autoPtr,
-            hCombustionThermo,
-            fvMesh,
-            (const fvMesh& mesh),
-            (mesh)
-        );
+    //- Declare run-time constructor selection tables
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        hCombustionThermo,
+        fvMesh,
+        (const fvMesh& mesh),
+        (mesh)
+    );
 
 
     // Constructors
@@ -89,34 +88,41 @@ public:
 
     // Selectors
 
+        //- Standard selection based on fvMesh
         static autoPtr<hCombustionThermo> New(const fvMesh&);
 
+        //- Select and check that package contains 'thermoType'
+        static autoPtr<hCombustionThermo> NewType
+        (
+            const fvMesh&,
+            const word& thermoType
+        );
 
-    // Destructor
 
-        virtual ~hCombustionThermo();
+    //- Destructor
+    virtual ~hCombustionThermo();
 
 
     // Member functions
 
-        //- Return the composition of the combustion mixture
-        virtual combustionMixture& composition() = 0;
+        //- Return the composition of the multi-component mixture
+        virtual basicMultiComponentMixture& composition() = 0;
 
-        //- Return the composition of the combustion mixture
-        virtual const combustionMixture& composition() const = 0;
+        //- Return the composition of the multi-component mixture
+        virtual const basicMultiComponentMixture& composition() const = 0;
 
 
         // Access to thermodynamic state variables
 
             //- Enthalpy [J/kg]
             //  Non-const access allowed for transport equations
-            volScalarField& h()
+            virtual volScalarField& h()
             {
                 return h_;
             }
 
             //- Enthalpy [J/kg]
-            const volScalarField& h() const
+            virtual const volScalarField& h() const
             {
                 return h_;
             }
diff --git a/src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermos.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermos.C
similarity index 80%
rename from src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermos.C
rename to src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermos.C
index a41be30f2..ef9a2247a 100644
--- a/src/thermophysicalModels/combustion/hCombustionThermo/hCombustionThermos.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/hCombustionThermos.C
@@ -24,11 +24,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "hCombustionThermo.H"
-#include "hMixtureThermo.H"
-
 #include "makeCombustionThermo.H"
-#include "addToRunTimeSelectionTable.H"
+
+#include "hCombustionThermo.H"
+#include "hPsiMixtureThermo.H"
 
 #include "perfectGas.H"
 
@@ -46,6 +45,7 @@ License
 #include "multiComponentMixture.H"
 #include "reactingMixture.H"
 
+#include "thermoPhysicsTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,7 +57,7 @@ namespace Foam
 makeCombustionThermo
 (
     hCombustionThermo,
-    hMixtureThermo,
+    hPsiMixtureThermo,
     homogeneousMixture,
     constTransport,
     hConstThermo,
@@ -67,7 +67,7 @@ makeCombustionThermo
 makeCombustionThermo
 (
     hCombustionThermo,
-    hMixtureThermo,
+    hPsiMixtureThermo,
     inhomogeneousMixture,
     constTransport,
     hConstThermo,
@@ -77,7 +77,7 @@ makeCombustionThermo
 makeCombustionThermo
 (
     hCombustionThermo,
-    hMixtureThermo,
+    hPsiMixtureThermo,
     veryInhomogeneousMixture,
     constTransport,
     hConstThermo,
@@ -87,7 +87,7 @@ makeCombustionThermo
 makeCombustionThermo
 (
     hCombustionThermo,
-    hMixtureThermo,
+    hPsiMixtureThermo,
     homogeneousMixture,
     sutherlandTransport,
     janafThermo,
@@ -97,7 +97,7 @@ makeCombustionThermo
 makeCombustionThermo
 (
     hCombustionThermo,
-    hMixtureThermo,
+    hPsiMixtureThermo,
     inhomogeneousMixture,
     sutherlandTransport,
     janafThermo,
@@ -107,7 +107,7 @@ makeCombustionThermo
 makeCombustionThermo
 (
     hCombustionThermo,
-    hMixtureThermo,
+    hPsiMixtureThermo,
     veryInhomogeneousMixture,
     sutherlandTransport,
     janafThermo,
@@ -117,43 +117,32 @@ makeCombustionThermo
 makeCombustionThermo
 (
     hCombustionThermo,
-    hMixtureThermo,
+    hPsiMixtureThermo,
     dieselMixture,
     sutherlandTransport,
     janafThermo,
     perfectGas
 );
-   
-makeCombustionThermo
+
+// Multi-component thermo
+
+makeCombustionMixtureThermo
 (
     hCombustionThermo,
-    hMixtureThermo,
+    hPsiMixtureThermo,
     multiComponentMixture,
-    sutherlandTransport,
-    janafThermo,
-    perfectGas
+    gasThermoPhysics
 );
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Reaction thermo
+// Multi-component reaction thermo
 
-defineTemplateTypeNameAndDebug(hMixtureThermo<reactingMixture>, 0)
-
-typedef hMixtureThermo<reactingMixture> hMixtureThermoReactingMixture;
-
-addToRunTimeSelectionTable
+makeCombustionMixtureThermo
 (
     hCombustionThermo,
-    hMixtureThermoReactingMixture,
-    fvMesh
-);
-
-addToRunTimeSelectionTable
-(
-    basicThermo,
-    hMixtureThermoReactingMixture,
-    fvMesh
+    hPsiMixtureThermo,
+    reactingMixture,
+    gasThermoPhysics
 );
 
 
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/makeCombustionThermo.H b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/makeCombustionThermo.H
new file mode 100644
index 000000000..72d33581d
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/makeCombustionThermo.H
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+InClass
+    Foam::hCombustionThermo
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeCombustionThermo_H
+#define makeCombustionThermo_H
+
+#include "addToRunTimeSelectionTable.H"
+#include "basicPsiThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeCombustionThermo(CThermo,MixtureThermo,Mixture,Transport,Thermo,EqnOfState) \
+                                                                              \
+typedef MixtureThermo                                                         \
+    <Mixture<Transport<specieThermo<Thermo<EqnOfState> > > > >                \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState;                    \
+                                                                              \
+defineTemplateTypeNameAndDebugWithName                                        \
+(                                                                             \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    #MixtureThermo                                                            \
+        "<"#Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>>", \
+    0                                                                         \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    basicPsiThermo,                                                           \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    fvMesh                                                                    \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    CThermo,                                                                  \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    fvMesh                                                                    \
+)
+
+
+#define makeCombustionMixtureThermo(CThermo,MixtureThermo,Mixture,ThermoPhys) \
+                                                                              \
+typedef MixtureThermo<Mixture<ThermoPhys> >                                   \
+    MixtureThermo##Mixture##ThermoPhys;                                       \
+                                                                              \
+defineTemplateTypeNameAndDebugWithName                                        \
+(                                                                             \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    #MixtureThermo"<"#Mixture"<"#ThermoPhys">>",                              \
+    0                                                                         \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    basicPsiThermo,                                                           \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    fvMesh                                                                    \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    CThermo,                                                                  \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    fvMesh                                                                    \
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
new file mode 100644
index 000000000..42b7b1c7b
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hCombustionThermo/newhCombustionThermo.C
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hCombustionThermo.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::New
+(
+    const fvMesh& mesh
+)
+{
+    word hCombustionThermoTypeName;
+
+    // Enclose the creation of the thermophysicalProperties to ensure it is
+    // deleted before the turbulenceModel is created otherwise the dictionary
+    // is entered in the database twice
+    {
+        IOdictionary thermoDict
+        (
+            IOobject
+            (
+                "thermophysicalProperties",
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        thermoDict.lookup("thermoType") >> hCombustionThermoTypeName;
+    }
+
+    Info<< "Selecting thermodynamics package " << hCombustionThermoTypeName
+        << endl;
+
+    fvMeshConstructorTable::iterator cstrIter =
+        fvMeshConstructorTablePtr_->find(hCombustionThermoTypeName);
+
+    if (cstrIter == fvMeshConstructorTablePtr_->end())
+    {
+        FatalErrorIn("hCombustionThermo::New(const fvMesh&)")
+            << "Unknown hCombustionThermo type "
+            << hCombustionThermoTypeName << nl << nl
+            << "Valid hCombustionThermo types are:" << nl
+            << fvMeshConstructorTablePtr_->toc() << nl
+            << exit(FatalError);
+    }
+
+    return autoPtr<hCombustionThermo>(cstrIter()(mesh));
+}
+
+
+Foam::autoPtr<Foam::hCombustionThermo> Foam::hCombustionThermo::NewType
+(
+    const fvMesh& mesh,
+    const word& thermoType
+)
+{
+    word hCombustionThermoTypeName;
+
+    // Enclose the creation of the thermophysicalProperties to ensure it is
+    // deleted before the turbulenceModel is created otherwise the dictionary
+    // is entered in the database twice
+    {
+        IOdictionary thermoDict
+        (
+            IOobject
+            (
+                "thermophysicalProperties",
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        thermoDict.lookup("thermoType") >> hCombustionThermoTypeName;
+
+        if (hCombustionThermoTypeName.find(thermoType) == string::npos)
+        {
+            wordList allModels = fvMeshConstructorTablePtr_->toc();
+            DynamicList<word> validModels;
+            forAll(allModels, i)
+            {
+                if (allModels[i].find(thermoType) != string::npos)
+                {
+                    validModels.append(allModels[i]);
+                }
+            }
+
+            FatalErrorIn
+            (
+                "autoPtr<hCombustionThermo> hCombustionThermo::NewType"
+                "("
+                    "const fvMesh&, "
+                    "const word&"
+                ")"
+            )   << "Inconsistent thermo package selected:" << nl << nl
+                << hCombustionThermoTypeName << nl << nl << "Please select a "
+                << "thermo package based on " << thermoType
+                << ". Valid options include:" << nl << validModels << nl
+                << exit(FatalError);
+        }
+    }
+
+    Info<< "Selecting thermodynamics package " << hCombustionThermoTypeName
+        << endl;
+
+    fvMeshConstructorTable::iterator cstrIter =
+        fvMeshConstructorTablePtr_->find(hCombustionThermoTypeName);
+
+    if (cstrIter == fvMeshConstructorTablePtr_->end())
+    {
+        FatalErrorIn("hCombustionThermo::New(const fvMesh&)")
+            << "Unknown hCombustionThermo type "
+            << hCombustionThermoTypeName << nl << nl
+            << "Valid hCombustionThermo types are:" << nl
+            << fvMeshConstructorTablePtr_->toc() << nl
+            << exit(FatalError);
+    }
+
+    return autoPtr<hCombustionThermo>(cstrIter()(mesh));
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermo.C
similarity index 100%
rename from src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermo.C
rename to src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermo.C
diff --git a/src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermo.H b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermo.H
similarity index 95%
rename from src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermo.H
rename to src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermo.H
index aae89b452..f381bed08 100644
--- a/src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermo.H
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermo.H
@@ -96,9 +96,8 @@ public:
         static autoPtr<hhuCombustionThermo> New(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~hhuCombustionThermo();
+    //- Destructor
+    virtual ~hhuCombustionThermo();
 
 
     // Member functions
@@ -111,13 +110,13 @@ public:
 
             //- Unburnt gas enthalpy [J/kg]
             //  Non-const access allowed for transport equations
-            volScalarField& hu()
+            virtual volScalarField& hu()
             {
                 return hu_;
             }
 
             //- Unburnt gas enthalpy [J/kg]
-            const volScalarField& hu() const
+            virtual const volScalarField& hu() const
             {
                 return hu_;
             }
@@ -140,7 +139,7 @@ public:
             ) const = 0;
 
             //- Unburnt gas temperature [K]
-            const volScalarField& Tu() const
+            virtual const volScalarField& Tu() const
             {
                 return Tu_;
             }
diff --git a/src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermos.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermos.C
similarity index 100%
rename from src/thermophysicalModels/combustion/hhuCombustionThermo/hhuCombustionThermos.C
rename to src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/hhuCombustionThermos.C
diff --git a/src/thermophysicalModels/combustion/hhuCombustionThermo/newhhuCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
similarity index 100%
rename from src/thermophysicalModels/combustion/hhuCombustionThermo/newhhuCombustionThermo.C
rename to src/thermophysicalModels/reactionThermo/combustionThermo/hhuCombustionThermo/newhhuCombustionThermo.C
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermo.C
new file mode 100644
index 000000000..d754d16f6
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermo.C
@@ -0,0 +1,67 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hsCombustionThermo.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(hsCombustionThermo, 0);
+    defineRunTimeSelectionTable(hsCombustionThermo, fvMesh);
+}
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::hsCombustionThermo::hsCombustionThermo(const fvMesh& mesh)
+:
+    basicPsiThermo(mesh),
+
+    hs_
+    (
+        IOobject
+        (
+            "hs",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimEnergy/dimMass,
+        this->hBoundaryTypes()
+    )
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::hsCombustionThermo::~hsCombustionThermo()
+{}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermo.H b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermo.H
new file mode 100644
index 000000000..764e564c3
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermo.H
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::hsCombustionThermo
+
+Description
+    Sensible enthalpy variant of combustionThermo
+
+SourceFiles
+    hsCombustionThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hsCombustionThermo_H
+#define hsCombustionThermo_H
+
+#include "basicPsiThermo.H"
+#include "basicMultiComponentMixture.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class hsCombustionThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+class hsCombustionThermo
+:
+    public basicPsiThermo
+{
+
+protected:
+
+    // Protected data
+
+        //- Sensible enthalpy field
+        volScalarField hs_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("hsCombustionThermo");
+
+
+    //- Declare run-time constructor selection tables
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        hsCombustionThermo,
+        fvMesh,
+        (const fvMesh& mesh),
+        (mesh)
+    );
+
+
+    // Constructors
+
+        //- Construct from dictionary and mesh
+        hsCombustionThermo(const fvMesh&);
+
+
+    // Selectors
+
+        //- Standard selection based on fvMesh
+        static autoPtr<hsCombustionThermo> New(const fvMesh&);
+
+        //- Select and check that package contains 'thermoType'
+        static autoPtr<hsCombustionThermo> NewType
+        (
+            const fvMesh&,
+            const word& thermoType
+        );
+
+
+    //- Destructor
+    virtual ~hsCombustionThermo();
+
+
+    // Member functions
+
+        //- Return the composition of the multi-component mixture
+        virtual basicMultiComponentMixture& composition() = 0;
+
+        //- Return the composition of the multi-component mixture
+        virtual const basicMultiComponentMixture& composition() const = 0;
+
+
+        // Access to thermodynamic state variables
+
+            //- Sensible enthalpy [J/kg]
+            //  Non-const access allowed for transport equations
+            virtual volScalarField& hs()
+            {
+                return hs_;
+            }
+
+            //- Sensible enthalpy [J/kg]
+            virtual const volScalarField& hs() const
+            {
+                return hs_;
+            }
+
+
+        //- Update properties
+        virtual void correct() = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermos.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermos.C
new file mode 100644
index 000000000..02d859c98
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/hsCombustionThermos.C
@@ -0,0 +1,153 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "makeHsCombustionThermo.H"
+
+#include "hsCombustionThermo.H"
+#include "hsPsiMixtureThermo.H"
+
+#include "perfectGas.H"
+
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "specieThermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "dieselMixture.H"
+#include "homogeneousMixture.H"
+#include "inhomogeneousMixture.H"
+#include "veryInhomogeneousMixture.H"
+
+#include "reactingMixture.H"
+#include "multiComponentMixture.H"
+
+#include "thermoPhysicsTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeHsCombustionThermo
+(
+    hsCombustionThermo,
+    hsPsiMixtureThermo,
+    homogeneousMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeHsCombustionThermo
+(
+    hsCombustionThermo,
+    hsPsiMixtureThermo,
+    inhomogeneousMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeHsCombustionThermo
+(
+    hsCombustionThermo,
+    hsPsiMixtureThermo,
+    veryInhomogeneousMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeHsCombustionThermo
+(
+    hsCombustionThermo,
+    hsPsiMixtureThermo,
+    homogeneousMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+makeHsCombustionThermo
+(
+    hsCombustionThermo,
+    hsPsiMixtureThermo,
+    inhomogeneousMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+makeHsCombustionThermo
+(
+    hsCombustionThermo,
+    hsPsiMixtureThermo,
+    veryInhomogeneousMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+makeHsCombustionThermo
+(
+    hsCombustionThermo,
+    hsPsiMixtureThermo,
+    dieselMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+// Multi-component thermo
+
+makeHsCombustionMixtureThermo
+(
+    hsCombustionThermo,
+    hsPsiMixtureThermo,
+    multiComponentMixture,
+    gasThermoPhysics
+);
+
+
+// Multi-component reaction thermo
+
+makeHsCombustionMixtureThermo
+(
+    hsCombustionThermo,
+    hsPsiMixtureThermo,
+    reactingMixture,
+    gasThermoPhysics
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/makeHsCombustionThermo.H b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/makeHsCombustionThermo.H
new file mode 100644
index 000000000..f2d237054
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/makeHsCombustionThermo.H
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+InClass
+    Foam::hsCombustionThermo
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeHsCombustionThermo_H
+#define makeHsCombustionThermo_H
+
+#include "addToRunTimeSelectionTable.H"
+#include "basicPsiThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeHsCombustionThermo(CThermo,MixtureThermo,Mixture,Transport,Thermo,EqnOfState) \
+                                                                              \
+typedef MixtureThermo                                                         \
+    <Mixture<Transport<specieThermo<Thermo<EqnOfState> > > > >                \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState;                    \
+                                                                              \
+defineTemplateTypeNameAndDebugWithName                                        \
+(                                                                             \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    #MixtureThermo                                                            \
+        "<"#Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>>", \
+    0                                                                         \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    basicPsiThermo,                                                           \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    fvMesh                                                                    \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    CThermo,                                                                  \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    fvMesh                                                                    \
+)
+
+
+#define makeHsCombustionMixtureThermo(CThermo,MixtureThermo,Mixture,ThermoPhys) \
+                                                                              \
+typedef MixtureThermo<Mixture<ThermoPhys> >                                   \
+    MixtureThermo##Mixture##ThermoPhys;                                       \
+                                                                              \
+defineTemplateTypeNameAndDebugWithName                                        \
+(                                                                             \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    #MixtureThermo"<"#Mixture"<"#ThermoPhys">>",                              \
+    0                                                                         \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    basicPsiThermo,                                                           \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    fvMesh                                                                    \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    CThermo,                                                                  \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    fvMesh                                                                    \
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/newhsCombustionThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/newhsCombustionThermo.C
new file mode 100644
index 000000000..604dfea49
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/hsCombustionThermo/newhsCombustionThermo.C
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hsCombustionThermo.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::hsCombustionThermo> Foam::hsCombustionThermo::New
+(
+    const fvMesh& mesh
+)
+{
+    word hsCombustionThermoTypeName;
+
+    // Enclose the creation of the thermophysicalProperties to ensure it is
+    // deleted before the turbulenceModel is created otherwise the dictionary
+    // is entered in the database twice
+    {
+        IOdictionary thermoDict
+        (
+            IOobject
+            (
+                "thermophysicalProperties",
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        thermoDict.lookup("thermoType") >> hsCombustionThermoTypeName;
+    }
+
+    Info<< "Selecting thermodynamics package " << hsCombustionThermoTypeName
+        << endl;
+
+    fvMeshConstructorTable::iterator cstrIter =
+        fvMeshConstructorTablePtr_->find(hsCombustionThermoTypeName);
+
+    if (cstrIter == fvMeshConstructorTablePtr_->end())
+    {
+        FatalErrorIn("hsCombustionThermo::New(const fvMesh&)")
+            << "Unknown hsCombustionThermo type "
+            << hsCombustionThermoTypeName << nl << nl
+            << "Valid hsCombustionThermo types are:" << nl
+            << fvMeshConstructorTablePtr_->toc() << nl
+            << exit(FatalError);
+    }
+
+    return autoPtr<hsCombustionThermo>(cstrIter()(mesh));
+}
+
+
+Foam::autoPtr<Foam::hsCombustionThermo> Foam::hsCombustionThermo::NewType
+(
+    const fvMesh& mesh,
+    const word& thermoType
+)
+{
+    word hsCombustionThermoTypeName;
+
+    // Enclose the creation of the thermophysicalProperties to ensure it is
+    // deleted before the turbulenceModel is created otherwise the dictionary
+    // is entered in the database twice
+    {
+        IOdictionary thermoDict
+        (
+            IOobject
+            (
+                "thermophysicalProperties",
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        thermoDict.lookup("thermoType") >> hsCombustionThermoTypeName;
+
+        if (hsCombustionThermoTypeName.find(thermoType) == string::npos)
+        {
+            wordList allModels = fvMeshConstructorTablePtr_->toc();
+            DynamicList<word> validModels;
+            forAll(allModels, i)
+            {
+                if (allModels[i].find(thermoType) != string::npos)
+                {
+                    validModels.append(allModels[i]);
+                }
+            }
+
+            FatalErrorIn
+            (
+                "autoPtr<hsCombustionThermo> hsCombustionThermo::NewType"
+                "("
+                    "const fvMesh&, "
+                    "const word&"
+                ")"
+            )   << "Inconsistent thermo package selected:" << nl << nl
+                << hsCombustionThermoTypeName << nl << nl << "Please select a "
+                << "thermo package based on " << thermoType
+                << ". Valid options include:" << nl << validModels << nl
+                << exit(FatalError);
+        }
+    }
+
+    Info<< "Selecting thermodynamics package " << hsCombustionThermoTypeName
+        << endl;
+
+    fvMeshConstructorTable::iterator cstrIter =
+        fvMeshConstructorTablePtr_->find(hsCombustionThermoTypeName);
+
+    if (cstrIter == fvMeshConstructorTablePtr_->end())
+    {
+        FatalErrorIn("hsCombustionThermo::New(const fvMesh&)")
+            << "Unknown hsCombustionThermo type "
+            << hsCombustionThermoTypeName << nl << nl
+            << "Valid hsCombustionThermo types are:" << nl
+            << fvMeshConstructorTablePtr_->toc() << nl
+            << exit(FatalError);
+    }
+
+    return autoPtr<hsCombustionThermo>(cstrIter()(mesh));
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
new file mode 100644
index 000000000..7ff8e104a
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.C
@@ -0,0 +1,321 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hPsiMixtureThermo.H"
+#include "fvMesh.H"
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hPsiMixtureThermo<MixtureType>::calculate()
+{
+    const scalarField& hCells = h_.internalField();
+    const scalarField& pCells = p_.internalField();
+
+    scalarField& TCells = T_.internalField();
+    scalarField& psiCells = psi_.internalField();
+    scalarField& muCells = mu_.internalField();
+    scalarField& alphaCells = alpha_.internalField();
+
+    forAll(TCells, celli)
+    {
+        const typename MixtureType::thermoType& mixture =
+            this->cellMixture(celli);
+
+        TCells[celli] = mixture.TH(hCells[celli], TCells[celli]);
+        psiCells[celli] = mixture.psi(pCells[celli], TCells[celli]);
+
+        muCells[celli] = mixture.mu(TCells[celli]);
+        alphaCells[celli] = mixture.alpha(TCells[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        fvPatchScalarField& pp = p_.boundaryField()[patchi];
+        fvPatchScalarField& pT = T_.boundaryField()[patchi];
+        fvPatchScalarField& ppsi = psi_.boundaryField()[patchi];
+
+        fvPatchScalarField& ph = h_.boundaryField()[patchi];
+
+        fvPatchScalarField& pmu_ = mu_.boundaryField()[patchi];
+        fvPatchScalarField& palpha_ = alpha_.boundaryField()[patchi];
+
+        if (pT.fixesValue())
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture =
+                    this->patchFaceMixture(patchi, facei);
+
+                ph[facei] = mixture.H(pT[facei]);
+
+                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
+                pmu_[facei] = mixture.mu(pT[facei]);
+                palpha_[facei] = mixture.alpha(pT[facei]);
+            }
+        }
+        else
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture =
+                    this->patchFaceMixture(patchi, facei);
+
+                pT[facei] = mixture.TH(ph[facei], pT[facei]);
+
+                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
+                pmu_[facei] = mixture.mu(pT[facei]);
+                palpha_[facei] = mixture.alpha(pT[facei]);
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hPsiMixtureThermo<MixtureType>::hPsiMixtureThermo(const fvMesh& mesh)
+:
+    hCombustionThermo(mesh),
+    MixtureType(*this, mesh)
+{
+    scalarField& hCells = h_.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(hCells, celli)
+    {
+        hCells[celli] = this->cellMixture(celli).H(TCells[celli]);
+    }
+
+    forAll(h_.boundaryField(), patchi)
+    {
+        h_.boundaryField()[patchi] == h(T_.boundaryField()[patchi], patchi);
+    }
+
+    hBoundaryCorrection(h_);
+
+    calculate();
+
+    // Switch on saving old time
+    psi_.oldTime();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hPsiMixtureThermo<MixtureType>::~hPsiMixtureThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hPsiMixtureThermo<MixtureType>::correct()
+{
+    if (debug)
+    {
+        Info<< "entering hPsiMixtureThermo<MixtureType>::correct()" << endl;
+    }
+
+    // force the saving of the old-time values
+    psi_.oldTime();
+
+    calculate();
+
+    if (debug)
+    {
+        Info<< "exiting hPsiMixtureThermo<MixtureType>::correct()" << endl;
+    }
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hPsiMixtureThermo<MixtureType>::hc() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> thc
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "hc",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            h_.dimensions()
+        )
+    );
+
+    volScalarField& hcf = thc();
+    scalarField& hcCells = hcf.internalField();
+
+    forAll(hcCells, celli)
+    {
+        hcCells[celli] = this->cellMixture(celli).Hc();
+    }
+
+    forAll(hcf.boundaryField(), patchi)
+    {
+        scalarField& hcp = hcf.boundaryField()[patchi];
+
+        forAll(hcp, facei)
+        {
+            hcp[facei] = this->patchFaceMixture(patchi, facei).Hc();
+        }
+    }
+
+    return thc;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hPsiMixtureThermo<MixtureType>::h
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    tmp<scalarField> th(new scalarField(T.size()));
+    scalarField& h = th();
+
+    forAll(T, celli)
+    {
+        h[celli] = this->cellMixture(cells[celli]).H(T[celli]);
+    }
+
+    return th;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hPsiMixtureThermo<MixtureType>::h
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> th(new scalarField(T.size()));
+    scalarField& h = th();
+
+    forAll(T, facei)
+    {
+        h[facei] = this->patchFaceMixture(patchi, facei).H(T[facei]);
+    }
+
+    return th;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hPsiMixtureThermo<MixtureType>::Cp
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCp(new scalarField(T.size()));
+
+    scalarField& cp = tCp();
+
+    forAll(T, facei)
+    {
+        cp[facei] = this->patchFaceMixture(patchi, facei).Cp(T[facei]);
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hPsiMixtureThermo<MixtureType>::Cp() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> tCp
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cp",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionSet(0, 2, -2, -1, 0)
+        )
+    );
+
+    volScalarField& cp = tCp();
+
+    scalarField& cpCells = cp.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(TCells, celli)
+    {
+        cpCells[celli] = this->cellMixture(celli).Cp(TCells[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        cp.boundaryField()[patchi] = Cp(T_.boundaryField()[patchi], patchi);
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+bool Foam::hPsiMixtureThermo<MixtureType>::read()
+{
+    if (hCombustionThermo::read())
+    {
+        MixtureType::read(*this);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.H b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.H
similarity index 77%
rename from src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.H
rename to src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.H
index 2733c77a5..ecafafbbe 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.H
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hPsiMixtureThermo/hPsiMixtureThermo.H
@@ -23,18 +23,18 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::hMixtureThermo
+    Foam::hPsiMixtureThermo
 
 Description
-    Foam::hMixtureThermo
+    Foam::hPsiMixtureThermo
 
 SourceFiles
-    hMixtureThermo.C
+    hPsiMixtureThermo.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef hMixtureThermo_H
-#define hMixtureThermo_H
+#ifndef hPsiMixtureThermo_H
+#define hPsiMixtureThermo_H
 
 #include "hCombustionThermo.H"
 
@@ -44,11 +44,11 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class hMixtureThermo Declaration
+                      Class hPsiMixtureThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class MixtureType>
-class hMixtureThermo
+class hPsiMixtureThermo
 :
     public hCombustionThermo,
     public MixtureType
@@ -58,36 +58,35 @@ class hMixtureThermo
         void calculate();
 
         //- Construct as copy (not implemented)
-        hMixtureThermo(const hMixtureThermo<MixtureType>&);
+        hPsiMixtureThermo(const hPsiMixtureThermo<MixtureType>&);
 
 
 public:
 
     //- Runtime type information
-    TypeName("hMixtureThermo");
+    TypeName("hPsiMixtureThermo");
 
 
     // Constructors
 
         //- Construct from mesh
-        hMixtureThermo(const fvMesh&);
+        hPsiMixtureThermo(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~hMixtureThermo();
+    //- Destructor
+    virtual ~hPsiMixtureThermo();
 
 
     // Member functions
 
-        //- Return the compostion of the combustion mixture
-        combustionMixture& composition()
+        //- Return the compostion of the multi-component mixture
+        virtual basicMultiComponentMixture& composition()
         {
             return *this;
         }
 
-        //- Return the compostion of the combustion mixture
-        const combustionMixture& composition() const
+        //- Return the compostion of the multi-component mixture
+        virtual const basicMultiComponentMixture& composition() const
         {
             return *this;
         }
@@ -95,6 +94,9 @@ public:
         //- Update properties
         virtual void correct();
 
+        //- Chemical enthalpy [J/kg]
+        virtual tmp<volScalarField> hc() const;
+
 
         // Fields derived from thermodynamic state variables
 
@@ -122,16 +124,6 @@ public:
             //- Heat capacity at constant pressure [J/kg/K]
             virtual tmp<volScalarField> Cp() const;
 
-            //- Heat capacity at constant volume for patch [J/kg/K]
-            virtual tmp<scalarField> Cv
-            (
-                const scalarField& T,
-                const label patchi
-            ) const;
-
-            //- Heat capacity at constant volume [J/kg/K]
-            virtual tmp<volScalarField> Cv() const;
-
 
         //- Read thermophysicalProperties dictionary
         virtual bool read();
@@ -145,7 +137,7 @@ public:
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
-#   include "hMixtureThermo.C"
+#   include "hPsiMixtureThermo.C"
 #endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
similarity index 81%
rename from src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
rename to src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
index 2685a1472..d4dfce35a 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.C
@@ -174,6 +174,51 @@ void Foam::hhuMixtureThermo<MixtureType>::correct()
 }
 
 
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::hc() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> thc
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "hc",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            h_.dimensions()
+        )
+    );
+
+    volScalarField& hcf = thc();
+    scalarField& hcCells = hcf.internalField();
+
+    forAll(hcCells, celli)
+    {
+        hcCells[celli] = this->cellMixture(celli).Hc();
+    }
+
+    forAll(hcf.boundaryField(), patchi)
+    {
+        scalarField& hcp = hcf.boundaryField()[patchi];
+
+        forAll(hcp, facei)
+        {
+            hcp[facei] = this->patchFaceMixture(patchi, facei).Hc();
+        }
+    }
+
+    return thc;
+}
+
+
 template<class MixtureType>
 Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::h
 (
@@ -233,7 +278,8 @@ Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::Cp
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Cp() const
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::Cp() const
 {
     const fvMesh& mesh = T_.mesh();
 
@@ -255,10 +301,12 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Cp() const
     );
 
     volScalarField& cp = tCp();
+    scalarField& cpCells = cp.internalField();
+    const scalarField& TCells = T_.internalField();
 
-    forAll(T_, celli)
+    forAll(TCells, celli)
     {
-        cp[celli] = this->cellMixture(celli).Cp(T_[celli]);
+        cpCells[celli] = this->cellMixture(celli).Cp(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -329,7 +377,8 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Cv() const
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::hu
+Foam::tmp<Foam::scalarField>
+Foam::hhuMixtureThermo<MixtureType>::hu
 (
     const scalarField& Tu,
     const labelList& cells
@@ -348,7 +397,8 @@ Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::hu
 
 
 template<class MixtureType>
-Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::hu
+Foam::tmp<Foam::scalarField>
+Foam::hhuMixtureThermo<MixtureType>::hu
 (
     const scalarField& Tu,
     const label patchi
@@ -367,7 +417,8 @@ Foam::tmp<Foam::scalarField> Foam::hhuMixtureThermo<MixtureType>::hu
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Tb() const
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::Tb() const
 {
     tmp<volScalarField> tTb
     (
@@ -386,10 +437,14 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Tb() const
     );
 
     volScalarField& Tb_ = tTb();
+    scalarField& TbCells = Tb_.internalField();
+    const scalarField& TCells = T_.internalField();
+    const scalarField& hCells = h_.internalField();
 
-    forAll(Tb_, celli)
+    forAll(TbCells, celli)
     {
-        Tb_[celli] = this->cellProducts(celli).TH(h_[celli], T_[celli]);
+        TbCells[celli] =
+            this->cellProducts(celli).TH(hCells[celli], TCells[celli]);
     }
 
     forAll(Tb_.boundaryField(), patchi)
@@ -402,7 +457,8 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::Tb() const
         forAll(pTb, facei)
         {
             pTb[facei] =
-                this->patchFaceProducts(patchi, facei).TH(ph[facei], pT[facei]);
+                this->patchFaceProducts(patchi, facei)
+               .TH(ph[facei], pT[facei]);
         }
     }
 
@@ -432,10 +488,14 @@ Foam::hhuMixtureThermo<MixtureType>::psiu() const
     );
 
     volScalarField& psiu = tpsiu();
+    scalarField& psiuCells = psiu.internalField();
+    const scalarField& TuCells = Tu_.internalField();
+    const scalarField& pCells = p_.internalField();
 
-    forAll(psiu, celli)
+    forAll(psiuCells, celli)
     {
-        psiu[celli] = this->cellReactants(celli).psi(p_[celli], Tu_[celli]);
+        psiuCells[celli] =
+            this->cellReactants(celli).psi(pCells[celli], TuCells[celli]);
     }
 
     forAll(psiu.boundaryField(), patchi)
@@ -479,12 +539,15 @@ Foam::hhuMixtureThermo<MixtureType>::psib() const
     );
 
     volScalarField& psib = tpsib();
-
+    scalarField& psibCells = psib.internalField();
     volScalarField Tb_ = Tb();
+    const scalarField& TbCells = Tb_.internalField();
+    const scalarField& pCells = p_.internalField();
 
-    forAll(psib, celli)
+    forAll(psibCells, celli)
     {
-        psib[celli] = this->cellReactants(celli).psi(p_[celli], Tb_[celli]);
+        psibCells[celli] =
+            this->cellReactants(celli).psi(pCells[celli], TbCells[celli]);
     }
 
     forAll(psib.boundaryField(), patchi)
@@ -507,7 +570,8 @@ Foam::hhuMixtureThermo<MixtureType>::psib() const
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::muu() const
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::muu() const
 {
     tmp<volScalarField> tmuu
     (
@@ -527,10 +591,12 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::muu() const
     );
 
     volScalarField& muu_ = tmuu();
+    scalarField& muuCells = muu_.internalField();
+    const scalarField& TuCells = Tu_.internalField();
 
-    forAll(muu_, celli)
+    forAll(muuCells, celli)
     {
-        muu_[celli] = this->cellReactants(celli).mu(Tu_[celli]);
+        muuCells[celli] = this->cellReactants(celli).mu(TuCells[celli]);
     }
 
     forAll(muu_.boundaryField(), patchi)
@@ -550,7 +616,8 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::muu() const
 
 
 template<class MixtureType>
-Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::mub() const
+Foam::tmp<Foam::volScalarField>
+Foam::hhuMixtureThermo<MixtureType>::mub() const
 {
     tmp<volScalarField> tmub
     (
@@ -570,11 +637,13 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::mub() const
     );
 
     volScalarField& mub_ = tmub();
+    scalarField& mubCells = mub_.internalField();
     volScalarField Tb_ = Tb();
+    const scalarField& TbCells = Tb_.internalField();
 
-    forAll(mub_, celli)
+    forAll(mubCells, celli)
     {
-        mub_[celli] = this->cellProducts(celli).mu(Tb_[celli]);
+        mubCells[celli] = this->cellProducts(celli).mu(TbCells[celli]);
     }
 
     forAll(mub_.boundaryField(), patchi)
@@ -584,7 +653,8 @@ Foam::tmp<Foam::volScalarField> Foam::hhuMixtureThermo<MixtureType>::mub() const
 
         forAll(pMub, facei)
         {
-            pMub[facei] = this->patchFaceProducts(patchi, facei).mu(pTb[facei]);
+            pMub[facei] =
+                this->patchFaceProducts(patchi, facei).mu(pTb[facei]);
         }
     }
 
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.H b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.H
similarity index 91%
rename from src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.H
rename to src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.H
index 3b81df017..84a46caa4 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.H
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hhuMixtureThermo/hhuMixtureThermo.H
@@ -36,15 +36,13 @@ SourceFiles
 #ifndef hhuMixtureThermo_H
 #define hhuMixtureThermo_H
 
-#include "hMixtureThermo.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                     Class hhuMixtureThermo Declaration
+                      Class hhuMixtureThermo Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class MixtureType>
@@ -73,21 +71,20 @@ public:
         hhuMixtureThermo(const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~hhuMixtureThermo();
+    //- Destructor
+    virtual ~hhuMixtureThermo();
 
 
     // Member functions
 
-        //- Return the compostion of the combustion mixture
-        virtual combustionMixture& composition()
+        //- Return the compostion of the multi-component mixture
+        virtual basicMultiComponentMixture& composition()
         {
             return *this;
         }
 
-        //- Return the compostion of the combustion mixture
-        virtual const combustionMixture& composition() const
+        //- Return the compostion of the multi-component mixture
+        virtual const basicMultiComponentMixture& composition() const
         {
             return *this;
         }
@@ -95,6 +92,9 @@ public:
         //- Update properties
         virtual void correct();
 
+        //- Chemical enthalpy [J/kg]
+        virtual tmp<volScalarField> hc() const;
+
 
         // Fields derived from thermodynamic state variables
 
@@ -175,7 +175,7 @@ public:
 
 } // End namespace Foam
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
 #   include "hhuMixtureThermo.C"
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.C b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C
similarity index 64%
rename from src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.C
rename to src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C
index f008e7db3..dc3d0d5c4 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/hMixtureThermo/hMixtureThermo.C
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.C
@@ -24,34 +24,32 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "hMixtureThermo.H"
+#include "hsPsiMixtureThermo.H"
 #include "fvMesh.H"
 #include "fixedValueFvPatchFields.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class MixtureType>
-hMixtureThermo<MixtureType>::hMixtureThermo(const fvMesh& mesh)
+Foam::hsPsiMixtureThermo<MixtureType>::hsPsiMixtureThermo(const fvMesh& mesh)
 :
-    hCombustionThermo(mesh),
+    hsCombustionThermo(mesh),
     MixtureType(*this, mesh)
 {
-    forAll(h_, celli)
+    scalarField& hCells = hs_.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(hCells, celli)
     {
-        h_[celli] = this->cellMixture(celli).H(T_[celli]);
+        hCells[celli] = this->cellMixture(celli).Hs(TCells[celli]);
     }
 
-    forAll(h_.boundaryField(), patchi)
+    forAll(hs_.boundaryField(), patchi)
     {
-        h_.boundaryField()[patchi] == h(T_.boundaryField()[patchi], patchi);
+        hs_.boundaryField()[patchi] == hs(T_.boundaryField()[patchi], patchi);
     }
 
-    hBoundaryCorrection(h_);
+    hBoundaryCorrection(hs_);
 
     calculate();
     psi_.oldTime();   // Switch on saving old time
@@ -61,25 +59,33 @@ hMixtureThermo<MixtureType>::hMixtureThermo(const fvMesh& mesh)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 template<class MixtureType>
-hMixtureThermo<MixtureType>::~hMixtureThermo()
+Foam::hsPsiMixtureThermo<MixtureType>::~hsPsiMixtureThermo()
 {}
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class MixtureType>
-void hMixtureThermo<MixtureType>::calculate()
+void Foam::hsPsiMixtureThermo<MixtureType>::calculate()
 {
-    forAll(T_, celli)
+    const scalarField& hsCells = hs_.internalField();
+    const scalarField& pCells = p_.internalField();
+
+    scalarField& TCells = T_.internalField();
+    scalarField& psiCells = psi_.internalField();
+    scalarField& muCells = mu_.internalField();
+    scalarField& alphaCells = alpha_.internalField();
+
+    forAll(TCells, celli)
     {
         const typename MixtureType::thermoType& mixture_ =
             this->cellMixture(celli);
 
-        T_[celli] = mixture_.TH(h_[celli], T_[celli]);
-        psi_[celli] = mixture_.psi(p_[celli], T_[celli]);
+        TCells[celli] = mixture_.THs(hsCells[celli], TCells[celli]);
+        psiCells[celli] = mixture_.psi(pCells[celli], TCells[celli]);
 
-        mu_[celli] = mixture_.mu(T_[celli]);
-        alpha_[celli] = mixture_.alpha(T_[celli]);
+        muCells[celli] = mixture_.mu(TCells[celli]);
+        alphaCells[celli] = mixture_.alpha(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -88,7 +94,7 @@ void hMixtureThermo<MixtureType>::calculate()
         fvPatchScalarField& pT = T_.boundaryField()[patchi];
         fvPatchScalarField& ppsi = psi_.boundaryField()[patchi];
 
-        fvPatchScalarField& ph = h_.boundaryField()[patchi];
+        fvPatchScalarField& phs = hs_.boundaryField()[patchi];
 
         fvPatchScalarField& pmu_ = mu_.boundaryField()[patchi];
         fvPatchScalarField& palpha_ = alpha_.boundaryField()[patchi];
@@ -100,7 +106,7 @@ void hMixtureThermo<MixtureType>::calculate()
                 const typename MixtureType::thermoType& mixture_ =
                     this->patchFaceMixture(patchi, facei);
 
-                ph[facei] = mixture_.H(pT[facei]);
+                phs[facei] = mixture_.Hs(pT[facei]);
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu_[facei] = mixture_.mu(pT[facei]);
@@ -114,7 +120,7 @@ void hMixtureThermo<MixtureType>::calculate()
                 const typename MixtureType::thermoType& mixture_ =
                     this->patchFaceMixture(patchi, facei);
 
-                pT[facei] = mixture_.TH(ph[facei], pT[facei]);
+                pT[facei] = mixture_.THs(phs[facei], pT[facei]);
 
                 ppsi[facei] = mixture_.psi(pp[facei], pT[facei]);
                 pmu_[facei] = mixture_.mu(pT[facei]);
@@ -128,45 +134,112 @@ void hMixtureThermo<MixtureType>::calculate()
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class MixtureType>
-tmp<scalarField> hMixtureThermo<MixtureType>::h
+void Foam::hsPsiMixtureThermo<MixtureType>::correct()
+{
+    if (debug)
+    {
+        Info<< "entering hMixtureThermo<MixtureType>::correct()" << endl;
+    }
+
+    // force the saving of the old-time values
+    psi_.oldTime();
+
+    calculate();
+
+    if (debug)
+    {
+        Info<< "exiting hMixtureThermo<MixtureType>::correct()" << endl;
+    }
+}
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hsPsiMixtureThermo<MixtureType>::hc() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> thc
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "hc",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            hs_.dimensions()
+        )
+    );
+
+    volScalarField& hcf = thc();
+    scalarField& hcCells = hcf.internalField();
+
+    forAll(hcCells, celli)
+    {
+        hcCells[celli] = this->cellMixture(celli).Hc();
+    }
+
+    forAll(hcf.boundaryField(), patchi)
+    {
+        scalarField& hcp = hcf.boundaryField()[patchi];
+
+        forAll(hcp, facei)
+        {
+            hcp[facei] = this->patchFaceMixture(patchi, facei).Hc();
+        }
+    }
+
+    return thc;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hsPsiMixtureThermo<MixtureType>::hs
 (
     const scalarField& T,
     const labelList& cells
 ) const
 {
-    tmp<scalarField> th(new scalarField(T.size()));
-    scalarField& h = th();
+    tmp<scalarField> ths(new scalarField(T.size()));
+    scalarField& hs = ths();
 
     forAll(T, celli)
     {
-        h[celli] = this->cellMixture(cells[celli]).H(T[celli]);
+        hs[celli] = this->cellMixture(cells[celli]).Hs(T[celli]);
     }
 
-    return th;
+    return ths;
 }
 
 
 template<class MixtureType>
-tmp<scalarField> hMixtureThermo<MixtureType>::h
+Foam::tmp<Foam::scalarField>
+Foam::hsPsiMixtureThermo<MixtureType>::hs
 (
     const scalarField& T,
     const label patchi
 ) const
 {
-    tmp<scalarField> th(new scalarField(T.size()));
-    scalarField& h = th();
+    tmp<scalarField> ths(new scalarField(T.size()));
+    scalarField& hs = ths();
 
     forAll(T, facei)
     {
-        h[facei] = this->patchFaceMixture(patchi, facei).H(T[facei]);
+        hs[facei] = this->patchFaceMixture(patchi, facei).Hs(T[facei]);
     }
 
-    return th;
+    return ths;
 }
 
 
 template<class MixtureType>
-tmp<scalarField> hMixtureThermo<MixtureType>::Cp
+Foam::tmp<Foam::scalarField>
+Foam::hsPsiMixtureThermo<MixtureType>::Cp
 (
     const scalarField& T,
     const label patchi
@@ -186,7 +259,8 @@ tmp<scalarField> hMixtureThermo<MixtureType>::Cp
 
 
 template<class MixtureType>
-tmp<volScalarField> hMixtureThermo<MixtureType>::Cp() const
+Foam::tmp<Foam::volScalarField>
+Foam::hsPsiMixtureThermo<MixtureType>::Cp() const
 {
     const fvMesh& mesh = T_.mesh();
 
@@ -203,15 +277,18 @@ tmp<volScalarField> hMixtureThermo<MixtureType>::Cp() const
                 IOobject::NO_WRITE
             ),
             mesh,
-            dimensionSet(0, 2, -2, -1, 0)
+            dimEnergy/dimMass/dimTemperature
         )
     );
 
     volScalarField& cp = tCp();
 
-    forAll(T_, celli)
+    scalarField& cpCells = cp.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(TCells, celli)
     {
-        cp[celli] = this->cellMixture(celli).Cp(T_[celli]);
+        cpCells[celli] = this->cellMixture(celli).Cp(TCells[celli]);
     }
 
     forAll(T_.boundaryField(), patchi)
@@ -224,87 +301,9 @@ tmp<volScalarField> hMixtureThermo<MixtureType>::Cp() const
 
 
 template<class MixtureType>
-tmp<scalarField> hMixtureThermo<MixtureType>::Cv
-(
-    const scalarField& T,
-    const label patchi
-) const
+bool Foam::hsPsiMixtureThermo<MixtureType>::read()
 {
-    tmp<scalarField> tCv(new scalarField(T.size()));
-
-    scalarField& cv = tCv();
-
-    forAll(T, facei)
-    {
-        cv[facei] = this->patchFaceMixture(patchi, facei).Cv(T[facei]);
-    }
-
-    return tCv;
-}
-
-
-template<class MixtureType>
-tmp<volScalarField> hMixtureThermo<MixtureType>::Cv() const
-{
-    const fvMesh& mesh = T_.mesh();
-
-    tmp<volScalarField> tCv
-    (
-        new volScalarField
-        (
-            IOobject
-            (
-                "Cv",
-                mesh.time().timeName(),
-                mesh,
-                IOobject::NO_READ,
-                IOobject::NO_WRITE
-            ),
-            mesh,
-            dimensionSet(0, 2, -2, -1, 0)
-        )
-    );
-
-    volScalarField& cv = tCv();
-
-    forAll(T_, celli)
-    {
-        cv[celli] = this->cellMixture(celli).Cv(T_[celli]);
-    }
-
-    forAll(T_.boundaryField(), patchi)
-    {
-        cv.boundaryField()[patchi] = Cv(T_.boundaryField()[patchi], patchi);
-    }
-
-    return tCv;
-}
-
-
-template<class MixtureType>
-void hMixtureThermo<MixtureType>::correct()
-{
-    if (debug)
-    {
-        Info<< "entering hMixtureThermo<MixtureType>::correct()" << endl;
-    }
-
-    // force the saving of the old-time values
-    psi_.oldTime();
-
-    calculate();
-
-    if (debug)
-    {
-        Info<< "exiting hMixtureThermo<MixtureType>::correct()" << endl;
-    }
-}
-
-
-template<class MixtureType>
-bool hMixtureThermo<MixtureType>::read()
-{
-    if (hCombustionThermo::read())
+    if (hsCombustionThermo::read())
     {
         MixtureType::read(*this);
         return true;
@@ -316,8 +315,4 @@ bool hMixtureThermo<MixtureType>::read()
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.H b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.H
new file mode 100644
index 000000000..8eb3ebb63
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/combustionThermo/mixtureThermos/hsPsiMixtureThermo/hsPsiMixtureThermo.H
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::hsPsiMixtureThermo
+
+Description
+    Foam::hsPsiMixtureThermo
+
+SourceFiles
+    hsPsiMixtureThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hsPsiMixtureThermo_H
+#define hsPsiMixtureThermo_H
+
+#include "hsCombustionThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                   Class hsPsiMixtureThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MixtureType>
+class hsPsiMixtureThermo
+:
+    public hsCombustionThermo,
+    public MixtureType
+{
+    // Private member functions
+
+        void calculate();
+
+        //- Construct as copy (not implemented)
+        hsPsiMixtureThermo(const hsPsiMixtureThermo<MixtureType>&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("hsPsiMixtureThermo");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        hsPsiMixtureThermo(const fvMesh&);
+
+
+    //- Destructor
+    virtual ~hsPsiMixtureThermo();
+
+
+    // Member functions
+
+        //- Return the compostion of the multi-component mixture
+        virtual basicMultiComponentMixture& composition()
+        {
+            return *this;
+        }
+
+        //- Return the compostion of the multi-component mixture
+        virtual const basicMultiComponentMixture& composition() const
+        {
+            return *this;
+        }
+
+        //- Update properties
+        virtual void correct();
+
+
+        // Fields derived from thermodynamic state variables
+
+            //- Chemical enthalpy [J/kg]
+            virtual tmp<volScalarField> hc() const;
+
+            //- Sensible enthalpy for cell-set [J/kg]
+            virtual tmp<scalarField> hs
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
+            //- Sensible enthalpy for patch [J/kg]
+            virtual tmp<scalarField> hs
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure for patch [J/kg/K]
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure [J/kg/K]
+            virtual tmp<volScalarField> Cp() const;
+
+
+        //- Read thermophysicalProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "hsPsiMixtureThermo.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C
similarity index 100%
rename from src/thermophysicalModels/combustion/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C
rename to src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.C
diff --git a/src/thermophysicalModels/combustion/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H
similarity index 98%
rename from src/thermophysicalModels/combustion/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H
rename to src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H
index c0c7863ee..96f764978 100644
--- a/src/thermophysicalModels/combustion/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/fixedUnburntEnthalpy/fixedUnburntEnthalpyFvPatchScalarField.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                Class fixedUnburntEnthalpyFvPatchScalarField Declaration
+          Class fixedUnburntEnthalpyFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
 class fixedUnburntEnthalpyFvPatchScalarField
diff --git a/src/thermophysicalModels/combustion/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C
similarity index 100%
rename from src/thermophysicalModels/combustion/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C
rename to src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.C
diff --git a/src/thermophysicalModels/combustion/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H
similarity index 98%
rename from src/thermophysicalModels/combustion/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H
rename to src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H
index fe89624f6..997fd0b1d 100644
--- a/src/thermophysicalModels/combustion/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/gradientUnburntEnthalpy/gradientUnburntEnthalpyFvPatchScalarField.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-               Class gradientUnburntEnthalpyFvPatchScalarField Declaration
+         Class gradientUnburntEnthalpyFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
 class gradientUnburntEnthalpyFvPatchScalarField
diff --git a/src/thermophysicalModels/combustion/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
similarity index 100%
rename from src/thermophysicalModels/combustion/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
rename to src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.C
diff --git a/src/thermophysicalModels/combustion/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H
similarity index 98%
rename from src/thermophysicalModels/combustion/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H
rename to src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H
index 399b48c64..0b403cb92 100644
--- a/src/thermophysicalModels/combustion/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H
+++ b/src/thermophysicalModels/reactionThermo/derivedFvPatchFields/mixedUnburntEnthalpy/mixedUnburntEnthalpyFvPatchScalarField.H
@@ -44,7 +44,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-               Class mixedUnburntEnthalpyFvPatchScalarField Declaration
+           Class mixedUnburntEnthalpyFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
 class mixedUnburntEnthalpyFvPatchScalarField
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/combustionMixture/combustionMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
similarity index 91%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/combustionMixture/combustionMixture.C
rename to src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
index ef715948c..085512e7e 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/combustionMixture/combustionMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.C
@@ -24,17 +24,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "combustionMixture.H"
-#include "fvMesh.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "basicMultiComponentMixture.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-combustionMixture::combustionMixture
+Foam::basicMultiComponentMixture::basicMultiComponentMixture
 (
     const dictionary& thermoDict,
     const wordList& specieNames,
@@ -107,11 +101,10 @@ combustionMixture::combustionMixture
             );
         }
     }
+
+    // Do not enforce constraint of sum of mass fractions to equal 1 here
+    // - not applicable to all models
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/combustionMixture/combustionMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
similarity index 67%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/combustionMixture/combustionMixture.H
rename to src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
index 88eb1bf93..34caf605d 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/combustionMixture/combustionMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixture.H
@@ -23,18 +23,18 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::combustionMixture
+    Foam::basicMultiComponentMixture
 
 Description
     combustion mixture
 
 SourceFiles
-    combustionMixture.C
+    basicMultiComponentMixture.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef combustionMixture_H
-#define combustionMixture_H
+#ifndef basicMultiComponentMixture_H
+#define basicMultiComponentMixture_H
 
 #include "volFields.H"
 #include "PtrList.H"
@@ -46,17 +46,17 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class combustionMixture Declaration
+                 Class basicMultiComponentMixture Declaration
 \*---------------------------------------------------------------------------*/
 
-class combustionMixture
+class basicMultiComponentMixture
 {
 
 protected:
 
     // Protected data
 
-        //- The table of species
+        //- Table of specie names
         speciesTable species_;
 
         //- Species mass fractions
@@ -68,7 +68,7 @@ public:
     // Constructors
 
         //- Construct from dictionary and mesh
-        combustionMixture
+        basicMultiComponentMixture
         (
             const dictionary&,
             const wordList& specieNames,
@@ -76,69 +76,47 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~combustionMixture()
-        {}
+    //- Destructor
+    virtual ~basicMultiComponentMixture()
+    {}
 
 
     // Member functions
 
-        //- Return the mass-fraction fields
-        PtrList<volScalarField>& Y()
+        //- Return the table of species
+        const speciesTable& species() const
         {
-            return Y_;
+            return species_;
         }
 
+        //- Return the mass-fraction fields
+        inline PtrList<volScalarField>& Y();
+
         //- Return the const mass-fraction fields
-        const PtrList<volScalarField>& Y() const
-        {
-            return Y_;
-        }
+        inline const PtrList<volScalarField>& Y() const;
 
         //- Return the mass-fraction field for a specie given by index
-        volScalarField& Y(const label i)
-        {
-            return Y_[i];
-        }
+        inline volScalarField& Y(const label i);
 
         //- Return the const mass-fraction field for a specie given by index
-        const volScalarField& Y(const label i) const
-        {
-            return Y_[i];
-        }
+        inline const volScalarField& Y(const label i) const;
 
         //- Return the mass-fraction field for a specie given by name
-        volScalarField& Y(const word& specieName)
-        {
-            return Y_[species_[specieName]];
-        }
+        inline volScalarField& Y(const word& specieName);
 
         //- Return the const mass-fraction field for a specie given by name
-        const volScalarField& Y(const word& specieName) const
-        {
-            return Y_[species_[specieName]];
-        }
+        inline const volScalarField& Y(const word& specieName) const;
 
-        //- does the mixture include this specie
-        bool contains(const word& specieName) const
-        {
-            return species_.contains(specieName);
-        }
+        //- Does the mixture include this specie?
+        inline bool contains(const word& specieName) const;
 
-        scalar fres(const scalar ft, const scalar stoicRatio) const
-        {
-            return max(ft - (1.0 - ft)/stoicRatio, 0.0);
-        }
+        inline scalar fres(const scalar ft, const scalar stoicRatio) const;
 
-        tmp<volScalarField> fres
+        inline tmp<volScalarField> fres
         (
             const volScalarField& ft,
             const dimensionedScalar& stoicRatio
-        ) const
-        {
-            return max(ft - (scalar(1) - ft)/stoicRatio.value(), scalar(0));
-        }
+        ) const;
 };
 
 
@@ -148,6 +126,10 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "basicMultiComponentMixtureI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixtureI.H b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixtureI.H
new file mode 100644
index 000000000..e0c267244
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/mixtures/basicMultiComponentMixture/basicMultiComponentMixtureI.H
@@ -0,0 +1,103 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+inline Foam::PtrList<Foam::volScalarField>&
+Foam::basicMultiComponentMixture::Y()
+{
+    return Y_;
+}
+
+
+inline const Foam::PtrList<Foam::volScalarField>&
+Foam::basicMultiComponentMixture::Y() const
+{
+    return Y_;
+}
+
+
+inline Foam::volScalarField& Foam::basicMultiComponentMixture::Y(const label i)
+{
+    return Y_[i];
+}
+
+
+inline const Foam::volScalarField& Foam::basicMultiComponentMixture::Y
+(
+    const label i
+) const
+{
+    return Y_[i];
+}
+
+
+inline Foam::volScalarField& Foam::basicMultiComponentMixture::Y
+(
+    const word& specieName
+)
+{
+    return Y_[species_[specieName]];
+}
+
+
+inline const Foam::volScalarField& Foam::basicMultiComponentMixture::Y
+(
+    const word& specieName
+) const
+{
+    return Y_[species_[specieName]];
+}
+
+
+inline bool Foam::basicMultiComponentMixture::contains
+(
+    const word& specieName
+) const
+{
+    return species_.contains(specieName);
+}
+
+
+inline Foam::scalar Foam::basicMultiComponentMixture::fres
+(
+    const scalar ft,
+    const scalar stoicRatio
+) const
+{
+    return max(ft - (1.0 - ft)/stoicRatio, 0.0);
+}
+
+
+inline Foam::tmp<Foam::volScalarField> Foam::basicMultiComponentMixture::fres
+(
+    const volScalarField& ft,
+    const dimensionedScalar& stoicRatio
+) const
+{
+    return max(ft - (scalar(1) - ft)/stoicRatio.value(), scalar(0));
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/dieselMixture/dieselMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
similarity index 83%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/dieselMixture/dieselMixture.C
rename to src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
index 1183be048..bf96efd0c 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/dieselMixture/dieselMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.C
@@ -27,28 +27,27 @@ License
 #include "dieselMixture.H"
 #include "fvMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const char* dieselMixture<ThermoType>::specieNames_[2] =
-    {"ft", "fu"};
+const char* Foam::dieselMixture<ThermoType>::specieNames_[2] = {"ft", "fu"};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ThermoType>
-dieselMixture<ThermoType>::dieselMixture
+Foam::dieselMixture<ThermoType>::dieselMixture
 (
     const dictionary& thermoDict,
     const fvMesh& mesh
 )
 :
-    combustionMixture(thermoDict, speciesTable(nSpecies_, specieNames_), mesh),
+    basicMultiComponentMixture
+    (
+        thermoDict,
+        speciesTable(nSpecies_, specieNames_),
+        mesh
+    ),
 
     stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
 
@@ -66,7 +65,7 @@ dieselMixture<ThermoType>::dieselMixture
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const ThermoType& dieselMixture<ThermoType>::mixture
+const ThermoType& Foam::dieselMixture<ThermoType>::mixture
 (
     const scalar ft,
     const scalar fu
@@ -91,7 +90,7 @@ const ThermoType& dieselMixture<ThermoType>::mixture
 
 
 template<class ThermoType>
-void dieselMixture<ThermoType>::read(const dictionary& thermoDict)
+void Foam::dieselMixture<ThermoType>::read(const dictionary& thermoDict)
 {
     fuel_ = ThermoType(thermoDict.lookup("fuel"));
     oxidant_ = ThermoType(thermoDict.lookup("oxidant"));
@@ -99,8 +98,4 @@ void dieselMixture<ThermoType>::read(const dictionary& thermoDict)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/dieselMixture/dieselMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H
similarity index 95%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/dieselMixture/dieselMixture.H
rename to src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H
index 4b26f552d..2af737ebf 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/dieselMixture/dieselMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/dieselMixture/dieselMixture.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef dieselMixture_H
 #define dieselMixture_H
 
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,13 +44,13 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class dieselMixture Declaration
+                         Class dieselMixture Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ThermoType>
 class dieselMixture
 :
-    public combustionMixture
+    public basicMultiComponentMixture
 {
     // Private data
 
@@ -84,10 +84,9 @@ public:
         dieselMixture(const dictionary&, const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~dieselMixture()
-        {}
+    //- Destructor
+    virtual ~dieselMixture()
+    {}
 
 
     // Member functions
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/egrMixture/egrMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
similarity index 81%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/egrMixture/egrMixture.C
rename to src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
index 2a94da857..8fdc65da2 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/egrMixture/egrMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.C
@@ -27,27 +27,27 @@ License
 #include "egrMixture.H"
 #include "fvMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const char* egrMixture<ThermoType>::specieNames_[3] = {"ft", "b", "egr"};
+const char* Foam::egrMixture<ThermoType>::specieNames_[3] = {"ft", "b", "egr"};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ThermoType>
-egrMixture<ThermoType>::egrMixture
+Foam::egrMixture<ThermoType>::egrMixture
 (
     const dictionary& thermoDict,
     const fvMesh& mesh
 )
 :
-    combustionMixture(thermoDict, speciesTable(nSpecies_, specieNames_), mesh),
+    basicMultiComponentMixture
+    (
+        thermoDict,
+        speciesTable(nSpecies_, specieNames_),
+        mesh
+    ),
 
     stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
 
@@ -66,7 +66,7 @@ egrMixture<ThermoType>::egrMixture
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const ThermoType& egrMixture<ThermoType>::mixture
+const ThermoType& Foam::egrMixture<ThermoType>::mixture
 (
     const scalar ft,
     const scalar b,
@@ -79,13 +79,13 @@ const ThermoType& egrMixture<ThermoType>::mixture
     }
     else
     {
-        
+
         scalar fu = b*ft + (1.0 - b)*fres(ft, stoicRatio().value());
         scalar ox = 1 - ft - (ft - fu)*stoicRatio().value();
-        
+
         fu *= (1.0 - egr);
         ox *= (1.0 - egr);
-        
+
         scalar pr = 1 - fu - ox;
 
         mixture_ = fu/fuel_.W()*fuel_;
@@ -98,10 +98,9 @@ const ThermoType& egrMixture<ThermoType>::mixture
 
 
 template<class ThermoType>
-void egrMixture<ThermoType>::read(const dictionary& thermoDict)
+void Foam::egrMixture<ThermoType>::read(const dictionary& thermoDict)
 {
-    stoicRatio_ =
-        dimensionedScalar(thermoDict.lookup("stoichiometricAirFuelMassRatio"));
+    stoicRatio_ = thermoDict.lookup("stoichiometricAirFuelMassRatio");
 
     fuel_ = ThermoType(thermoDict.lookup("fuel"));
     oxidant_ = ThermoType(thermoDict.lookup("oxidant"));
@@ -109,8 +108,4 @@ void egrMixture<ThermoType>::read(const dictionary& thermoDict)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/egrMixture/egrMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
similarity index 96%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/egrMixture/egrMixture.H
rename to src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
index 97a844358..904fea346 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/egrMixture/egrMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/egrMixture/egrMixture.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef egrMixture_H
 #define egrMixture_H
 
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,13 +44,13 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class egrMixture Declaration
+                         Class egrMixture Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ThermoType>
 class egrMixture
 :
-    public combustionMixture
+    public basicMultiComponentMixture
 {
     // Private data
 
@@ -90,10 +90,9 @@ public:
         egrMixture(const dictionary&, const fvMesh&);
 
 
-   // Destructor
-
-        virtual ~egrMixture()
-        {}
+    //- Destructor
+    virtual ~egrMixture()
+    {}
 
 
     // Member functions
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/homogeneousMixture/homogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
similarity index 80%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/homogeneousMixture/homogeneousMixture.C
rename to src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
index 93af1e2c2..e107e0e6e 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/homogeneousMixture/homogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.C
@@ -27,27 +27,27 @@ License
 #include "homogeneousMixture.H"
 #include "fvMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const char* homogeneousMixture<ThermoType>::specieNames_[1] = {"b"};
+const char* Foam::homogeneousMixture<ThermoType>::specieNames_[1] = {"b"};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ThermoType>
-homogeneousMixture<ThermoType>::homogeneousMixture
+Foam::homogeneousMixture<ThermoType>::homogeneousMixture
 (
     const dictionary& thermoDict,
     const fvMesh& mesh
 )
 :
-    combustionMixture(thermoDict, speciesTable(nSpecies_, specieNames_), mesh),
+    basicMultiComponentMixture
+    (
+        thermoDict,
+        speciesTable(nSpecies_, specieNames_),
+        mesh
+    ),
 
     reactants_(thermoDict.lookup("reactants")),
     products_(thermoDict.lookup("products")),
@@ -59,7 +59,10 @@ homogeneousMixture<ThermoType>::homogeneousMixture
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const ThermoType& homogeneousMixture<ThermoType>::mixture(const scalar b) const
+const ThermoType& Foam::homogeneousMixture<ThermoType>::mixture
+(
+    const scalar b
+) const
 {
     if (b > 0.999)
     {
@@ -80,15 +83,11 @@ const ThermoType& homogeneousMixture<ThermoType>::mixture(const scalar b) const
 
 
 template<class ThermoType>
-void homogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
+void Foam::homogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
 {
     reactants_ = ThermoType(thermoDict.lookup("reactants"));
     products_ = ThermoType(thermoDict.lookup("products"));
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/homogeneousMixture/homogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
similarity index 96%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/homogeneousMixture/homogeneousMixture.H
rename to src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
index 2ccb380d7..ad270c1f4 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/homogeneousMixture/homogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/homogeneousMixture/homogeneousMixture.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef homogeneousMixture_H
 #define homogeneousMixture_H
 
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ namespace Foam
 template<class ThermoType>
 class homogeneousMixture
 :
-    public combustionMixture
+    public basicMultiComponentMixture
 {
     // Private data
 
@@ -81,10 +81,9 @@ public:
         homogeneousMixture(const dictionary&, const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~homogeneousMixture()
-        {}
+    //- Destructor
+    virtual ~homogeneousMixture()
+    {}
 
 
     // Member functions
@@ -134,7 +133,7 @@ public:
 
 } // End namespace Foam
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 
 #ifdef NoRepository
 #   include "homogeneousMixture.C"
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/inhomogeneousMixture/inhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
similarity index 80%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
rename to src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
index 0979fdaf8..f34a20b5f 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.C
@@ -27,27 +27,28 @@ License
 #include "inhomogeneousMixture.H"
 #include "fvMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const char* inhomogeneousMixture<ThermoType>::specieNames_[2] = {"ft", "b"};
+const char* Foam::inhomogeneousMixture<ThermoType>::specieNames_[2] =
+    {"ft", "b"};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ThermoType>
-inhomogeneousMixture<ThermoType>::inhomogeneousMixture
+Foam::inhomogeneousMixture<ThermoType>::inhomogeneousMixture
 (
     const dictionary& thermoDict,
     const fvMesh& mesh
 )
 :
-    combustionMixture(thermoDict, speciesTable(nSpecies_, specieNames_), mesh),
+    basicMultiComponentMixture
+    (
+        thermoDict,
+        speciesTable(nSpecies_, specieNames_),
+        mesh
+    ),
 
     stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
 
@@ -65,7 +66,7 @@ inhomogeneousMixture<ThermoType>::inhomogeneousMixture
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const ThermoType& inhomogeneousMixture<ThermoType>::mixture
+const ThermoType& Foam::inhomogeneousMixture<ThermoType>::mixture
 (
     const scalar ft,
     const scalar b
@@ -91,10 +92,9 @@ const ThermoType& inhomogeneousMixture<ThermoType>::mixture
 
 
 template<class ThermoType>
-void inhomogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
+void Foam::inhomogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
 {
-    stoicRatio_ =
-        dimensionedScalar(thermoDict.lookup("stoichiometricAirFuelMassRatio"));
+    stoicRatio_ = thermoDict.lookup("stoichiometricAirFuelMassRatio");
 
     fuel_ = ThermoType(thermoDict.lookup("fuel"));
     oxidant_ = ThermoType(thermoDict.lookup("oxidant"));
@@ -102,8 +102,4 @@ void inhomogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/inhomogeneousMixture/inhomogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
similarity index 96%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
rename to src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
index aef1e8d1b..bf7cafef5 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/inhomogeneousMixture/inhomogeneousMixture.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef inhomogeneousMixture_H
 #define inhomogeneousMixture_H
 
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -50,7 +50,7 @@ namespace Foam
 template<class ThermoType>
 class inhomogeneousMixture
 :
-    public combustionMixture
+    public basicMultiComponentMixture
 {
     // Private data
 
@@ -87,10 +87,9 @@ public:
         inhomogeneousMixture(const dictionary&, const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~inhomogeneousMixture()
-        {}
+    //- Destructor
+    virtual ~inhomogeneousMixture()
+    {}
 
 
     // Member functions
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/multiComponentMixture/multiComponentMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
similarity index 78%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/multiComponentMixture/multiComponentMixture.C
rename to src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
index cad375caf..d24f74bdb 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/multiComponentMixture/multiComponentMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.C
@@ -25,17 +25,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "multiComponentMixture.H"
-#include "fvMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 template<class ThermoType>
-const ThermoType& multiComponentMixture<ThermoType>::constructSpeciesData
+const ThermoType& Foam::multiComponentMixture<ThermoType>::constructSpeciesData
 (
     const dictionary& thermoDict
 )
@@ -54,11 +48,11 @@ const ThermoType& multiComponentMixture<ThermoType>::constructSpeciesData
 
 
 template<class ThermoType>
-void multiComponentMixture<ThermoType>::correctMassFractions()
+void Foam::multiComponentMixture<ThermoType>::correctMassFractions()
 {
     volScalarField Yt = Y_[0];
 
-    for(label n=1; n<Y_.size(); n++)
+    for (label n=1; n<Y_.size(); n++)
     {
         Yt += Y_[n];
     }
@@ -73,7 +67,7 @@ void multiComponentMixture<ThermoType>::correctMassFractions()
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ThermoType>
-multiComponentMixture<ThermoType>::multiComponentMixture
+Foam::multiComponentMixture<ThermoType>::multiComponentMixture
 (
     const dictionary& thermoDict,
     const wordList& specieNames,
@@ -81,7 +75,7 @@ multiComponentMixture<ThermoType>::multiComponentMixture
     const fvMesh& mesh
 )
 :
-    combustionMixture(thermoDict, specieNames, mesh),
+    basicMultiComponentMixture(thermoDict, specieNames, mesh),
     speciesData_(species_.size()),
     mixture_("mixture", *specieThermoData[specieNames[0]])
 {
@@ -99,13 +93,13 @@ multiComponentMixture<ThermoType>::multiComponentMixture
 
 
 template<class ThermoType>
-multiComponentMixture<ThermoType>::multiComponentMixture
+Foam::multiComponentMixture<ThermoType>::multiComponentMixture
 (
     const dictionary& thermoDict,
     const fvMesh& mesh
 )
 :
-    combustionMixture(thermoDict, thermoDict.lookup("species"), mesh),
+    basicMultiComponentMixture(thermoDict, thermoDict.lookup("species"), mesh),
     speciesData_(species_.size()),
     mixture_("mixture", constructSpeciesData(thermoDict))
 {
@@ -116,7 +110,7 @@ multiComponentMixture<ThermoType>::multiComponentMixture
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const ThermoType& multiComponentMixture<ThermoType>::cellMixture
+const ThermoType& Foam::multiComponentMixture<ThermoType>::cellMixture
 (
     const label celli
 ) const
@@ -127,13 +121,13 @@ const ThermoType& multiComponentMixture<ThermoType>::cellMixture
     {
         mixture_ += Y_[n][celli]/speciesData_[n].W()*speciesData_[n];
     }
-        
+
     return mixture_;
 }
 
 
 template<class ThermoType>
-const ThermoType& multiComponentMixture<ThermoType>::patchFaceMixture
+const ThermoType& Foam::multiComponentMixture<ThermoType>::patchFaceMixture
 (
     const label patchi,
     const label facei
@@ -149,13 +143,16 @@ const ThermoType& multiComponentMixture<ThermoType>::patchFaceMixture
             Y_[n].boundaryField()[patchi][facei]
            /speciesData_[n].W()*speciesData_[n];
     }
-        
+
     return mixture_;
 }
 
 
 template<class ThermoType>
-void multiComponentMixture<ThermoType>::read(const dictionary& thermoDict)
+void Foam::multiComponentMixture<ThermoType>::read
+(
+    const dictionary& thermoDict
+)
 {
     forAll(species_, i)
     {
@@ -164,8 +161,4 @@ void multiComponentMixture<ThermoType>::read(const dictionary& thermoDict)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/multiComponentMixture/multiComponentMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
similarity index 95%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/multiComponentMixture/multiComponentMixture.H
rename to src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
index b280a088f..e8b9a243d 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/multiComponentMixture/multiComponentMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/multiComponentMixture/multiComponentMixture.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef multiComponentMixture_H
 #define multiComponentMixture_H
 
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 #include "HashPtrTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -45,13 +45,13 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class multiComponentMixture Declaration
+                    Class multiComponentMixture Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ThermoType>
 class multiComponentMixture
 :
-    public combustionMixture
+    public basicMultiComponentMixture
 {
     // Private data
 
@@ -96,10 +96,9 @@ public:
         multiComponentMixture(const dictionary&, const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~multiComponentMixture()
-        {}
+    //- Destructor
+    virtual ~multiComponentMixture()
+    {}
 
 
     // Member functions
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/reactingMixture/reactingMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C
similarity index 70%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/reactingMixture/reactingMixture.C
rename to src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C
index 75548dd4d..e4fcc746f 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/reactingMixture/reactingMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.C
@@ -27,44 +27,41 @@ License
 #include "reactingMixture.H"
 #include "fvMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-reactingMixture::reactingMixture
+template<class ThermoType>
+Foam::reactingMixture<ThermoType>::reactingMixture
 (
     const dictionary& thermoDict,
     const fvMesh& mesh
 )
 :
-    autoPtr<chemistryReader>(chemistryReader::New(thermoDict)),
-    multiComponentMixture<chemistryReader::reactionThermo>
+    autoPtr<chemistryReader<ThermoType> >
+    (
+        chemistryReader<ThermoType>::New(thermoDict)
+    ),
+    multiComponentMixture<ThermoType>
     (
         thermoDict,
-        autoPtr<chemistryReader>::operator()().species(),
-        autoPtr<chemistryReader>::operator()().sThermo(),
+        autoPtr<chemistryReader<ThermoType> >::operator()().species(),
+        autoPtr<chemistryReader<ThermoType> >::operator()().speciesThermo(),
         mesh
     ),
-    PtrList<chemistryReader::reaction>
+    PtrList<Reaction<ThermoType> >
     (
-        autoPtr<chemistryReader>::operator()().reactions(), species_
+        autoPtr<chemistryReader<ThermoType> >::operator()().reactions(),
+        this->species_
     )
 {
-    autoPtr<chemistryReader>::clear();
+    autoPtr<chemistryReader<ThermoType> >::clear();
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void reactingMixture::read(const dictionary& thermoDict)
+template<class ThermoType>
+void Foam::reactingMixture<ThermoType>::read(const dictionary& thermoDict)
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/reactingMixture/reactingMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
similarity index 82%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/reactingMixture/reactingMixture.H
rename to src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
index 60ebcbe1e..ba4af9383 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/reactingMixture/reactingMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/reactingMixture/reactingMixture.H
@@ -45,24 +45,16 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class reactingMixture Declaration
+                      Class reactingMixture Declaration
 \*---------------------------------------------------------------------------*/
 
+template<class ThermoType>
 class reactingMixture
 :
-    public autoPtr<chemistryReader>,
-    public multiComponentMixture<chemistryReader::reactionThermo>,
-    public PtrList<chemistryReader::reaction>
+    public autoPtr<chemistryReader<ThermoType> >,
+    public multiComponentMixture<ThermoType>,
+    public PtrList<Reaction<ThermoType> >
 {
-
-public:
-
-    typedef chemistryReader::reaction reaction;
-    typedef chemistryReader::reactionThermo reactionThermo;
-
-
-private:
-
     // Private member functions
 
         //- Disallow default bitwise copy construct
@@ -74,16 +66,19 @@ private:
 
 public:
 
+    //- The type of thermo package this mixture is instantiated for
+    typedef ThermoType thermoType;
+
+
     // Constructors
 
         //- Construct from dictionary and mesh
         reactingMixture(const dictionary&, const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~reactingMixture()
-        {}
+    //- Destructor
+    virtual ~reactingMixture()
+    {}
 
 
     // Member functions
@@ -99,6 +94,12 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#ifdef NoRepository
+#   include "reactingMixture.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
similarity index 82%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
rename to src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
index f069528bc..abc5005d0 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
+++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.C
@@ -27,28 +27,28 @@ License
 #include "veryInhomogeneousMixture.H"
 #include "fvMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const char* veryInhomogeneousMixture<ThermoType>::specieNames_[3] =
+const char* Foam::veryInhomogeneousMixture<ThermoType>::specieNames_[3] =
     {"ft", "fu", "b"};
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class ThermoType>
-veryInhomogeneousMixture<ThermoType>::veryInhomogeneousMixture
+Foam::veryInhomogeneousMixture<ThermoType>::veryInhomogeneousMixture
 (
     const dictionary& thermoDict,
     const fvMesh& mesh
 )
 :
-    combustionMixture(thermoDict, speciesTable(nSpecies_, specieNames_), mesh),
+    basicMultiComponentMixture
+    (
+        thermoDict,
+        speciesTable(nSpecies_, specieNames_),
+        mesh
+    ),
 
     stoicRatio_(thermoDict.lookup("stoichiometricAirFuelMassRatio")),
 
@@ -67,7 +67,7 @@ veryInhomogeneousMixture<ThermoType>::veryInhomogeneousMixture
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class ThermoType>
-const ThermoType& veryInhomogeneousMixture<ThermoType>::mixture
+const ThermoType& Foam::veryInhomogeneousMixture<ThermoType>::mixture
 (
     const scalar ft,
     const scalar fu
@@ -92,7 +92,10 @@ const ThermoType& veryInhomogeneousMixture<ThermoType>::mixture
 
 
 template<class ThermoType>
-void veryInhomogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
+void Foam::veryInhomogeneousMixture<ThermoType>::read
+(
+    const dictionary& thermoDict
+)
 {
     fuel_ = ThermoType(thermoDict.lookup("fuel"));
     oxidant_ = ThermoType(thermoDict.lookup("oxidant"));
@@ -100,8 +103,4 @@ void veryInhomogeneousMixture<ThermoType>::read(const dictionary& thermoDict)
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
similarity index 95%
rename from src/thermophysicalModels/combustion/mixtureThermos/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
rename to src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
index 0971c5ee1..1dd8839e3 100644
--- a/src/thermophysicalModels/combustion/mixtureThermos/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
+++ b/src/thermophysicalModels/reactionThermo/mixtures/veryInhomogeneousMixture/veryInhomogeneousMixture.H
@@ -36,7 +36,7 @@ SourceFiles
 #ifndef veryInhomogeneousMixture_H
 #define veryInhomogeneousMixture_H
 
-#include "combustionMixture.H"
+#include "basicMultiComponentMixture.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,13 +44,13 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class veryInhomogeneousMixture Declaration
+                  Class veryInhomogeneousMixture Declaration
 \*---------------------------------------------------------------------------*/
 
 template<class ThermoType>
 class veryInhomogeneousMixture
 :
-    public combustionMixture
+    public basicMultiComponentMixture
 {
     // Private data
 
@@ -90,10 +90,9 @@ public:
         veryInhomogeneousMixture(const dictionary&, const fvMesh&);
 
 
-    // Destructor
-
-        virtual ~veryInhomogeneousMixture()
-        {}
+    //- Destructor
+    virtual ~veryInhomogeneousMixture()
+    {}
 
 
     // Member functions
diff --git a/applications/test/mesh/meshTest.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermo.C
similarity index 67%
rename from applications/test/mesh/meshTest.C
rename to src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermo.C
index 3aa6a3311..421088628 100644
--- a/applications/test/mesh/meshTest.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermo.C
@@ -24,45 +24,44 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "argList.H"
+#include "hReactionThermo.H"
 #include "fvMesh.H"
-#include "volFields.H"
-#include "surfaceFields.H"
-
-using namespace Foam;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Main program:
 
-int main(int argc, char *argv[])
+namespace Foam
 {
+    defineTypeNameAndDebug(hReactionThermo, 0);
+    defineRunTimeSelectionTable(hReactionThermo, fvMesh);
+}
 
-#   include "setRootCase.H"
-#   include "createTime.H"
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-    Info<< "Create mesh, no clear-out\n" << endl;
-    fvMesh mesh
+Foam::hReactionThermo::hReactionThermo(const fvMesh& mesh)
+:
+    basicRhoThermo(mesh),
+
+    h_
     (
         IOobject
         (
-            fvMesh::defaultRegion,
-            runTime.timeName(),
-            runTime,
-            IOobject::MUST_READ
-        )
-    );
+            "h",
+            mesh.time().timeName(),
+            mesh,
+            IOobject::NO_READ,
+            IOobject::NO_WRITE
+        ),
+        mesh,
+        dimensionSet(0, 2, -2, 0, 0),
+        this->hBoundaryTypes()
+    )
+{}
 
-    Info<< mesh.C() << endl;
-    Info<< mesh.V() << endl;
 
-    surfaceVectorField Cf = mesh.Cf();
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-    Info<< Cf << endl;
-
-    Info << "End\n" << endl;
-
-    return 0;
-}
+Foam::hReactionThermo::~hReactionThermo()
+{}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermo.H b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermo.H
new file mode 100644
index 000000000..fd98fc2f2
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermo.H
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::hReactionThermo
+
+Description
+    Foam::hReactionThermo
+
+SourceFiles
+    hReactionThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hReactionThermo_H
+#define hReactionThermo_H
+
+#include "basicRhoThermo.H"
+#include "basicMultiComponentMixture.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class hReactionThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+class hReactionThermo
+:
+    public basicRhoThermo
+{
+
+protected:
+
+    // Protected data
+
+        //- Enthalpy field
+        volScalarField h_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("hReactionThermo");
+
+
+    //- Declare run-time constructor selection tables
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        hReactionThermo,
+        fvMesh,
+        (const fvMesh& mesh),
+        (mesh)
+    );
+
+
+    // Constructors
+
+        //- Construct from dictionary and mesh
+        hReactionThermo(const fvMesh&);
+
+
+    // Selectors
+
+        //- Standard selection based on fvMesh
+        static autoPtr<hReactionThermo> New(const fvMesh&);
+
+        //- Select and check that package contains 'thermoType'
+        static autoPtr<hReactionThermo> NewType
+        (
+            const fvMesh&,
+            const word& thermoType
+        );
+
+
+    //- Destructor
+    virtual ~hReactionThermo();
+
+
+    // Member functions
+
+        //- Return the composition of the multi-component mixture
+        virtual basicMultiComponentMixture& composition() = 0;
+
+        //- Return the composition of the multi-component mixture
+        virtual const basicMultiComponentMixture& composition() const = 0;
+
+
+        // Access to thermodynamic state variables
+
+            //- Enthalpy [J/kg]
+            //  Non-const access allowed for transport equations
+            virtual volScalarField& h()
+            {
+                return h_;
+            }
+
+            //- Enthalpy [J/kg]
+            virtual const volScalarField& h() const
+            {
+                return h_;
+            }
+
+
+        //- Update properties
+        virtual void correct() = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermos.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermos.C
new file mode 100644
index 000000000..c39356399
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/hReactionThermos.C
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "makeReactionThermo.H"
+
+#include "hReactionThermo.H"
+#include "hRhoMixtureThermo.H"
+
+#include "perfectGas.H"
+
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "specieThermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "homogeneousMixture.H"
+#include "inhomogeneousMixture.H"
+#include "veryInhomogeneousMixture.H"
+#include "dieselMixture.H"
+#include "multiComponentMixture.H"
+#include "reactingMixture.H"
+
+#include "thermoPhysicsTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeReactionThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    homogeneousMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeReactionThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    inhomogeneousMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeReactionThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    veryInhomogeneousMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeReactionThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    homogeneousMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+makeReactionThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    inhomogeneousMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+makeReactionThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    veryInhomogeneousMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+
+makeReactionThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    dieselMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+
+// Multi-component thermo
+
+makeReactionMixtureThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    multiComponentMixture,
+    icoPoly8ThermoPhysics
+);
+
+makeReactionMixtureThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    multiComponentMixture,
+    gasThermoPhysics
+);
+
+
+// Multi-component reaction thermo
+
+makeReactionMixtureThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    reactingMixture,
+    icoPoly8ThermoPhysics
+);
+
+makeReactionMixtureThermo
+(
+    hReactionThermo,
+    hRhoMixtureThermo,
+    reactingMixture,
+    gasThermoPhysics
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/makeReactionThermo.H b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/makeReactionThermo.H
new file mode 100644
index 000000000..b9b5de10b
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/makeReactionThermo.H
@@ -0,0 +1,100 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+InClass
+    Foam::hReactionThermo
+
+Description
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactionThermo_H
+#define makeReactionThermo_H
+
+#include "addToRunTimeSelectionTable.H"
+#include "basicRhoThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeReactionThermo(CThermo,MixtureThermo,Mixture,Transport,Thermo,EqnOfState) \
+                                                                              \
+typedef MixtureThermo                                                         \
+    <Mixture<Transport<specieThermo<Thermo<EqnOfState> > > > >                \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState;                    \
+                                                                              \
+defineTemplateTypeNameAndDebugWithName                                        \
+(                                                                             \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    #MixtureThermo                                                            \
+        "<"#Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>>", \
+    0                                                                         \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    basicRhoThermo,                                                           \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    fvMesh                                                                    \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    CThermo,                                                                  \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    fvMesh                                                                    \
+)
+
+
+#define makeReactionMixtureThermo(CThermo,MixtureThermo,Mixture,ThermoPhys)   \
+                                                                              \
+typedef MixtureThermo<Mixture<ThermoPhys> >                                   \
+    MixtureThermo##Mixture##ThermoPhys;                                       \
+                                                                              \
+defineTemplateTypeNameAndDebugWithName                                        \
+(                                                                             \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    #MixtureThermo"<"#Mixture"<"#ThermoPhys">>",                              \
+    0                                                                         \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    basicRhoThermo,                                                           \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    fvMesh                                                                    \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    CThermo,                                                                  \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    fvMesh                                                                    \
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
new file mode 100644
index 000000000..545112734
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hReactionThermo/newhReactionThermo.C
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hReactionThermo.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::New
+(
+    const fvMesh& mesh
+)
+{
+    word hReactionThermoTypeName;
+
+    // Enclose the creation of the thermophysicalProperties to ensure it is
+    // deleted before the turbulenceModel is created otherwise the dictionary
+    // is entered in the database twice
+    {
+        IOdictionary thermoDict
+        (
+            IOobject
+            (
+                "thermophysicalProperties",
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        thermoDict.lookup("thermoType") >> hReactionThermoTypeName;
+    }
+
+    Info<< "Selecting thermodynamics package " << hReactionThermoTypeName
+        << endl;
+
+    fvMeshConstructorTable::iterator cstrIter =
+        fvMeshConstructorTablePtr_->find(hReactionThermoTypeName);
+
+    if (cstrIter == fvMeshConstructorTablePtr_->end())
+    {
+        FatalErrorIn("hReactionThermo::New(const fvMesh&)")
+            << "Unknown hReactionThermo type "
+            << hReactionThermoTypeName << nl << nl
+            << "Valid hReactionThermo types are:" << nl
+            << fvMeshConstructorTablePtr_->toc() << nl
+            << exit(FatalError);
+    }
+
+    return autoPtr<hReactionThermo>(cstrIter()(mesh));
+}
+
+
+Foam::autoPtr<Foam::hReactionThermo> Foam::hReactionThermo::NewType
+(
+    const fvMesh& mesh,
+    const word& thermoType
+)
+{
+    word hReactionThermoTypeName;
+
+    // Enclose the creation of the thermophysicalProperties to ensure it is
+    // deleted before the turbulenceModel is created otherwise the dictionary
+    // is entered in the database twice
+    {
+        IOdictionary thermoDict
+        (
+            IOobject
+            (
+                "thermophysicalProperties",
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        thermoDict.lookup("thermoType") >> hReactionThermoTypeName;
+
+        if (hReactionThermoTypeName.find(thermoType) == string::npos)
+        {
+            wordList allModels = fvMeshConstructorTablePtr_->toc();
+            DynamicList<word> validModels;
+            forAll(allModels, i)
+            {
+                if (allModels[i].find(thermoType) != string::npos)
+                {
+                    validModels.append(allModels[i]);
+                }
+            }
+
+            FatalErrorIn
+            (
+                "autoPtr<hReactionThermo> hReactionThermo::NewType"
+                "("
+                    "const fvMesh&, "
+                    "const word&"
+                ")"
+            )   << "Inconsistent thermo package selected:" << nl << nl
+                << hReactionThermoTypeName << nl << nl << "Please select a "
+                << "thermo package based on " << thermoType
+                << ". Valid options include:" << nl << validModels << nl
+                << exit(FatalError);
+        }
+    }
+
+    Info<< "Selecting thermodynamics package " << hReactionThermoTypeName
+        << endl;
+
+    fvMeshConstructorTable::iterator cstrIter =
+        fvMeshConstructorTablePtr_->find(hReactionThermoTypeName);
+
+    if (cstrIter == fvMeshConstructorTablePtr_->end())
+    {
+        FatalErrorIn("hReactionThermo::New(const fvMesh&)")
+            << "Unknown hReactionThermo type "
+            << hReactionThermoTypeName << nl << nl
+            << "Valid hReactionThermo types are:" << nl
+            << fvMeshConstructorTablePtr_->toc() << nl
+            << exit(FatalError);
+    }
+
+    return autoPtr<hReactionThermo>(cstrIter()(mesh));
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/pointField/testPointField.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermo.C
similarity index 69%
rename from applications/test/pointField/testPointField.C
rename to src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermo.C
index b1303be9a..912b59b72 100644
--- a/applications/test/pointField/testPointField.C
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermo.C
@@ -22,51 +22,46 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Application
-    testPointField
-
-Description
-    For each time calculate the magnitude of velocity.
-
 \*---------------------------------------------------------------------------*/
 
-#include "fvCFD.H"
-#include "pointMesh.H"
-#include "pointFields.H"
+#include "hsReactionThermo.H"
+#include "fvMesh.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-int main(int argc, char *argv[])
+namespace Foam
 {
+    defineTypeNameAndDebug(hsReactionThermo, 0);
+    defineRunTimeSelectionTable(hsReactionThermo, fvMesh);
+}
 
-#   include "setRootCase.H"
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-#   include "createTime.H"
-#   include "createMesh.H"
+Foam::hsReactionThermo::hsReactionThermo(const fvMesh& mesh)
+:
+    basicRhoThermo(mesh),
 
-    pointMesh pMesh(mesh);
-
-    pointVectorField U
+    hs_
     (
         IOobject
         (
-            "U",
-            runTime.timeName(),
+            "hs",
+            mesh.time().timeName(),
             mesh,
             IOobject::NO_READ,
-            IOobject::AUTO_WRITE
+            IOobject::NO_WRITE
         ),
-        pMesh,
-        dimensionedVector("fvmU", dimLength, vector::zero),
-        pointPatchVectorField::calculatedType()
-    );
+        mesh,
+        dimEnergy/dimMass,
+        this->hBoundaryTypes()
+    )
+{}
 
-    pointVectorField V = U + 2*U;
 
-    Info<< "End\n" << endl;
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-    return(0);
-}
+Foam::hsReactionThermo::~hsReactionThermo()
+{}
 
 
 // ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermo.H b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermo.H
new file mode 100644
index 000000000..451b94b99
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermo.H
@@ -0,0 +1,144 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::hsReactionThermo
+
+Description
+    Sensible enthalpy variant for reactionThermo
+
+SourceFiles
+    hReactionThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hsReactionThermo_H
+#define hsReactionThermo_H
+
+#include "basicRhoThermo.H"
+#include "basicMultiComponentMixture.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                     Class hsReactionThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+class hsReactionThermo
+:
+    public basicRhoThermo
+{
+
+protected:
+
+    // Protected data
+
+        //- Sensible enthalpy [J/kg]
+        volScalarField hs_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("hsReactionThermo");
+
+
+    //- Declare run-time constructor selection tables
+    declareRunTimeSelectionTable
+    (
+        autoPtr,
+        hsReactionThermo,
+        fvMesh,
+        (const fvMesh& mesh),
+        (mesh)
+    );
+
+
+    // Constructors
+
+        //- Construct from dictionary and mesh
+        hsReactionThermo(const fvMesh&);
+
+
+    // Selectors
+
+        //- Standard selection based on fvMesh
+        static autoPtr<hsReactionThermo> New(const fvMesh&);
+
+        //- Select and check that package contains 'thermoType'
+        static autoPtr<hsReactionThermo> NewType
+        (
+            const fvMesh&,
+            const word& thermoType
+        );
+
+
+    //- Destructor
+    virtual ~hsReactionThermo();
+
+
+    // Member functions
+
+        //- Return the composition of the multi-component mixture
+        virtual basicMultiComponentMixture& composition() = 0;
+
+        //- Return the composition of the multi-component mixture
+        virtual const basicMultiComponentMixture& composition() const = 0;
+
+
+        // Access to thermodynamic state variables
+
+            //- Sensible enthalpy [J/kg]
+            //  Non-const access allowed for transport equations
+            virtual volScalarField& hs()
+            {
+                return hs_;
+            }
+
+            //- Sensible enthalpy [J/kg]
+            virtual const volScalarField& hs() const
+            {
+                return hs_;
+            }
+
+
+        //- Update properties
+        virtual void correct() = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermos.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermos.C
new file mode 100644
index 000000000..3a3b0fcb2
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/hsReactionThermos.C
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "makeHsReactionThermo.H"
+
+#include "hsReactionThermo.H"
+#include "hsRhoMixtureThermo.H"
+
+#include "perfectGas.H"
+
+#include "hConstThermo.H"
+#include "janafThermo.H"
+#include "specieThermo.H"
+
+#include "constTransport.H"
+#include "sutherlandTransport.H"
+
+#include "homogeneousMixture.H"
+#include "inhomogeneousMixture.H"
+#include "veryInhomogeneousMixture.H"
+#include "dieselMixture.H"
+#include "multiComponentMixture.H"
+#include "reactingMixture.H"
+
+#include "thermoPhysicsTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeHsReactionThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    homogeneousMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeHsReactionThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    inhomogeneousMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeHsReactionThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    veryInhomogeneousMixture,
+    constTransport,
+    hConstThermo,
+    perfectGas
+);
+
+makeHsReactionThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    homogeneousMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+makeHsReactionThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    inhomogeneousMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+makeHsReactionThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    veryInhomogeneousMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+
+makeHsReactionThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    dieselMixture,
+    sutherlandTransport,
+    janafThermo,
+    perfectGas
+);
+
+
+// Multi-component thermo
+
+makeHsReactionMixtureThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    multiComponentMixture,
+    icoPoly8ThermoPhysics
+);
+
+makeHsReactionMixtureThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    multiComponentMixture,
+    gasThermoPhysics
+);
+
+
+// Multi-component reaction thermo
+
+makeHsReactionMixtureThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    reactingMixture,
+    icoPoly8ThermoPhysics
+);
+
+makeHsReactionMixtureThermo
+(
+    hsReactionThermo,
+    hsRhoMixtureThermo,
+    reactingMixture,
+    gasThermoPhysics
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/makeHsReactionThermo.H b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/makeHsReactionThermo.H
new file mode 100644
index 000000000..7a5cf04b7
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/makeHsReactionThermo.H
@@ -0,0 +1,98 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+InClass
+    Foam::hReactionThermo
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef makeReactionThermo_H
+#define makeReactionThermo_H
+
+#include "addToRunTimeSelectionTable.H"
+#include "basicRhoThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#define makeHsReactionThermo(CThermo,MixtureThermo,Mixture,Transport,Thermo,EqnOfState)\
+                                                                              \
+typedef MixtureThermo                                                         \
+    <Mixture<Transport<specieThermo<Thermo<EqnOfState> > > > >                \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState;                    \
+                                                                              \
+defineTemplateTypeNameAndDebugWithName                                        \
+(                                                                             \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    #MixtureThermo                                                            \
+        "<"#Mixture"<"#Transport"<specieThermo<"#Thermo"<"#EqnOfState">>>>>", \
+    0                                                                         \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    basicRhoThermo,                                                           \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    fvMesh                                                                    \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    CThermo,                                                                  \
+    MixtureThermo##Mixture##Transport##Thermo##EqnOfState,                    \
+    fvMesh                                                                    \
+)
+
+
+#define makeHsReactionMixtureThermo(CThermo,MixtureThermo,Mixture,ThermoPhys) \
+                                                                              \
+typedef MixtureThermo<Mixture<ThermoPhys> >                                   \
+    MixtureThermo##Mixture##ThermoPhys;                                       \
+                                                                              \
+defineTemplateTypeNameAndDebugWithName                                        \
+(                                                                             \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    #MixtureThermo"<"#Mixture"<"#ThermoPhys">>",                              \
+    0                                                                         \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    basicRhoThermo,                                                           \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    fvMesh                                                                    \
+);                                                                            \
+                                                                              \
+addToRunTimeSelectionTable                                                    \
+(                                                                             \
+    CThermo,                                                                  \
+    MixtureThermo##Mixture##ThermoPhys,                                       \
+    fvMesh                                                                    \
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/newhsReactionThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/newhsReactionThermo.C
new file mode 100644
index 000000000..1a75059b9
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/hsReactionThermo/newhsReactionThermo.C
@@ -0,0 +1,151 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hsReactionThermo.H"
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+Foam::autoPtr<Foam::hsReactionThermo> Foam::hsReactionThermo::New
+(
+    const fvMesh& mesh
+)
+{
+    word hsReactionThermoTypeName;
+
+    // Enclose the creation of the thermophysicalProperties to ensure it is
+    // deleted before the turbulenceModel is created otherwise the dictionary
+    // is entered in the database twice
+    {
+        IOdictionary thermoDict
+        (
+            IOobject
+            (
+                "thermophysicalProperties",
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        thermoDict.lookup("thermoType") >> hsReactionThermoTypeName;
+    }
+
+    Info<< "Selecting thermodynamics package " << hsReactionThermoTypeName
+        << endl;
+
+    fvMeshConstructorTable::iterator cstrIter =
+        fvMeshConstructorTablePtr_->find(hsReactionThermoTypeName);
+
+    if (cstrIter == fvMeshConstructorTablePtr_->end())
+    {
+        FatalErrorIn("hsReactionThermo::New(const fvMesh&)")
+            << "Unknown hsReactionThermo type "
+            << hsReactionThermoTypeName << nl << nl
+            << "Valid hsReactionThermo types are:" << nl
+            << fvMeshConstructorTablePtr_->toc() << nl
+            << exit(FatalError);
+    }
+
+    return autoPtr<hsReactionThermo>(cstrIter()(mesh));
+}
+
+
+Foam::autoPtr<Foam::hsReactionThermo> Foam::hsReactionThermo::NewType
+(
+    const fvMesh& mesh,
+    const word& thermoType
+)
+{
+    word hsReactionThermoTypeName;
+
+    // Enclose the creation of the thermophysicalProperties to ensure it is
+    // deleted before the turbulenceModel is created otherwise the dictionary
+    // is entered in the database twice
+    {
+        IOdictionary thermoDict
+        (
+            IOobject
+            (
+                "thermophysicalProperties",
+                mesh.time().constant(),
+                mesh,
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        thermoDict.lookup("thermoType") >> hsReactionThermoTypeName;
+
+        if (hsReactionThermoTypeName.find(thermoType) == string::npos)
+        {
+            wordList allModels = fvMeshConstructorTablePtr_->toc();
+            DynamicList<word> validModels;
+            forAll(allModels, i)
+            {
+                if (allModels[i].find(thermoType) != string::npos)
+                {
+                    validModels.append(allModels[i]);
+                }
+            }
+
+            FatalErrorIn
+            (
+                "autoPtr<hsReactionThermo> hsReactionThermo::NewType"
+                "("
+                    "const fvMesh&, "
+                    "const word&"
+                ")"
+            )   << "Inconsistent thermo package selected:" << nl << nl
+                << hsReactionThermoTypeName << nl << nl << "Please select a "
+                << "thermo package based on " << thermoType
+                << ". Valid options include:" << nl << validModels << nl
+                << exit(FatalError);
+        }
+    }
+
+    Info<< "Selecting thermodynamics package " << hsReactionThermoTypeName
+        << endl;
+
+    fvMeshConstructorTable::iterator cstrIter =
+        fvMeshConstructorTablePtr_->find(hsReactionThermoTypeName);
+
+    if (cstrIter == fvMeshConstructorTablePtr_->end())
+    {
+        FatalErrorIn("hsReactionThermo::New(const fvMesh&)")
+            << "Unknown hsReactionThermo type "
+            << hsReactionThermoTypeName << nl << nl
+            << "Valid hsReactionThermo types are:" << nl
+            << fvMeshConstructorTablePtr_->toc() << nl
+            << exit(FatalError);
+    }
+
+    return autoPtr<hsReactionThermo>(cstrIter()(mesh));
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
new file mode 100644
index 000000000..3c55c7190
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.C
@@ -0,0 +1,320 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hRhoMixtureThermo.H"
+#include "fvMesh.H"
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hRhoMixtureThermo<MixtureType>::calculate()
+{
+    const scalarField& hCells = h_.internalField();
+    const scalarField& pCells = p_.internalField();
+
+    scalarField& TCells = T_.internalField();
+    scalarField& psiCells = psi_.internalField();
+    scalarField& rhoCells = rho_.internalField();
+    scalarField& muCells = mu_.internalField();
+    scalarField& alphaCells = alpha_.internalField();
+
+    forAll(TCells, celli)
+    {
+        const typename MixtureType::thermoType& mixture =
+            this->cellMixture(celli);
+
+        TCells[celli] = mixture.TH(hCells[celli], TCells[celli]);
+        psiCells[celli] = mixture.psi(pCells[celli], TCells[celli]);
+        rhoCells[celli] = mixture.rho(pCells[celli], TCells[celli]);
+
+        muCells[celli] = mixture.mu(TCells[celli]);
+        alphaCells[celli] = mixture.alpha(TCells[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        fvPatchScalarField& pp = p_.boundaryField()[patchi];
+        fvPatchScalarField& pT = T_.boundaryField()[patchi];
+        fvPatchScalarField& ppsi = psi_.boundaryField()[patchi];
+        fvPatchScalarField& prho = rho_.boundaryField()[patchi];
+
+        fvPatchScalarField& ph = h_.boundaryField()[patchi];
+
+        fvPatchScalarField& pmu_ = mu_.boundaryField()[patchi];
+        fvPatchScalarField& palpha_ = alpha_.boundaryField()[patchi];
+
+        if (pT.fixesValue())
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture =
+                    this->patchFaceMixture(patchi, facei);
+
+                ph[facei] = mixture.H(pT[facei]);
+
+                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
+                prho[facei] = mixture.rho(pp[facei], pT[facei]);
+                pmu_[facei] = mixture.mu(pT[facei]);
+                palpha_[facei] = mixture.alpha(pT[facei]);
+            }
+        }
+        else
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture =
+                    this->patchFaceMixture(patchi, facei);
+
+                pT[facei] = mixture.TH(ph[facei], pT[facei]);
+
+                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
+                prho[facei] = mixture.rho(pp[facei], pT[facei]);
+                pmu_[facei] = mixture.mu(pT[facei]);
+                palpha_[facei] = mixture.alpha(pT[facei]);
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hRhoMixtureThermo<MixtureType>::hRhoMixtureThermo(const fvMesh& mesh)
+:
+    hReactionThermo(mesh),
+    MixtureType(*this, mesh)
+{
+    scalarField& hCells = h_.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(hCells, celli)
+    {
+        hCells[celli] = this->cellMixture(celli).H(TCells[celli]);
+    }
+
+    forAll(h_.boundaryField(), patchi)
+    {
+        h_.boundaryField()[patchi] == h(T_.boundaryField()[patchi], patchi);
+    }
+
+    hBoundaryCorrection(h_);
+
+    calculate();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hRhoMixtureThermo<MixtureType>::~hRhoMixtureThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hRhoMixtureThermo<MixtureType>::correct()
+{
+    if (debug)
+    {
+        Info<< "entering hRhoMixtureThermo<MixtureType>::correct()" << endl;
+    }
+
+    calculate();
+
+    if (debug)
+    {
+        Info<< "exiting hRhoMixtureThermo<MixtureType>::correct()" << endl;
+    }
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hRhoMixtureThermo<MixtureType>::hc() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> thc
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "hc",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            h_.dimensions()
+        )
+    );
+
+    volScalarField& hcf = thc();
+    scalarField& hcCells = hcf.internalField();
+
+    forAll(hcCells, celli)
+    {
+        hcCells[celli] = this->cellMixture(celli).Hc();
+    }
+
+    forAll(hcf.boundaryField(), patchi)
+    {
+        scalarField& hcp = hcf.boundaryField()[patchi];
+
+        forAll(hcp, facei)
+        {
+            hcp[facei] = this->patchFaceMixture(patchi, facei).Hc();
+        }
+    }
+
+    return thc;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hRhoMixtureThermo<MixtureType>::h
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    tmp<scalarField> th(new scalarField(T.size()));
+    scalarField& h = th();
+
+    forAll(T, celli)
+    {
+        h[celli] = this->cellMixture(cells[celli]).H(T[celli]);
+    }
+
+    return th;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hRhoMixtureThermo<MixtureType>::h
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> th(new scalarField(T.size()));
+    scalarField& h = th();
+
+    forAll(T, facei)
+    {
+        h[facei] = this->patchFaceMixture(patchi, facei).H(T[facei]);
+    }
+
+    return th;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hRhoMixtureThermo<MixtureType>::Cp
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCp(new scalarField(T.size()));
+
+    scalarField& cp = tCp();
+
+    forAll(T, facei)
+    {
+        cp[facei] = this->patchFaceMixture(patchi, facei).Cp(T[facei]);
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hRhoMixtureThermo<MixtureType>::Cp() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> tCp
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cp",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimensionSet(0, 2, -2, -1, 0)
+        )
+    );
+
+    volScalarField& cp = tCp();
+
+    scalarField& cpCells = cp.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(TCells, celli)
+    {
+        cpCells[celli] = this->cellMixture(celli).Cp(TCells[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        cp.boundaryField()[patchi] = Cp(T_.boundaryField()[patchi], patchi);
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+bool Foam::hRhoMixtureThermo<MixtureType>::read()
+{
+    if (hReactionThermo::read())
+    {
+        MixtureType::read(*this);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.H b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.H
new file mode 100644
index 000000000..d5e94150e
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hRhoMixtureThermo/hRhoMixtureThermo.H
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::hRhoMixtureThermo
+
+Description
+    Foam::hRhoMixtureThermo
+
+SourceFiles
+    hRhoMixtureThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hRhoMixtureThermo_H
+#define hRhoMixtureThermo_H
+
+#include "hReactionThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class hRhoMixtureThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MixtureType>
+class hRhoMixtureThermo
+:
+    public hReactionThermo,
+    public MixtureType
+{
+    // Private member functions
+
+        void calculate();
+
+        //- Construct as copy (not implemented)
+        hRhoMixtureThermo(const hRhoMixtureThermo<MixtureType>&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("hRhoMixtureThermo");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        hRhoMixtureThermo(const fvMesh&);
+
+
+    //- Destructor
+    virtual ~hRhoMixtureThermo();
+
+
+    // Member functions
+
+        //- Return the compostion of the multi-component mixture
+        virtual basicMultiComponentMixture& composition()
+        {
+            return *this;
+        }
+
+        //- Return the compostion of the multi-component mixture
+        virtual const basicMultiComponentMixture& composition() const
+        {
+            return *this;
+        }
+
+        //- Update properties
+        virtual void correct();
+
+        //- Chemical enthalpy [J/kg]
+        virtual tmp<volScalarField> hc() const;
+
+
+        // Fields derived from thermodynamic state variables
+
+            //- Enthalpy for cell-set [J/kg]
+            virtual tmp<scalarField> h
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
+            //- Enthalpy for patch [J/kg]
+            virtual tmp<scalarField> h
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure for patch [J/kg/K]
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure [J/kg/K]
+            virtual tmp<volScalarField> Cp() const;
+
+
+        //- Read thermophysicalProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "hRhoMixtureThermo.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C
new file mode 100644
index 000000000..e9d6d8765
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.C
@@ -0,0 +1,320 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "hsRhoMixtureThermo.H"
+#include "fvMesh.H"
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hsRhoMixtureThermo<MixtureType>::calculate()
+{
+    const scalarField& hsCells = hs_.internalField();
+    const scalarField& pCells = p_.internalField();
+
+    scalarField& TCells = T_.internalField();
+    scalarField& psiCells = psi_.internalField();
+    scalarField& rhoCells = rho_.internalField();
+    scalarField& muCells = mu_.internalField();
+    scalarField& alphaCells = alpha_.internalField();
+
+    forAll(TCells, celli)
+    {
+        const typename MixtureType::thermoType& mixture =
+            this->cellMixture(celli);
+
+        TCells[celli] = mixture.THs(hsCells[celli], TCells[celli]);
+        psiCells[celli] = mixture.psi(pCells[celli], TCells[celli]);
+        rhoCells[celli] = mixture.rho(pCells[celli], TCells[celli]);
+
+        muCells[celli] = mixture.mu(TCells[celli]);
+        alphaCells[celli] = mixture.alpha(TCells[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        fvPatchScalarField& pp = p_.boundaryField()[patchi];
+        fvPatchScalarField& pT = T_.boundaryField()[patchi];
+        fvPatchScalarField& ppsi = psi_.boundaryField()[patchi];
+        fvPatchScalarField& prho = rho_.boundaryField()[patchi];
+
+        fvPatchScalarField& phs = hs_.boundaryField()[patchi];
+
+        fvPatchScalarField& pmu_ = mu_.boundaryField()[patchi];
+        fvPatchScalarField& palpha_ = alpha_.boundaryField()[patchi];
+
+        if (pT.fixesValue())
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture =
+                    this->patchFaceMixture(patchi, facei);
+
+                phs[facei] = mixture.Hs(pT[facei]);
+
+                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
+                prho[facei] = mixture.rho(pp[facei], pT[facei]);
+                pmu_[facei] = mixture.mu(pT[facei]);
+                palpha_[facei] = mixture.alpha(pT[facei]);
+            }
+        }
+        else
+        {
+            forAll(pT, facei)
+            {
+                const typename MixtureType::thermoType& mixture =
+                    this->patchFaceMixture(patchi, facei);
+
+                pT[facei] = mixture.THs(phs[facei], pT[facei]);
+
+                ppsi[facei] = mixture.psi(pp[facei], pT[facei]);
+                prho[facei] = mixture.rho(pp[facei], pT[facei]);
+                pmu_[facei] = mixture.mu(pT[facei]);
+                palpha_[facei] = mixture.alpha(pT[facei]);
+            }
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hsRhoMixtureThermo<MixtureType>::hsRhoMixtureThermo(const fvMesh& mesh)
+:
+    hsReactionThermo(mesh),
+    MixtureType(*this, mesh)
+{
+    scalarField& hsCells = hs_.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(hsCells, celli)
+    {
+        hsCells[celli] = this->cellMixture(celli).Hs(TCells[celli]);
+    }
+
+    forAll(hs_.boundaryField(), patchi)
+    {
+        hs_.boundaryField()[patchi] == hs(T_.boundaryField()[patchi], patchi);
+    }
+
+    hBoundaryCorrection(hs_);
+
+    calculate();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+template<class MixtureType>
+Foam::hsRhoMixtureThermo<MixtureType>::~hsRhoMixtureThermo()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class MixtureType>
+void Foam::hsRhoMixtureThermo<MixtureType>::correct()
+{
+    if (debug)
+    {
+        Info<< "entering hsRhoMixtureThermo<MixtureType>::correct()" << endl;
+    }
+
+    calculate();
+
+    if (debug)
+    {
+        Info<< "exiting hsRhoMixtureThermo<MixtureType>::correct()" << endl;
+    }
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hsRhoMixtureThermo<MixtureType>::hc() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> thc
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "hc",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            hs_.dimensions()
+        )
+    );
+
+    volScalarField& hcf = thc();
+    scalarField& hcCells = hcf.internalField();
+
+    forAll(hcCells, celli)
+    {
+        hcCells[celli] = this->cellMixture(celli).Hc();
+    }
+
+    forAll(hcf.boundaryField(), patchi)
+    {
+        scalarField& hcp = hcf.boundaryField()[patchi];
+
+        forAll(hcp, facei)
+        {
+            hcp[facei] = this->patchFaceMixture(patchi, facei).Hc();
+        }
+    }
+
+    return thc;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hsRhoMixtureThermo<MixtureType>::hs
+(
+    const scalarField& T,
+    const labelList& cells
+) const
+{
+    tmp<scalarField> ths(new scalarField(T.size()));
+    scalarField& hs = ths();
+
+    forAll(T, celli)
+    {
+        hs[celli] = this->cellMixture(cells[celli]).Hs(T[celli]);
+    }
+
+    return ths;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hsRhoMixtureThermo<MixtureType>::hs
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> ths(new scalarField(T.size()));
+    scalarField& hs = ths();
+
+    forAll(T, facei)
+    {
+        hs[facei] = this->patchFaceMixture(patchi, facei).Hs(T[facei]);
+    }
+
+    return ths;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::scalarField>
+Foam::hsRhoMixtureThermo<MixtureType>::Cp
+(
+    const scalarField& T,
+    const label patchi
+) const
+{
+    tmp<scalarField> tCp(new scalarField(T.size()));
+
+    scalarField& cp = tCp();
+
+    forAll(T, facei)
+    {
+        cp[facei] = this->patchFaceMixture(patchi, facei).Cp(T[facei]);
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+Foam::tmp<Foam::volScalarField>
+Foam::hsRhoMixtureThermo<MixtureType>::Cp() const
+{
+    const fvMesh& mesh = T_.mesh();
+
+    tmp<volScalarField> tCp
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "Cp",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh,
+            dimEnergy/dimMass/dimTemperature
+        )
+    );
+
+    volScalarField& cp = tCp();
+
+    scalarField& cpCells = cp.internalField();
+    const scalarField& TCells = T_.internalField();
+
+    forAll(TCells, celli)
+    {
+        cpCells[celli] = this->cellMixture(celli).Cp(TCells[celli]);
+    }
+
+    forAll(T_.boundaryField(), patchi)
+    {
+        cp.boundaryField()[patchi] = Cp(T_.boundaryField()[patchi], patchi);
+    }
+
+    return tCp;
+}
+
+
+template<class MixtureType>
+bool Foam::hsRhoMixtureThermo<MixtureType>::read()
+{
+    if (hsReactionThermo::read())
+    {
+        MixtureType::read(*this);
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.H b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.H
new file mode 100644
index 000000000..4fa3eb681
--- /dev/null
+++ b/src/thermophysicalModels/reactionThermo/reactionThermo/mixtureThermos/hsRhoMixtureThermo/hsRhoMixtureThermo.H
@@ -0,0 +1,148 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::hsRhoMixtureThermo
+
+Description
+    Foam::hsRhoMixtureThermo
+
+SourceFiles
+    hsRhoMixtureThermo.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef hsRhoMixtureThermo_H
+#define hsRhoMixtureThermo_H
+
+#include "hsReactionThermo.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                      Class hsRhoMixtureThermo Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class MixtureType>
+class hsRhoMixtureThermo
+:
+    public hsReactionThermo,
+    public MixtureType
+{
+    // Private member functions
+
+        void calculate();
+
+        //- Construct as copy (not implemented)
+        hsRhoMixtureThermo(const hsRhoMixtureThermo<MixtureType>&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("hsRhoMixtureThermo");
+
+
+    // Constructors
+
+        //- Construct from mesh
+        hsRhoMixtureThermo(const fvMesh&);
+
+
+    //- Destructor
+    virtual ~hsRhoMixtureThermo();
+
+
+    // Member functions
+
+        //- Return the compostion of the multi-component mixture
+        virtual basicMultiComponentMixture& composition()
+        {
+            return *this;
+        }
+
+        //- Return the compostion of the multi-component mixture
+        virtual const basicMultiComponentMixture& composition() const
+        {
+            return *this;
+        }
+
+        //- Update properties
+        virtual void correct();
+
+
+        // Fields derived from thermodynamic state variables
+
+            //- Chemical enthalpy [J/kg]
+            virtual tmp<volScalarField> hc() const;
+
+
+            //- Sensible nthalpy for cell-set [J/kg]
+            virtual tmp<scalarField> hs
+            (
+                const scalarField& T,
+                const labelList& cells
+            ) const;
+
+            //- Sensible enthalpy for patch [J/kg]
+            virtual tmp<scalarField> hs
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure for patch [J/kg/K]
+            virtual tmp<scalarField> Cp
+            (
+                const scalarField& T,
+                const label patchi
+            ) const;
+
+            //- Heat capacity at constant pressure [J/kg/K]
+            virtual tmp<volScalarField> Cp() const;
+
+
+        //- Read thermophysicalProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "hsRhoMixtureThermo.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C
index 2db6333c8..53db1c6ab 100644
--- a/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C
+++ b/src/thermophysicalModels/solidMixture/solidMixture/solidMixture.C
@@ -34,7 +34,7 @@ Foam::solidMixture::solidMixture
     const dictionary& thermophysicalProperties
 )
 :
-    components_(thermophysicalProperties.lookup("solidFuelComponents")),
+    components_(thermophysicalProperties.lookup("solidComponents")),
     properties_(components_.size())
 {
 
diff --git a/src/transportModels/Allwmake b/src/transportModels/Allwmake
index 17d1ae804..7272653e0 100755
--- a/src/transportModels/Allwmake
+++ b/src/transportModels/Allwmake
@@ -1,7 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 set -x
 
 wmake libso incompressible
 wmake libso interfaceProperties
-wmake libso viscoelastic
-#wmake libso compressible
+# wmake libso compressible
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C
index e75011a55..cb6e25b70 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.C
@@ -36,6 +36,7 @@ namespace Foam
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
+//- Calculate and return the laminar viscosity
 word twoPhaseMixture::getPhaseName(const word& key) const
 {
     if (isDict(key))
diff --git a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
index f663b6960..b7bd1b49c 100644
--- a/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
+++ b/src/transportModels/incompressible/incompressibleTwoPhaseMixture/twoPhaseMixture.H
@@ -47,7 +47,7 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class twoPhaseMixture Declaration
+                      Class twoPhaseMixture Declaration
 \*---------------------------------------------------------------------------*/
 
 class twoPhaseMixture
diff --git a/src/transportModels/interfaceProperties/Make/files b/src/transportModels/interfaceProperties/Make/files
index 56f21e91b..a62008cee 100644
--- a/src/transportModels/interfaceProperties/Make/files
+++ b/src/transportModels/interfaceProperties/Make/files
@@ -1,11 +1,11 @@
 interfaceProperties.C
 interfaceCompression/interfaceCompression.C
 
-gammaContactAngle/gammaContactAngle/gammaContactAngleFvPatchScalarField.C
-gammaContactAngle/constantGammaContactAngle/constantGammaContactAngleFvPatchScalarField.C
-gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.C
-gammaContactAngle/timeVaryingGammaContactAngle/timeVaryingGammaContactAngleFvPatchScalarField.C
+alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
+alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
+alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
 
-gammaFixedPressure/gammaFixedPressureFvPatchScalarField.C
+alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
 
 LIB = $(FOAM_LIBBIN)/libinterfaceProperties
diff --git a/src/transportModels/interfaceProperties/gammaContactAngle/gammaContactAngle/gammaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
similarity index 72%
rename from src/transportModels/interfaceProperties/gammaContactAngle/gammaContactAngle/gammaContactAngleFvPatchScalarField.C
rename to src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index 4ac2706ab..f8cbf26f2 100644
--- a/src/transportModels/interfaceProperties/gammaContactAngle/gammaContactAngle/gammaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -24,7 +24,7 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "gammaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volMesh.H"
@@ -33,14 +33,13 @@ License
 
 namespace Foam
 {
+    defineTypeNameAndDebug(alphaContactAngleFvPatchScalarField, 0);
+}
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-defineTypeNameAndDebug(gammaContactAngleFvPatchScalarField, 0);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -50,9 +49,9 @@ gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
 {}
 
 
-gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
-    const gammaContactAngleFvPatchScalarField& gcpsf,
+    const alphaContactAngleFvPatchScalarField& gcpsf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -62,7 +61,7 @@ gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
 {}
 
 
-gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -75,18 +74,18 @@ gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
 }
 
 
-gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
-    const gammaContactAngleFvPatchScalarField& gcpsf
+    const alphaContactAngleFvPatchScalarField& gcpsf
 )
 :
     zeroGradientFvPatchScalarField(gcpsf)
 {}
 
 
-gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
+Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
-    const gammaContactAngleFvPatchScalarField& gcpsf,
+    const alphaContactAngleFvPatchScalarField& gcpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -94,8 +93,4 @@ gammaContactAngleFvPatchScalarField::gammaContactAngleFvPatchScalarField
 {}
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/transportModels/interfaceProperties/gammaContactAngle/gammaContactAngle/gammaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
similarity index 78%
rename from src/transportModels/interfaceProperties/gammaContactAngle/gammaContactAngle/gammaContactAngleFvPatchScalarField.H
rename to src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
index f820e634b..7604f043c 100644
--- a/src/transportModels/interfaceProperties/gammaContactAngle/gammaContactAngle/gammaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::gammaContactAngleFvPatchScalarField
+    Foam::alphaContactAngleFvPatchScalarField
 
 Description
-    Abstract base class for gammaContactAngle boundary conditions.
+    Abstract base class for alphaContactAngle boundary conditions.
 
     Derived classes must implement the theta() fuction which returns the
     wall contact angle field.
 
 SourceFiles
-    gammaContactAngleFvPatchScalarField.C
+    alphaContactAngleFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef gammaContactAngleFvPatchScalarField_H
-#define gammaContactAngleFvPatchScalarField_H
+#ifndef alphaContactAngleFvPatchScalarField_H
+#define alphaContactAngleFvPatchScalarField_H
 
 #include "zeroGradientFvPatchFields.H"
 #include "fvsPatchFields.H"
@@ -48,10 +48,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class gammaContactAngleFvPatch Declaration
+                   Class alphaContactAngleFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class gammaContactAngleFvPatchScalarField
+class alphaContactAngleFvPatchScalarField
 :
     public zeroGradientFvPatchScalarField
 {
@@ -59,46 +59,46 @@ class gammaContactAngleFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("gammaContactAngle");
+    TypeName("alphaContactAngle");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        gammaContactAngleFvPatchScalarField
+        alphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        gammaContactAngleFvPatchScalarField
+        alphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const dictionary&
         );
 
-        //- Construct by mapping given gammaContactAngleFvPatchScalarField
+        //- Construct by mapping given alphaContactAngleFvPatchScalarField
         //  onto a new patch
-        gammaContactAngleFvPatchScalarField
+        alphaContactAngleFvPatchScalarField
         (
-            const gammaContactAngleFvPatchScalarField&,
+            const alphaContactAngleFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        gammaContactAngleFvPatchScalarField
+        alphaContactAngleFvPatchScalarField
         (
-            const gammaContactAngleFvPatchScalarField&
+            const alphaContactAngleFvPatchScalarField&
         );
 
         //- Construct as copy setting internal field reference
-        gammaContactAngleFvPatchScalarField
+        alphaContactAngleFvPatchScalarField
         (
-            const gammaContactAngleFvPatchScalarField&,
+            const alphaContactAngleFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
diff --git a/src/transportModels/interfaceProperties/gammaContactAngle/constantGammaContactAngle/constantGammaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
similarity index 64%
rename from src/transportModels/interfaceProperties/gammaContactAngle/constantGammaContactAngle/constantGammaContactAngleFvPatchScalarField.C
rename to src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
index 44047f477..012bb5735 100644
--- a/src/transportModels/interfaceProperties/gammaContactAngle/constantGammaContactAngle/constantGammaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
@@ -24,85 +24,81 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "constantGammaContactAngleFvPatchScalarField.H"
+#include "constantAlphaContactAngleFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "volMesh.H"
 #include "fvPatchFieldMapper.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-constantGammaContactAngleFvPatchScalarField::
-constantGammaContactAngleFvPatchScalarField
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     theta0_(0.0)
 {}
 
 
-constantGammaContactAngleFvPatchScalarField::
-constantGammaContactAngleFvPatchScalarField
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
 (
-    const constantGammaContactAngleFvPatchScalarField& gcpsf,
+    const constantAlphaContactAngleFvPatchScalarField& gcpsf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
     theta0_(gcpsf.theta0_)
 {}
 
 
-constantGammaContactAngleFvPatchScalarField::
-constantGammaContactAngleFvPatchScalarField
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     theta0_(readScalar(dict.lookup("theta0")))
 {
     evaluate();
 }
 
 
-constantGammaContactAngleFvPatchScalarField::
-constantGammaContactAngleFvPatchScalarField
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
 (
-    const constantGammaContactAngleFvPatchScalarField& gcpsf
+    const constantAlphaContactAngleFvPatchScalarField& gcpsf
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf),
+    alphaContactAngleFvPatchScalarField(gcpsf),
     theta0_(gcpsf.theta0_)
 {}
 
 
-constantGammaContactAngleFvPatchScalarField::
-constantGammaContactAngleFvPatchScalarField
+Foam::constantAlphaContactAngleFvPatchScalarField::
+constantAlphaContactAngleFvPatchScalarField
 (
-    const constantGammaContactAngleFvPatchScalarField& gcpsf,
+    const constantAlphaContactAngleFvPatchScalarField& gcpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, iF),
+    alphaContactAngleFvPatchScalarField(gcpsf, iF),
     theta0_(gcpsf.theta0_)
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField> constantGammaContactAngleFvPatchScalarField::theta
+Foam::tmp<Foam::scalarField>
+Foam::constantAlphaContactAngleFvPatchScalarField::theta
 (
     const fvPatchVectorField&,
     const fvsPatchVectorField&
@@ -112,7 +108,10 @@ tmp<scalarField> constantGammaContactAngleFvPatchScalarField::theta
 }
 
 
-void constantGammaContactAngleFvPatchScalarField::write(Ostream& os) const
+void Foam::constantAlphaContactAngleFvPatchScalarField::write
+(
+    Ostream& os
+) const
 {
     fvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
@@ -122,14 +121,13 @@ void constantGammaContactAngleFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField
-(
-    fvPatchScalarField,
-    constantGammaContactAngleFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        constantAlphaContactAngleFvPatchScalarField
+    );
+}
 
 // ************************************************************************* //
diff --git a/src/transportModels/interfaceProperties/gammaContactAngle/constantGammaContactAngle/constantGammaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H
similarity index 74%
rename from src/transportModels/interfaceProperties/gammaContactAngle/constantGammaContactAngle/constantGammaContactAngleFvPatchScalarField.H
rename to src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H
index 18e679582..027d6d778 100644
--- a/src/transportModels/interfaceProperties/gammaContactAngle/constantGammaContactAngle/constantGammaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.H
@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::constantGammaContactAngleFvPatchScalarField
+    Foam::constantAlphaContactAngleFvPatchScalarField
 
 Description
-    A constant gammaContactAngle scalar boundary condition 
-    (gammaContactAngleFvPatchScalarField)
+    A constant alphaContactAngle scalar boundary condition
+    (alphaContactAngleFvPatchScalarField)
 
 SourceFiles
-    constantGammaContactAngleFvPatchScalarField.C
+    constantAlphaContactAngleFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef constantGammaContactAngleFvPatchScalarField_H
-#define constantGammaContactAngleFvPatchScalarField_H
+#ifndef constantAlphaContactAngleFvPatchScalarField_H
+#define constantAlphaContactAngleFvPatchScalarField_H
 
-#include "gammaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,12 +45,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class constantGammaContactAngleFvPatch Declaration
+                           Class constantAlphaContactAngleFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class constantGammaContactAngleFvPatchScalarField
+class constantAlphaContactAngleFvPatchScalarField
 :
-    public gammaContactAngleFvPatchScalarField
+    public alphaContactAngleFvPatchScalarField
 {
     // Private data
 
@@ -61,20 +61,20 @@ class constantGammaContactAngleFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("constantGammaContactAngle");
+    TypeName("constantAlphaContactAngle");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        constantGammaContactAngleFvPatchScalarField
+        constantAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        constantGammaContactAngleFvPatchScalarField
+        constantAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -82,20 +82,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  constantGammaContactAngleFvPatchScalarField
+        //  constantAlphaContactAngleFvPatchScalarField
         //  onto a new patch
-        constantGammaContactAngleFvPatchScalarField
+        constantAlphaContactAngleFvPatchScalarField
         (
-            const constantGammaContactAngleFvPatchScalarField&,
+            const constantAlphaContactAngleFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        constantGammaContactAngleFvPatchScalarField
+        constantAlphaContactAngleFvPatchScalarField
         (
-            const constantGammaContactAngleFvPatchScalarField&
+            const constantAlphaContactAngleFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -103,14 +103,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new constantGammaContactAngleFvPatchScalarField(*this)
+                new constantAlphaContactAngleFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        constantGammaContactAngleFvPatchScalarField
+        constantAlphaContactAngleFvPatchScalarField
         (
-            const constantGammaContactAngleFvPatchScalarField&,
+            const constantAlphaContactAngleFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -122,7 +122,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new constantGammaContactAngleFvPatchScalarField(*this, iF)
+                new constantAlphaContactAngleFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/transportModels/interfaceProperties/gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
similarity index 77%
rename from src/transportModels/interfaceProperties/gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.C
rename to src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
index dd9c33fad..685d868e5 100644
--- a/src/transportModels/interfaceProperties/gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
@@ -24,21 +24,21 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "dynamicGammaContactAngleFvPatchScalarField.H"
+#include "dynamicAlphaContactAngleFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volMesh.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::dynamicGammaContactAngleFvPatchScalarField::
-dynamicGammaContactAngleFvPatchScalarField
+Foam::dynamicAlphaContactAngleFvPatchScalarField::
+dynamicAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     theta0_(0.0),
     uTheta_(0.0),
     thetaA_(0.0),
@@ -46,16 +46,16 @@ dynamicGammaContactAngleFvPatchScalarField
 {}
 
 
-Foam::dynamicGammaContactAngleFvPatchScalarField::
-dynamicGammaContactAngleFvPatchScalarField
+Foam::dynamicAlphaContactAngleFvPatchScalarField::
+dynamicAlphaContactAngleFvPatchScalarField
 (
-    const dynamicGammaContactAngleFvPatchScalarField& gcpsf,
+    const dynamicAlphaContactAngleFvPatchScalarField& gcpsf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
     theta0_(gcpsf.theta0_),
     uTheta_(gcpsf.uTheta_),
     thetaA_(gcpsf.thetaA_),
@@ -63,15 +63,15 @@ dynamicGammaContactAngleFvPatchScalarField
 {}
 
 
-Foam::dynamicGammaContactAngleFvPatchScalarField::
-dynamicGammaContactAngleFvPatchScalarField
+Foam::dynamicAlphaContactAngleFvPatchScalarField::
+dynamicAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     theta0_(readScalar(dict.lookup("theta0"))),
     uTheta_(readScalar(dict.lookup("uTheta"))),
     thetaA_(readScalar(dict.lookup("thetaA"))),
@@ -81,13 +81,13 @@ dynamicGammaContactAngleFvPatchScalarField
 }
 
 
-Foam::dynamicGammaContactAngleFvPatchScalarField::
-dynamicGammaContactAngleFvPatchScalarField
+Foam::dynamicAlphaContactAngleFvPatchScalarField::
+dynamicAlphaContactAngleFvPatchScalarField
 (
-    const dynamicGammaContactAngleFvPatchScalarField& gcpsf
+    const dynamicAlphaContactAngleFvPatchScalarField& gcpsf
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf),
+    alphaContactAngleFvPatchScalarField(gcpsf),
     theta0_(gcpsf.theta0_),
     uTheta_(gcpsf.uTheta_),
     thetaA_(gcpsf.thetaA_),
@@ -95,14 +95,14 @@ dynamicGammaContactAngleFvPatchScalarField
 {}
 
 
-Foam::dynamicGammaContactAngleFvPatchScalarField::
-dynamicGammaContactAngleFvPatchScalarField
+Foam::dynamicAlphaContactAngleFvPatchScalarField::
+dynamicAlphaContactAngleFvPatchScalarField
 (
-    const dynamicGammaContactAngleFvPatchScalarField& gcpsf,
+    const dynamicAlphaContactAngleFvPatchScalarField& gcpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, iF),
+    alphaContactAngleFvPatchScalarField(gcpsf, iF),
     theta0_(gcpsf.theta0_),
     uTheta_(gcpsf.uTheta_),
     thetaA_(gcpsf.thetaA_),
@@ -113,7 +113,7 @@ dynamicGammaContactAngleFvPatchScalarField
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 Foam::tmp<Foam::scalarField>
-Foam::dynamicGammaContactAngleFvPatchScalarField::theta
+Foam::dynamicAlphaContactAngleFvPatchScalarField::theta
 (
     const fvPatchVectorField& Up,
     const fvsPatchVectorField& nHat
@@ -144,7 +144,7 @@ Foam::dynamicGammaContactAngleFvPatchScalarField::theta
 }
 
 
-void Foam::dynamicGammaContactAngleFvPatchScalarField::write(Ostream& os) const
+void Foam::dynamicAlphaContactAngleFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
@@ -162,7 +162,7 @@ namespace Foam
     makePatchTypeField
     (
         fvPatchScalarField,
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
     );
 }
 
diff --git a/src/transportModels/interfaceProperties/gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H
similarity index 75%
rename from src/transportModels/interfaceProperties/gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.H
rename to src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H
index a339c29ec..aadd8ca8b 100644
--- a/src/transportModels/interfaceProperties/gammaContactAngle/dynamicGammaContactAngle/dynamicGammaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.H
@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::dynamicGammaContactAngleFvPatchScalarField
+    Foam::dynamicAlphaContactAngleFvPatchScalarField
 
 Description
-    A dynamic gammaContactAngle scalar boundary condition 
-    (gammaContactAngleFvPatchScalarField)
+    A dynamic alphaContactAngle scalar boundary condition
+    (alphaContactAngleFvPatchScalarField)
 
 SourceFiles
-    dynamicGammaContactAngleFvPatchScalarField.C
+    dynamicAlphaContactAngleFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef dynamicGammaContactAngleFvPatchScalarField_H
-#define dynamicGammaContactAngleFvPatchScalarField_H
+#ifndef dynamicAlphaContactAngleFvPatchScalarField_H
+#define dynamicAlphaContactAngleFvPatchScalarField_H
 
-#include "gammaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,12 +45,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class dynamicGammaContactAngleFvPatch Declaration
+                           Class dynamicAlphaContactAngleFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class dynamicGammaContactAngleFvPatchScalarField
+class dynamicAlphaContactAngleFvPatchScalarField
 :
-    public gammaContactAngleFvPatchScalarField
+    public alphaContactAngleFvPatchScalarField
 {
     // Private data
 
@@ -70,20 +70,20 @@ class dynamicGammaContactAngleFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("dynamicGammaContactAngle");
+    TypeName("dynamicAlphaContactAngle");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -91,20 +91,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  dynamicGammaContactAngleFvPatchScalarField
+        //  dynamicAlphaContactAngleFvPatchScalarField
         //  onto a new patch
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
         (
-            const dynamicGammaContactAngleFvPatchScalarField&,
+            const dynamicAlphaContactAngleFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
         (
-            const dynamicGammaContactAngleFvPatchScalarField&
+            const dynamicAlphaContactAngleFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -112,14 +112,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new dynamicGammaContactAngleFvPatchScalarField(*this)
+                new dynamicAlphaContactAngleFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        dynamicGammaContactAngleFvPatchScalarField
+        dynamicAlphaContactAngleFvPatchScalarField
         (
-            const dynamicGammaContactAngleFvPatchScalarField&,
+            const dynamicAlphaContactAngleFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -131,7 +131,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new dynamicGammaContactAngleFvPatchScalarField(*this, iF)
+                new dynamicAlphaContactAngleFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/transportModels/interfaceProperties/gammaContactAngle/timeVaryingGammaContactAngle/timeVaryingGammaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
similarity index 73%
rename from src/transportModels/interfaceProperties/gammaContactAngle/timeVaryingGammaContactAngle/timeVaryingGammaContactAngleFvPatchScalarField.C
rename to src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
index 1e0b98935..22a3a031f 100644
--- a/src/transportModels/interfaceProperties/gammaContactAngle/timeVaryingGammaContactAngle/timeVaryingGammaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
@@ -24,27 +24,22 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "timeVaryingGammaContactAngleFvPatchScalarField.H"
+#include "timeVaryingAlphaContactAngleFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volMesh.H"
 #include "Time.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-timeVaryingGammaContactAngleFvPatchScalarField::
-timeVaryingGammaContactAngleFvPatchScalarField
+Foam::timeVaryingAlphaContactAngleFvPatchScalarField::
+timeVaryingAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     t0_(0.0),
     thetaT0_(0.0),
     te_(0.0),
@@ -52,16 +47,16 @@ timeVaryingGammaContactAngleFvPatchScalarField
 {}
 
 
-timeVaryingGammaContactAngleFvPatchScalarField::
-timeVaryingGammaContactAngleFvPatchScalarField
+Foam::timeVaryingAlphaContactAngleFvPatchScalarField::
+timeVaryingAlphaContactAngleFvPatchScalarField
 (
-    const timeVaryingGammaContactAngleFvPatchScalarField& gcpsf,
+    const timeVaryingAlphaContactAngleFvPatchScalarField& gcpsf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
+    alphaContactAngleFvPatchScalarField(gcpsf, p, iF, mapper),
     t0_(gcpsf.t0_),
     thetaT0_(gcpsf.thetaT0_),
     te_(gcpsf.te_),
@@ -69,15 +64,15 @@ timeVaryingGammaContactAngleFvPatchScalarField
 {}
 
 
-timeVaryingGammaContactAngleFvPatchScalarField::
-timeVaryingGammaContactAngleFvPatchScalarField
+Foam::timeVaryingAlphaContactAngleFvPatchScalarField::
+timeVaryingAlphaContactAngleFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    gammaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF),
     t0_(readScalar(dict.lookup("t0"))),
     thetaT0_(readScalar(dict.lookup("thetaT0"))),
     te_(readScalar(dict.lookup("te"))),
@@ -87,14 +82,14 @@ timeVaryingGammaContactAngleFvPatchScalarField
 }
 
 
-timeVaryingGammaContactAngleFvPatchScalarField::
-timeVaryingGammaContactAngleFvPatchScalarField
+Foam::timeVaryingAlphaContactAngleFvPatchScalarField::
+timeVaryingAlphaContactAngleFvPatchScalarField
 (
-    const timeVaryingGammaContactAngleFvPatchScalarField& gcpsf,
+    const timeVaryingAlphaContactAngleFvPatchScalarField& gcpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    gammaContactAngleFvPatchScalarField(gcpsf, iF),
+    alphaContactAngleFvPatchScalarField(gcpsf, iF),
     t0_(gcpsf.t0_),
     thetaT0_(gcpsf.thetaT0_),
     te_(gcpsf.te_),
@@ -104,7 +99,8 @@ timeVaryingGammaContactAngleFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<scalarField> timeVaryingGammaContactAngleFvPatchScalarField::theta
+Foam::tmp<Foam::scalarField>
+Foam::timeVaryingAlphaContactAngleFvPatchScalarField::theta
 (
     const fvPatchVectorField&,
     const fvsPatchVectorField&
@@ -130,7 +126,10 @@ tmp<scalarField> timeVaryingGammaContactAngleFvPatchScalarField::theta
 }
 
 
-void timeVaryingGammaContactAngleFvPatchScalarField::write(Ostream& os) const
+void Foam::timeVaryingAlphaContactAngleFvPatchScalarField::write
+(
+    Ostream& os
+) const
 {
     fvPatchScalarField::write(os);
     os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
@@ -143,10 +142,13 @@ void timeVaryingGammaContactAngleFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, timeVaryingGammaContactAngleFvPatchScalarField);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        timeVaryingAlphaContactAngleFvPatchScalarField
+    );
+}
 
 // ************************************************************************* //
diff --git a/src/transportModels/interfaceProperties/gammaContactAngle/timeVaryingGammaContactAngle/timeVaryingGammaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H
similarity index 75%
rename from src/transportModels/interfaceProperties/gammaContactAngle/timeVaryingGammaContactAngle/timeVaryingGammaContactAngleFvPatchScalarField.H
rename to src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H
index 4003f0271..93518629d 100644
--- a/src/transportModels/interfaceProperties/gammaContactAngle/timeVaryingGammaContactAngle/timeVaryingGammaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.H
@@ -23,21 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::timeVaryingGammaContactAngleFvPatchScalarField
+    Foam::timeVaryingAlphaContactAngleFvPatchScalarField
 
 Description
-    A time-varying gammaContactAngle scalar boundary condition
-    (gammaContactAngleFvPatchScalarField)
+    A time-varying alphaContactAngle scalar boundary condition
+    (alphaContactAngleFvPatchScalarField)
 
 SourceFiles
-    timeVaryingGammaContactAngleFvPatchScalarField.C
+    timeVaryingAlphaContactAngleFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef timeVaryingGammaContactAngleFvPatchScalarField_H
-#define timeVaryingGammaContactAngleFvPatchScalarField_H
+#ifndef timeVaryingAlphaContactAngleFvPatchScalarField_H
+#define timeVaryingAlphaContactAngleFvPatchScalarField_H
 
-#include "gammaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -45,12 +45,12 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class timeVaryingGammaContactAngleFvPatch Declaration
+            Class timeVaryingAlphaContactAngleFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class timeVaryingGammaContactAngleFvPatchScalarField
+class timeVaryingAlphaContactAngleFvPatchScalarField
 :
-    public gammaContactAngleFvPatchScalarField
+    public alphaContactAngleFvPatchScalarField
 {
     // Private data
 
@@ -64,31 +64,31 @@ class timeVaryingGammaContactAngleFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("timeVaryingGammaContactAngle");
+    TypeName("timeVaryingAlphaContactAngle");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        timeVaryingGammaContactAngleFvPatchScalarField
+        timeVaryingAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        timeVaryingGammaContactAngleFvPatchScalarField
+        timeVaryingAlphaContactAngleFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const dictionary&
         );
 
-        //- Construct by mapping given timeVaryingGammaContactAngleFvPatchScalarField
+        //- Construct by mapping given timeVaryingAlphaContactAngleFvPatchScalarField
         //  onto a new patch
-        timeVaryingGammaContactAngleFvPatchScalarField
+        timeVaryingAlphaContactAngleFvPatchScalarField
         (
-            const timeVaryingGammaContactAngleFvPatchScalarField&,
+            const timeVaryingAlphaContactAngleFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
@@ -99,14 +99,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new timeVaryingGammaContactAngleFvPatchScalarField(*this)
+                new timeVaryingAlphaContactAngleFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        timeVaryingGammaContactAngleFvPatchScalarField
+        timeVaryingAlphaContactAngleFvPatchScalarField
         (
-            const timeVaryingGammaContactAngleFvPatchScalarField&,
+            const timeVaryingAlphaContactAngleFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -118,7 +118,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new timeVaryingGammaContactAngleFvPatchScalarField(*this, iF)
+                new timeVaryingAlphaContactAngleFvPatchScalarField(*this, iF)
             );
         }
 
diff --git a/src/transportModels/interfaceProperties/gammaFixedPressure/gammaFixedPressureFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
similarity index 69%
rename from src/transportModels/interfaceProperties/gammaFixedPressure/gammaFixedPressureFvPatchScalarField.C
rename to src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
index 1cd85fe7f..982d82fa0 100644
--- a/src/transportModels/interfaceProperties/gammaFixedPressure/gammaFixedPressureFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.C
@@ -24,20 +24,17 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "gammaFixedPressureFvPatchScalarField.H"
+#include "alphaFixedPressureFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "surfaceFields.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
+#include "uniformDimensionedFields.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
+Foam::alphaFixedPressureFvPatchScalarField::
+alphaFixedPressureFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
@@ -48,9 +45,10 @@ gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
 {}
 
 
-gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
+Foam::alphaFixedPressureFvPatchScalarField::
+alphaFixedPressureFvPatchScalarField
 (
-    const gammaFixedPressureFvPatchScalarField& ptf,
+    const alphaFixedPressureFvPatchScalarField& ptf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
@@ -61,7 +59,8 @@ gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
 {}
 
 
-gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
+Foam::alphaFixedPressureFvPatchScalarField::
+alphaFixedPressureFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
@@ -85,9 +84,10 @@ gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
 }
 
 
-gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
+Foam::alphaFixedPressureFvPatchScalarField::
+alphaFixedPressureFvPatchScalarField
 (
-    const gammaFixedPressureFvPatchScalarField& tppsf
+    const alphaFixedPressureFvPatchScalarField& tppsf
 )
 :
     fixedValueFvPatchScalarField(tppsf),
@@ -95,9 +95,10 @@ gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
 {}
 
 
-gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
+Foam::alphaFixedPressureFvPatchScalarField::
+alphaFixedPressureFvPatchScalarField
 (
-    const gammaFixedPressureFvPatchScalarField& tppsf,
+    const alphaFixedPressureFvPatchScalarField& tppsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
@@ -108,7 +109,7 @@ gammaFixedPressureFvPatchScalarField::gammaFixedPressureFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void gammaFixedPressureFvPatchScalarField::autoMap
+void Foam::alphaFixedPressureFvPatchScalarField::autoMap
 (
     const fvPatchFieldMapper& m
 )
@@ -118,7 +119,7 @@ void gammaFixedPressureFvPatchScalarField::autoMap
 }
 
 
-void gammaFixedPressureFvPatchScalarField::rmap
+void Foam::alphaFixedPressureFvPatchScalarField::rmap
 (
     const fvPatchScalarField& ptf,
     const labelList& addr
@@ -126,24 +127,22 @@ void gammaFixedPressureFvPatchScalarField::rmap
 {
     fixedValueFvPatchScalarField::rmap(ptf, addr);
 
-    const gammaFixedPressureFvPatchScalarField& tiptf =
-        refCast<const gammaFixedPressureFvPatchScalarField>(ptf);
+    const alphaFixedPressureFvPatchScalarField& tiptf =
+        refCast<const alphaFixedPressureFvPatchScalarField>(ptf);
 
     p_.rmap(tiptf.p_, addr);
 }
 
 
-void gammaFixedPressureFvPatchScalarField::updateCoeffs()
+void Foam::alphaFixedPressureFvPatchScalarField::updateCoeffs()
 {
     if (updated())
     {
         return;
     }
 
-    const dictionary& environmentalProperties
-        = db().lookupObject<IOdictionary>("environmentalProperties");
-
-    dimensionedVector g(environmentalProperties.lookup("g"));
+    const uniformDimensionedVectorField& g =
+        db().lookupObject<uniformDimensionedVectorField>("g");
 
     const fvPatchField<scalar>& rho =
         patch().lookupPatchField<volScalarField, scalar>("rho");
@@ -154,7 +153,10 @@ void gammaFixedPressureFvPatchScalarField::updateCoeffs()
 }
 
 
-void gammaFixedPressureFvPatchScalarField::write(Ostream& os) const
+void Foam::alphaFixedPressureFvPatchScalarField::write
+(
+    Ostream& os
+) const
 {
     fvPatchScalarField::write(os);
     p_.writeEntry("p", os);
@@ -164,10 +166,13 @@ void gammaFixedPressureFvPatchScalarField::write(Ostream& os) const
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, gammaFixedPressureFvPatchScalarField);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
+namespace Foam
+{
+    makePatchTypeField
+    (
+        fvPatchScalarField,
+        alphaFixedPressureFvPatchScalarField
+    );
+}
 
 // ************************************************************************* //
diff --git a/src/transportModels/interfaceProperties/gammaFixedPressure/gammaFixedPressureFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H
similarity index 79%
rename from src/transportModels/interfaceProperties/gammaFixedPressure/gammaFixedPressureFvPatchScalarField.H
rename to src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H
index 65b478f25..710ac0e80 100644
--- a/src/transportModels/interfaceProperties/gammaFixedPressure/gammaFixedPressureFvPatchScalarField.H
+++ b/src/transportModels/interfaceProperties/alphaFixedPressure/alphaFixedPressureFvPatchScalarField.H
@@ -23,18 +23,18 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::gammaFixedPressureFvPatchScalarField
+    Foam::alphaFixedPressureFvPatchScalarField
 
 Description
-    A fixed-pressure gammaContactAngle boundary
+    A fixed-pressure alphaContactAngle boundary
 
 SourceFiles
-    gammaFixedPressureFvPatchScalarField.C
+    alphaFixedPressureFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef gammaFixedPressureFvPatchScalarField_H
-#define gammaFixedPressureFvPatchScalarField_H
+#ifndef alphaFixedPressureFvPatchScalarField_H
+#define alphaFixedPressureFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -44,10 +44,10 @@ namespace Foam
 {
 
 /*---------------------------------------------------------------------------*\
-                 Class gammaFixedPressureFvPatch Declaration
+                 Class alphaFixedPressureFvPatch Declaration
 \*---------------------------------------------------------------------------*/
 
-class gammaFixedPressureFvPatchScalarField
+class alphaFixedPressureFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
@@ -60,40 +60,40 @@ class gammaFixedPressureFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("gammaFixedPressure");
+    TypeName("alphaFixedPressure");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        gammaFixedPressureFvPatchScalarField
+        alphaFixedPressureFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        gammaFixedPressureFvPatchScalarField
+        alphaFixedPressureFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const dictionary&
         );
 
-        //- Construct by mapping given gammaFixedPressureFvPatchScalarField
+        //- Construct by mapping given alphaFixedPressureFvPatchScalarField
         //  onto a new patch
-        gammaFixedPressureFvPatchScalarField
+        alphaFixedPressureFvPatchScalarField
         (
-            const gammaFixedPressureFvPatchScalarField&,
+            const alphaFixedPressureFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        gammaFixedPressureFvPatchScalarField
+        alphaFixedPressureFvPatchScalarField
         (
-            const gammaFixedPressureFvPatchScalarField&
+            const alphaFixedPressureFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -101,14 +101,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new gammaFixedPressureFvPatchScalarField(*this)
+                new alphaFixedPressureFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        gammaFixedPressureFvPatchScalarField
+        alphaFixedPressureFvPatchScalarField
         (
-            const gammaFixedPressureFvPatchScalarField&,
+            const alphaFixedPressureFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -120,7 +120,7 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new gammaFixedPressureFvPatchScalarField(*this, iF)
+                new alphaFixedPressureFvPatchScalarField(*this, iF)
             );
         }
 
@@ -129,13 +129,13 @@ public:
 
         // Access
 
-            //- Return the gammaFixed pressure
+            //- Return the alphaFixed pressure
             const scalarField& p() const
             {
                 return p_;
             }
 
-            //- Return reference to the gammaFixed pressure to allow adjustment
+            //- Return reference to the alphaFixed pressure to allow adjustment
             scalarField& p()
             {
                 return p_;
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.C b/src/transportModels/interfaceProperties/interfaceProperties.C
index d9486df81..795edb3b7 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.C
+++ b/src/transportModels/interfaceProperties/interfaceProperties.C
@@ -22,33 +22,20 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Application
-    interfaceProperties
-
-Description
-    Properties to aid interFoam :
-    1. Correct the gamma boundary condition for dynamic contact angle.
-    2. Calculate interface curvature.
-
 \*---------------------------------------------------------------------------*/
 
 #include "interfaceProperties.H"
-#include "gammaContactAngleFvPatchScalarField.H"
+#include "alphaContactAngleFvPatchScalarField.H"
 #include "mathematicalConstants.H"
 #include "surfaceInterpolate.H"
 #include "fvcDiv.H"
 #include "fvcGrad.H"
 #include "fvcSnGrad.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Static Member Data  * * * * * * * * * * * * //
 
-const scalar interfaceProperties::convertToRad =
-    mathematicalConstant::pi/180.0;
+const Foam::scalar Foam::interfaceProperties::convertToRad =
+    Foam::mathematicalConstant::pi/180.0;
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -59,26 +46,26 @@ const scalar interfaceProperties::convertToRad =
 // The dynamic contact angle is calculated from the component of the
 // velocity on the direction of the interface, parallel to the wall.
 
-void interfaceProperties::correctContactAngle
+void Foam::interfaceProperties::correctContactAngle
 (
     surfaceVectorField::GeometricBoundaryField& nHatb
 ) const
 {
-    const fvMesh& mesh = gamma_.mesh();
-    const volScalarField::GeometricBoundaryField& gbf = gamma_.boundaryField();
+    const fvMesh& mesh = alpha1_.mesh();
+    const volScalarField::GeometricBoundaryField& gbf = alpha1_.boundaryField();
 
     const fvBoundaryMesh& boundary = mesh.boundary();
 
     forAll(boundary, patchi)
     {
-        if (isA<gammaContactAngleFvPatchScalarField>(gbf[patchi]))
+        if (isA<alphaContactAngleFvPatchScalarField>(gbf[patchi]))
         {
-            const gammaContactAngleFvPatchScalarField& gcap = 
-                refCast<const gammaContactAngleFvPatchScalarField>
+            const alphaContactAngleFvPatchScalarField& gcap =
+                refCast<const alphaContactAngleFvPatchScalarField>
                 (gbf[patchi]);
 
             fvsPatchVectorField& nHatp = nHatb[patchi];
-            scalarField theta = 
+            scalarField theta =
                 convertToRad*gcap.theta(U_.boundaryField()[patchi], nHatp);
 
             vectorField nf = boundary[patchi].nf();
@@ -109,22 +96,22 @@ void interfaceProperties::correctContactAngle
 }
 
 
-void interfaceProperties::calculateK()
+void Foam::interfaceProperties::calculateK()
 {
-    const fvMesh& mesh = gamma_.mesh();
+    const fvMesh& mesh = alpha1_.mesh();
     const surfaceVectorField& Sf = mesh.Sf();
 
-    // Cell gradient of gamma
-    volVectorField gradGamma = fvc::grad(gamma_);
+    // Cell gradient of alpha
+    volVectorField gradAlpha = fvc::grad(alpha1_);
 
-    // Interpolated face-gradient of gamma
-    surfaceVectorField gradGammaf = fvc::interpolate(gradGamma);
-    //gradGammaf -=
+    // Interpolated face-gradient of alpha
+    surfaceVectorField gradAlphaf = fvc::interpolate(gradAlpha);
+    //gradAlphaf -=
     //    (mesh.Sf()/mesh.magSf())
-    //   *(fvc::snGrad(gamma_) - (mesh.Sf() & gradGammaf)/mesh.magSf());
+    //   *(fvc::snGrad(alpha1_) - (mesh.Sf() & gradAlphaf)/mesh.magSf());
 
     // Face unit interface normal
-    surfaceVectorField nHatfv = gradGammaf/(mag(gradGammaf) + deltaN_);
+    surfaceVectorField nHatfv = gradAlphaf/(mag(gradAlphaf) + deltaN_);
     correctContactAngle(nHatfv.boundaryField());
 
     // Face unit interface normal flux
@@ -136,7 +123,7 @@ void interfaceProperties::calculateK()
     // Complex expression for curvature.
     // Correction is formally zero but numerically non-zero.
     /*
-    volVectorField nHat = gradGamma/(mag(gradGamma) + deltaN_);
+    volVectorField nHat = gradAlpha/(mag(gradAlpha) + deltaN_);
     forAll(nHat.boundaryField(), patchi)
     {
         nHat.boundaryField()[patchi] = nHatfv.boundaryField()[patchi];
@@ -149,19 +136,19 @@ void interfaceProperties::calculateK()
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-interfaceProperties::interfaceProperties
+Foam::interfaceProperties::interfaceProperties
 (
-    const volScalarField& gamma,
+    const volScalarField& alpha1,
     const volVectorField& U,
     const IOdictionary& dict
 )
 :
     transportPropertiesDict_(dict),
-    cGamma_
+    cAlpha_
     (
         readScalar
         (
-            gamma.mesh().solutionDict().subDict("PISO").lookup("cGamma")
+            alpha1.mesh().solutionDict().subDict("PISO").lookup("cAlpha")
         )
     ),
     sigma_(dict.lookup("sigma")),
@@ -169,10 +156,10 @@ interfaceProperties::interfaceProperties
     deltaN_
     (
         "deltaN",
-        1e-8/pow(average(gamma.mesh().V()), 1.0/3.0)
+        1e-8/pow(average(alpha1.mesh().V()), 1.0/3.0)
     ),
 
-    gamma_(gamma),
+    alpha1_(alpha1),
     U_(U),
 
     nHatf_
@@ -180,10 +167,10 @@ interfaceProperties::interfaceProperties
         IOobject
         (
             "nHatf",
-            gamma_.time().timeName(),
-            gamma_.mesh()
+            alpha1_.time().timeName(),
+            alpha1_.mesh()
         ),
-        gamma_.mesh(),
+        alpha1_.mesh(),
         dimensionedScalar("nHatf", dimArea, 0.0)
     ),
 
@@ -192,10 +179,10 @@ interfaceProperties::interfaceProperties
         IOobject
         (
             "K",
-            gamma_.time().timeName(),
-            gamma_.mesh()
+            alpha1_.time().timeName(),
+            alpha1_.mesh()
         ),
-        gamma_.mesh(),
+        alpha1_.mesh(),
         dimensionedScalar("K", dimless/dimLength, 0.0)
     )
 {
@@ -203,8 +190,4 @@ interfaceProperties::interfaceProperties
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.H b/src/transportModels/interfaceProperties/interfaceProperties.H
index b8b9c2480..66910ede0 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.H
+++ b/src/transportModels/interfaceProperties/interfaceProperties.H
@@ -29,7 +29,7 @@ Description
     Contains the interface properties.
 
     Properties to aid interFoam:
-    -# Correct the gamma boundary condition for dynamic contact angle.
+    -# Correct the alpha boundary condition for dynamic contact angle.
     -# Calculate interface curvature.
 
 SourceFiles
@@ -61,7 +61,7 @@ class interfaceProperties
         const dictionary& transportPropertiesDict_;
 
         //- Compression coefficient
-        scalar cGamma_;
+        scalar cAlpha_;
 
         //- Surface tension
         dimensionedScalar sigma_;
@@ -69,7 +69,7 @@ class interfaceProperties
         //- Stabilisation for normalisation of the interface normal
         const dimensionedScalar deltaN_;
 
-        const volScalarField& gamma_;
+        const volScalarField& alpha1_;
         const volVectorField& U_;
         surfaceScalarField nHatf_;
         volScalarField K_;
@@ -104,7 +104,7 @@ public:
         //- Construct from volume fraction field gamma and IOdictionary
         interfaceProperties
         (
-            const volScalarField& gamma,
+            const volScalarField& alpha1,
             const volVectorField& U,
             const IOdictionary&
         );
@@ -112,9 +112,9 @@ public:
 
     // Member Functions
 
-        scalar cGamma() const
+        scalar cAlpha() const
         {
-            return cGamma_;
+            return cAlpha_;
         }
 
         const dimensionedScalar& deltaN() const
diff --git a/src/turbulenceModels/Allwmake b/src/turbulenceModels/Allwmake
index a05e81fc0..80dc9dc1e 100755
--- a/src/turbulenceModels/Allwmake
+++ b/src/turbulenceModels/Allwmake
@@ -1,5 +1,9 @@
 #!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
 set -x
 
-( cd RAS && ./Allwmake )
-( cd LES && ./Allwmake )
+LES/Allwmake
+incompressible/Allwmake
+compressible/Allwmake
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/src/turbulenceModels/LES/Allwmake b/src/turbulenceModels/LES/Allwmake
deleted file mode 100755
index a8a3a782d..000000000
--- a/src/turbulenceModels/LES/Allwmake
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-set -x
-
-wmake libso LESfilters
-wmakeLnInclude incompressible
-wmake libso LESdeltas
-wmake libso incompressible
-wmake libso compressible
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
index 12f3a5992..0101836b3 100644
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
+++ b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.C
@@ -59,6 +59,35 @@ LESdelta::LESdelta(const word& name, const fvMesh& mesh)
 {}
 
 
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+autoPtr<LESdelta> LESdelta::New
+(
+    const word& name,
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+{
+    word deltaType(dict.lookup("delta"));
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(deltaType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "LESdelta::New(const fvMesh&, const dictionary&)"
+        )   << "Unknown LESdelta type " << deltaType << endl << endl
+            << "Valid LESdelta types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<LESdelta>(cstrIter()(name, mesh, dict));
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
index b4bc81f1d..96337381f 100644
--- a/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
+++ b/src/turbulenceModels/LES/LESdeltas/LESdelta/LESdelta.H
@@ -50,7 +50,7 @@ namespace Foam
 class fvMesh;
 
 /*---------------------------------------------------------------------------*\
-                           Class LESdelta Declaration
+                          Class LESdelta Declaration
 \*---------------------------------------------------------------------------*/
 
 class LESdelta
@@ -99,7 +99,7 @@ public:
     // Constructors
 
         //- Construct from name and mesh
-        LESdelta(const word& name, const fvMesh& mesh);
+        LESdelta(const word& name, const fvMesh&);
 
 
     // Selectors
@@ -108,15 +108,14 @@ public:
         static autoPtr<LESdelta> New
         (
             const word& name,
-            const fvMesh& mesh,
-            const dictionary& LESdeltaDict
+            const fvMesh&,
+            const dictionary&
         );
 
 
-    // Destructor
-
-        virtual ~LESdelta()
-        {}
+    //- Destructor
+    virtual ~LESdelta()
+    {}
 
 
     // Member Functions
diff --git a/src/turbulenceModels/LES/LESdeltas/Make/files b/src/turbulenceModels/LES/LESdeltas/Make/files
index a86d1b629..a25139763 100644
--- a/src/turbulenceModels/LES/LESdeltas/Make/files
+++ b/src/turbulenceModels/LES/LESdeltas/Make/files
@@ -1,5 +1,4 @@
 LESdelta/LESdelta.C
-LESdelta/newDelta.C
 cubeRootVolDelta/cubeRootVolDelta.C
 PrandtlDelta/PrandtlDelta.C
 smoothDelta/smoothDelta.C
diff --git a/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C b/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
index 33b7a23fd..8a92f5063 100644
--- a/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
+++ b/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.C
@@ -62,10 +62,11 @@ PrandtlDelta::PrandtlDelta
 :
     LESdelta(name, mesh),
     geometricDelta_(LESdelta::New(name, mesh, dd.subDict(type() + "Coeffs"))),
-    kappa_(dd.lookupOrDefault<scalar>("kappa", 0.4187)),
+    kappa_(dimensionedScalar(dd.lookup("kappa")).value()),
     Cdelta_
     (
-        dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Cdelta", 0.158)
+        dimensionedScalar(dd.subDict(type() + "Coeffs").lookup("Cdelta"))
+       .value()
     )
 {
     calcDelta();
@@ -79,8 +80,8 @@ void PrandtlDelta::read(const dictionary& d)
     const dictionary& dd(d.subDict(type() + "Coeffs"));
 
     geometricDelta_().read(dd);
-    d.readIfPresent<scalar>("kappa", kappa_);
-    dd.readIfPresent<scalar>("Cdelta", Cdelta_);
+    kappa_ = dimensionedScalar(d.lookup("kappa")).value();
+    Cdelta_ = dimensionedScalar(dd.lookup("Cdelta")).value();
     calcDelta();
 }
 
diff --git a/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H b/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
index b5d04993e..5df105d5c 100644
--- a/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
+++ b/src/turbulenceModels/LES/LESdeltas/PrandtlDelta/PrandtlDelta.H
@@ -85,19 +85,19 @@ public:
         );
 
 
-    // Destructor
-
-        ~PrandtlDelta()
+    //- Destructor
+    
+        virtual ~PrandtlDelta()
         {}
 
 
     // Member Functions
 
         //- Read the LESdelta dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
         // Correct values
-        void correct();
+        virtual void correct();
 };
 
 
diff --git a/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C b/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
index 13d80a9d4..960e6e157 100644
--- a/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
+++ b/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.C
@@ -42,8 +42,7 @@ addToRunTimeSelectionTable(LESdelta, cubeRootVolDelta, dictionary);
 
 void cubeRootVolDelta::calcDelta()
 {
-    const Vector<label>& directions = mesh().directions();
-    label nD = (directions.nComponents + cmptSum(directions))/2;
+    label nD = mesh().nGeometricD();
 
     if (nD == 3)
     {
@@ -55,14 +54,15 @@ void cubeRootVolDelta::calcDelta()
             << "Case is 2D, LES is not strictly applicable\n"
             << endl;
 
+        const Vector<label>& directions = mesh().geometricD();
+
         scalar thickness = 0.0;
         for (direction dir=0; dir<directions.nComponents; dir++)
         {
             if (directions[dir] == -1)
             {
-                boundBox bb(mesh().points(), false);
-
-                thickness = (bb.max() - bb.min())[dir];
+                thickness = mesh().bounds().span()[dir];
+                break;
             }
         }
 
@@ -70,11 +70,9 @@ void cubeRootVolDelta::calcDelta()
     }
     else
     {
-        delta_.internalField() = deltaCoeff_*pow(mesh().V(), 1.0/3.0);
-
-        WarningIn("cubeRootVolDelta::calcDelta()")
+        FatalErrorIn("cubeRootVolDelta::calcDelta()")
             << "Case is not 3D or 2D, LES is not applicable"
-            << endl;
+            << exit(FatalError);
     }
 }
 
diff --git a/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H b/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
index ae9d9c3b7..6750c3800 100644
--- a/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
+++ b/src/turbulenceModels/LES/LESdeltas/cubeRootVolDelta/cubeRootVolDelta.H
@@ -85,7 +85,7 @@ public:
 
     // Destructor
 
-        ~cubeRootVolDelta()
+        virtual ~cubeRootVolDelta()
         {}
 
 
diff --git a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
index 0433782bd..f9a4e322b 100644
--- a/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
+++ b/src/turbulenceModels/LES/LESdeltas/smoothDelta/smoothDelta.H
@@ -26,8 +26,8 @@ Class
     Foam::smoothDelta
 
 Description
-    Smoothed delta which takes a given simple geometric delta and applies 
-    smoothing to it such that the ratio of deltas between two cells is no 
+    Smoothed delta which takes a given simple geometric delta and applies
+    smoothing to it such that the ratio of deltas between two cells is no
     larger than a specified amount, typically 1.15.
 
 SourceFiles
@@ -233,19 +233,18 @@ public:
         );
 
 
-    // Destructor
-
-        ~smoothDelta()
-        {}
+    //- Destructor
+    virtual ~smoothDelta()
+    {}
 
 
     // Member Functions
 
         //- Read the LESdelta dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
         // Correct values
-        void correct();
+        virtual void correct();
 };
 
 
diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
index a780baba3..9fa63f35f 100644
--- a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
+++ b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.C
@@ -38,8 +38,37 @@ namespace Foam
 defineTypeNameAndDebug(LESfilter, 0);
 defineRunTimeSelectionTable(LESfilter, dictionary);
 
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+autoPtr<LESfilter> LESfilter::New
+(
+    const fvMesh& mesh,
+    const dictionary& dict
+)
+{
+    word filterType(dict.lookup("filter"));
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(filterType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "LESfilter::New(const fvMesh&, const dictionary&)"
+        )   << "Unknown LESfilter type " << filterType << endl << endl
+            << "Valid LESfilter types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<LESfilter>(cstrIter()(mesh, dict));
+}
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
index be11e8704..42e9a32f6 100644
--- a/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
+++ b/src/turbulenceModels/LES/LESfilters/LESfilter/LESfilter.H
@@ -102,13 +102,13 @@ public:
         //- Return a reference to the selected LES filter
         static autoPtr<LESfilter> New
         (
-            const fvMesh& mesh,
-            const dictionary& LESfilterDict
+            const fvMesh&,
+            const dictionary&
         );
 
 
-    // Destructor
-
+    //- Destructor
+    
         virtual ~LESfilter()
         {}
 
diff --git a/src/turbulenceModels/LES/LESfilters/Make/files b/src/turbulenceModels/LES/LESfilters/Make/files
index 567121638..864b819f3 100644
--- a/src/turbulenceModels/LES/LESfilters/Make/files
+++ b/src/turbulenceModels/LES/LESfilters/Make/files
@@ -1,7 +1,6 @@
 LESfilter/LESfilter.C
-LESfilter/newFilter.C
 simpleFilter/simpleFilter.C
 laplaceFilter/laplaceFilter.C
-anisotropicFilter/anisotropicFilter.C 
+anisotropicFilter/anisotropicFilter.C
 
 LIB = $(FOAM_LIBBIN)/libLESfilters
diff --git a/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H b/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
index fad451ed4..117d2c074 100644
--- a/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
+++ b/src/turbulenceModels/LES/LESfilters/anisotropicFilter/anisotropicFilter.H
@@ -79,34 +79,36 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         anisotropicFilter(const fvMesh& mesh, scalar widthCoeff);
 
-        //- from IOdictionary
+        //- Construct from IOdictionary
         anisotropicFilter(const fvMesh& mesh, const dictionary&);
 
 
-    // Destructor
-
-        ~anisotropicFilter()
-        {}
+    //- Destructor
+    virtual ~anisotropicFilter()
+    {}
 
 
     // Member Functions
 
         //- Read the LESfilter dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
 
     // Member Operators
 
-        tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
-        tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
-        tmp<volSymmTensorField> operator()
+        virtual tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
+
+        virtual tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
+
+        virtual tmp<volSymmTensorField> operator()
         (
             const tmp<volSymmTensorField>&
         ) const;
-        tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
+
+        virtual tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
 };
 
 
diff --git a/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C b/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
index 73e9d00e3..5e66f6046 100644
--- a/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
+++ b/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.C
@@ -49,7 +49,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, scalar widthCoeff)
     (
         IOobject
         (
-            "anisotropicFilterCoeff",
+            "laplaceFilterCoeff",
             mesh.time().timeName(),
             mesh
         ),
@@ -70,7 +70,7 @@ Foam::laplaceFilter::laplaceFilter(const fvMesh& mesh, const dictionary& bd)
     (
         IOobject
         (
-            "anisotropicFilterCoeff",
+            "laplaceFilterCoeff",
             mesh.time().timeName(),
             mesh
         ),
diff --git a/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H b/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
index 2b418718f..23e2764d1 100644
--- a/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
+++ b/src/turbulenceModels/LES/LESfilters/laplaceFilter/laplaceFilter.H
@@ -80,34 +80,36 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         laplaceFilter(const fvMesh& mesh, scalar widthCoeff);
 
-        //- from IOdictionary
+        //- Construct from IOdictionary
         laplaceFilter(const fvMesh& mesh, const dictionary&);
 
 
-    // Destructor
-
-        ~laplaceFilter()
-        {}
+    //- Destructor
+    virtual ~laplaceFilter()
+    {}
 
 
     // Member Functions
 
         //- Read the LESfilter dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
 
     // Member Operators
 
-        tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
-        tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
-        tmp<volSymmTensorField> operator()
+        virtual tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
+
+        virtual tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
+
+        virtual tmp<volSymmTensorField> operator()
         (
             const tmp<volSymmTensorField>&
         ) const;
-        tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
+
+        virtual tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
 };
 
 
diff --git a/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H b/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
index 8719096de..e578582ad 100644
--- a/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
+++ b/src/turbulenceModels/LES/LESfilters/simpleFilter/simpleFilter.H
@@ -69,34 +69,36 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         simpleFilter(const fvMesh& mesh);
 
-        //- from IOdictionary
+        //- Construct from IOdictionary
         simpleFilter(const fvMesh& mesh, const dictionary&);
 
 
-    // Destructor
-
-        ~simpleFilter()
-        {}
+    //- Destructor
+    virtual ~simpleFilter()
+    {}
 
 
     // Member Functions
 
         //- Read the LESfilter dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
 
     // Member Operators
 
-        tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
-        tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
-        tmp<volSymmTensorField> operator()
+        virtual tmp<volScalarField> operator()(const tmp<volScalarField>&) const;
+
+        virtual tmp<volVectorField> operator()(const tmp<volVectorField>&) const;
+
+        virtual tmp<volSymmTensorField> operator()
         (
             const tmp<volSymmTensorField>&
         ) const;
-        tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
+
+        virtual tmp<volTensorField> operator()(const tmp<volTensorField>&) const;
 };
 
 
diff --git a/src/turbulenceModels/LES/compressible/LESModel/newLESModel.C b/src/turbulenceModels/LES/compressible/LESModel/newLESModel.C
deleted file mode 100644
index 87437abdb..000000000
--- a/src/turbulenceModels/LES/compressible/LESModel/newLESModel.C
+++ /dev/null
@@ -1,94 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "LESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace compressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-autoPtr<LESModel> LESModel::New
-(
-    const volScalarField& rho,
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    const basicThermo& thermoPhysicalModel
-)
-{
-    word LESModelTypeName;
-
-    // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the turbulenceModel is created otherwise the dictionary
-    // is entered in the database twice
-    {
-        IOdictionary turbulencePropertiesDict
-        (
-            IOobject
-            (
-                "LESProperties",
-                U.time().constant(),
-                U.db(),
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
-
-        turbulencePropertiesDict.lookup("LESModel") >> LESModelTypeName;
-    }
-
-    Info<< "Selecting LES turbulence model " << LESModelTypeName << endl;
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(LESModelTypeName);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESModel::New(const volVectorField& U, const "
-            "surfaceScalarField& phi, const basicThermo&)"
-        )   << "Unknown LESModel type " << LESModelTypeName
-            << endl << endl
-            << "Valid LESModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<LESModel>(cstrIter()(rho, U, phi, thermoPhysicalModel));
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace compressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/compressible/Make/files b/src/turbulenceModels/LES/compressible/Make/files
deleted file mode 100644
index 59ced1fae..000000000
--- a/src/turbulenceModels/LES/compressible/Make/files
+++ /dev/null
@@ -1,15 +0,0 @@
-wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
-
-LESModel/LESModel.C
-LESModel/newLESModel.C
-GenEddyVisc/GenEddyVisc.C
-GenSGSStress/GenSGSStress.C
-
-Smagorinsky/Smagorinsky.C
-oneEqEddy/oneEqEddy.C
-lowReOneEqEddy/lowReOneEqEddy.C
-dynOneEqEddy/dynOneEqEddy.C
-DeardorffDiffStress/DeardorffDiffStress.C
-SpalartAllmaras/SpalartAllmaras.C
-
-LIB = $(FOAM_LIBBIN)/libcompressibleLESModels
diff --git a/src/turbulenceModels/LES/compressible/Make/options b/src/turbulenceModels/LES/compressible/Make/options
deleted file mode 100644
index c148a902e..000000000
--- a/src/turbulenceModels/LES/compressible/Make/options
+++ /dev/null
@@ -1,11 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I../LESdeltas/lnInclude \
-    -I../LESfilters/lnInclude \
-    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
-
-LIB_LIBS = \
-    -lLESdeltas \
-    -lLESfilters \
-    -lmeshTools
diff --git a/src/turbulenceModels/LES/incompressible/LESModel/newLESModel.C b/src/turbulenceModels/LES/incompressible/LESModel/newLESModel.C
deleted file mode 100644
index ec0426520..000000000
--- a/src/turbulenceModels/LES/incompressible/LESModel/newLESModel.C
+++ /dev/null
@@ -1,93 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "LESModel.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-autoPtr<LESModel> LESModel::New
-(
-    const volVectorField& U,
-    const surfaceScalarField& phi,
-    transportModel& transport
-)
-{
-    word LESModelTypeName;
-
-    // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the turbulenceModel is created otherwise the dictionary
-    // is entered in the database twice
-    {
-        IOdictionary turbulencePropertiesDict
-        (
-            IOobject
-            (
-                "LESProperties",
-                U.time().constant(),
-                U.db(),
-                IOobject::MUST_READ,
-                IOobject::NO_WRITE
-            )
-        );
-
-        turbulencePropertiesDict.lookup("LESModel") >> LESModelTypeName;
-    }
-
-    Info<< "Selecting LES turbulence model " << LESModelTypeName << endl;
-
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(LESModelTypeName);
-
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
-    {
-        FatalErrorIn
-        (
-            "LESModel::select(const volVectorField&, const "
-            "surfaceScalarField&, transportModel&)"
-        )   << "Unknown LESModel type " << LESModelTypeName
-            << endl << endl
-            << "Valid LESModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
-            << exit(FatalError);
-    }
-
-    return autoPtr<LESModel>(cstrIter()(U, phi, transport));
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/incompressible/Make/options b/src/turbulenceModels/LES/incompressible/Make/options
deleted file mode 100644
index a2991710f..000000000
--- a/src/turbulenceModels/LES/incompressible/Make/options
+++ /dev/null
@@ -1,12 +0,0 @@
-EXE_INC = \
-    -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
-    -I../LESdeltas/lnInclude \
-    -I../LESfilters/lnInclude \
-    -I$(LIB_SRC)/transportModels
-
-LIB_LIBS = \
-    -lLESdeltas \
-    -lLESfilters\
-    -lfiniteVolume \
-    -lmeshTools
diff --git a/src/turbulenceModels/RAS/Allwmake b/src/turbulenceModels/RAS/Allwmake
deleted file mode 100755
index 5ccba2b37..000000000
--- a/src/turbulenceModels/RAS/Allwmake
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-set -x
-
-wmake libso incompressible
-wmake libso compressible
diff --git a/src/turbulenceModels/RAS/compressible/Make/files b/src/turbulenceModels/RAS/compressible/Make/files
deleted file mode 100644
index ce8848796..000000000
--- a/src/turbulenceModels/RAS/compressible/Make/files
+++ /dev/null
@@ -1,22 +0,0 @@
-/* RAS turbulence models */
-RASModel/RASModel.C
-RASModel/newRASModel.C
-laminar/laminar.C
-kEpsilon/kEpsilon.C
-RNGkEpsilon/RNGkEpsilon.C
-LaunderSharmaKE/LaunderSharmaKE.C
-LRR/LRR.C
-LaunderGibsonRSTM/LaunderGibsonRSTM.C
-realizableKE/realizableKE.C
-SpalartAllmaras/SpalartAllmaras.C
-kOmegaSST/kOmegaSST.C
-kOmegaSST_LowRe/kOmegaSST_LowRe.C
-
-/* Wall functions */
-wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
-
-/* Patch fields */
-derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
-derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
-
-LIB = $(FOAM_LIBBIN)/libcompressibleRASModels
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/checkkOmegaPatchFieldTypes.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/checkkOmegaPatchFieldTypes.H
deleted file mode 100644
index 025c06bb9..000000000
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST/checkkOmegaPatchFieldTypes.H
+++ /dev/null
@@ -1,19 +0,0 @@
-if (!isType<zeroGradientFvPatchScalarField>(k_.boundaryField()[patchi]))
-{
-    FatalErrorIn("wall-function evaluation")
-        << k_.boundaryField()[patchi].type()
-        << " is the wrong k patchField type for wall-functions on patch "
-        << curPatch.name() << nl
-        << "    should be zeroGradient"
-        << exit(FatalError);
-}
-
-if (!isType<zeroGradientFvPatchScalarField>(omega_.boundaryField()[patchi]))
-{
-    FatalErrorIn("wall-function evaluation")
-        << omega_.boundaryField()[patchi].type()
-        << " is the wrong omega patchField type for wall-functions on patch "
-        << curPatch.name() << nl
-        << "    should be zeroGradient"
-        << exit(FatalError);
-}
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallFunctionsI.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallFunctionsI.H
deleted file mode 100644
index d23070755..000000000
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallFunctionsI.H
+++ /dev/null
@@ -1,127 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    kOmegaWallFunctions
-
-Description
-    Calculate wall generation and frequency omega from wall-functions.
-
-\*---------------------------------------------------------------------------*/
-
-{
-    labelList cellBoundaryFaceCount(omega_.size(), 0);
-
-    scalar Cmu25 = pow(Cmu_.value(), 0.25);
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    //- Initialise the near-wall omega and G fields to zero
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                omega_[faceCelli] = 0.0;
-                G[faceCelli] = 0.0;
-            }
-        }
-    }
-
-    //- Accumulate the wall face contributions to omega and G
-    //  Increment cellBoundaryFaceCount for each face for averaging
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-#           include "checkkOmegaPatchFieldTypes.H"
-
-            const scalarField& rhow = rho_.boundaryField()[patchi];
-
-            const scalarField& muw = mu().boundaryField()[patchi];
-            const scalarField& mutw = mut_.boundaryField()[patchi];
-
-            scalarField magFaceGradU =
-                mag(U_.boundaryField()[patchi].snGrad());
-
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                scalar yPlus =
-                    Cmu25*y_[faceCelli]
-                    *sqrt(k_[faceCelli])
-                    /(muw[facei]/rhow[facei]);
-
-                // For corner cells (with two boundary or more faces),
-                // omega and G in the near-wall cell are calculated
-                // as an average
-
-                cellBoundaryFaceCount[faceCelli]++;
-
-                omega_[faceCelli] +=
-                    sqrt(k_[faceCelli])
-                   /(Cmu25*kappa_.value()*y_[faceCelli]);
-
-                if (yPlus > yPlusLam_)
-                {
-                    G[faceCelli] +=
-                        (mutw[facei] + muw[facei])
-                       *magFaceGradU[facei]
-                       *Cmu25*sqrt(k_[faceCelli])
-                       /(kappa_.value()*y_[faceCelli]);
-                }
-            }
-        }
-    }
-
-
-    // Perform the averaging
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                omega_[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-                G[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallViscosityI.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallViscosityI.H
deleted file mode 100644
index bbba714c6..000000000
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaWallViscosityI.H
+++ /dev/null
@@ -1,73 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    kOmegaWallViscosity
-
-Description
-    Calculate wall viscosity from wall-functions.
-
-\*---------------------------------------------------------------------------*/
-
-{
-    scalar Cmu25 = pow(Cmu_.value(), 0.25);
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            const scalarField& rhow = rho_.boundaryField()[patchi];
-
-            const scalarField& muw = mu().boundaryField()[patchi];
-            scalarField& mutw = mut_.boundaryField()[patchi];
-
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                scalar yPlus =
-                    Cmu25*y_[faceCelli]
-                   *sqrt(k_[faceCelli])/(muw[facei]/rhow[facei]);
-
-                if (yPlus > yPlusLam_)
-                {
-                    mutw[facei] =
-                         muw[facei]
-                        *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
-                }
-                else
-                {
-                    mutw[facei] = 0.0;
-                }
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/wallOmegaI.H b/src/turbulenceModels/RAS/compressible/kOmegaSST/wallOmegaI.H
deleted file mode 100644
index 6ad4a15f8..000000000
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST/wallOmegaI.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    wallOmega
-
-Description
-    Set wall dissipation in the omega matrix
-
-\*---------------------------------------------------------------------------*/
-
-{
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& p = patches[patchi];
-
-        if (isType<wallFvPatch>(p))
-        {
-            omegaEqn().setValues
-            (
-                p.faceCells(),
-                omega_.boundaryField()[patchi].patchInternalField()
-            );
-        }
-    }
-}
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/wallDissipationI.H b/src/turbulenceModels/RAS/compressible/wallFunctions/wallDissipationI.H
deleted file mode 100644
index 36bdda81d..000000000
--- a/src/turbulenceModels/RAS/compressible/wallFunctions/wallDissipationI.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    wallDissipation
-
-Description
-    Set wall dissipation in the epsilon matrix
-
-\*---------------------------------------------------------------------------*/
-
-{
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& p = patches[patchi];
-
-        if (isType<wallFvPatch>(p))
-        {
-            epsEqn().setValues
-            (
-                p.faceCells(),
-                epsilon_.boundaryField()[patchi].patchInternalField()
-            );
-        }
-    }
-}
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H b/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H
deleted file mode 100644
index fbe04ba1a..000000000
--- a/src/turbulenceModels/RAS/compressible/wallFunctions/wallFunctionsI.H
+++ /dev/null
@@ -1,128 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    wallFunctions
-
-Description
-    Calculate wall dissipation from wall-functions.
-
-\*---------------------------------------------------------------------------*/
-
-{
-    labelList cellBoundaryFaceCount(epsilon_.size(), 0);
-
-    scalar Cmu25 = pow(Cmu_.value(), 0.25);
-    scalar Cmu75 = pow(Cmu_.value(), 0.75);
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    //- Initialise the near-wall G field to zero
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                epsilon_[faceCelli] = 0.0;
-                G[faceCelli] = 0.0;
-            }
-        }
-    }
-
-    //- Accumulate the wall face contributions to epsilon and G
-    //  Increment cellBoundaryFaceCount for each face for averaging
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-#           include "checkPatchFieldTypes.H"
-
-            const scalarField& rhow = rho_.boundaryField()[patchi];
-
-            const scalarField& muw = mu().boundaryField()[patchi];
-            const scalarField& mutw = mut_.boundaryField()[patchi];
-
-            scalarField magFaceGradU =
-                mag(U_.boundaryField()[patchi].snGrad());
-
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                scalar yPlus =
-                    Cmu25*RASModel::y_[patchi][facei]
-                   *sqrt(k_[faceCelli])
-                   /(muw[facei]/rhow[facei]);
-
-                // For corner cells (with two boundary or more faces),
-                // epsilon and G in the near-wall cell are calculated
-                // as an average
-
-                cellBoundaryFaceCount[faceCelli]++;
-
-                epsilon_[faceCelli] +=
-                    Cmu75*pow(k_[faceCelli], 1.5)
-                   /(kappa_.value()*RASModel::y_[patchi][facei]);
-
-                if (yPlus > yPlusLam_)
-                {
-                    G[faceCelli] +=
-                        (mutw[facei] + muw[facei])
-                       *magFaceGradU[facei]
-                       *Cmu25*sqrt(k_[faceCelli])
-                       /(kappa_.value()*RASModel::y_[patchi][facei]);
-                }
-            }
-        }
-    }
-
-
-    // Perform the averaging
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                epsilon_[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-                G[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H b/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H
deleted file mode 100644
index f712e24ba..000000000
--- a/src/turbulenceModels/RAS/compressible/wallFunctions/wallViscosityI.H
+++ /dev/null
@@ -1,73 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    wallViscosity
-
-Description
-    Calculate wall viscosity from wall-functions.
-
-\*---------------------------------------------------------------------------*/
-
-{
-    scalar Cmu25 = pow(Cmu_.value(), 0.25);
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            const scalarField& rhow = rho_.boundaryField()[patchi];
-
-            const scalarField& muw = mu().boundaryField()[patchi];
-            scalarField& mutw = mut_.boundaryField()[patchi];
-
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                scalar yPlus =
-                    Cmu25*RASModel::y_[patchi][facei]
-                   *sqrt(k_[faceCelli])/(muw[facei]/rhow[facei]);
-
-                if (yPlus > yPlusLam_)
-                {
-                    mutw[facei] =
-                        muw[facei]
-                       *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
-                }
-                else
-                {
-                    mutw[facei] = 0.0;
-                }
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/Make/files b/src/turbulenceModels/RAS/incompressible/Make/files
deleted file mode 100644
index 24f77263c..000000000
--- a/src/turbulenceModels/RAS/incompressible/Make/files
+++ /dev/null
@@ -1,31 +0,0 @@
-/* RAS turbulence models */
-RASModel/RASModel.C
-RASModel/newRASModel.C
-laminar/laminar.C
-kEpsilon/kEpsilon.C
-RNGkEpsilon/RNGkEpsilon.C
-realizableKE/realizableKE.C
-kOmegaSST/kOmegaSST.C
-SpalartAllmaras/SpalartAllmaras.C
-LRR/LRR.C
-LaunderGibsonRSTM/LaunderGibsonRSTM.C
-LaunderSharmaKE/LaunderSharmaKE.C
-QZeta/QZeta.C
-LienCubicKE/LienCubicKE.C
-LienCubicKELowRe/LienCubicKELowRe.C
-NonlinearKEShih/NonlinearKEShih.C
-LienLeschzinerLowRe/LienLeschzinerLowRe.C
-LamBremhorstKE/LamBremhorstKE.C
-
-kOmegaSST_LowRe/kOmegaSST_LowRe.C
-
-/* Wall functions */
-wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
-wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
-wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
-
-/* Patch fields */
-derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
-derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
-
-LIB = $(FOAM_LIBBIN)/libincompressibleRASModels
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/checkkOmegaPatchFieldTypes.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/checkkOmegaPatchFieldTypes.H
deleted file mode 100644
index 025c06bb9..000000000
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/checkkOmegaPatchFieldTypes.H
+++ /dev/null
@@ -1,19 +0,0 @@
-if (!isType<zeroGradientFvPatchScalarField>(k_.boundaryField()[patchi]))
-{
-    FatalErrorIn("wall-function evaluation")
-        << k_.boundaryField()[patchi].type()
-        << " is the wrong k patchField type for wall-functions on patch "
-        << curPatch.name() << nl
-        << "    should be zeroGradient"
-        << exit(FatalError);
-}
-
-if (!isType<zeroGradientFvPatchScalarField>(omega_.boundaryField()[patchi]))
-{
-    FatalErrorIn("wall-function evaluation")
-        << omega_.boundaryField()[patchi].type()
-        << " is the wrong omega patchField type for wall-functions on patch "
-        << curPatch.name() << nl
-        << "    should be zeroGradient"
-        << exit(FatalError);
-}
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallFunctionsI.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallFunctionsI.H
deleted file mode 100644
index 46e2909b5..000000000
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallFunctionsI.H
+++ /dev/null
@@ -1,125 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    kOmegaWallFunctions
-
-Description
-    Calculate wall generation and frequency omega from wall-functions.
-
-\*---------------------------------------------------------------------------*/
-
-{
-    labelList cellBoundaryFaceCount(omega_.size(), 0);
-
-    scalar Cmu25 = pow(Cmu_.value(), 0.25);
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    //- Initialise the near-wall omega and G fields to zero
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                omega_[faceCelli] = 0.0;
-                G[faceCelli] = 0.0;
-            }
-        }
-    }
-
-    //- Accumulate the wall face contributions to omega and G
-    //  Increment cellBoundaryFaceCount for each face for averaging
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-#           include "checkkOmegaPatchFieldTypes.H"
-
-            const scalarField& nuw = nu().boundaryField()[patchi];
-            const scalarField& nutw = nut_.boundaryField()[patchi];
-
-            scalarField magFaceGradU =
-                mag(U_.boundaryField()[patchi].snGrad());
-
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                scalar yPlus =
-                    Cmu25*y_[faceCelli]
-                    *sqrt(k_[faceCelli])
-                    /nuw[facei];
-
-                // For corner cells (with two boundary or more faces),
-                // omega and G in the near-wall cell are calculated
-                // as an average
-
-                cellBoundaryFaceCount[faceCelli]++;
-
-                omega_[faceCelli] +=
-                    sqrt(k_[faceCelli])
-                   /(Cmu25*kappa_.value()*y_[faceCelli]);
-
-                if (yPlus > yPlusLam_)
-                {
-                    G[faceCelli] +=
-                        (nutw[facei] + nuw[facei])
-                       *magFaceGradU[facei]
-                       *Cmu25*sqrt(k_[faceCelli])
-                       /(kappa_.value()*y_[faceCelli]);
-                }
-            }
-        }
-    }
-
-
-    // Perform the averaging
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                omega_[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-                G[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallViscosityI.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallViscosityI.H
deleted file mode 100644
index 055fd59c2..000000000
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaWallViscosityI.H
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    kOmegaWallViscosity
-
-Description
-    Calculate wall viscosity from wall-functions.
-
-\*---------------------------------------------------------------------------*/
-
-{
-    scalar Cmu25 = pow(Cmu_.value(), 0.25);
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            const scalarField& nuw = nu().boundaryField()[patchi];
-            scalarField& nutw = nut_.boundaryField()[patchi];
-
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                scalar yPlus =
-                    Cmu25*y_[faceCelli]*sqrt(k_[faceCelli])/nuw[facei];
-
-                if (yPlus > yPlusLam_)
-                {
-                    nutw[facei] =
-                         nuw[facei]
-                        *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
-                }
-                else
-                {
-                    nutw[facei] = 0.0;
-                }
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/wallOmegaI.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST/wallOmegaI.H
deleted file mode 100644
index 6ad4a15f8..000000000
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/wallOmegaI.H
+++ /dev/null
@@ -1,51 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    wallOmega
-
-Description
-    Set wall dissipation in the omega matrix
-
-\*---------------------------------------------------------------------------*/
-
-{
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& p = patches[patchi];
-
-        if (isType<wallFvPatch>(p))
-        {
-            omegaEqn().setValues
-            (
-                p.faceCells(),
-                omega_.boundaryField()[patchi].patchInternalField()
-            );
-        }
-    }
-}
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/checkkOmega_LowRePatchFieldTypes.H b/src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/checkkOmega_LowRePatchFieldTypes.H
deleted file mode 100644
index 025c06bb9..000000000
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/checkkOmega_LowRePatchFieldTypes.H
+++ /dev/null
@@ -1,19 +0,0 @@
-if (!isType<zeroGradientFvPatchScalarField>(k_.boundaryField()[patchi]))
-{
-    FatalErrorIn("wall-function evaluation")
-        << k_.boundaryField()[patchi].type()
-        << " is the wrong k patchField type for wall-functions on patch "
-        << curPatch.name() << nl
-        << "    should be zeroGradient"
-        << exit(FatalError);
-}
-
-if (!isType<zeroGradientFvPatchScalarField>(omega_.boundaryField()[patchi]))
-{
-    FatalErrorIn("wall-function evaluation")
-        << omega_.boundaryField()[patchi].type()
-        << " is the wrong omega patchField type for wall-functions on patch "
-        << curPatch.name() << nl
-        << "    should be zeroGradient"
-        << exit(FatalError);
-}
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
deleted file mode 100644
index bbb7df846..000000000
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,306 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutStandardRoughWallFunctionFvPatchScalarField.H"
-#include "RASModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutStandardRoughWallFunctionFvPatchScalarField::
-nutStandardRoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(p, iF),
-    UName_("undefined"),
-    roughnessHeight_(pTraits<scalar>::zero),
-    roughnessConstant_(pTraits<scalar>::zero),
-    roughnessFudgeFactor_(pTraits<scalar>::zero)
-{}
-
-
-nutStandardRoughWallFunctionFvPatchScalarField::
-nutStandardRoughWallFunctionFvPatchScalarField
-(
-    const nutStandardRoughWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    UName_(ptf.UName_),
-    roughnessHeight_(ptf.roughnessHeight_),
-    roughnessConstant_(ptf.roughnessConstant_),
-    roughnessFudgeFactor_(ptf.roughnessFudgeFactor_)
-{}
-
-
-nutStandardRoughWallFunctionFvPatchScalarField::
-nutStandardRoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchScalarField(p, iF, dict),
-    UName_(dict.lookupOrDefault<word>("U", "U")),
-    roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
-    roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
-    roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor")))
-{}
-
-
-nutStandardRoughWallFunctionFvPatchScalarField::
-nutStandardRoughWallFunctionFvPatchScalarField
-(
-    const nutStandardRoughWallFunctionFvPatchScalarField& tppsf
-)
-:
-    fixedValueFvPatchScalarField(tppsf),
-    UName_(tppsf.UName_),
-    roughnessHeight_(tppsf.roughnessHeight_),
-    roughnessConstant_(tppsf.roughnessConstant_),
-    roughnessFudgeFactor_(tppsf.roughnessFudgeFactor_)
-{}
-
-
-nutStandardRoughWallFunctionFvPatchScalarField::
-nutStandardRoughWallFunctionFvPatchScalarField
-(
-    const nutStandardRoughWallFunctionFvPatchScalarField& tppsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(tppsf, iF),
-    UName_(tppsf.UName_),
-    roughnessHeight_(tppsf.roughnessHeight_),
-    roughnessConstant_(tppsf.roughnessConstant_),
-    roughnessFudgeFactor_(tppsf.roughnessFudgeFactor_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void nutStandardRoughWallFunctionFvPatchScalarField::evaluate
-(
-    const Pstream::commsTypes
-)
-{
-    const RASModel& rasModel
-        = db().lookupObject<RASModel>("RASProperties");
-
-    const scalar kappa = rasModel.kappa().value();
-    const scalar E = rasModel.E().value();
-    const scalar yPlusLam = 11.225;
-
-    // The reciprical of the distance to the adjacent cell centre.
-    const scalarField& ry = patch().deltaCoeffs();
-
-    const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
-
-    // The flow velocity at the adjacent cell centre.
-    scalarField magUp = mag(U.patchInternalField() - U);
-
-    const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
-    scalarField& nutw = *this;
-
-    scalarField magFaceGradU = mag(U.snGrad());
-
-    if(roughnessHeight_ > 0.0)
-    {
-        // Rough Walls.
-        const scalar c_1 = 1/(90 - 2.25) + roughnessConstant_;
-        static const scalar c_2 = 2.25/(90 - 2.25);
-        static const scalar c_3 = 2.0*atan(1.0)/log(90/2.25);
-        static const scalar c_4 = c_3*log(2.25);
-
-        //if (KsPlusBasedOnYPlus_)
-        {
-            // If KsPlus is based on YPlus the extra term added to the law
-            // of the wall will depend on yPlus.
-            forAll(nutw, facei)
-            {
-                const scalar magUpara = magUp[facei];
-                const scalar Re = magUpara/(nuw[facei]*ry[facei]);
-                const scalar kappaRe = kappa*Re;
-
-                scalar yPlus = yPlusLam;
-                const scalar ryPlusLam = 1.0/yPlus;
-
-                int iter = 0;
-                scalar yPlusLast = 0.0;
-                scalar dKsPlusdYPlus = roughnessHeight_*ry[facei];
-
-                // Enforce the roughnessHeight to be less than the distance to
-                // the first cell centre.
-                if(dKsPlusdYPlus > 1)
-                {
-                    dKsPlusdYPlus = 1;
-                }
-
-                // Fudge factor to get results to be similar to fluent
-                // (at least difference between rough and smooth).
-                dKsPlusdYPlus *= roughnessFudgeFactor_;
-
-                do
-                {
-                    yPlusLast = yPlus;
-
-                    // The non-dimensional roughness height.
-                    scalar KsPlus = yPlus*dKsPlusdYPlus;
-
-                    // The extra term in the law-of-the-wall.
-                    scalar G = 0.0;
-
-                    scalar yPlusGPrime = 0.0;
-
-                    if (KsPlus >= 90)
-                    {
-                        const scalar t_1 = 1 + roughnessConstant_*KsPlus;
-                        G = log(t_1);
-                        yPlusGPrime = roughnessConstant_*KsPlus/t_1;
-                    }
-                    else if (KsPlus > 2.25)
-                    {
-                        const scalar t_1 = c_1*KsPlus - c_2;
-                        const scalar t_2 = c_3*log(KsPlus) - c_4;
-                        const scalar sint_2 = sin(t_2);
-                        const scalar logt_1 = log(t_1);
-                        G = logt_1*sint_2;
-                        yPlusGPrime =
-                            (c_1*sint_2*KsPlus/t_1) + (c_3*logt_1*cos(t_2));
-                    }
-
-                    scalar denom = 1.0 + log(E* yPlus) - G - yPlusGPrime;
-                    if(mag(denom) > VSMALL)
-                    {
-                        yPlus = (kappaRe + yPlus*(1 - yPlusGPrime))/denom;
-                    }
-                    else
-                    {
-                        // Ensure immediate end and nutw = 0.
-                        yPlus = 0;
-                    }
-
-                } while
-                (
-                    mag(ryPlusLam*(yPlus - yPlusLast)) > 0.0001
-                 && ++iter < 10
-                 && yPlus > VSMALL
-                );
-
-                if (yPlus > yPlusLam)
-                {
-                    nutw[facei] = nuw[facei]*(yPlus*yPlus/Re - 1);
-                }
-                else
-                {
-                    nutw[facei] = 0.0;
-                }
-            }
-        }
-    }
-    else
-    {
-        // Smooth Walls.
-        forAll(nutw, facei)
-        {
-            const scalar magUpara = magUp[facei];
-            const scalar Re = magUpara/(nuw[facei]*ry[facei]);
-            const scalar kappaRe = kappa*Re;
-
-            scalar yPlus = yPlusLam;
-            const scalar ryPlusLam = 1.0/yPlus;
-
-            int iter = 0;
-            scalar yPlusLast = 0.0;
-
-            do
-            {
-                yPlusLast = yPlus;
-                yPlus = (kappaRe + yPlus)/(1.0 + log(E*yPlus));
-
-            } while(mag(ryPlusLam*(yPlus - yPlusLast)) > 0.0001 && ++iter < 10);
-
-            if (yPlus > yPlusLam)
-            {
-                nutw[facei] = nuw[facei]*(yPlus*yPlus/Re - 1);
-            }
-            else
-            {
-                nutw[facei] = 0.0;
-            }
-        }
-    }
-}
-
-
-void nutStandardRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fixedValueFvPatchScalarField::write(os);
-    os.writeKeyword("U") << UName_ << token::END_STATEMENT << nl;
-    os.writeKeyword("roughnessHeight")
-        << roughnessHeight_ << token::END_STATEMENT << nl;
-    os.writeKeyword("roughnessConstant")
-        << roughnessConstant_ << token::END_STATEMENT << nl;
-    os.writeKeyword("roughnessFudgeFactor")
-        << roughnessFudgeFactor_ << token::END_STATEMENT << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    nutStandardRoughWallFunctionFvPatchScalarField
-);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 44742420f..000000000
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,186 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutStandardWallFunctionFvPatchScalarField.H"
-#include "RASModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutStandardWallFunctionFvPatchScalarField::
-nutStandardWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(p, iF),
-    UName_("undefined")
-{}
-
-
-nutStandardWallFunctionFvPatchScalarField::
-nutStandardWallFunctionFvPatchScalarField
-(
-    const nutStandardWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    UName_(ptf.UName_)
-{}
-
-
-nutStandardWallFunctionFvPatchScalarField::
-nutStandardWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchScalarField(p, iF, dict),
-    UName_(dict.lookupOrDefault<word>("U", "U"))
-{}
-
-
-nutStandardWallFunctionFvPatchScalarField::
-nutStandardWallFunctionFvPatchScalarField
-(
-    const nutStandardWallFunctionFvPatchScalarField& tppsf
-)
-:
-    fixedValueFvPatchScalarField(tppsf),
-    UName_(tppsf.UName_)
-{}
-
-
-nutStandardWallFunctionFvPatchScalarField::
-nutStandardWallFunctionFvPatchScalarField
-(
-    const nutStandardWallFunctionFvPatchScalarField& tppsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(tppsf, iF),
-    UName_(tppsf.UName_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void nutStandardWallFunctionFvPatchScalarField::evaluate
-(
-    const Pstream::commsTypes
-)
-{
-    const RASModel& rasModel
-        = db().lookupObject<RASModel>("RASProperties");
-
-    scalar kappa = rasModel.kappa().value();
-    scalar E = rasModel.E().value();
-    scalar yPlusLam = rasModel.yPlusLam();
-
-    const scalarField& ry = patch().deltaCoeffs();
-
-    const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
-
-    scalarField magUp = mag(U.patchInternalField() - U);
-
-    const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
-    scalarField& nutw = *this;
-
-    scalarField magFaceGradU = mag(U.snGrad());
-
-    forAll(nutw, facei)
-    {
-        scalar magUpara = magUp[facei];
-
-        scalar kappaRe = kappa*magUpara/(nuw[facei]*ry[facei]);
-
-        scalar yPlus = yPlusLam;
-        scalar ryPlusLam = 1.0/yPlus;
-
-        int iter = 0;
-        scalar yPlusLast = 0.0;
-
-        do
-        {
-            yPlusLast = yPlus;
-            yPlus = (kappaRe + yPlus)/(1.0 + log(E*yPlus));
-
-        } while(mag(ryPlusLam*(yPlus - yPlusLast)) > 0.01 && ++iter < 10 );
-
-        if (yPlus > yPlusLam)
-        {
-            nutw[facei] = nuw[facei]*(yPlus*kappa/log(E*yPlus) - 1);
-        }
-        else
-        {
-            nutw[facei] = 0.0;
-        }
-    }
-}
-
-
-void nutStandardWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fixedValueFvPatchScalarField::write(os);
-    os.writeKeyword("U") << UName_ << token::END_STATEMENT << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField
-(
-    fvPatchScalarField,
-    nutStandardWallFunctionFvPatchScalarField
-);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
deleted file mode 100644
index 3fdd8d24a..000000000
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+++ /dev/null
@@ -1,185 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-\*---------------------------------------------------------------------------*/
-
-#include "nutWallFunctionFvPatchScalarField.H"
-#include "RASModel.H"
-#include "fvPatchFieldMapper.H"
-#include "volFields.H"
-#include "addToRunTimeSelectionTable.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-namespace incompressible
-{
-namespace RASModels
-{
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(p, iF),
-    UName_("undefined")
-{}
-
-
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
-(
-    const nutWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    UName_(ptf.UName_)
-{}
-
-
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchScalarField(p, iF, dict),
-    UName_(dict.lookupOrDefault<word>("U", "U"))
-{}
-
-
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
-(
-    const nutWallFunctionFvPatchScalarField& tppsf
-)
-:
-    fixedValueFvPatchScalarField(tppsf),
-    UName_(tppsf.UName_)
-{}
-
-
-nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
-(
-    const nutWallFunctionFvPatchScalarField& tppsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(tppsf, iF),
-    UName_(tppsf.UName_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void nutWallFunctionFvPatchScalarField::evaluate(const Pstream::commsTypes)
-{
-    const RASModel& rasModel
-        = db().lookupObject<RASModel>("RASProperties");
-
-    scalar kappa = rasModel.kappa().value();
-    scalar E = rasModel.E().value();
-
-    const scalarField& ry = patch().deltaCoeffs();
-
-    const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
-
-    scalarField magUp = mag(U.patchInternalField() - U);
-
-    const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
-
-    scalarField& nutw = *this;
-
-    scalarField magFaceGradU = mag(U.snGrad());
-
-    forAll(nutw, facei)
-    {
-        scalar magUpara = magUp[facei];
-
-        scalar utau = sqrt((nutw[facei] + nuw[facei])*magFaceGradU[facei]);
-
-        if (utau > VSMALL)
-        {
-            int iter = 0;
-            scalar err = GREAT;
-
-            do
-            {
-                scalar kUu = min(kappa*magUpara/utau, 50);
-                scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
-
-                scalar f =
-                    - utau/(ry[facei]*nuw[facei])
-                    + magUpara/utau
-                    + 1/E*(fkUu - 1.0/6.0*kUu*sqr(kUu));
-
-                scalar df =
-                    1.0/(ry[facei]*nuw[facei])
-                  + magUpara/sqr(utau)
-                  + 1/E*kUu*fkUu/utau;
-
-                scalar utauNew = utau + f/df;
-                err = mag((utau - utauNew)/utau);
-                utau = utauNew;
-
-            } while (utau > VSMALL && err > 0.01 && ++iter < 10);
-
-            nutw[facei] =
-                max(sqr(max(utau, 0))/magFaceGradU[facei] - nuw[facei], 0.0);
-        }
-        else
-        {
-            nutw[facei] = 0;
-        }
-    }
-}
-
-
-void nutWallFunctionFvPatchScalarField::write(Ostream& os) const
-{
-    fixedValueFvPatchScalarField::write(os);
-    os.writeKeyword("U") << UName_ << token::END_STATEMENT << nl;
-}
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-makePatchTypeField(fvPatchScalarField, nutWallFunctionFvPatchScalarField);
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace RASModels
-} // End namespace incompressible
-} // End namespace Foam
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H
deleted file mode 100644
index 9d0eb1e53..000000000
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallFunctionsI.H
+++ /dev/null
@@ -1,126 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    wallFunctions
-
-Description
-    Calculate wall generation and dissipation from wall-functions.
-
-\*---------------------------------------------------------------------------*/
-
-{
-    labelList cellBoundaryFaceCount(epsilon_.size(), 0);
-
-    scalar Cmu25 = pow(Cmu_.value(), 0.25);
-    scalar Cmu75 = pow(Cmu_.value(), 0.75);
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    //- Initialise the near-wall epsilon and G fields to zero
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                epsilon_[faceCelli] = 0.0;
-                G[faceCelli] = 0.0;
-            }
-        }
-    }
-
-    //- Accumulate the wall face contributions to epsilon and G
-    //  Increment cellBoundaryFaceCount for each face for averaging
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-#           include "checkPatchFieldTypes.H"
-
-            const scalarField& nuw = nu().boundaryField()[patchi];
-            const scalarField& nutw = nut_.boundaryField()[patchi];
-
-            scalarField magFaceGradU =
-                mag(U_.boundaryField()[patchi].snGrad());
-
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                scalar yPlus =
-                    Cmu25*RASModel::y_[patchi][facei]
-                   *sqrt(k_[faceCelli])
-                   /nuw[facei];
-
-                // For corner cells (with two boundary or more faces),
-                // epsilon and G in the near-wall cell are calculated
-                // as an average
-
-                cellBoundaryFaceCount[faceCelli]++;
-
-                epsilon_[faceCelli] +=
-                     Cmu75*pow(k_[faceCelli], 1.5)
-                    /(kappa_.value()*RASModel::y_[patchi][facei]);
-
-                if (yPlus > yPlusLam_)
-                {
-                    G[faceCelli] +=
-                        (nutw[facei] + nuw[facei])
-                       *magFaceGradU[facei]
-                       *Cmu25*sqrt(k_[faceCelli])
-                       /(kappa_.value()*RASModel::y_[patchi][facei]);
-                }
-            }
-        }
-    }
-
-
-    // Perform the averaging
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                epsilon_[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-                G[faceCelli] /= cellBoundaryFaceCount[faceCelli];
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallViscosityI.H b/src/turbulenceModels/RAS/incompressible/wallFunctions/wallViscosityI.H
deleted file mode 100644
index 73c083071..000000000
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallViscosityI.H
+++ /dev/null
@@ -1,70 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright held by original author
-     \\/     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 2 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, write to the Free Software Foundation,
-    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
-Global
-    wallViscosity
-
-Description
-    Calculate wall viscosity from wall-functions.
-
-\*---------------------------------------------------------------------------*/
-
-{
-    scalar Cmu25 = pow(Cmu_.value(), 0.25);
-
-    const fvPatchList& patches = mesh_.boundary();
-
-    forAll(patches, patchi)
-    {
-        const fvPatch& curPatch = patches[patchi];
-
-        if (isType<wallFvPatch>(curPatch))
-        {
-            const scalarField& nuw = nu().boundaryField()[patchi];
-            scalarField& nutw = nut_.boundaryField()[patchi];
-
-            forAll(curPatch, facei)
-            {
-                label faceCelli = curPatch.faceCells()[facei];
-
-                scalar yPlus =
-                    Cmu25*y_[patchi][facei]*sqrt(k_[faceCelli])/nuw[facei];
-
-                if (yPlus > yPlusLam_)
-                {
-                    nutw[facei] =
-                         nuw[facei]
-                        *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
-                }
-                else
-                {
-                    nutw[facei] = 0.0;
-                }
-            }
-        }
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
similarity index 91%
rename from src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.C
rename to src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index fc4528999..ff7fedc9b 100644
--- a/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -41,9 +41,21 @@ namespace LESModels
 defineTypeNameAndDebug(DeardorffDiffStress, 0);
 addToRunTimeSelectionTable(LESModel, DeardorffDiffStress, dictionary);
 
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void DeardorffDiffStress::updateSubGridScaleFields(const volScalarField& K)
+{
+    muSgs_ = ck_*rho()*sqrt(K)*delta();
+    muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt_;
+    alphaSgs_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 DeardorffDiffStress::DeardorffDiffStress
 (
     const volScalarField& rho,
@@ -60,7 +72,7 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.094
         )
     ),
@@ -69,11 +81,13 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cm",
-            coeffDict(),
+            coeffDict_,
             4.13
         )
     )
 {
+    updateSubGridScaleFields(0.5*tr(B_));
+
     printCoeffs();
 }
 
@@ -120,8 +134,7 @@ void DeardorffDiffStress::correct(const tmp<volTensorField>& tgradU)
     K = 0.5*tr(B_);
     bound(K, k0());
 
-    muSgs_ = ck_*rho()*sqrt(K)*delta();
-    muSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields(K);
 }
 
 
diff --git a/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
similarity index 92%
rename from src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.H
rename to src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
index c41a852fd..091e4b909 100644
--- a/src/turbulenceModels/LES/compressible/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/compressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -81,6 +81,9 @@ class DeardorffDiffStress
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields(const volScalarField& K);
+
         // Disallow default bitwise copy construct and assignment
         DeardorffDiffStress(const DeardorffDiffStress&);
         DeardorffDiffStress& operator=(const DeardorffDiffStress&);
@@ -103,10 +106,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~DeardorffDiffStress()
-        {}
+    //- Destructor
+    virtual ~DeardorffDiffStress()
+    {}
 
 
     // Member Functions
@@ -121,10 +123,10 @@ public:
         }
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
similarity index 88%
rename from src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.C
rename to src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
index 207ffe5f4..dd0152257 100644
--- a/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -37,7 +37,6 @@ namespace LESModels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 GenEddyVisc::GenEddyVisc
 (
     const volScalarField& rho,
@@ -56,11 +55,21 @@ GenEddyVisc::GenEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            coeffDict(),
+            coeffDict_,
             1.048
         )
     ),
 
+    Prt_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Prt",
+            coeffDict_,
+            1.0
+        )
+    ),
+
     k_
     (
         IOobject
@@ -85,10 +94,21 @@ GenEddyVisc::GenEddyVisc
             IOobject::AUTO_WRITE
         ),
         mesh_
+    ),
+
+    alphaSgs_
+    (
+        IOobject
+        (
+            "alphaSgs",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
     )
-{
-    printCoeffs();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -125,6 +145,7 @@ bool GenEddyVisc::read()
     if (LESModel::read())
     {
         ce_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
similarity index 89%
rename from src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.H
rename to src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
index ebf559cbb..9bb7836f1 100644
--- a/src/turbulenceModels/LES/compressible/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/compressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -68,10 +68,17 @@ class GenEddyVisc
 
 protected:
 
+    // Model coefficients
+
         dimensionedScalar ce_;
+        dimensionedScalar Prt_;
+
+
+    // Fields
 
         volScalarField k_;
         volScalarField muSgs_;
+        volScalarField alphaSgs_;
 
 
 public:
@@ -88,10 +95,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~GenEddyVisc()
-        {}
+    //- Destructor
+    virtual ~GenEddyVisc()
+    {}
 
 
     // Member Functions
@@ -114,12 +120,18 @@ public:
             return muSgs_;
         }
 
-        //- Return thermal conductivity
+        //- Return thermal diffusivity
+        virtual tmp<volScalarField> alphaSgs() const
+        {
+            return alphaSgs_;
+        }
+
+        //- Return thermal diffusivity
         virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", muSgs_ + alpha())
+                new volScalarField("alphaEff", alphaSgs_ + alpha())
             );
         }
 
@@ -137,8 +149,8 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
similarity index 90%
rename from src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.C
rename to src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
index f4590a86d..c502af649 100644
--- a/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.C
@@ -37,7 +37,6 @@ namespace LESModels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 GenSGSStress::GenSGSStress
 (
     const volScalarField& rho,
@@ -60,11 +59,21 @@ GenSGSStress::GenSGSStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            coeffDict(),
+            coeffDict_,
             1.048
         )
     ),
 
+    Prt_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Prt",
+            coeffDict_,
+            1.0
+        )
+    ),
+
     B_
     (
         IOobject
@@ -89,6 +98,19 @@ GenSGSStress::GenSGSStress
             IOobject::AUTO_WRITE
         ),
         mesh_
+    ),
+
+    alphaSgs_
+    (
+        IOobject
+        (
+            "alphaSgs",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
     )
 {}
 
diff --git a/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
similarity index 86%
rename from src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.H
rename to src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
index 4ba4f4d96..9d1742e17 100644
--- a/src/turbulenceModels/LES/compressible/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/compressible/LES/GenSGSStress/GenSGSStress.H
@@ -69,10 +69,16 @@ class GenSGSStress
 
 protected:
 
+    // Model coefficients
+
         dimensionedScalar ce_;
+        dimensionedScalar Prt_;
+
+    // Fields
 
         volSymmTensorField B_;
         volScalarField muSgs_;
+        volScalarField alphaSgs_;
 
 
 public:
@@ -89,43 +95,48 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~GenSGSStress()
-        {}
+    //- Destructor
+    virtual ~GenSGSStress()
+    {}
 
 
     // Member Functions
 
-        //- Return the SGS turbulent kinetic energy.
+        //- Return the SGS turbulent kinetic energy
         virtual tmp<volScalarField> k() const
         {
             return 0.5*tr(B_);
         }
 
-        //- Return the SGS turbulent dissipation.
+        //- Return the SGS turbulent dissipation
         virtual tmp<volScalarField> epsilon() const
         {
             volScalarField K = k();
             return ce_*K*sqrt(K)/delta();
         }
 
-        //- Return the SGS viscosity.
+        //- Return the SGS viscosity
         virtual tmp<volScalarField> muSgs() const
         {
             return muSgs_;
         }
 
+        //- Return the SGS thermal diffusivity
+        virtual tmp<volScalarField> alphaSgs() const
+        {
+            return alphaSgs_;
+        }
+
         //- Return thermal conductivity
         virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", muSgs_ + alpha())
+                new volScalarField("alphaEff", alphaSgs_ + alpha())
             );
         }
 
-        //- Return the sub-grid stress tensor.
+        //- Return the sub-grid stress tensor
         virtual tmp<volSymmTensorField> B() const
         {
             return B_;
@@ -136,14 +147,14 @@ public:
         virtual tmp<volSymmTensorField> devRhoBeff() const;
 
         //- Returns divergence of B : i.e. the additional term in the
-        //  filtered NSE.
+        //  filtered NSE
         virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const;
 
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/compressible/LESModel/LESModel.C b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
similarity index 60%
rename from src/turbulenceModels/LES/compressible/LESModel/LESModel.C
rename to src/turbulenceModels/compressible/LES/LESModel/LESModel.C
index 0d41abc43..b2d2d0efb 100644
--- a/src/turbulenceModels/LES/compressible/LESModel/LESModel.C
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.C
@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LESModel.H"
-#include "wallDist.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,6 +38,7 @@ namespace compressible
 
 defineTypeNameAndDebug(LESModel, 0);
 defineRunTimeSelectionTable(LESModel, dictionary);
+addToRunTimeSelectionTable(turbulenceModel, LESModel, turbulenceModel);
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
@@ -61,6 +62,8 @@ LESModel::LESModel
     const basicThermo& thermoPhysicalModel
 )
 :
+    turbulenceModel(rho, U, phi, thermoPhysicalModel),
+
     IOdictionary
     (
         IOobject
@@ -73,25 +76,71 @@ LESModel::LESModel
         )
     ),
 
-    runTime_(U.time()),
-    mesh_(U.mesh()),
-
-    rho_(rho),
-    U_(U),
-    phi_(phi),
-    thermoPhysicalModel_(thermoPhysicalModel),
-
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subDict(type + "Coeffs")),
+    coeffDict_(subOrEmptyDict(type + "Coeffs")),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
 
     delta_(LESdelta::New("delta", U.mesh(), *this))
 {
-    if (found("k0"))
+    readIfPresent("k0", k0_);
+
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+autoPtr<LESModel> LESModel::New
+(
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const basicThermo& thermoPhysicalModel
+)
+{
+    word modelName;
+
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
     {
-        lookup("k0") >> k0_;
+        IOdictionary dict
+        (
+            IOobject
+            (
+                "LESProperties",
+                U.time().constant(),
+                U.db(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        dict.lookup("LESModel") >> modelName;
     }
+
+    Info<< "Selecting LES turbulence model " << modelName << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(modelName);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "LESModel::New(const volVectorField& U, const "
+            "surfaceScalarField& phi, const basicThermo&)"
+        )   << "Unknown LESModel type " << modelName
+            << endl << endl
+            << "Valid LESModel types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<LESModel>(cstrIter()(rho, U, phi, thermoPhysicalModel));
 }
 
 
@@ -113,15 +162,15 @@ bool LESModel::read()
 {
     if (regIOobject::read())
     {
-        coeffDict_ = subDict(type() + "Coeffs");
+        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
+        {
+            coeffDict_ <<= *dictPtr;
+        }
+
+        readIfPresent("k0", k0_);
 
         delta_().read(*this);
 
-        if (found("k0"))
-        {
-            lookup("k0") >> k0_;
-        }
-
         return true;
     }
     else
diff --git a/src/turbulenceModels/LES/compressible/LESModel/LESModel.H b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
similarity index 76%
rename from src/turbulenceModels/LES/compressible/LESModel/LESModel.H
rename to src/turbulenceModels/compressible/LES/LESModel/LESModel.H
index 8742a2a19..fa8fd0d5e 100644
--- a/src/turbulenceModels/LES/compressible/LESModel/LESModel.H
+++ b/src/turbulenceModels/compressible/LES/LESModel/LESModel.H
@@ -33,23 +33,23 @@ Class
     Foam::compressible::LESModel
 
 Description
-    Class for all compressible flow LES SGS models.
+    Base class for all compressible flow LES SGS models.
 
-    This class defines the basic interface for a compressible flow SGS model,
-    and encapsulates data of value to all possible models. In particular
-    this includes references to all the dependent fields (rho, U, phi),
-    the physical viscosity mu, and the turbulenceProperties dictionary
-    which contains the model selection and model coefficients.
+    This class defines the basic interface for a compressible flow SGS
+    model, and encapsulates data of value to all possible models.
+    In particular this includes references to all the dependent fields
+    (rho, U, phi), the physical viscosity mu, and the LESProperties
+    dictionary, which contains the model selection and model coefficients.
 
 SourceFiles
     LESModel.C
-    newLESModel.C
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef compressibleLESModel_H
 #define compressibleLESModel_H
 
+#include "compressible/turbulenceModel/turbulenceModel.H"
 #include "LESdelta.H"
 #include "fvm.H"
 #include "fvc.H"
@@ -72,6 +72,7 @@ namespace compressible
 
 class LESModel
 :
+    public turbulenceModel,
     public IOdictionary
 {
 
@@ -79,20 +80,6 @@ protected:
 
     // Protected data
 
-        const Time& runTime_;
-        const fvMesh& mesh_;
-
-
-private:
-
-    // Private data
-
-        const volScalarField& rho_;
-        const volVectorField& U_;
-        const surfaceScalarField& phi_;
-
-        const basicThermo& thermoPhysicalModel_;
-
         Switch printCoeffs_;
         dictionary coeffDict_;
 
@@ -101,21 +88,23 @@ private:
         autoPtr<LESdelta> delta_;
 
 
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        LESModel(const LESModel&);
-        LESModel& operator=(const LESModel&);
-
-
-protected:
-
     // Protected Member Functions
 
         //- Print model coefficients
         virtual void printCoeffs();
 
 
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        LESModel(const LESModel&);
+
+        //- Disallow default bitwise assignment
+        LESModel& operator=(const LESModel&);
+
+
 public:
 
     //- Runtime type information
@@ -164,53 +153,23 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~LESModel()
-        {}
+    //- Destructor
+    virtual ~LESModel()
+    {}
 
 
     // Member Functions
 
         // Access
 
-            //- Access function to the density field
-            inline const volScalarField& rho() const
-            {
-                return rho_;
-            }
-
-            //- Access function to velocity field
-            inline const volVectorField& U() const
-            {
-                return U_;
-            }
-
-            //- Access function to flux field
-            inline const surfaceScalarField& phi() const
-            {
-                return phi_;
-            }
-
-            //- Access function to the thermophysical properties model
-            inline const basicThermo& thermo() const
-            {
-                return thermoPhysicalModel_;
-            }
-
-            //- Access the dictionary which provides info. about choice of
-            //  models, and all related data (particularly model coefficients).
-            inline dictionary& coeffDict()
+            //- Const access to the coefficients dictionary,
+            //  which provides info. about choice of models,
+            //  and all related data (particularly model coefficients).
+            inline const dictionary& coeffDict() const
             {
                 return coeffDict_;
             }
 
-            //- Access function to filter width
-            inline const volScalarField& delta() const
-            {
-                return delta_();
-            }
-
             //- Return the value of k0 which k is not allowed to be less than
             const dimensionedScalar& k0() const
             {
@@ -223,16 +182,10 @@ public:
                 return k0_;
             }
 
-            //- Access function to laminar viscosity
-            tmp<volScalarField> mu() const
+            //- Access function to filter width
+            inline const volScalarField& delta() const
             {
-                return thermoPhysicalModel_.mu();
-            }
-
-            //- Access function to laminar thermal conductivity
-            tmp<volScalarField> alpha() const
-            {
-                return thermoPhysicalModel_.alpha();
+                return delta_();
             }
 
 
@@ -242,7 +195,7 @@ public:
         //- Return the SGS turbulent dissipation.
         virtual tmp<volScalarField> epsilon() const = 0;
 
-        //- Return the effective viscosity
+        //- Return the SGS turbulent viscosity
         virtual tmp<volScalarField> muSgs() const = 0;
 
         //- Return the effective viscosity
@@ -254,6 +207,9 @@ public:
             );
         }
 
+        //- Return the SGS turbulent thermal diffusivity
+        virtual tmp<volScalarField> alphaSgs() const = 0;
+
         //- Return the SGS thermal conductivity.
         virtual tmp<volScalarField> alphaEff() const = 0;
 
@@ -268,6 +224,40 @@ public:
         // This is the additional term due to the filtering of the NSE.
         virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const = 0;
 
+
+        // RAS compatibility functions for the turbulenceModel base class
+
+            //- Return the turbulence viscosity
+            virtual tmp<volScalarField> mut() const
+            {
+                return muSgs();
+            }
+
+            //- Return the turbulence thermal diffusivity
+            virtual tmp<volScalarField> alphat() const
+            {
+                return alphaSgs();
+            }
+
+            //- Return the Reynolds stress tensor
+            virtual tmp<volSymmTensorField> R() const
+            {
+                return B();
+            }
+
+            //- Return the effective stress tensor including the laminar stress
+            virtual tmp<volSymmTensorField> devRhoReff() const
+            {
+                return devRhoBeff();
+            }
+
+            //- Return the source term for the momentum equation
+            virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const
+            {
+                return divDevRhoBeff(U);
+            }
+
+
         //- Correct Eddy-Viscosity and related properties.
         //  This calls correct(const tmp<volTensorField>& gradU) by supplying
         //  gradU calculated locally.
@@ -276,7 +266,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read() = 0;
 };
 
diff --git a/src/turbulenceModels/compressible/LES/Make/files b/src/turbulenceModels/compressible/LES/Make/files
new file mode 100644
index 000000000..331f60eb8
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/Make/files
@@ -0,0 +1,24 @@
+LESModel/LESModel.C
+GenEddyVisc/GenEddyVisc.C
+GenSGSStress/GenSGSStress.C
+
+Smagorinsky/Smagorinsky.C
+oneEqEddy/oneEqEddy.C
+lowReOneEqEddy/lowReOneEqEddy.C
+dynOneEqEddy/dynOneEqEddy.C
+DeardorffDiffStress/DeardorffDiffStress.C
+SpalartAllmaras/SpalartAllmaras.C
+
+vanDriestDelta/vanDriestDelta.C
+
+/* Wall functions */
+wallFunctions=derivedFvPatchFields/wallFunctions
+
+muSgsWallFunctions=$(wallFunctions)/muSgsWallFunctions
+$(muSgsWallFunctions)/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
+
+alphaSgsWallFunctions=$(wallFunctions)/alphaSgsWallFunctions
+$(alphaSgsWallFunctions)/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
+$(alphaSgsWallFunctions)/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
+
+LIB = $(FOAM_LIBBIN)/libcompressibleLESModels
diff --git a/src/turbulenceModels/compressible/LES/Make/options b/src/turbulenceModels/compressible/LES/Make/options
new file mode 100644
index 000000000..5f392cebf
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/Make/options
@@ -0,0 +1,14 @@
+EXE_INC = \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/LES/LESfilters/lnInclude \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude
+
+LIB_LIBS = \
+    -lcompressibleTurbulenceModel \
+    -lLESdeltas \
+    -lLESfilters \
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
similarity index 89%
rename from src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.C
rename to src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
index c9ce2c81f..2a8f29da5 100644
--- a/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.C
@@ -41,9 +41,29 @@ namespace LESModels
 defineTypeNameAndDebug(Smagorinsky, 0);
 addToRunTimeSelectionTable(LESModel, Smagorinsky, dictionary);
 
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Smagorinsky::updateSubGridScaleFields(const volTensorField& gradU)
+{
+    volSymmTensorField D = symm(gradU);
+
+    volScalarField a = ce_/delta();
+    volScalarField b = (2.0/3.0)*tr(D);
+    volScalarField c = 2*ck_*delta()*(dev(D) && D);
+
+    k_ = sqr((-b + sqrt(sqr(b) + 4*a*c))/(2*a));
+
+    muSgs_ = ck_*rho()*delta()*sqrt(k_);
+    muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt_;
+    alphaSgs_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 Smagorinsky::Smagorinsky
 (
     const volScalarField& rho,
@@ -60,11 +80,13 @@ Smagorinsky::Smagorinsky
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.02
         )
     )
 {
+    updateSubGridScaleFields(fvc::grad(U));
+
     printCoeffs();
 }
 
@@ -74,17 +96,7 @@ Smagorinsky::Smagorinsky
 void Smagorinsky::correct(const tmp<volTensorField>& gradU)
 {
     GenEddyVisc::correct(gradU);
-
-    volSymmTensorField D = symm(gradU);
-
-    volScalarField a = ce_/delta();
-    volScalarField b = (2.0/3.0)*tr(D);
-    volScalarField c = 2*ck_*delta()*(dev(D) && D);
-
-    k_ = sqr((-b + sqrt(sqr(b) + 4*a*c))/(2*a));
-
-    muSgs_ = ck_*rho()*delta()*sqrt(k_);
-    muSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields(gradU());
 }
 
 
diff --git a/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
similarity index 91%
rename from src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.H
rename to src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
index 49cfb7e70..cfd7fc39d 100644
--- a/src/turbulenceModels/LES/compressible/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/compressible/LES/Smagorinsky/Smagorinsky.H
@@ -76,6 +76,9 @@ class Smagorinsky
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields(const volTensorField& gradU);
+
         // Disallow default bitwise copy construct and assignment
         Smagorinsky(const Smagorinsky&);
         Smagorinsky& operator=(const Smagorinsky&);
@@ -98,19 +101,18 @@ public:
         );
 
 
-    // Destructor
-
-        ~Smagorinsky()
-        {}
+    //- Destructor
+    virtual ~Smagorinsky()
+    {}
 
 
     // Member Functions
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
similarity index 83%
rename from src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.C
rename to src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 84743b660..3d3997cf8 100644
--- a/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -45,24 +45,32 @@ addToRunTimeSelectionTable(LESModel, SpalartAllmaras, dictionary);
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
+void SpalartAllmaras::updateSubGridScaleFields()
+{
+    muSgs_.internalField() = rho()*fv1()*nuTilda_.internalField();
+    muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt_;
+    alphaSgs_.correctBoundaryConditions();
+}
+
+
 tmp<volScalarField> SpalartAllmaras::fv1() const
 {
-    volScalarField chi3 = pow3(nuTilda_/(mu()/rho()));
+    volScalarField chi3 = pow3(rho()*nuTilda_/mu());
     return chi3/(chi3 + pow3(Cv1_));
 }
 
 
 tmp<volScalarField> SpalartAllmaras::fv2() const
 {
-    volScalarField chi = nuTilda_/(mu()/rho());
-    //return scalar(1) - chi/(scalar(1) + chi*fv1());
-    return 1.0/pow3(scalar(1) + chi/Cv2_);
+    return 1.0/pow3(scalar(1) + rho()*nuTilda_/(mu()*Cv2_));
 }
 
 
 tmp<volScalarField> SpalartAllmaras::fv3() const
 {
-    volScalarField chi = nuTilda_/(mu()/rho());
+    volScalarField chi = rho()*nuTilda_/mu();
     volScalarField chiByCv2 = (1/Cv2_)*chi;
 
     return
@@ -104,13 +112,22 @@ SpalartAllmaras::SpalartAllmaras
 :
     LESModel(typeName, rho, U, phi, thermoPhysicalModel),
 
-    alphaNut_
+    sigmaNut_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaNut",
-            coeffDict(),
-            1.5
+            "sigmaNut",
+            coeffDict_,
+            0.66666
+        )
+    ),
+    Prt_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Prt",
+            coeffDict_,
+            1.0
         )
     ),
 
@@ -119,7 +136,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb1",
-            coeffDict(),
+            coeffDict_,
             0.1355
         )
     ),
@@ -128,7 +145,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb2",
-            coeffDict(),
+            coeffDict_,
             0.622
         )
     ),
@@ -137,7 +154,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv1",
-            coeffDict(),
+            coeffDict_,
             7.1
         )
     ),
@@ -146,7 +163,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv2",
-            coeffDict(),
+            coeffDict_,
             5.0
         )
     ),
@@ -155,7 +172,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "CDES",
-            coeffDict(),
+            coeffDict_,
             0.65
         )
     ),
@@ -164,7 +181,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.07
         )
     ),
@@ -174,16 +191,16 @@ SpalartAllmaras::SpalartAllmaras
         (
             "kappa",
             *this,
-            0.4187
+            0.41
         )
     ),
-    Cw1_(Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_)),
+    Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
     Cw2_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw2",
-            coeffDict(),
+            coeffDict_,
             0.3
         )
     ),
@@ -192,7 +209,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw3",
-            coeffDict(),
+            coeffDict_,
             2.0
         )
     ),
@@ -222,9 +239,23 @@ SpalartAllmaras::SpalartAllmaras
             IOobject::AUTO_WRITE
         ),
         mesh_
-    )
+    ),
 
+    alphaSgs_
+    (
+        IOobject
+        (
+            "alphaSgs",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    )
 {
+    updateSubGridScaleFields();
+
     printCoeffs();
 }
 
@@ -277,21 +308,20 @@ void SpalartAllmaras::correct(const tmp<volTensorField>& tgradU)
       + fvm::div(phi(), nuTilda_)
       - fvm::laplacian
         (
-            alphaNut_*(nuTilda_*rho() + mu()),
+            (nuTilda_*rho() + mu())/sigmaNut_,
             nuTilda_,
             "laplacian(DnuTildaEff,nuTilda)"
         )
-      - alphaNut_*rho()*Cb2_*magSqr(fvc::grad(nuTilda_))
+      - rho()*Cb2_/sigmaNut_*magSqr(fvc::grad(nuTilda_))
      ==
         rho()*Cb1_*Stilda*nuTilda_
       - fvm::Sp(rho()*Cw1_*fw(Stilda)*nuTilda_/sqr(dTilda_), nuTilda_)
     );
 
     bound(nuTilda_, dimensionedScalar("zero", nuTilda_.dimensions(), 0.0));
-
     nuTilda_.correctBoundaryConditions();
-    muSgs_.internalField() = rho()*fv1()*nuTilda_.internalField();
-    muSgs_.correctBoundaryConditions();
+
+    updateSubGridScaleFields();
 }
 
 
@@ -299,10 +329,11 @@ bool SpalartAllmaras::read()
 {
     if (LESModel::read())
     {
-        alphaNut_.readIfPresent(coeffDict());
+        sigmaNut_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
         Cb1_.readIfPresent(coeffDict());
         Cb2_.readIfPresent(coeffDict());
-        Cw1_ = Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_);
+        Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
         Cw2_.readIfPresent(coeffDict());
         Cw3_.readIfPresent(coeffDict());
         Cv1_.readIfPresent(coeffDict());
diff --git a/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
similarity index 74%
rename from src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.H
rename to src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
index 988ddc91b..9369e22d0 100644
--- a/src/turbulenceModels/LES/compressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -49,7 +49,7 @@ namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class SpalartAllmaras Declaration
+                       Class SpalartAllmaras Declaration
 \*---------------------------------------------------------------------------*/
 
 class SpalartAllmaras
@@ -58,22 +58,36 @@ class SpalartAllmaras
 {
     // Private data
 
-        dimensionedScalar alphaNut_;
+        // Model coefficients
 
-        dimensionedScalar Cb1_;
-        dimensionedScalar Cb2_;
-        dimensionedScalar Cv1_;
-        dimensionedScalar Cv2_;
-        dimensionedScalar CDES_;
-        dimensionedScalar ck_;
-        dimensionedScalar kappa_;
-        dimensionedScalar Cw1_;
-        dimensionedScalar Cw2_;
-        dimensionedScalar Cw3_;
+            dimensionedScalar sigmaNut_;
+            dimensionedScalar Prt_;
+
+            dimensionedScalar Cb1_;
+            dimensionedScalar Cb2_;
+            dimensionedScalar Cv1_;
+            dimensionedScalar Cv2_;
+            dimensionedScalar CDES_;
+            dimensionedScalar ck_;
+            dimensionedScalar kappa_;
+            dimensionedScalar Cw1_;
+            dimensionedScalar Cw2_;
+            dimensionedScalar Cw3_;
+
+
+    // Fields
+
+        volScalarField nuTilda_;
+        volScalarField dTilda_;
+        volScalarField muSgs_;
+        volScalarField alphaSgs_;
 
 
     // Private member functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields();
+
         tmp<volScalarField> fv1() const;
         tmp<volScalarField> fv2() const;
         tmp<volScalarField> fv3() const;
@@ -83,10 +97,6 @@ class SpalartAllmaras
         SpalartAllmaras(const SpalartAllmaras&);
         SpalartAllmaras& operator=(const SpalartAllmaras&);
 
-        volScalarField nuTilda_;
-        volScalarField dTilda_;
-        volScalarField muSgs_;
-
 
 public:
 
@@ -106,40 +116,45 @@ public:
         );
 
 
-    // Destructor
-
-        ~SpalartAllmaras()
-        {}
+    //- Destructor
+    virtual ~SpalartAllmaras()
+    {}
 
 
     // Member Functions
 
-        //- Return SGS kinetic energy
-        tmp<volScalarField> k() const
-        {
-            return sqr(muSgs()/rho()/ck_/dTilda_);
-        }
-
-        //- Return sub-grid disipation rate
-        tmp<volScalarField> epsilon() const;
-
         tmp<volScalarField> nuTilda() const
         {
             return nuTilda_;
         }
 
+        //- Return SGS kinetic energy
+        virtual tmp<volScalarField> k() const
+        {
+            return sqr(muSgs()/rho()/ck_/dTilda_);
+        }
+
+        //- Return sub-grid disipation rate
+        virtual tmp<volScalarField> epsilon() const;
+
         //- Return SGS viscosity
-        tmp<volScalarField> muSgs() const
+        virtual tmp<volScalarField> muSgs() const
         {
             return muSgs_;
         }
 
+        //- Return SGS thermal diffusivity
+        virtual tmp<volScalarField> alphaSgs() const
+        {
+            return alphaSgs_;
+        }
+
         //- Return thermal conductivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", muSgs_ + alpha())
+                new volScalarField("alphaEff", alphaSgs_ + alpha())
             );
         }
 
@@ -152,13 +167,13 @@ public:
 
         //- Returns div(rho*dev(B)).
         // This is the additional term due to the filtering of the NSE.
-        tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoBeff(volVectorField& U) const;
 
         //- Correct nuTilda and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..8f7c6856a
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
@@ -0,0 +1,334 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "alphaSgsJayatillekeWallFunctionFvPatchScalarField.H"
+#include "LESModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::maxExp_ = 50.0;
+scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::tolerance_ = 0.01;
+label alphaSgsJayatillekeWallFunctionFvPatchScalarField::maxIters_ = 10;
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void alphaSgsJayatillekeWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn
+        (
+            "alphaSgsJayatillekeWallFunctionFvPatchScalarField::checkType()"
+        )
+            << "Patch type for patch " << patch().name() << " must be wall\n"
+            << "Current patch type is " << patch().type() << nl
+            << exit(FatalError);
+    }
+}
+
+
+scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::Psmooth
+(
+    const scalar Prat
+) const
+{
+    return 9.24*(pow(Prat, 0.75) - 1.0)*(1.0 + 0.28*exp(-0.007*Prat));
+}
+
+
+scalar alphaSgsJayatillekeWallFunctionFvPatchScalarField::yPlusTherm
+(
+    const scalar P,
+    const scalar Prat
+) const
+{
+    scalar ypt = 11.0;
+
+    for (int i=0; i<maxIters_; i++)
+    {
+        scalar f = ypt - (log(E_*ypt)/kappa_ + P)/Prat;
+        scalar df = 1.0 - 1.0/(ypt*kappa_*Prat);
+        scalar yptNew = ypt - f/df;
+
+        if (yptNew < VSMALL)
+        {
+            return 0;
+        }
+        else if (mag(yptNew - ypt) < tolerance_)
+        {
+            return yptNew;
+        }
+        else
+        {
+            ypt = yptNew;
+        }
+     }
+
+    return ypt;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+alphaSgsJayatillekeWallFunctionFvPatchScalarField::
+alphaSgsJayatillekeWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    Prt_(0.85),
+    kappa_(0.41),
+    E_(9.8)
+{
+    checkType();
+}
+
+
+alphaSgsJayatillekeWallFunctionFvPatchScalarField::
+alphaSgsJayatillekeWallFunctionFvPatchScalarField
+(
+    const alphaSgsJayatillekeWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    Prt_(ptf.Prt_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_)
+{}
+
+
+alphaSgsJayatillekeWallFunctionFvPatchScalarField::
+alphaSgsJayatillekeWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8))
+{
+    checkType();
+}
+
+
+alphaSgsJayatillekeWallFunctionFvPatchScalarField::
+alphaSgsJayatillekeWallFunctionFvPatchScalarField
+(
+    const alphaSgsJayatillekeWallFunctionFvPatchScalarField& awfpsf
+)
+:
+    fixedValueFvPatchScalarField(awfpsf),
+    Prt_(awfpsf.Prt_),
+    kappa_(awfpsf.kappa_),
+    E_(awfpsf.E_)
+{
+    checkType();
+}
+
+
+alphaSgsJayatillekeWallFunctionFvPatchScalarField::
+alphaSgsJayatillekeWallFunctionFvPatchScalarField
+(
+    const alphaSgsJayatillekeWallFunctionFvPatchScalarField& awfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(awfpsf, iF),
+    Prt_(awfpsf.Prt_),
+    kappa_(awfpsf.kappa_),
+    E_(awfpsf.E_)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void alphaSgsJayatillekeWallFunctionFvPatchScalarField::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    const LESModel& lesModel = db().lookupObject<LESModel>("LESProperties");
+
+    // Field data
+    const label patchI = patch().index();
+
+    const scalarField& muw = lesModel.mu().boundaryField()[patchI];
+    const scalarField muSgsw = lesModel.muSgs()().boundaryField()[patchI];
+
+    const scalarField& alphaw = lesModel.alpha().boundaryField()[patchI];
+    scalarField& alphaSgsw = *this;
+
+    const fvPatchVectorField& Uw = lesModel.U().boundaryField()[patchI];
+    const scalarField magUp = mag(Uw.patchInternalField() - Uw);
+    const scalarField magGradUw = mag(Uw.snGrad());
+
+    const scalarField& rhow = lesModel.rho().boundaryField()[patchI];
+    const fvPatchScalarField& hw =
+        patch().lookupPatchField<volScalarField, scalar>("h");
+
+    const scalarField& ry = patch().deltaCoeffs();
+
+    // Heat flux [W/m2] - lagging alphaSgsw
+    const scalarField qDot = (alphaw + alphaSgsw)*hw.snGrad();
+
+    // Populate boundary values
+    forAll(alphaSgsw, faceI)
+    {
+        // Calculate uTau using Newton-Raphson iteration
+        scalar uTau =
+            sqrt((muSgsw[faceI] + muw[faceI])/rhow[faceI]*magGradUw[faceI]);
+
+        if (uTau > ROOTVSMALL)
+        {
+            label iter = 0;
+            scalar err = GREAT;
+
+            do
+            {
+                scalar kUu = min(kappa_*magUp[faceI]/uTau, maxExp_);
+                scalar fkUu = exp(kUu) - 1.0 - kUu*(1.0 + 0.5*kUu);
+
+                scalar f =
+                    - uTau/(ry[faceI]*muw[faceI]/rhow[faceI])
+                    + magUp[faceI]/uTau
+                    + 1.0/E_*(fkUu - 1.0/6.0*kUu*sqr(kUu));
+
+                scalar df =
+                    - 1.0/(ry[faceI]*muw[faceI]/rhow[faceI])
+                    - magUp[faceI]/sqr(uTau)
+                    - 1.0/E_*kUu*fkUu/uTau;
+
+                scalar uTauNew = uTau - f/df;
+                err = mag((uTau - uTauNew)/uTau);
+                uTau = uTauNew;
+
+            } while (uTau>VSMALL && err>tolerance_ && ++iter<maxIters_);
+
+            scalar yPlus = uTau/ry[faceI]/(muw[faceI]/rhow[faceI]);
+
+            // Molecular Prandtl number
+            scalar Pr = muw[faceI]/alphaw[faceI];
+
+            // Molecular-to-turbulenbt Prandtl number ratio
+            scalar Prat = Pr/Prt_;
+
+            // Thermal sublayer thickness
+            scalar P = Psmooth(Prat);
+            scalar yPlusTherm = this->yPlusTherm(P, Prat);
+
+            // Evaluate new effective thermal diffusivity
+            scalar alphaEff = 0.0;
+            if (yPlus < yPlusTherm)
+            {
+                scalar A = qDot[faceI]*rhow[faceI]*uTau/ry[faceI];
+                scalar B = qDot[faceI]*Pr*yPlus;
+                scalar C = Pr*0.5*rhow[faceI]*uTau*sqr(magUp[faceI]);
+                alphaEff = A/(B + C + VSMALL);
+            }
+            else
+            {
+                scalar A = qDot[faceI]*rhow[faceI]*uTau/ry[faceI];
+                scalar B = qDot[faceI]*Prt_*(1.0/kappa_*log(E_*yPlus) + P);
+                scalar magUc = uTau/kappa_*log(E_*yPlusTherm) - mag(Uw[faceI]);
+                scalar C =
+                    0.5*rhow[faceI]*uTau
+                   *(Prt_*sqr(magUp[faceI]) + (Pr - Prt_)*sqr(magUc));
+                alphaEff = A/(B + C + VSMALL);
+            }
+
+            // Update turbulent thermal diffusivity
+            alphaSgsw[faceI] = max(0.0, alphaEff - alphaw[faceI]);
+
+            if (debug)
+            {
+                Info<< "    uTau           = " << uTau << nl
+                    << "    Pr             = " << Pr << nl
+                    << "    Prt            = " << Prt_ << nl
+                    << "    qDot           = " << qDot[faceI] << nl
+                    << "    yPlus          = " << yPlus << nl
+                    << "    yPlusTherm     = " << yPlusTherm << nl
+                    << "    alphaEff       = " << alphaEff << nl
+                    << "    alphaw         = " << alphaw[faceI] << nl
+                    << "    alphaSgsw      = " << alphaSgsw[faceI] << nl
+                    << endl;
+            }
+        }
+        else
+        {
+            alphaSgsw[faceI] = 0.0;
+        }
+    }
+}
+
+
+void alphaSgsJayatillekeWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    alphaSgsJayatillekeWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..2bab1dc0d
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsJayatillekeWallFunction/alphaSgsJayatillekeWallFunctionFvPatchScalarField.H
@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    alphaSgsJayatillekeWallFunctionFvPatchScalarField
+
+Description
+    Thermal wall function for turbulent thermal diffusivity based on the
+    Jayatilleke thermal wall function
+
+SourceFiles
+    alphaSgsJayatillekeWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef alphaSgsJayatillekeWallFunctionFvPatchScalarField_H
+#define alphaSgsJayatillekeWallFunctionFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+     Class alphaSgsJayatillekeWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class alphaSgsJayatillekeWallFunctionFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private data
+
+        //- Turbulent Prandtl number
+        scalar Prt_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+
+        // Solution parameters
+
+            static scalar maxExp_;
+            static scalar tolerance_;
+            static label maxIters_;
+
+
+    // Private member functions
+
+        //- Check the type of the patch
+        void checkType();
+
+        //- `P' function
+        scalar Psmooth(const scalar Prat) const;
+
+        //- Calculate y+ at the edge of the thermal laminar sublayer
+        scalar yPlusTherm
+        (
+            const scalar P,
+            const scalar Prat
+        ) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("alphaSgsJayatillekeWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given an
+        //  alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        //  onto a new patch
+        alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        (
+            const alphaSgsJayatillekeWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        (
+            const alphaSgsJayatillekeWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphaSgsJayatillekeWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        alphaSgsJayatillekeWallFunctionFvPatchScalarField
+        (
+            const alphaSgsJayatillekeWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphaSgsJayatillekeWallFunctionFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Evaluate the patchField
+            virtual void evaluate
+            (
+                const Pstream::commsTypes commsType=Pstream::Pstream::blocking
+            );
+
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..b57c6e280
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.C
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "alphaSgsWallFunctionFvPatchScalarField.H"
+#include "LESModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void alphaSgsWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn
+        (
+            "alphaSgsWallFunctionFvPatchScalarField::checkType()"
+        )
+            << "Patch type for patch " << patch().name() << " must be wall\n"
+            << "Current patch type is " << patch().type() << nl
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+alphaSgsWallFunctionFvPatchScalarField::
+alphaSgsWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    Prt_(0.85)
+{
+    checkType();
+}
+
+
+alphaSgsWallFunctionFvPatchScalarField::
+alphaSgsWallFunctionFvPatchScalarField
+(
+    const alphaSgsWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    Prt_(ptf.Prt_)
+{}
+
+
+alphaSgsWallFunctionFvPatchScalarField::
+alphaSgsWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85))
+{
+    checkType();
+}
+
+
+alphaSgsWallFunctionFvPatchScalarField::
+alphaSgsWallFunctionFvPatchScalarField
+(
+    const alphaSgsWallFunctionFvPatchScalarField& awfpsf
+)
+:
+    fixedValueFvPatchScalarField(awfpsf),
+    Prt_(awfpsf.Prt_)
+{
+    checkType();
+}
+
+
+alphaSgsWallFunctionFvPatchScalarField::
+alphaSgsWallFunctionFvPatchScalarField
+(
+    const alphaSgsWallFunctionFvPatchScalarField& awfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(awfpsf, iF),
+    Prt_(awfpsf.Prt_)
+
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void alphaSgsWallFunctionFvPatchScalarField::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    const LESModel& lesModel = db().lookupObject<LESModel>("LESProperties");
+
+    const scalarField muSgsw =
+        lesModel.muSgs()().boundaryField()[patch().index()];
+
+    operator==(muSgsw/Prt_);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    alphaSgsWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H
similarity index 68%
rename from src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H
index f39f012ff..57725a34b 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardWallFunction/nutStandardWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/alphaSgsWallFunctions/alphaSgsWallFunction/alphaSgsWallFunctionFvPatchScalarField.H
@@ -23,18 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RASModels::nutStandardWallFunctionFvPatchScalarField
+    alphaSgsWallFunctionFvPatchScalarField
 
 Description
-    Wall function boundary condition for walls
+    Boundary condition for thermal diffusivity when using wall functions
+    - replicates OpenFOAM v1.5 (and earlier) behaviour
 
 SourceFiles
-    nutStandardWallFunctionFvPatchScalarField.C
+    alphaSgsWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nutStandardWallFunctionFvPatchScalarField_H
-#define nutStandardWallFunctionFvPatchScalarField_H
+#ifndef alphaSgsWallFunctionFvPatchScalarField_H
+#define alphaSgsWallFunctionFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -42,62 +43,68 @@ SourceFiles
 
 namespace Foam
 {
-namespace incompressible
+namespace compressible
 {
-namespace RASModels
+namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class nutWallFunctionFvPatch Declaration
+           Class alphaSgsWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class nutStandardWallFunctionFvPatchScalarField
+class alphaSgsWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
     // Private data
 
-        //- Name of the velocity field
-        word UName_;
+        //- Turbulent Prandtl number
+        scalar Prt_;
+
+
+    // Private member functions
+
+        //- Check the type of the patch
+        void checkType();
 
 
 public:
 
     //- Runtime type information
-    TypeName("nutStandardWallFunction");
+    TypeName("alphaSgsWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        nutStandardWallFunctionFvPatchScalarField
+        alphaSgsWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        nutStandardWallFunctionFvPatchScalarField
+        alphaSgsWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const dictionary&
         );
 
-        //- Construct by mapping given nutStandardWallFunctionFvPatchScalarField
+        //- Construct by mapping given alphaSgsWallFunctionFvPatchScalarField
         //  onto a new patch
-        nutStandardWallFunctionFvPatchScalarField
+        alphaSgsWallFunctionFvPatchScalarField
         (
-            const nutStandardWallFunctionFvPatchScalarField&,
+            const alphaSgsWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        nutStandardWallFunctionFvPatchScalarField
+        alphaSgsWallFunctionFvPatchScalarField
         (
-            const nutStandardWallFunctionFvPatchScalarField&
+            const alphaSgsWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -105,14 +112,14 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutStandardWallFunctionFvPatchScalarField(*this)
+                new alphaSgsWallFunctionFvPatchScalarField(*this)
             );
         }
 
         //- Construct as copy setting internal field reference
-        nutStandardWallFunctionFvPatchScalarField
+        alphaSgsWallFunctionFvPatchScalarField
         (
-            const nutStandardWallFunctionFvPatchScalarField&,
+            const alphaSgsWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -124,40 +131,27 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutStandardWallFunctionFvPatchScalarField(*this, iF)
+                new alphaSgsWallFunctionFvPatchScalarField(*this, iF)
             );
         }
 
 
     // Member functions
 
-        // Access
-
-            //- Return the name of the velocity field
-            const word& UName() const
-            {
-                return UName_;
-            }
-
-
         // Evaluation functions
 
             //- Evaluate the patchField
             virtual void evaluate
             (
-                const Pstream::commsTypes commsType=Pstream::blocking
+                const Pstream::commsTypes commsType=Pstream::Pstream::blocking
             );
-
-
-        //- Write
-        virtual void write(Ostream& os) const;
 };
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-} // End namespace RASModels
-} // End namespace incompressible
+} // End namespace LESModels
+} // End namespace compressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
similarity index 64%
rename from src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
index 893e63240..06e8a97a8 100644
--- a/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.C
@@ -47,7 +47,12 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    rhoName_("rho"),
+    muName_("mu"),
+    kappa_(0.41),
+    E_(9.8)
 {}
 
 
@@ -59,18 +64,12 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
-{}
-
-
-muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    Istream& is
-)
-:
-    fixedValueFvPatchScalarField(p, iF, is)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    rhoName_(ptf.rhoName_),
+    muName_(ptf.muName_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_)
 {}
 
 
@@ -81,26 +80,41 @@ muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu")),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8))
 {}
 
 
 muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 (
-    const muSgsWallFunctionFvPatchScalarField& tppsf
+    const muSgsWallFunctionFvPatchScalarField& mwfpsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf)
+    fixedValueFvPatchScalarField(mwfpsf),
+    UName_(mwfpsf.UName_),
+    rhoName_(mwfpsf.rhoName_),
+    muName_(mwfpsf.muName_),
+    kappa_(mwfpsf.kappa_),
+    E_(mwfpsf.E_)
 {}
 
 
 muSgsWallFunctionFvPatchScalarField::muSgsWallFunctionFvPatchScalarField
 (
-    const muSgsWallFunctionFvPatchScalarField& tppsf,
+    const muSgsWallFunctionFvPatchScalarField& mwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF)
+    fixedValueFvPatchScalarField(mwfpsf, iF),
+    UName_(mwfpsf.UName_),
+    rhoName_(mwfpsf.rhoName_),
+    muName_(mwfpsf.muName_),
+    kappa_(mwfpsf.kappa_),
+    E_(mwfpsf.E_)
 {}
 
 
@@ -111,25 +125,18 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const LESModel& sgsModel
-        = db().lookupObject<LESModel>("LESProperties");
-
-    scalar kappa = readScalar(sgsModel.lookup("kappa"));
-
-    scalar E = readScalar(sgsModel.subDict("wallFunctionCoeffs").lookup("E"));
-
     const scalarField& ry = patch().deltaCoeffs();
 
     const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     scalarField magUp = mag(U.patchInternalField() - U);
 
     const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>("mu");
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
 
     const scalarField& rhow =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
 
     scalarField& muSgsw = *this;
 
@@ -139,31 +146,28 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
     {
         scalar magUpara = magUp[facei];
 
-        scalar utau = sqrt
-        (
-            (muSgsw[facei] + muw[facei])
-            *magFaceGradU[facei]/rhow[facei]
-        );
+        scalar utau =
+            sqrt((muSgsw[facei] + muw[facei])*magFaceGradU[facei]/rhow[facei]);
 
-        if(utau > 0)
+        if (utau > 0)
         {
             int iter = 0;
             scalar err = GREAT;
 
             do
             {
-                scalar kUu = kappa*magUpara/utau;
+                scalar kUu = kappa_*magUpara/utau;
                 scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
 
                 scalar f =
                     - utau/(ry[facei]*muw[facei]/rhow[facei])
                     + magUpara/utau
-                    + 1/E*(fkUu - 1.0/6.0*kUu*sqr(kUu));
+                    + 1/E_*(fkUu - 1.0/6.0*kUu*sqr(kUu));
 
                 scalar df =
                     - 1.0/(ry[facei]*muw[facei]/rhow[facei])
                     - magUpara/sqr(utau)
-                    - 1/E*kUu*fkUu/utau;
+                    - 1/E_*kUu*fkUu/utau;
 
                 scalar utauNew = utau - f/df;
                 err = mag((utau - utauNew)/utau);
@@ -172,7 +176,11 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
             } while (utau > VSMALL && err > 0.01 && ++iter < 10);
 
             muSgsw[facei] =
-                max(rhow[facei]*sqr(utau)/magFaceGradU[facei] - muw[facei],0.0);
+                max
+                (
+                    rhow[facei]*sqr(utau)/magFaceGradU[facei] - muw[facei],
+                    0.0
+                );
         }
         else
         {
@@ -182,9 +190,25 @@ void muSgsWallFunctionFvPatchScalarField::evaluate
 }
 
 
+void muSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, muSgsWallFunctionFvPatchScalarField);
+makePatchTypeField
+(
+    fvPatchScalarField,
+    muSgsWallFunctionFvPatchScalarField
+);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
similarity index 84%
rename from src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
index bbd4fb918..f05c7528c 100644
--- a/src/turbulenceModels/LES/compressible/wallFunc/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/LES/derivedFvPatchFields/wallFunctions/muSgsWallFunctions/muSgsWallFunction/muSgsWallFunctionFvPatchScalarField.H
@@ -23,10 +23,11 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::LESModels::muSgsWallFunctionFvPatchScalarField
+    Foam::compressible::LESModels::
+        muSgsWallFunctionFvPatchScalarField
 
 Description
-    wall function boundary condition for compressible flows
+    Spalart Allmaas wall function boundary condition for compressible flows
 
 SourceFiles
     muSgsWallFunctionFvPatchScalarField.C
@@ -48,7 +49,7 @@ namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class muSgsWallFunctionFvPatch Declaration
+     Class muSgsWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
 class muSgsWallFunctionFvPatchScalarField
@@ -57,6 +58,21 @@ class muSgsWallFunctionFvPatchScalarField
 {
     // Private data
 
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
 
 public:
 
@@ -73,14 +89,6 @@ public:
             const DimensionedField<scalar, volMesh>&
         );
 
-        //- Construct from patch, internal field and Istream
-        muSgsWallFunctionFvPatchScalarField
-        (
-            const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            Istream&
-        );
-
         //- Construct from patch, internal field and dictionary
         muSgsWallFunctionFvPatchScalarField
         (
@@ -89,7 +97,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given muSgsWallFunctionFvPatchScalarField
+        //- Construct by mapping given
+        //  muSgsWallFunctionFvPatchScalarField
         //  onto a new patch
         muSgsWallFunctionFvPatchScalarField
         (
@@ -129,7 +138,11 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new muSgsWallFunctionFvPatchScalarField(*this, iF)
+                new muSgsWallFunctionFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
             );
         }
 
@@ -143,6 +156,11 @@ public:
             (
                 const Pstream::commsTypes commsType=Pstream::blocking
             );
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
similarity index 94%
rename from src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.C
rename to src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
index 0429b4e8d..9ac61b719 100644
--- a/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.C
@@ -43,6 +43,16 @@ addToRunTimeSelectionTable(LESModel, dynOneEqEddy, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+void dynOneEqEddy::updateSubGridScaleFields(const volSymmTensorField& D)
+{
+    muSgs_ = ck_(D)*rho()*sqrt(k_)*delta();
+    muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt_;
+    alphaSgs_.correctBoundaryConditions();
+}
+
+
 dimensionedScalar dynOneEqEddy::ck_(const volSymmTensorField& D) const
 {
     volScalarField KK = 0.5*(filter_(magSqr(U())) - magSqr(filter_(U())));
@@ -76,7 +86,6 @@ dimensionedScalar dynOneEqEddy::ce_(const volSymmTensorField& D) const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 dynOneEqEddy::dynOneEqEddy
 (
     const volScalarField& rho,
@@ -91,16 +100,12 @@ dynOneEqEddy::dynOneEqEddy
     filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
     filter_(filterPtr_())
 {
+    updateSubGridScaleFields(dev(symm(fvc::grad(U))));
+
     printCoeffs();
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-dynOneEqEddy::~dynOneEqEddy()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void dynOneEqEddy::correct(const tmp<volTensorField>& tgradU)
@@ -126,8 +131,7 @@ void dynOneEqEddy::correct(const tmp<volTensorField>& tgradU)
 
     bound(k_, dimensionedScalar("0", k_.dimensions(), 1.0e-10));
 
-    muSgs_ = ck_(D)*rho()*sqrt(k_)*delta();
-    muSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields(D);
 }
 
 
diff --git a/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
similarity index 92%
rename from src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.H
rename to src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
index 797fcbc23..138975f23 100644
--- a/src/turbulenceModels/LES/compressible/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -82,6 +82,9 @@ class dynOneEqEddy
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields(const volSymmTensorField& D);
+
         //- Calculate ck, ce by filtering the velocity field U.
         dimensionedScalar ck_(const volSymmTensorField& D) const;
         dimensionedScalar ce_(const volSymmTensorField& D) const;
@@ -110,8 +113,8 @@ public:
 
 
     // Destructor
-
-        ~dynOneEqEddy();
+    virtual ~dynOneEqEddy()
+    {}
 
 
     // Member Functions
@@ -119,17 +122,17 @@ public:
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
         {
-            return tmp<volScalarField> 
+            return tmp<volScalarField>
             (
                 new volScalarField("DkEff", muSgs_ + mu())
             );
         }
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.C b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
similarity index 91%
rename from src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.C
rename to src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
index e5568c0d0..7e1ab2c04 100644
--- a/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.C
@@ -41,9 +41,24 @@ namespace LESModels
 defineTypeNameAndDebug(lowReOneEqEddy, 0);
 addToRunTimeSelectionTable(LESModel, lowReOneEqEddy, dictionary);
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void lowReOneEqEddy::updateSubGridScaleFields()
+{
+    // High Re eddy viscosity
+    muSgs_ = ck_*rho()*sqrt(k_)*delta();
+
+    // low Re no corrected eddy viscosity
+    muSgs_ -= (mu()/beta_)*(scalar(1) - exp(-beta_*muSgs_/mu()));
+    muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt_;
+    alphaSgs_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 lowReOneEqEddy::lowReOneEqEddy
 (
     const volScalarField& rho,
@@ -60,7 +75,7 @@ lowReOneEqEddy::lowReOneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.07
         )
     ),
@@ -69,11 +84,13 @@ lowReOneEqEddy::lowReOneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "beta",
-            coeffDict(),
+            coeffDict_,
             0.01
         )
     )
 {
+    updateSubGridScaleFields();
+
     printCoeffs();
 }
 
@@ -102,13 +119,7 @@ void lowReOneEqEddy::correct(const tmp<volTensorField>& tgradU)
 
     bound(k_, k0());
 
-    // High Re eddy viscosity
-    muSgs_ = ck_*rho()*sqrt(k_)*delta();
-
-    // low Re no corrected eddy viscosity
-    muSgs_ -= (mu()/beta_)*(scalar(1) - exp(-beta_*muSgs_/mu()));
-
-    muSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields();
 }
 
 
diff --git a/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.H b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
similarity index 92%
rename from src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.H
rename to src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
index 5a4e1b316..204de547a 100644
--- a/src/turbulenceModels/LES/compressible/lowReOneEqEddy/lowReOneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/lowReOneEqEddy/lowReOneEqEddy.H
@@ -77,6 +77,9 @@ class lowReOneEqEddy
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields();
+
         // Disallow default bitwise copy construct and assignment
         lowReOneEqEddy(const lowReOneEqEddy&);
         lowReOneEqEddy& operator=(const lowReOneEqEddy&);
@@ -100,10 +103,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~lowReOneEqEddy()
-        {}
+    //- Destructor
+    virtual ~lowReOneEqEddy()
+    {}
 
 
     // Member Functions
@@ -118,10 +120,10 @@ public:
         }
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
similarity index 91%
rename from src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.C
rename to src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
index fca434f89..59e45c6f7 100644
--- a/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.C
@@ -41,6 +41,18 @@ namespace LESModels
 defineTypeNameAndDebug(oneEqEddy, 0);
 addToRunTimeSelectionTable(LESModel, oneEqEddy, dictionary);
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void oneEqEddy::updateSubGridScaleFields()
+{
+    muSgs_ = ck_*rho()*sqrt(k_)*delta();
+    muSgs_.correctBoundaryConditions();
+
+    alphaSgs_ = muSgs_/Prt_;
+    alphaSgs_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 oneEqEddy::oneEqEddy
@@ -59,11 +71,13 @@ oneEqEddy::oneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.094
         )
     )
 {
+    updateSubGridScaleFields();
+
     printCoeffs();
 }
 
@@ -95,8 +109,7 @@ void oneEqEddy::correct(const tmp<volTensorField>& tgradU)
 
     bound(k_, k0());
 
-    muSgs_ = ck_*rho()*sqrt(k_)*delta();
-    muSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields();
 }
 
 
diff --git a/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
similarity index 93%
rename from src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.H
rename to src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
index 46122fb5f..4f133295d 100644
--- a/src/turbulenceModels/LES/compressible/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
@@ -80,6 +80,9 @@ class oneEqEddy
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields();
+
         // Disallow default bitwise copy construct and assignment
         oneEqEddy(const oneEqEddy&);
         oneEqEddy& operator=(const oneEqEddy&);
@@ -104,9 +107,8 @@ public:
 
 
     // Destructor
-
-        ~oneEqEddy()
-        {}
+    virtual ~oneEqEddy()
+    {}
 
 
     // Member Functions
@@ -121,10 +123,10 @@ public:
         }
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
new file mode 100644
index 000000000..367631381
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.C
@@ -0,0 +1,160 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "vanDriestDelta.H"
+#include "LESModel.H"
+#include "wallFvPatch.H"
+#include "wallDistData.H"
+#include "wallPointYPlus.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(vanDriestDelta, 0);
+addToRunTimeSelectionTable(LESdelta, vanDriestDelta, dictionary);
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void vanDriestDelta::calcDelta()
+{
+    const LESModel& lesModel = mesh_.lookupObject<LESModel>("LESProperties");
+
+    const volVectorField& U = lesModel.U();
+    const volScalarField& rho = lesModel.rho();
+    const volScalarField& mu = lesModel.mu();
+    tmp<volScalarField> muSgs = lesModel.muSgs();
+
+    volScalarField ystar
+    (
+        IOobject
+        (
+            "ystar",
+            mesh_.time().constant(),
+            mesh_
+        ),
+        mesh_,
+        dimensionedScalar("ystar", dimLength, GREAT)
+    );
+
+    const fvPatchList& patches = mesh_.boundary();
+    forAll(patches, patchi)
+    {
+        if (isA<wallFvPatch>(patches[patchi]))
+        {
+            const fvPatchVectorField& Uw = U.boundaryField()[patchi];
+            const scalarField& rhow = rho.boundaryField()[patchi];
+            const scalarField& muw = mu.boundaryField()[patchi];
+            const scalarField& muSgsw = muSgs().boundaryField()[patchi];
+
+            ystar.boundaryField()[patchi] =
+                muw/(rhow*sqrt((muw + muSgsw)*mag(Uw.snGrad())/rhow + VSMALL));
+        }
+    }
+
+    wallPointYPlus::yPlusCutOff = 500;
+    wallDistData<wallPointYPlus> y(mesh_, ystar);
+
+    delta_ = min
+    (
+        static_cast<const volScalarField&>(geometricDelta_()),
+        (kappa_/Cdelta_)*((scalar(1) + SMALL) - exp(-y/ystar/Aplus_))*y
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+vanDriestDelta::vanDriestDelta
+(
+    const word& name,
+    const fvMesh& mesh,
+    const dictionary& dd
+)
+:
+    LESdelta(name, mesh),
+    geometricDelta_
+    (
+        LESdelta::New("geometricDelta", mesh, dd.subDict(type() + "Coeffs"))
+    ),
+    kappa_(dd.lookupOrDefault<scalar>("kappa", 0.41)),
+    Aplus_
+    (
+        dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Aplus", 26.0)
+    ),
+    Cdelta_
+    (
+        dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Cdelta", 0.158)
+    ),
+    calcInterval_
+    (
+        dd.subDict(type() + "Coeffs").lookupOrDefault<label>("calcInterval", 1)
+    )
+{
+    delta_ = geometricDelta_();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void vanDriestDelta::read(const dictionary& d)
+{
+    const dictionary& dd(d.subDict(type() + "Coeffs"));
+
+    geometricDelta_().read(dd);
+    d.readIfPresent<scalar>("kappa", kappa_);
+    dd.readIfPresent<scalar>("Aplus", Aplus_);
+    dd.readIfPresent<scalar>("Cdelta", Cdelta_);
+    dd.readIfPresent<label>("calcInterval", calcInterval_);
+    calcDelta();
+}
+
+
+void vanDriestDelta::correct()
+{
+    if (mesh().time().timeIndex() % calcInterval_ == 0)
+    {
+        geometricDelta_().correct();
+        calcDelta();
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H
new file mode 100644
index 000000000..f80d7a695
--- /dev/null
+++ b/src/turbulenceModels/compressible/LES/vanDriestDelta/vanDriestDelta.H
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::LESModels::vanDriestDelta
+
+Description
+    Simple cube-root of cell volume delta used in compressible LES models.
+
+SourceFiles
+    vanDriestDelta.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef vanDriestDelta_H
+#define vanDriestDelta_H
+
+#include "LESdelta.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class vanDriestDelta Declaration
+\*---------------------------------------------------------------------------*/
+
+class vanDriestDelta
+:
+    public LESdelta
+{
+    // Private data
+
+        autoPtr<LESdelta> geometricDelta_;
+        scalar kappa_;
+        scalar Aplus_;
+        scalar Cdelta_;
+        label calcInterval_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct and assignment
+        vanDriestDelta(const vanDriestDelta&);
+        void operator=(const vanDriestDelta&);
+
+        // Calculate the delta values
+        void calcDelta();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("vanDriest");
+
+
+    // Constructors
+
+        //- Construct from name, mesh and IOdictionary
+        vanDriestDelta(const word& name, const fvMesh& mesh, const dictionary&);
+
+
+    //- Destructor
+    virtual ~vanDriestDelta()
+    {}
+
+
+    // Member Functions
+
+        //- Read the LESdelta dictionary
+        virtual void read(const dictionary&);
+
+        // Correct values
+        virtual void correct();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/LRR/LRR.C b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
similarity index 82%
rename from src/turbulenceModels/RAS/compressible/LRR/LRR.C
rename to src/turbulenceModels/compressible/RAS/LRR/LRR.C
index 8efe3243e..e524d9214 100644
--- a/src/turbulenceModels/RAS/compressible/LRR/LRR.C
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.C
@@ -28,6 +28,8 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "wallFvPatch.H"
 
+#include "backwardsCompatibilityWallFunctions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -44,13 +46,12 @@ addToRunTimeSelectionTable(RASModel, LRR, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 LRR::LRR
 (
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),
@@ -127,29 +128,29 @@ LRR::LRR
             0.0
         )
     ),
-    alphaR_
+    sigmaR_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaR",
+            "sigmaR",
             coeffDict_,
-            1.22
+            0.81967
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
-    alphah_
+    Prt_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphah",
+            "Prt",
             coeffDict_,
             1.0
         )
@@ -165,9 +166,8 @@ LRR::LRR
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateR("R", mesh_)
     ),
-
     k_
     (
         IOobject
@@ -175,12 +175,11 @@ LRR::LRR
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -188,12 +187,11 @@ LRR::LRR
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
-
     mut_
     (
         IOobject
@@ -202,13 +200,23 @@ LRR::LRR
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::AUTO_WRITE
         ),
-        Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
+        autoCreateMut("mut", mesh_)
+    ),
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
     )
 {
-#   include "wallViscosityI.H"
-
     if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
     {
         FatalErrorIn
@@ -221,6 +229,12 @@ LRR::LRR
             << exit(FatalError);
     }
 
+    mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_.correctBoundaryConditions();
+
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -276,17 +290,17 @@ bool LRR::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        Clrr1_.readIfPresent(coeffDict_);
-        Clrr2_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        Cs_.readIfPresent(coeffDict_);
-        Ceps_.readIfPresent(coeffDict_);
-        alphaR_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
-        couplingFactor_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        Clrr1_.readIfPresent(coeffDict());
+        Clrr2_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        Cs_.readIfPresent(coeffDict());
+        Ceps_.readIfPresent(coeffDict());
+        sigmaR_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
+        couplingFactor_.readIfPresent(coeffDict());
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
@@ -311,15 +325,22 @@ void LRR::correct()
     {
         // Re-calculate viscosity
         mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+        mut_.correctBoundaryConditions();
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
+
         return;
     }
 
     RASModel::correct();
 
     volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
-    volScalarField G = 0.5*mag(tr(P));
+    volScalarField G("RASModel::G", 0.5*mag(tr(P)));
 
-#   include "wallFunctionsI.H"
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
@@ -335,7 +356,7 @@ void LRR::correct()
 
     epsEqn().relax();
 
-#   include "wallDissipationI.H"
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
@@ -349,7 +370,7 @@ void LRR::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -398,8 +419,11 @@ void LRR::correct()
 
     // Re-calculate viscosity
     mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
+    mut_.correctBoundaryConditions();
 
-#   include "wallViscosityI.H"
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 
 
     // Correct wall shear stresses
@@ -408,7 +432,7 @@ void LRR::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             symmTensorField& Rw = R_.boundaryField()[patchi];
 
diff --git a/src/turbulenceModels/RAS/compressible/LRR/LRR.H b/src/turbulenceModels/compressible/RAS/LRR/LRR.H
similarity index 71%
rename from src/turbulenceModels/RAS/compressible/LRR/LRR.H
rename to src/turbulenceModels/compressible/RAS/LRR/LRR.H
index dae297c31..dd372ca02 100644
--- a/src/turbulenceModels/RAS/compressible/LRR/LRR.H
+++ b/src/turbulenceModels/compressible/RAS/LRR/LRR.H
@@ -40,9 +40,9 @@ Description
             C2          1.92;
             Cs          0.25;
             Ceps        0.15;
-            alphah      1.0;    // only for compressible
-            alphaEps    0.76923;
-            alphaR      1.22;   // only for compressible
+            Prt         1.0;        // only for compressible
+            sigmaEps    1.3;
+            sigmaR      0.81967;    // only for compressible
             couplingFactor  0.0;    // only for incompressible
         }
     @endverbatim
@@ -77,26 +77,32 @@ class LRR
 {
     // Private data
 
-        dimensionedScalar Cmu_;
+        // Model coefficients
 
-        dimensionedScalar Clrr1_;
-        dimensionedScalar Clrr2_;
+            dimensionedScalar Cmu_;
 
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar Cs_;
-        dimensionedScalar Ceps_;
+            dimensionedScalar Clrr1_;
+            dimensionedScalar Clrr2_;
 
-        dimensionedScalar couplingFactor_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar Cs_;
+            dimensionedScalar Ceps_;
 
-        dimensionedScalar alphaR_;
-        dimensionedScalar alphaEps_;
-        dimensionedScalar alphah_;
+            dimensionedScalar couplingFactor_;
 
-        volSymmTensorField R_;
-        volScalarField k_;
-        volScalarField epsilon_;
-        volScalarField mut_;
+            dimensionedScalar sigmaR_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar Prt_;
+
+
+        // Fields
+
+            volSymmTensorField R_;
+            volScalarField k_;
+            volScalarField epsilon_;
+            volScalarField mut_;
+            volScalarField alphat_;
 
 
 public:
@@ -106,35 +112,29 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         LRR
         (
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
-    // Destructor
-
-        ~LRR(){}
+    //- Destructor
+    virtual ~LRR()
+    {}
 
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
         //- Return the effective diffusivity for R
         tmp<volScalarField> DREff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DREff", alphaR_*mut_ + mu())
+                new volScalarField("DREff", mut_/sigmaR_ + mu())
             );
         }
 
@@ -143,48 +143,54 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*mut_ + mu())
+                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
             );
         }
 
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> mut() const
+        {
+            return mut_;
+        }
+
         //- Return the effective turbulent thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphat_ + alpha())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const
+        virtual tmp<volSymmTensorField> R() const
         {
             return R_;
         }
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
similarity index 82%
rename from src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
rename to src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 8fd61b004..61cc2d626 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -27,8 +27,8 @@ License
 #include "LaunderGibsonRSTM.H"
 #include "addToRunTimeSelectionTable.H"
 #include "wallFvPatch.H"
-#include "wallDist.H"
-#include "wallDistReflection.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -46,13 +46,12 @@ addToRunTimeSelectionTable(RASModel, LaunderGibsonRSTM, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 LaunderGibsonRSTM::LaunderGibsonRSTM
 (
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),
@@ -66,6 +65,15 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             0.09
         )
     ),
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            coeffDict_,
+            0.41
+        )
+    ),
     Clg1_
     (
         dimensioned<scalar>::lookupOrAddToDict
@@ -147,29 +155,29 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             0.0
         )
     ),
-    alphaR_
+    sigmaR_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaR",
+            "sigmaR",
             coeffDict_,
-            1.22
+            0.81967
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
-    alphah_
+    Prt_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphah",
+            "Prt",
             coeffDict_,
             1.0
         )
@@ -187,9 +195,8 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateR("R", mesh_)
     ),
-
     k_
     (
         IOobject
@@ -197,12 +204,11 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -210,12 +216,11 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
-
     mut_
     (
         IOobject
@@ -224,13 +229,23 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::AUTO_WRITE
         ),
-        Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
+        autoCreateMut("mut", mesh_)
+    ),
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
     )
 {
-#   include "wallViscosityI.H"
-
     if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
     {
         FatalErrorIn
@@ -243,6 +258,12 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             << exit(FatalError);
     }
 
+    mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_.correctBoundaryConditions();
+
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -298,20 +319,21 @@ bool LaunderGibsonRSTM::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        Clg1_.readIfPresent(coeffDict_);
-        Clg2_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        Cs_.readIfPresent(coeffDict_);
-        Ceps_.readIfPresent(coeffDict_);
-        C1Ref_.readIfPresent(coeffDict_);
-        C2Ref_.readIfPresent(coeffDict_);
-        alphaR_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        kappa_.readIfPresent(coeffDict());
+        Clg1_.readIfPresent(coeffDict());
+        Clg2_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        Cs_.readIfPresent(coeffDict());
+        Ceps_.readIfPresent(coeffDict());
+        C1Ref_.readIfPresent(coeffDict());
+        C2Ref_.readIfPresent(coeffDict());
+        sigmaR_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
 
-        couplingFactor_.readIfPresent(coeffDict_);
+        couplingFactor_.readIfPresent(coeffDict());
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
@@ -336,6 +358,12 @@ void LaunderGibsonRSTM::correct()
     {
         // Re-calculate viscosity
         mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+        mut_.correctBoundaryConditions();
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
+
         return;
     }
 
@@ -347,9 +375,10 @@ void LaunderGibsonRSTM::correct()
     }
 
     volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
-    volScalarField G = 0.5*mag(tr(P));
+    volScalarField G("RASModel::G", 0.5*mag(tr(P)));
 
-#   include "wallFunctionsI.H"
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
@@ -365,7 +394,7 @@ void LaunderGibsonRSTM::correct()
 
     epsEqn().relax();
 
-#   include "wallDissipationI.H"
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
@@ -379,7 +408,7 @@ void LaunderGibsonRSTM::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -437,10 +466,11 @@ void LaunderGibsonRSTM::correct()
 
     // Re-calculate turbulent viscosity
     mut_ = Cmu_*rho_*sqr(k_)/epsilon_;
+    mut_.correctBoundaryConditions();
 
-
-#   include "wallViscosityI.H"
-
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 
     // Correct wall shear stresses
 
@@ -448,7 +478,7 @@ void LaunderGibsonRSTM::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             symmTensorField& Rw = R_.boundaryField()[patchi];
 
diff --git a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
similarity index 70%
rename from src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
rename to src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index 0673d4dff..d207d1ffb 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -33,6 +33,7 @@ Description
         LaunderGibsonRSTMCoeffs
         {
             Cmu         0.09;
+            kappa       0.41;
             Clg1        1.8;
             Clg2        0.6;
             C1          1.44;
@@ -41,9 +42,9 @@ Description
             C2Ref       0.3;
             Cs          0.25;
             Ceps        0.15;
-            alphah      1.0;    // only for compressible
-            alphaEps    0.76923;
-            alphaR      1.22;
+            sigmah      1.0;    // only for compressible
+            sigmaEps    1.3;
+            sigmaR      0.81967;
             couplingFactor  0.0;
         }
     @endverbatim
@@ -79,31 +80,38 @@ class LaunderGibsonRSTM
 {
     // Private data
 
-        dimensionedScalar Cmu_;
+        // Model coefficients
 
-        dimensionedScalar Clg1_;
-        dimensionedScalar Clg2_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar kappa_;
 
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar Cs_;
-        dimensionedScalar Ceps_;
+            dimensionedScalar Clg1_;
+            dimensionedScalar Clg2_;
 
-        dimensionedScalar C1Ref_;
-        dimensionedScalar C2Ref_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar Cs_;
+            dimensionedScalar Ceps_;
 
-        dimensionedScalar couplingFactor_;
+            dimensionedScalar C1Ref_;
+            dimensionedScalar C2Ref_;
 
-        dimensionedScalar alphaR_;
-        dimensionedScalar alphaEps_;
-        dimensionedScalar alphah_;
+            dimensionedScalar couplingFactor_;
 
-        wallDistReflection y_;
+            dimensionedScalar sigmaR_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar Prt_;
 
-        volSymmTensorField R_;
-        volScalarField k_;
-        volScalarField epsilon_;
-        volScalarField mut_;
+
+        // Fields
+
+            wallDistReflection y_;
+
+            volSymmTensorField R_;
+            volScalarField k_;
+            volScalarField epsilon_;
+            volScalarField mut_;
+            volScalarField alphat_;
 
 
 public:
@@ -113,37 +121,29 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         LaunderGibsonRSTM
         (
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
-    // Destructor
-
-        ~LaunderGibsonRSTM(){}
+    //- Destructor
+    virtual ~LaunderGibsonRSTM()
+    {}
 
 
     // Member Functions
 
-        // Access
-
-        //- Return the turbulence viscosity
-        tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
         //- Return the effective diffusivity for R
         tmp<volScalarField> DREff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DREff", alphaR_*mut_ + mu())
+                new volScalarField("DREff", mut_/sigmaR_ + mu())
             );
         }
 
@@ -152,48 +152,54 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*mut_ + mu())
+                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
             );
         }
 
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> mut() const
+        {
+            return mut_;
+        }
+
         //- Return the effective turbulent thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphat_ + alpha())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const
+        virtual tmp<volSymmTensorField> R() const
         {
             return R_;
         }
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
similarity index 82%
rename from src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C
rename to src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index b872ce65a..08761f521 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -26,7 +26,8 @@ License
 
 #include "LaunderSharmaKE.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -60,13 +61,12 @@ tmp<volScalarField> LaunderSharmaKE::f2() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 LaunderSharmaKE::LaunderSharmaKE
 (
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),
@@ -107,29 +107,29 @@ LaunderSharmaKE::LaunderSharmaKE
             -0.33
         )
     ),
-    alphak_
+    sigmak_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphak",
+            "sigmak",
             coeffDict_,
             1.0
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
-    alphah_
+    Prt_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphah",
+            "Prt",
             coeffDict_,
             1.0
         )
@@ -169,11 +169,30 @@ LaunderSharmaKE::LaunderSharmaKE
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::AUTO_WRITE
         ),
-        Cmu_*fMu()*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
+        autoCreateLowReMut("mut", mesh_)
+    ),
+
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
     )
 {
+    mut_ = rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_.correctBoundaryConditions();
+
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -234,13 +253,13 @@ bool LaunderSharmaKE::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        C3_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        C3_.readIfPresent(coeffDict());
+        sigmak_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -256,7 +275,12 @@ void LaunderSharmaKE::correct()
     if (!turbulence_)
     {
         // Re-calculate viscosity
-        mut_ = rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_);
+        mut_ == rho_*Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_);
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
+
         return;
     }
 
@@ -276,7 +300,7 @@ void LaunderSharmaKE::correct()
     }
 
     tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField G = mut_*(tgradU() && dev(twoSymm(tgradU())));
+    volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
     tgradU.clear();
 
 
@@ -318,7 +342,12 @@ void LaunderSharmaKE::correct()
 
 
     // Re-calculate viscosity
-    mut_ = Cmu_*fMu()*rho_*sqr(k_)/epsilon_;
+    mut_ == Cmu_*fMu()*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+
+
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
similarity index 75%
rename from src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
rename to src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 13dc54e20..712edbe65 100644
--- a/src/turbulenceModels/RAS/compressible/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/compressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -64,7 +64,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class LaunderSharmaKE Declaration
+                        Class LaunderSharmaKE Declaration
 \*---------------------------------------------------------------------------*/
 
 class LaunderSharmaKE
@@ -73,17 +73,23 @@ class LaunderSharmaKE
 {
     // Private data
 
-        dimensionedScalar Cmu_;
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar C3_;
-        dimensionedScalar alphak_;
-        dimensionedScalar alphaEps_;
-        dimensionedScalar alphah_;
+        // Model coefficients
 
-        volScalarField k_;
-        volScalarField epsilon_;
-        volScalarField mut_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar C3_;
+            dimensionedScalar sigmak_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar Prt_;
+
+
+        // Fields
+
+            volScalarField k_;
+            volScalarField epsilon_;
+            volScalarField mut_;
+            volScalarField alphat_;
 
 
     // Private member functions
@@ -99,35 +105,29 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         LaunderSharmaKE
         (
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
-    // Destructor
-
-        ~LaunderSharmaKE(){}
+    //- Destructor
+    virtual ~LaunderSharmaKE()
+    {}
 
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", alphak_*mut_ + mu())
+                new volScalarField("DkEff", mut_/sigmak_ + mu())
             );
         }
 
@@ -136,45 +136,51 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*mut_ + mu())
+                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
             );
         }
 
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> mut() const
+        {
+            return mut_;
+        }
+
         //- Return the effective turbulent thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphat_ + alpha())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/Make/files b/src/turbulenceModels/compressible/RAS/Make/files
new file mode 100644
index 000000000..499d38041
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/Make/files
@@ -0,0 +1,48 @@
+/* RAS turbulence models */
+RASModel/RASModel.C
+laminar/laminar.C
+kEpsilon/kEpsilon.C
+RNGkEpsilon/RNGkEpsilon.C
+LaunderSharmaKE/LaunderSharmaKE.C
+LRR/LRR.C
+LaunderGibsonRSTM/LaunderGibsonRSTM.C
+realizableKE/realizableKE.C
+SpalartAllmaras/SpalartAllmaras.C
+kOmegaSST/kOmegaSST.C
+kOmegaSST_LowRe/kOmegaSST_LowRe.C
+
+/* Wall functions */
+wallFunctions = derivedFvPatchFields/wallFunctions
+
+alphatWallFunctions = $(wallFunctions)/alphatWallFunctions
+$(alphatWallFunctions)/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
+
+mutWallFunctions = $(wallFunctions)/mutWallFunctions
+$(mutWallFunctions)/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutWallFunction/mutWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+$(mutWallFunctions)/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.C
+
+epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions
+$(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+
+omegaWallFunctions = $(wallFunctions)/omegaWallFunctions
+$(omegaWallFunctions)/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+
+kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
+$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
+
+/* Patch fields */
+derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
+derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+
+backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
+
+LIB = $(FOAM_LIBBIN)/libcompressibleRASModels
diff --git a/src/turbulenceModels/compressible/RAS/Make/options b/src/turbulenceModels/compressible/RAS/Make/options
new file mode 100644
index 000000000..b2b75c899
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/Make/options
@@ -0,0 +1,12 @@
+EXE_INC = \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+
+LIB_LIBS = \
+    -lcompressibleTurbulenceModel \
+    -lfiniteVolume \
+    -lbasicThermophysicalModels \
+    -lspecie \
+    -lmeshTools
diff --git a/src/turbulenceModels/RAS/compressible/RASModel/RASModel.C b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
similarity index 60%
rename from src/turbulenceModels/RAS/compressible/RASModel/RASModel.C
rename to src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
index b36d9053e..346b2ea7f 100644
--- a/src/turbulenceModels/RAS/compressible/RASModel/RASModel.C
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.C
@@ -25,9 +25,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "RASModel.H"
-#include "wallDist.H"
 #include "wallFvPatch.H"
-#include "fixedValueFvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -40,6 +39,7 @@ namespace compressible
 
 defineTypeNameAndDebug(RASModel, 0);
 defineRunTimeSelectionTable(RASModel, dictionary);
+addToRunTimeSelectionTable(turbulenceModel, RASModel, turbulenceModel);
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
@@ -60,9 +60,11 @@ RASModel::RASModel
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
+    turbulenceModel(rho, U, phi, thermophysicalModel),
+
     IOdictionary
     (
         IOobject
@@ -75,50 +77,84 @@ RASModel::RASModel
         )
     ),
 
-    runTime_(U.time()),
-    mesh_(U.mesh()),
-
-    rho_(rho),
-    U_(U),
-    phi_(phi),
-    thermophysicalModel_(thermophysicalModel),
-
     turbulence_(lookup("turbulence")),
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subDict(type + "Coeffs")),
-
-    kappa_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "kappa",
-            subDict("wallFunctionCoeffs"),
-            0.4187
-        )
-    ),
-    E_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "E",
-            subDict("wallFunctionCoeffs"),
-            9.0
-        )
-    ),
-
-    yPlusLam_(yPlusLam(kappa_.value(), E_.value())),
+    coeffDict_(subOrEmptyDict(type + "Coeffs")),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
-    epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL),
+    epsilon0_("epsilon0", k0_.dimensions()/dimTime, SMALL),
     epsilonSmall_("epsilonSmall", epsilon0_.dimensions(), SMALL),
+    omega0_("omega0", dimless/dimTime, SMALL),
+    omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
 
     y_(mesh_)
-{}
+{
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * * //
+
+autoPtr<RASModel> RASModel::New
+(
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const basicThermo& thermophysicalModel
+)
+{
+    word modelName;
+
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
+    {
+        IOdictionary dict
+        (
+            IOobject
+            (
+                "RASProperties",
+                U.time().constant(),
+                U.db(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        dict.lookup("RASModel") >> modelName;
+    }
+
+    Info<< "Selecting RAS turbulence model " << modelName << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(modelName);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "RASModel::New(const volScalarField&, "
+            "const volVectorField&, const surfaceScalarField&, "
+            "basicThermo&)"
+        )   << "Unknown RASModel type " << modelName
+            << endl << endl
+            << "Valid RASModel types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<RASModel>
+    (
+        cstrIter()(rho, U, phi, thermophysicalModel)
+    );
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-scalar RASModel::yPlusLam(const scalar kappa, const scalar E)
+scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const
 {
     scalar ypl = 11.0;
 
@@ -131,17 +167,15 @@ scalar RASModel::yPlusLam(const scalar kappa, const scalar E)
 }
 
 
-tmp<scalarField> RASModel::yPlus(const label patchNo) const
+tmp<scalarField> RASModel::yPlus(const label patchNo, const scalar Cmu) const
 {
     const fvPatch& curPatch = mesh_.boundary()[patchNo];
 
     tmp<scalarField> tYp(new scalarField(curPatch.size()));
     scalarField& Yp = tYp();
 
-    if (typeid(curPatch) == typeid(wallFvPatch))
+    if (isA<wallFvPatch>(curPatch))
     {
-        scalar Cmu(readScalar(coeffDict_.lookup("Cmu")));
-
         Yp = pow(Cmu, 0.25)
             *y_[patchNo]
             *sqrt(k()().boundaryField()[patchNo].patchInternalField())
@@ -155,8 +189,8 @@ tmp<scalarField> RASModel::yPlus(const label patchNo) const
         WarningIn
         (
             "tmp<scalarField> RASModel::yPlus(const label patchNo) const"
-        )   << "Patch " << patchNo << " is not a wall.  Returning blank field"
-            << endl;
+        )   << "Patch " << patchNo << " is not a wall. Returning null field"
+            << nl << endl;
 
         Yp.setSize(0);
     }
@@ -179,16 +213,17 @@ bool RASModel::read()
     if (regIOobject::read())
     {
         lookup("turbulence") >> turbulence_;
-        coeffDict_ = subDict(type() + "Coeffs");
 
-        kappa_.readIfPresent(subDict("wallFunctionCoeffs"));
-        E_.readIfPresent(subDict("wallFunctionCoeffs"));
-
-        yPlusLam_ = yPlusLam(kappa_.value(), E_.value());
+        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
+        {
+            coeffDict_ <<= *dictPtr;
+        }
 
         k0_.readIfPresent(*this);
         epsilon0_.readIfPresent(*this);
         epsilonSmall_.readIfPresent(*this);
+        omega0_.readIfPresent(*this);
+        omegaSmall_.readIfPresent(*this);
 
         return true;
     }
diff --git a/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
similarity index 77%
rename from src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
rename to src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
index 5f678e5fe..55cddda70 100644
--- a/src/turbulenceModels/RAS/compressible/RASModel/RASModel.H
+++ b/src/turbulenceModels/compressible/RAS/RASModel/RASModel.H
@@ -45,6 +45,7 @@ SourceFiles
 #ifndef compressibleRASModel_H
 #define compressibleRASModel_H
 
+#include "compressible/turbulenceModel/turbulenceModel.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "nearWallDist.H"
@@ -71,6 +72,7 @@ namespace compressible
 
 class RASModel
 :
+    public turbulenceModel,
     public IOdictionary
 {
 
@@ -78,29 +80,34 @@ protected:
 
     // Protected data
 
-        const Time& runTime_;
-        const fvMesh& mesh_;
-
-        const volScalarField& rho_;
-        const volVectorField& U_;
-        const surfaceScalarField& phi_;
-
-        basicThermo& thermophysicalModel_;
-
+        //- Turbulence on/off flag
         Switch turbulence_;
+
+        //- Flag to print the model coeffs at run-time
         Switch printCoeffs_;
+
+        //- Model coefficients dictionary
         dictionary coeffDict_;
 
-        dimensionedScalar kappa_;
-        dimensionedScalar E_;
-
-        scalar yPlusLam(const scalar kappa, const scalar E);
+        //- Value of y+ at the edge of the laminar sublayer
         scalar yPlusLam_;
 
+        //- Lower limit of k
         dimensionedScalar k0_;
+
+        //- Lower limit of epsilon
         dimensionedScalar epsilon0_;
+
+        //- Small epsilon value used to avoid divide by zero
         dimensionedScalar epsilonSmall_;
 
+        //- Lower limit for omega
+        dimensionedScalar omega0_;
+
+        //- Small omega value used to avoid divide by zero
+        dimensionedScalar omegaSmall_;
+
+        //- Near wall distance boundary field
         nearWallDist y_;
 
 
@@ -109,12 +116,6 @@ protected:
         //- Print model coefficients
         virtual void printCoeffs();
 
-        //- Return the laminar thermal conductivity
-        const volScalarField& alpha() const
-        {
-            return thermophysicalModel_.alpha();
-        }
-
 
 private:
 
@@ -144,7 +145,7 @@ public:
                 const volScalarField& rho,
                 const volVectorField& U,
                 const surfaceScalarField& phi,
-                basicThermo& thermoPhysicalModel
+                const basicThermo& thermoPhysicalModel
             ),
             (rho, U, phi, thermoPhysicalModel)
         );
@@ -159,7 +160,7 @@ public:
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermoPhysicalModel
+            const basicThermo& thermoPhysicalModel
         );
 
 
@@ -171,14 +172,13 @@ public:
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermoPhysicalModel
+            const basicThermo& thermoPhysicalModel
         );
 
 
-    // Destructor
-
-        virtual ~RASModel()
-        {}
+    //- Destructor
+    virtual ~RASModel()
+    {}
 
 
     // Member Functions
@@ -205,6 +205,19 @@ public:
                 return epsilonSmall_;
             }
 
+            //- Return the value of omega0 which epsilon is not allowed to be
+            //  less than
+            const dimensionedScalar& omega0() const
+            {
+                return omega0_;
+            }
+
+            //- Return the value of omegaSmall which is added to epsilon when
+            //  calculating nut
+            const dimensionedScalar& omegaSmall() const
+            {
+                return omegaSmall_;
+            }
 
             //- Allow k0 to be changed
             dimensionedScalar& k0()
@@ -224,26 +237,27 @@ public:
                 return epsilonSmall_;
             }
 
-
-            //- Return kappa for use in wall-functions
-            dimensionedScalar kappa() const
+            //- Allow omega0 to be changed
+            dimensionedScalar& omega0()
             {
-                return kappa_;
+                return omega0_;
             }
 
-            //- Return E for use in wall-functions
-            dimensionedScalar E() const
+            //- Allow omegaSmall to be changed
+            dimensionedScalar& omegaSmall()
             {
-                return E_;
+                return omegaSmall_;
             }
 
-            //- Return y+ at the edge of the laminar sublayer
-            //  for use in wall-functions
-            scalar yPlusLam() const
+            //- Return the near wall distances
+            const nearWallDist& y() const
             {
-                return yPlusLam_;
+                return y_;
             }
 
+            //- Calculate y+ at the edge of the laminar sublayer
+            scalar yPlusLam(const scalar kappa, const scalar E) const;
+
             //- Const access to the coefficients dictionary
             const dictionary& coeffDict() const
             {
@@ -251,12 +265,6 @@ public:
             }
 
 
-        //- Return the laminar viscosity
-        const volScalarField& mu() const
-        {
-            return thermophysicalModel_.mu();
-        }
-
         //- Return the turbulence viscosity
         virtual tmp<volScalarField> mut() const = 0;
 
@@ -288,12 +296,16 @@ public:
         virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const = 0;
 
         //- Return yPlus for the given patch
-        virtual tmp<scalarField> yPlus(const label patchI) const;
+        virtual tmp<scalarField> yPlus
+        (
+            const label patchI,
+            const scalar Cmu
+        ) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct() = 0;
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read() = 0;
 };
 
diff --git a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
similarity index 79%
rename from src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C
rename to src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 310b3e2d1..7d9f09a65 100644
--- a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -26,7 +26,8 @@ License
 
 #include "RNGkEpsilon.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,13 +45,12 @@ addToRunTimeSelectionTable(RASModel, RNGkEpsilon, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 RNGkEpsilon::RNGkEpsilon
 (
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),
@@ -91,29 +91,29 @@ RNGkEpsilon::RNGkEpsilon
             -0.33
         )
     ),
-    alphak_
+    sigmak_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphak",
+            "sigmak",
             coeffDict_,
-            1.39
+            0.71942
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            1.39
+            0.71942
         )
     ),
-    alphah_
+    Prt_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphah",
+            "Prt",
             coeffDict_,
             1.0
         )
@@ -144,12 +144,11 @@ RNGkEpsilon::RNGkEpsilon
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -157,12 +156,11 @@ RNGkEpsilon::RNGkEpsilon
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
-
     mut_
     (
         IOobject
@@ -171,12 +169,28 @@ RNGkEpsilon::RNGkEpsilon
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::AUTO_WRITE
         ),
-        Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
+        autoCreateMut("mut", mesh_)
+    ),
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
     )
 {
-#   include "wallViscosityI.H"
+    mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_.correctBoundaryConditions();
+
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 
     printCoeffs();
 }
@@ -238,15 +252,15 @@ bool RNGkEpsilon::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        C3_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
-        eta0_.readIfPresent(coeffDict_);
-        beta_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        C3_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
+        eta0_.readIfPresent(coeffDict());
+        beta_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -263,6 +277,12 @@ void RNGkEpsilon::correct()
     {
         // Re-calculate viscosity
         mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+        mut_.correctBoundaryConditions();
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
+
         return;
     }
 
@@ -279,7 +299,7 @@ void RNGkEpsilon::correct()
     volScalarField S2 = (tgradU() && dev(twoSymm(tgradU())));
     tgradU.clear();
 
-    volScalarField G = mut_*S2;
+    volScalarField G("RASModel::G", mut_*S2);
 
     volScalarField eta = sqrt(mag(S2))*k_/epsilon_;
     volScalarField eta3 = eta*sqr(eta);
@@ -287,7 +307,8 @@ void RNGkEpsilon::correct()
     volScalarField R =
         ((eta*(-eta/eta0_ + scalar(1)))/(beta_*eta3 + scalar(1)));
 
-#   include "wallFunctionsI.H"
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
@@ -303,7 +324,7 @@ void RNGkEpsilon::correct()
 
     epsEqn().relax();
 
-#   include "wallDissipationI.H"
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
@@ -328,9 +349,11 @@ void RNGkEpsilon::correct()
 
     // Re-calculate viscosity
     mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
+    mut_.correctBoundaryConditions();
 
-#   include "wallViscosityI.H"
-
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
similarity index 73%
rename from src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
rename to src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
index 3d70d5f5f..bd996faea 100644
--- a/src/turbulenceModels/RAS/compressible/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/compressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -36,9 +36,9 @@ Description
             C1          1.42;
             C2          1.68;
             C3          -0.33;  // only for compressible
-            alphah      1.0;    // only for compressible
-            alphak      1.39;
-            alphaEps    1.39;
+            Prt         1.0;    // only for compressible
+            sigmak      0.71942;
+            sigmaEps    0.71942;
             eta0        4.38;
             beta        0.012;
         }
@@ -74,19 +74,24 @@ class RNGkEpsilon
 {
     // Private data
 
-        dimensionedScalar Cmu_;
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar C3_;
-        dimensionedScalar alphak_;
-        dimensionedScalar alphaEps_;
-        dimensionedScalar alphah_;
-        dimensionedScalar eta0_;
-        dimensionedScalar beta_;
+        // Model coefficients
 
-        volScalarField k_;
-        volScalarField epsilon_;
-        volScalarField mut_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar C3_;
+            dimensionedScalar sigmak_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar Prt_;
+            dimensionedScalar eta0_;
+            dimensionedScalar beta_;
+
+        // Fields
+
+            volScalarField k_;
+            volScalarField epsilon_;
+            volScalarField mut_;
+            volScalarField alphat_;
 
 
 public:
@@ -96,35 +101,29 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         RNGkEpsilon
         (
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
-    // Destructor
-
-        ~RNGkEpsilon(){}
+    //- Destructor
+    virtual ~RNGkEpsilon()
+    {}
 
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", alphak_*mut_ + mu())
+                new volScalarField("DkEff", mut_/sigmak_ + mu())
             );
         }
 
@@ -133,45 +132,51 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*mut_ + mu())
+                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
             );
         }
 
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> mut() const
+        {
+            return mut_;
+        }
+
         //- Return the effective turbulent thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphat_ + alpha())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
similarity index 82%
rename from src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C
rename to src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index 16b1eb94c..95a869049 100644
--- a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -26,7 +26,8 @@ License
 
 #include "SpalartAllmaras.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallDist.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,8 +64,7 @@ tmp<volScalarField> SpalartAllmaras::fv2
     const volScalarField& fv1
 ) const
 {
-    return 1.0 - chi/(1.0 + chi*fv1);
-    //return 1.0/pow3(scalar(1) + chi/Cv2);
+    return 1.0/pow3(scalar(1) + chi/Cv2_);
 }
 
 
@@ -110,25 +110,34 @@ SpalartAllmaras::SpalartAllmaras
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),
 
-    alphaNut_
+    sigmaNut_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaNut",
+            "sigmaNut",
             coeffDict_,
-            1.5
+            0.66666
         )
     ),
-    alphah_
+    kappa_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphah",
+            "kappa",
+            coeffDict_,
+            0.41
+        )
+    ),
+    Prt_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Prt",
             coeffDict_,
             1.0
         )
@@ -152,7 +161,7 @@ SpalartAllmaras::SpalartAllmaras
             0.622
         )
     ),
-    Cw1_(Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_)),
+    Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
     Cw2_
     (
         dimensioned<scalar>::lookupOrAddToDict
@@ -216,8 +225,24 @@ SpalartAllmaras::SpalartAllmaras
         mesh_
     ),
 
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
+    ),
+
     d_(mesh_)
 {
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -280,16 +305,17 @@ bool SpalartAllmaras::read()
 {
     if (RASModel::read())
     {
-        alphaNut_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
+        sigmaNut_.readIfPresent(coeffDict());
+        kappa_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
 
-        Cb1_.readIfPresent(coeffDict_);
-        Cb2_.readIfPresent(coeffDict_);
-        Cw1_ = Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_);
-        Cw2_.readIfPresent(coeffDict_);
-        Cw3_.readIfPresent(coeffDict_);
-        Cv1_.readIfPresent(coeffDict_);
-        Cv2_.readIfPresent(coeffDict_);
+        Cb1_.readIfPresent(coeffDict());
+        Cb2_.readIfPresent(coeffDict());
+        Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
+        Cw2_.readIfPresent(coeffDict());
+        Cw3_.readIfPresent(coeffDict());
+        Cv1_.readIfPresent(coeffDict());
+        Cv2_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -306,6 +332,12 @@ void SpalartAllmaras::correct()
     {
         // Re-calculate viscosity
         mut_ = rho_*nuTilda_*fv1(chi());
+        mut_.correctBoundaryConditions();
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
+
         return;
     }
 
@@ -328,7 +360,7 @@ void SpalartAllmaras::correct()
         fvm::ddt(rho_, nuTilda_)
       + fvm::div(phi_, nuTilda_)
       - fvm::laplacian(DnuTildaEff(), nuTilda_)
-      - alphaNut_*Cb2_*rho_*magSqr(fvc::grad(nuTilda_))
+      - Cb2_/sigmaNut_*rho_*magSqr(fvc::grad(nuTilda_))
      ==
         Cb1_*rho_*Stilda*nuTilda_
       - fvm::Sp(Cw1_*fw(Stilda)*nuTilda_*rho_/sqr(d_), nuTilda_)
@@ -339,8 +371,13 @@ void SpalartAllmaras::correct()
     bound(nuTilda_, dimensionedScalar("0", nuTilda_.dimensions(), 0.0));
     nuTilda_.correctBoundaryConditions();
 
+    // Re-calculate viscosity
     mut_.internalField() = fv1*nuTilda_.internalField()*rho_.internalField();
     mut_.correctBoundaryConditions();
+
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
similarity index 78%
rename from src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
rename to src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index faa25eb5a..e1b3b3989 100644
--- a/src/turbulenceModels/RAS/compressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -54,8 +54,9 @@ Description
             Cw3         2.0;
             Cv1         7.1;
             Cv2         5.0;
-            alphaNut    1.5;
-            alphah      1.0;    // only for compressible
+            sigmaNut    0.66666;
+            Prt         1.0;    // only for compressible
+            kappa       0.41;
         }
     @endverbatim
 
@@ -81,7 +82,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class SpalartAllmaras Declaration
+                      Class SpalartAllmaras Declaration
 \*---------------------------------------------------------------------------*/
 
 class SpalartAllmaras
@@ -90,20 +91,29 @@ class SpalartAllmaras
 {
     // Private data
 
-        dimensionedScalar alphaNut_;
-        dimensionedScalar alphah_;
+        // Model coefficients
 
-        dimensionedScalar Cb1_;
-        dimensionedScalar Cb2_;
-        dimensionedScalar Cw1_;
-        dimensionedScalar Cw2_;
-        dimensionedScalar Cw3_;
-        dimensionedScalar Cv1_;
-        dimensionedScalar Cv2_;
+            dimensionedScalar sigmaNut_;
+            dimensionedScalar kappa_;
+            dimensionedScalar Prt_;
 
-        volScalarField nuTilda_;
-        volScalarField mut_;
+            dimensionedScalar Cb1_;
+            dimensionedScalar Cb2_;
+            dimensionedScalar Cw1_;
+            dimensionedScalar Cw2_;
+            dimensionedScalar Cw3_;
+            dimensionedScalar Cv1_;
+            dimensionedScalar Cv2_;
 
+
+        // Fields
+
+            volScalarField nuTilda_;
+            volScalarField mut_;
+            volScalarField alphat_;
+
+
+        //- Wall distance
         wallDist d_;
 
 
@@ -132,30 +142,23 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         SpalartAllmaras
         (
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
-    // Destructor
-
-        ~SpalartAllmaras()
-        {}
+    //- Destructor
+    virtual ~SpalartAllmaras()
+    {}
 
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
         //- Return the effective diffusivity for nuTilda
         tmp<volScalarField> DnuTildaEff() const
         {
@@ -164,21 +167,28 @@ public:
                 new volScalarField
                 (
                     "DnuTildaEff",
-                    alphaNut_*rho_*nuTilda_ + mu()
+                    rho_*nuTilda_/sigmaNut_ + mu()
                 )
             );
         }
-	      //- Return the effective turbulent thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> mut() const
+        {
+            return mut_;
+        }
+
+        //- Return the effective turbulent thermal diffusivity
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphat_ + alpha())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return tmp<volScalarField>
             (
@@ -197,7 +207,7 @@ public:
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return tmp<volScalarField>
             (
@@ -216,19 +226,19 @@ public:
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
new file mode 100644
index 000000000..40fcb14a1
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
@@ -0,0 +1,357 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "backwardsCompatibilityWallFunctions.H"
+
+#include "calculatedFvPatchField.H"
+#include "alphatWallFunctionFvPatchScalarField.H"
+#include "mutWallFunctionFvPatchScalarField.H"
+#include "mutLowReWallFunctionFvPatchScalarField.H"
+#include "epsilonWallFunctionFvPatchScalarField.H"
+#include "kqRWallFunctionFvPatchField.H"
+#include "omegaWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+tmp<volScalarField> autoCreateAlphat
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    IOobject alphatHeader
+    (
+        fieldName,
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (alphatHeader.headerOk())
+    {
+        return tmp<volScalarField>(new volScalarField(alphatHeader, mesh));
+    }
+    else
+    {
+        Info<< "--> Creating " << fieldName
+            << " to employ run-time selectable wall functions" << endl;
+
+        const fvBoundaryMesh& bm = mesh.boundary();
+
+        wordList alphatBoundaryTypes(bm.size());
+
+        forAll(bm, patchI)
+        {
+            if (isA<wallFvPatch>(bm[patchI]))
+            {
+                alphatBoundaryTypes[patchI] =
+                    RASModels::alphatWallFunctionFvPatchScalarField::typeName;
+            }
+            else
+            {
+                alphatBoundaryTypes[patchI] =
+                    calculatedFvPatchField<scalar>::typeName;
+            }
+        }
+
+        tmp<volScalarField> alphat
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh,
+                dimensionedScalar("zero", dimDensity*dimArea/dimTime, 0.0),
+                alphatBoundaryTypes
+            )
+        );
+
+        Info<< "    Writing new " << fieldName << endl;
+        alphat().write();
+
+        return alphat;
+    }
+}
+
+
+tmp<volScalarField> autoCreateMut
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    IOobject mutHeader
+    (
+        fieldName,
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (mutHeader.headerOk())
+    {
+        return tmp<volScalarField>(new volScalarField(mutHeader, mesh));
+    }
+    else
+    {
+        Info<< "--> Creating " << fieldName
+            << " to employ run-time selectable wall functions" << endl;
+
+        const fvBoundaryMesh& bm = mesh.boundary();
+
+        wordList mutBoundaryTypes(bm.size());
+
+        forAll(bm, patchI)
+        {
+            if (isA<wallFvPatch>(bm[patchI]))
+            {
+                mutBoundaryTypes[patchI] =
+                    RASModels::mutWallFunctionFvPatchScalarField::typeName;
+            }
+            else
+            {
+                mutBoundaryTypes[patchI] =
+                    calculatedFvPatchField<scalar>::typeName;
+            }
+        }
+
+        tmp<volScalarField> mut
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh,
+                dimensionedScalar("zero", dimDensity*dimArea/dimTime, 0.0),
+                mutBoundaryTypes
+            )
+        );
+
+        Info<< "    Writing new " << fieldName << endl;
+        mut().write();
+
+        return mut;
+    }
+}
+
+
+tmp<volScalarField> autoCreateLowReMut
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    IOobject mutHeader
+    (
+        fieldName,
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (mutHeader.headerOk())
+    {
+        return tmp<volScalarField>(new volScalarField(mutHeader, mesh));
+    }
+    else
+    {
+        Info<< "--> Creating " << fieldName
+            << " to employ run-time selectable wall functions" << endl;
+
+        const fvBoundaryMesh& bm = mesh.boundary();
+
+        wordList mutBoundaryTypes(bm.size());
+
+        forAll(bm, patchI)
+        {
+            if (isA<wallFvPatch>(bm[patchI]))
+            {
+                mutBoundaryTypes[patchI] =
+                    RASModels::mutLowReWallFunctionFvPatchScalarField::typeName;
+            }
+            else
+            {
+                mutBoundaryTypes[patchI] =
+                    calculatedFvPatchField<scalar>::typeName;
+            }
+        }
+
+        tmp<volScalarField> mut
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh,
+                dimensionedScalar("zero", dimDensity*dimArea/dimTime, 0.0),
+                mutBoundaryTypes
+            )
+        );
+
+        Info<< "    Writing new " << fieldName << endl;
+        mut().write();
+
+        return mut;
+    }
+}
+
+
+tmp<volScalarField> autoCreateEpsilon
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    return
+        autoCreateWallFunctionField
+        <
+            scalar,
+            RASModels::epsilonWallFunctionFvPatchScalarField
+        >
+        (
+            fieldName,
+            mesh
+        );
+}
+
+
+tmp<volScalarField> autoCreateOmega
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    return
+        autoCreateWallFunctionField
+        <
+            scalar,
+            RASModels::omegaWallFunctionFvPatchScalarField
+        >
+        (
+            fieldName,
+            mesh
+        );
+}
+
+
+tmp<volScalarField> autoCreateK
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    return
+        autoCreateWallFunctionField
+        <
+            scalar,
+            RASModels::kqRWallFunctionFvPatchField<scalar>
+        >
+        (
+            fieldName,
+            mesh
+        );
+}
+
+
+tmp<volScalarField> autoCreateQ
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    return
+        autoCreateWallFunctionField
+        <
+            scalar,
+            RASModels::kqRWallFunctionFvPatchField<scalar>
+        >
+        (
+            fieldName,
+            mesh
+        );
+}
+
+
+tmp<volSymmTensorField> autoCreateR
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    return
+        autoCreateWallFunctionField
+        <
+            symmTensor,
+            RASModels::kqRWallFunctionFvPatchField<symmTensor>
+        >
+        (
+            fieldName,
+            mesh
+        );
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
+
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
new file mode 100644
index 000000000..db95e2daa
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible
+
+Description
+    Auto creation of fields to provide backwards compatibility with
+    runtime selectable wall functions
+
+SourceFiles
+    backwardsCompatibilityWallFunctions.C
+    backwardsCompatibilityWallFunctionsTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef backwardsCompatibilityWallFunctions_H
+#define backwardsCompatibilityWallFunctions_H
+
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+    //- mut
+    tmp<volScalarField> autoCreateMut
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- mut for Low-Reynolds number models
+    tmp<volScalarField> autoCreateLowReMut
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- alphat
+    tmp<volScalarField> autoCreateAlphat
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- epsilon
+    tmp<volScalarField> autoCreateEpsilon
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- omega
+    tmp<volScalarField> autoCreateOmega
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- k
+    tmp<volScalarField> autoCreateK
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- Q
+    tmp<volScalarField> autoCreateQ
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- R
+    tmp<volSymmTensorField> autoCreateR
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- Helper function to create the new field
+    template<class Type, class PatchType>
+    tmp<GeometricField<Type, fvPatchField, volMesh> >
+    autoCreateWallFunctionField
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "backwardsCompatibilityWallFunctionsTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
new file mode 100644
index 000000000..16ae23e37
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
@@ -0,0 +1,170 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "backwardsCompatibilityWallFunctions.H"
+#include "Time.H"
+#include "OSspecific.H"
+
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type, class PatchType>
+tmp<GeometricField<Type, fvPatchField, volMesh> >
+autoCreateWallFunctionField
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    IOobject mutHeader
+    (
+        "mut",
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ
+    );
+
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
+    if (mutHeader.headerOk())
+    {
+        return tmp<fieldType>
+        (
+            new fieldType
+            (
+                IOobject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh
+            )
+        );
+    }
+    else
+    {
+        Info<< "--> Upgrading " << fieldName
+            << " to employ run-time selectable wall functions" << endl;
+
+        // Read existing field
+        IOobject ioObj
+        (
+            fieldName,
+            mesh.time().timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        );
+
+        tmp<fieldType> fieldOrig
+        (
+            new fieldType
+            (
+                ioObj,
+                mesh
+            )
+        );
+
+        // rename file
+        Info<< "    Backup original " << fieldName << " to "
+            << fieldName << ".old" << endl;
+        mvBak(ioObj.objectPath(), "old");
+
+
+        PtrList<fvPatchField<Type> > newPatchFields(mesh.boundary().size());
+
+        forAll(newPatchFields, patchI)
+        {
+            if (isA<wallFvPatch>(mesh.boundary()[patchI]))
+            {
+                newPatchFields.set
+                (
+                    patchI,
+                    new PatchType
+                    (
+                        mesh.boundary()[patchI],
+                        fieldOrig().dimensionedInternalField()
+                    )
+                );
+                newPatchFields[patchI] == fieldOrig().boundaryField()[patchI];
+            }
+            else
+            {
+                newPatchFields.set
+                (
+                    patchI,
+                    fieldOrig().boundaryField()[patchI].clone()
+                );
+            }
+        }
+
+        tmp<fieldType> fieldNew
+        (
+            new fieldType
+            (
+                IOobject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh,
+                fieldOrig().dimensions(),
+                fieldOrig().internalField(),
+                newPatchFields
+            )
+        );
+
+        Info<< "    Writing updated " << fieldName << endl;
+        fieldNew().write();
+
+        return fieldNew;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
new file mode 100644
index 000000000..cc791bc88
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -0,0 +1,238 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentHeatFluxTemperatureFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "RASModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+template<>
+const char*
+NamedEnum<turbulentHeatFluxTemperatureFvPatchScalarField::heatSourceType, 2>::
+names[] =
+    {
+        "power",
+        "flux"
+    };
+
+const
+NamedEnum<turbulentHeatFluxTemperatureFvPatchScalarField::heatSourceType, 2>
+    turbulentHeatFluxTemperatureFvPatchScalarField::heatSourceTypeNames_;
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+turbulentHeatFluxTemperatureFvPatchScalarField::
+turbulentHeatFluxTemperatureFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedGradientFvPatchScalarField(p, iF),
+    heatSource_(hsPower),
+    q_(p.size(), 0.0)
+{}
+
+
+turbulentHeatFluxTemperatureFvPatchScalarField::
+turbulentHeatFluxTemperatureFvPatchScalarField
+(
+    const turbulentHeatFluxTemperatureFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedGradientFvPatchScalarField(ptf, p, iF, mapper),
+    heatSource_(ptf.heatSource_),
+    q_(ptf.q_, mapper)
+{}
+
+
+turbulentHeatFluxTemperatureFvPatchScalarField::
+turbulentHeatFluxTemperatureFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedGradientFvPatchScalarField(p, iF),
+    heatSource_(heatSourceTypeNames_.read(dict.lookup("heatSource"))),
+    q_("q", dict, p.size())
+{
+    fvPatchField<scalar>::operator=(patchInternalField());
+    gradient() = 0.0;
+}
+
+
+turbulentHeatFluxTemperatureFvPatchScalarField::
+turbulentHeatFluxTemperatureFvPatchScalarField
+(
+    const turbulentHeatFluxTemperatureFvPatchScalarField& thftpsf
+)
+:
+    fixedGradientFvPatchScalarField(thftpsf),
+    heatSource_(thftpsf.heatSource_),
+    q_(thftpsf.q_)
+{}
+
+
+turbulentHeatFluxTemperatureFvPatchScalarField::
+turbulentHeatFluxTemperatureFvPatchScalarField
+(
+    const turbulentHeatFluxTemperatureFvPatchScalarField& thftpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedGradientFvPatchScalarField(thftpsf, iF),
+    heatSource_(thftpsf.heatSource_),
+    q_(thftpsf.q_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void turbulentHeatFluxTemperatureFvPatchScalarField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    fixedGradientFvPatchScalarField::autoMap(m);
+    q_.autoMap(m);
+}
+
+
+void turbulentHeatFluxTemperatureFvPatchScalarField::rmap
+(
+    const fvPatchScalarField& ptf,
+    const labelList& addr
+)
+{
+    fixedGradientFvPatchScalarField::rmap(ptf, addr);
+
+    const turbulentHeatFluxTemperatureFvPatchScalarField& thftptf =
+        refCast<const turbulentHeatFluxTemperatureFvPatchScalarField>
+        (
+            ptf
+        );
+
+    q_.rmap(thftptf.q_, addr);
+}
+
+
+void turbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+
+    const scalarField alphaEffp = rasModel.alphaEff()().boundaryField()[patchI];
+
+//    const scalarField& Tp = thermo.T().boundaryField()[patchI];
+    const scalarField& Tp = *this;
+
+    const scalarField Cpp = rasModel.thermo().Cp(Tp, patchI);
+
+    switch (heatSource_)
+    {
+        case hsPower:
+        {
+            const scalar Ap = gSum(patch().magSf());
+            gradient() = q_/(Ap*Cpp*alphaEffp);
+            break;
+        }
+        case hsFlux:
+        {
+            gradient() = q_/(Cpp*alphaEffp);
+            break;
+        }
+        default:
+        {
+            FatalErrorIn
+            (
+                "turbulentHeatFluxTemperatureFvPatchScalarField"
+                "("
+                    "const fvPatch&, "
+                    "const DimensionedField<scalar, volMesh>&, "
+                    "const dictionary&"
+                ")"
+            )   << "Unknown heat source type. Valid types are: "
+                << heatSourceTypeNames_ << nl << exit(FatalError);
+        }
+    }
+
+    fixedGradientFvPatchScalarField::updateCoeffs();
+}
+
+
+void turbulentHeatFluxTemperatureFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchScalarField::write(os);
+    os.writeKeyword("heatSource") << heatSourceTypeNames_[heatSource_]
+        << token::END_STATEMENT << nl;
+    q_.writeEntry("q", os);
+    gradient().writeEntry("gradient", os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    turbulentHeatFluxTemperatureFvPatchScalarField
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+
+// ************************************************************************* //
+
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
new file mode 100644
index 000000000..18b9aacda
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
@@ -0,0 +1,195 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::turbulentHeatFluxTemperatureFvPatchScalarField
+
+Description
+    Fixed heat flux boundary condition for temperature.
+
+SourceFiles
+    turbulentHeatFluxTemperatureFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef turbulentHeatFluxTemperatureFvPatchScalarFields_H
+#define turbulentHeatFluxTemperatureFvPatchScalarFields_H
+
+#include "fvPatchFields.H"
+#include "fixedGradientFvPatchFields.H"
+#include "NamedEnum.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+/*---------------------------------------------------------------------------*\
+     Class turbulentHeatFluxTemperatureFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class turbulentHeatFluxTemperatureFvPatchScalarField
+:
+    public fixedGradientFvPatchScalarField
+{
+public:
+
+    // Data types
+
+        //- Enumeration listing the possible hest source input modes
+        enum heatSourceType
+        {
+            hsPower,
+            hsFlux
+        };
+
+
+private:
+
+    // Private data
+
+        //- Heat source type names
+        static const NamedEnum<heatSourceType, 2> heatSourceTypeNames_;
+
+        //- Heat source type
+        heatSourceType heatSource_;
+
+        //- Heat power [W] or flux [W/m2]
+        scalarField q_;
+
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::turbulentHeatFluxTemperature");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        turbulentHeatFluxTemperatureFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        turbulentHeatFluxTemperatureFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  turbulentHeatFluxTemperatureFvPatchScalarField onto
+        //  a new patch
+        turbulentHeatFluxTemperatureFvPatchScalarField
+        (
+            const turbulentHeatFluxTemperatureFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        turbulentHeatFluxTemperatureFvPatchScalarField
+        (
+            const turbulentHeatFluxTemperatureFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentHeatFluxTemperatureFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        turbulentHeatFluxTemperatureFvPatchScalarField
+        (
+            const turbulentHeatFluxTemperatureFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentHeatFluxTemperatureFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap(const fvPatchFieldMapper&);
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchScalarField&,
+                const labelList&
+            );
+
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
similarity index 92%
rename from src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index 6a4351aaa..bf3e8f7e4 100644
--- a/src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -35,6 +35,8 @@ License
 
 namespace Foam
 {
+namespace compressible
+{
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -106,16 +108,17 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
     }
 
     // Lookup Cmu corresponding to the turbulence model selected
-    const compressible::RASModel& RAS =
-        db().lookupObject<compressible::RASModel>("RASProperties");
-    scalar Cmu = readScalar(RAS.coeffDict().lookup("Cmu"));
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar Cmu75 = pow(Cmu, 0.75);
+    const scalar Cmu =
+        rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
 
-    const fvPatchField<scalar>& k =
+    const scalar Cmu75 = pow(Cmu, 0.75);
+
+    const fvPatchField<scalar>& kp =
         patch().lookupPatchField<volScalarField, scalar>("k");
 
-    operator==(Cmu75*k*sqrt(k)/mixingLength_);
+    operator==(Cmu75*kp*sqrt(kp)/mixingLength_);
 
     fixedValueFvPatchField<scalar>::updateCoeffs();
 }
@@ -144,6 +147,7 @@ makePatchTypeField
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace compressible
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
similarity index 91%
rename from src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
index 312433657..961410247 100644
--- a/src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
@@ -23,7 +23,8 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::turbulentMixingLengthDissipationRateInletFvPatchScalarField
+    Foam::compressible::
+        turbulentMixingLengthDissipationRateInletFvPatchScalarField
 
 Description
     Calculate epsilon via the mixing length [m]
@@ -32,7 +33,7 @@ Description
     @verbatim
         inlet
         {
-            type            turbulentMixingLengthDissipationRateInlet;
+            type            compressible::turbulentMixingLengthDissipationRateInlet;
             mixingLength    0.005;         // 5 mm
             value           uniform 200;   // placeholder
         }
@@ -43,8 +44,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef turbulentMixingLengthDissipationRateInletFvPatchScalarField_H
-#define turbulentMixingLengthDissipationRateInletFvPatchScalarField_H
+#ifndef compressibleturbulentMixingLengthDissipationRateInletFvPatchField_H
+#define compressibleturbulentMixingLengthDissipationRateInletFvPatchField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -52,6 +53,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace compressible
+{
 
 /*---------------------------------------------------------------------------*\
        Class turbulentMixingLengthDissipationRateInletFvPatch Declaration
@@ -69,7 +72,7 @@ class turbulentMixingLengthDissipationRateInletFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("turbulentMixingLengthDissipationRateInlet");
+    TypeName("compressible::turbulentMixingLengthDissipationRateInlet");
 
 
     // Constructors
@@ -154,6 +157,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace compressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
similarity index 93%
rename from src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index 74702e8fc..d15b8a055 100644
--- a/src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -35,6 +35,8 @@ License
 
 namespace Foam
 {
+namespace compressible
+{
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -47,7 +49,7 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
 :
     fixedValueFvPatchField<scalar>(p, iF),
     mixingLength_(0.0),
-    kName_("undefined-k")
+    kName_("k")
 {}
 
 turbulentMixingLengthFrequencyInletFvPatchScalarField::
@@ -74,7 +76,7 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
 :
     fixedValueFvPatchField<scalar>(p, iF, dict),
     mixingLength_(readScalar(dict.lookup("mixingLength"))),
-    kName_(dict.lookup("k"))
+    kName_(dict.lookupOrDefault<word>("k", "k"))
 {}
 
 turbulentMixingLengthFrequencyInletFvPatchScalarField::
@@ -111,11 +113,12 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
     }
 
     // Lookup Cmu corresponding to the turbulence model selected
-    const incompressible::RASModel& RAS =
-        db().lookupObject<incompressible::RASModel>("RASProperties");
-    scalar Cmu = readScalar(RAS.coeffDict().lookup("Cmu"));
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar Cmu25 = pow(Cmu, 0.25);
+    const scalar Cmu =
+        rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
+
+    const scalar Cmu25 = pow(Cmu, 0.25);
 
     const fvPatchField<scalar>& kp =
         patch().lookupPatchField<volScalarField, scalar>(kName_);
@@ -150,6 +153,7 @@ makePatchTypeField
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace compressible
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
similarity index 91%
rename from src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
index 8c7589447..d981ff5ad 100644
--- a/src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::turbulentMixingLengthFrequencyInletFvPatchScalarField
+    Foam::compressible::turbulentMixingLengthFrequencyInletFvPatchScalarField
 
 Description
     Calculate omega via the mixing length
@@ -32,7 +32,7 @@ Description
     @verbatim
         inlet
         {
-            type            turbulentMixingLengthFrequencyInlet;
+            type            compressible::turbulentMixingLengthFrequencyInlet;
             mixingLength    0.005;         // 5 mm
             k               k;             // turbulent k field
             value           uniform 5;     // initial value
@@ -44,8 +44,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef turbulentMixingLengthFrequencyInletFvPatchScalarField_H
-#define turbulentMixingLengthFrequencyInletFvPatchScalarField_H
+#ifndef compressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
+#define compressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -53,6 +53,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace compressible
+{
 
 /*---------------------------------------------------------------------------*\
     Class turbulentMixingLengthFrequencyInletFvPatchScalarField Declaration
@@ -74,7 +76,7 @@ class turbulentMixingLengthFrequencyInletFvPatchScalarField
 public:
 
     //- Runtime type information
-    TypeName("turbulentMixingLengthFrequencyInlet");
+    TypeName("compressible::turbulentMixingLengthFrequencyInlet");
 
 
     // Constructors
@@ -159,6 +161,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace compressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/IndirectList/IndirectListI.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
similarity index 65%
rename from applications/test/IndirectList/IndirectListI.H
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
index 420e8e2ff..5004edaee 100644
--- a/applications/test/IndirectList/IndirectListI.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.C
@@ -22,55 +22,47 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
+#include "regionProperties.H"
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-//- Construct given size
-template<class T>
-inline Foam::IndirectList<T>::IndirectList
-(
-    const Foam::UList<T>& completeList,
-    const Foam::List<label>& addresses
-)
+Foam::regionProperties::regionProperties(const Time& runTime)
 :
-    completeList_(completeList),
-    addresses_(addresses)
+    IOdictionary
+    (
+        IOobject
+        (
+            "regionProperties",
+            runTime.time().constant(),
+            runTime.db(),
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    ),
+    fluidRegionNames_(lookup("fluidRegionNames")),
+    solidRegionNames_(lookup("solidRegionNames"))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::regionProperties::~regionProperties()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-template<class T>
-inline Foam::label Foam::IndirectList<T>::size() const
+const Foam::List<Foam::word>& Foam::regionProperties::fluidRegionNames() const
 {
-    return addresses_.size();
+    return fluidRegionNames_;
 }
 
 
-template<class T>
-inline const Foam::UList<T>& Foam::IndirectList<T>::
-completeList() const
+const Foam::List<Foam::word>& Foam::regionProperties::solidRegionNames() const
 {
-    return completeList_;
-}
-
-
-template<class T>
-inline const Foam::List<Foam::label>& Foam::IndirectList<T>::addresses() const
-{
-    return addresses_;
-}
-
-
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-template<class T>
-inline const T& Foam::IndirectList<T>::operator[](const Foam::label i) const
-{
-    return completeList_[addresses_[i]];
+    return solidRegionNames_;
 }
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
new file mode 100644
index 000000000..c9213ed9a
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/regionProperties.H
@@ -0,0 +1,106 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    regionProperties
+
+Description
+    Simple class to hold region information for coupled region simulations
+
+SourceFiles
+    regionProperties.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef regionProperties_H
+#define regionProperties_H
+
+#include "IOdictionary.H"
+#include "Time.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class regionProperties Declaration
+\*---------------------------------------------------------------------------*/
+
+class regionProperties
+:
+    public IOdictionary
+{
+    // Private data
+
+        //- List of the fluid region names
+        List<word> fluidRegionNames_;
+
+        //- List of the solid region names
+        List<word> solidRegionNames_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        regionProperties(const regionProperties&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const regionProperties&);
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        regionProperties(const Time& runTime);
+
+
+    // Destructor
+
+        ~regionProperties();
+
+
+    // Member Functions
+
+        // Access
+
+            //- Return const reference to the list of fluid region names
+            const List<word>& fluidRegionNames() const;
+
+            //- Return const reference to the list of solid region names
+            const List<word>& solidRegionNames() const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
new file mode 100644
index 000000000..f00287f4f
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.C
@@ -0,0 +1,375 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentTemperatureCoupledBaffleFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "directMappedPatchBase.H"
+#include "regionProperties.H"
+#include "basicThermo.H"
+#include "RASModel.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+bool Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::interfaceOwner
+(
+    const polyMesh& nbrRegion,
+    const polyPatch& nbrPatch
+) const
+{
+    const fvMesh& myRegion = patch().boundaryMesh().mesh();
+
+    if (nbrRegion.name() == myRegion.name())
+    {
+        return patch().index() < nbrPatch.index();
+    }
+    else
+    {
+        const regionProperties& props =
+            myRegion.objectRegistry::parent().lookupObject<regionProperties>
+            (
+                "regionProperties"
+            );
+
+        label myIndex = findIndex(props.fluidRegionNames(), myRegion.name());
+        if (myIndex == -1)
+        {
+            label i = findIndex(props.solidRegionNames(), myRegion.name());
+
+            if (i == -1)
+            {
+                FatalErrorIn
+                (
+                    "turbulentTemperatureCoupledBaffleFvPatchScalarField"
+                    "::interfaceOwner(const polyMesh&"
+                    ", const polyPatch&)const"
+                )   << "Cannot find region " << myRegion.name()
+                    << " neither in fluids " << props.fluidRegionNames()
+                    << " nor in solids " << props.solidRegionNames()
+                    << exit(FatalError);
+            }
+            myIndex = props.fluidRegionNames().size() + i;
+        }
+        label nbrIndex = findIndex
+        (
+            props.fluidRegionNames(),
+            nbrRegion.name()
+        );
+        if (nbrIndex == -1)
+        {
+            label i = findIndex(props.solidRegionNames(), nbrRegion.name());
+
+            if (i == -1)
+            {
+                FatalErrorIn
+                (
+                    "coupleManager::interfaceOwner"
+                    "(const polyMesh&, const polyPatch&) const"
+                )   << "Cannot find region " << nbrRegion.name()
+                    << " neither in fluids " << props.fluidRegionNames()
+                    << " nor in solids " << props.solidRegionNames()
+                    << exit(FatalError);
+            }
+            nbrIndex = props.fluidRegionNames().size() + i;
+        }
+
+        return myIndex < nbrIndex;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::
+turbulentTemperatureCoupledBaffleFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    neighbourFieldName_("undefined-neighbourFieldName"),
+    KName_("undefined-K")
+{}
+
+
+Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::
+turbulentTemperatureCoupledBaffleFvPatchScalarField
+(
+    const turbulentTemperatureCoupledBaffleFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    neighbourFieldName_(ptf.neighbourFieldName_),
+    KName_(ptf.KName_)
+{}
+
+
+Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::
+turbulentTemperatureCoupledBaffleFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    neighbourFieldName_(dict.lookup("neighbourFieldName")),
+    KName_(dict.lookup("K"))
+{
+    if (!isA<directMappedPatchBase>(this->patch().patch()))
+    {
+        FatalErrorIn
+        (
+            "turbulentTemperatureCoupledBaffleFvPatchScalarField::"
+            "turbulentTemperatureCoupledBaffleFvPatchScalarField\n"
+            "(\n"
+            "    const fvPatch& p,\n"
+            "    const DimensionedField<scalar, volMesh>& iF,\n"
+            "    const dictionary& dict\n"
+            ")\n"
+        )   << "\n    patch type '" << p.type()
+            << "' not type '" << directMappedPatchBase::typeName << "'"
+            << "\n    for patch " << p.name()
+            << " of field " << dimensionedInternalField().name()
+            << " in file " << dimensionedInternalField().objectPath()
+            << exit(FatalError);
+    }
+}
+
+
+Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::
+turbulentTemperatureCoupledBaffleFvPatchScalarField
+(
+    const turbulentTemperatureCoupledBaffleFvPatchScalarField& wtcsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(wtcsf, iF),
+    neighbourFieldName_(wtcsf.neighbourFieldName_),
+    KName_(wtcsf.KName_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::tmp<Foam::scalarField>
+Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const
+{
+    const fvMesh& mesh = patch().boundaryMesh().mesh();
+
+    if (KName_ == "none")
+    {
+        const compressible::RASModel& model =
+            db().lookupObject<compressible::RASModel>("RASProperties");
+
+        tmp<volScalarField> talpha = model.alphaEff();
+
+        const basicThermo& thermo =
+            db().lookupObject<basicThermo>("thermophysicalProperties");
+
+        return
+            talpha().boundaryField()[patch().index()]
+           *thermo.Cp()().boundaryField()[patch().index()];
+    }
+    else if (mesh.objectRegistry::foundObject<volScalarField>(KName_))
+    {
+        return patch().lookupPatchField<volScalarField, scalar>(KName_);
+    }
+    else if (mesh.objectRegistry::foundObject<volSymmTensorField>(KName_))
+    {
+        const symmTensorField& KWall =
+            patch().lookupPatchField<volSymmTensorField, scalar>(KName_);
+
+        vectorField n = patch().nf();
+
+        return n & KWall & n;
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "turbulentTemperatureCoupledBaffleFvPatchScalarField::K() const"
+        )   << "Did not find field " << KName_
+            << " on mesh " << mesh.name() << " patch " << patch().name()
+            << endl
+            << "Please set 'K' to 'none', a valid volScalarField"
+            << " or a valid volSymmTensorField." << exit(FatalError);
+
+        return scalarField(0);
+    }
+}
+
+
+void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Get the coupling information from the directMappedPatchBase
+    const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
+    (
+        patch().patch()
+    );
+    const polyMesh& nbrMesh = mpp.sampleMesh();
+    const fvPatch& nbrPatch = refCast<const fvMesh>
+    (
+        nbrMesh
+    ).boundary()[mpp.samplePolyPatch().index()];
+
+    // Force recalculation of mapping and schedule
+    const mapDistribute& distMap = mpp.map();
+    (void)distMap.schedule();
+
+    tmp<scalarField> intFld = patchInternalField();
+
+    if (interfaceOwner(nbrMesh, nbrPatch.patch()))
+    {
+        // Note: other side information could be cached - it only needs
+        // to be updated the first time round the iteration (i.e. when
+        // switching regions) but unfortunately we don't have this information.
+
+
+        // Calculate the temperature by harmonic averaging
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        const turbulentTemperatureCoupledBaffleFvPatchScalarField& nbrField =
+        refCast<const turbulentTemperatureCoupledBaffleFvPatchScalarField>
+        (
+            nbrPatch.lookupPatchField<volScalarField, scalar>
+            (
+                neighbourFieldName_
+            )
+        );
+
+        // Swap to obtain full local values of neighbour internal field
+        scalarField nbrIntFld = nbrField.patchInternalField();
+        mapDistribute::distribute
+        (
+            Pstream::defaultCommsType,
+            distMap.schedule(),
+            distMap.constructSize(),
+            distMap.subMap(),           // what to send
+            distMap.constructMap(),     // what to receive
+            nbrIntFld
+        );
+
+        // Swap to obtain full local values of neighbour K*delta
+        scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs();
+        mapDistribute::distribute
+        (
+            Pstream::defaultCommsType,
+            distMap.schedule(),
+            distMap.constructSize(),
+            distMap.subMap(),           // what to send
+            distMap.constructMap(),     // what to receive
+            nbrKDelta
+        );
+
+        tmp<scalarField> myKDelta = K()*patch().deltaCoeffs();
+
+        // Calculate common wall temperature. Reuse *this to store common value.
+        scalarField Twall
+        (
+            (myKDelta()*intFld() + nbrKDelta*nbrIntFld)
+          / (myKDelta() + nbrKDelta)
+        );
+        // Assign to me
+        fvPatchScalarField::operator=(Twall);
+        // Distribute back and assign to neighbour
+        mapDistribute::distribute
+        (
+            Pstream::defaultCommsType,
+            distMap.schedule(),
+            nbrField.size(),
+            distMap.constructMap(),     // reverse : what to send
+            distMap.subMap(),
+            Twall
+        );
+        const_cast<turbulentTemperatureCoupledBaffleFvPatchScalarField&>
+        (
+            nbrField
+        ).fvPatchScalarField::operator=(Twall);
+    }
+
+    if (debug)
+    {
+        //tmp<scalarField> normalGradient =
+        //    (*this-intFld())
+        //  * patch().deltaCoeffs();
+
+        scalar Q = gSum(K()*patch().magSf()*snGrad());
+
+        Info<< patch().boundaryMesh().mesh().name() << ':'
+            << patch().name() << ':'
+            << this->dimensionedInternalField().name() << " -> "
+            << nbrMesh.name() << ':'
+            << nbrPatch.name() << ':'
+            << this->dimensionedInternalField().name() << " :"
+            << " heatFlux:" << Q
+            << " walltemperature "
+            << " min:" << gMin(*this)
+            << " max:" << gMax(*this)
+            << " avg:" << gAverage(*this)
+            << endl;
+    }
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+void Foam::turbulentTemperatureCoupledBaffleFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fixedValueFvPatchScalarField::write(os);
+    os.writeKeyword("neighbourFieldName")<< neighbourFieldName_
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    turbulentTemperatureCoupledBaffleFvPatchScalarField
+);
+
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
new file mode 100644
index 000000000..ca68694c5
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffle/turbulentTemperatureCoupledBaffleFvPatchScalarField.H
@@ -0,0 +1,184 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    turbulentTemperatureCoupledBaffleFvPatchScalarField
+
+Description
+    Harmonic fixed value boundary condition for temperature, to be used
+    for heat-transfer on back-to-back baffles.
+
+    If my temperature is T1, heat conductivity K1 and neighbour is T2,K2
+
+    both sides get fixedValue (K1/dx1*T1 + K2/dx2*T2)/(K1/dx1+K2/dx2)
+
+    Example usage:
+        myInterfacePatchName
+        {
+            type                compressible::turbulentTemperatureCoupledBaffle;
+            neighbourFieldName  T;
+            K                   K; // or none
+            value               uniform 300;
+        }
+
+    Needs to be on underlying directMapped(Wall)FvPatch.
+
+    Note: if K is "none" looks up RASModel and basicThermo, otherwise expects
+    the solver to calculate a 'K' field.
+
+    Note: runs in parallel with arbitrary decomposition. Uses directMapped
+    functionality to calculate exchange.
+
+    Note: lags interface data so both sides use same data.
+    - problem: schedule to calculate average would interfere
+    with standard processor swaps.
+    - so: updateCoeffs sets both to same Twall. Only need to do
+    this for last outer iteration but don't have access to this.
+
+SourceFiles
+    turbulentTemperatureCoupledBaffleFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef turbulentTemperatureCoupledBaffleFvPatchScalarField_H
+#define turbulentTemperatureCoupledBaffleFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+        Class turbulentTemperatureCoupledBaffleFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class turbulentTemperatureCoupledBaffleFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private data
+
+        //- Name of field on the neighbour region
+        const word neighbourFieldName_;
+
+        //- Name of thermal conductivity field
+        const word KName_;
+
+
+    // Private Member Functions
+
+        //- Am I or neighbour owner of interface
+        bool interfaceOwner(const polyMesh&, const polyPatch&) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::turbulentTemperatureCoupledBaffle");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        turbulentTemperatureCoupledBaffleFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        turbulentTemperatureCoupledBaffleFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  turbulentTemperatureCoupledBaffleFvPatchScalarField onto a new patch
+        turbulentTemperatureCoupledBaffleFvPatchScalarField
+        (
+            const turbulentTemperatureCoupledBaffleFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentTemperatureCoupledBaffleFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        turbulentTemperatureCoupledBaffleFvPatchScalarField
+        (
+            const turbulentTemperatureCoupledBaffleFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentTemperatureCoupledBaffleFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        //- Get corresponding K field
+        tmp<scalarField> K() const;
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
new file mode 100644
index 000000000..978edc6e6
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
@@ -0,0 +1,332 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "directMappedPatchBase.H"
+#include "regionProperties.H"
+#include "basicThermo.H"
+#include "RASModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::
+turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    neighbourFieldName_("undefined-neighbourFieldName"),
+    KName_("undefined-K")
+{
+    this->refValue() = 0.0;
+    this->refGrad() = 0.0;
+    this->valueFraction() = 1.0;
+}
+
+
+turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::
+turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+(
+    const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mixedFvPatchScalarField(ptf, p, iF, mapper),
+    neighbourFieldName_(ptf.neighbourFieldName_),
+    KName_(ptf.KName_)
+{}
+
+
+turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::
+turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mixedFvPatchScalarField(p, iF),
+    neighbourFieldName_(dict.lookup("neighbourFieldName")),
+    KName_(dict.lookup("K"))
+{
+    if (!isA<directMappedPatchBase>(this->patch().patch()))
+    {
+        FatalErrorIn
+        (
+            "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::"
+            "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField\n"
+            "(\n"
+            "    const fvPatch& p,\n"
+            "    const DimensionedField<scalar, volMesh>& iF,\n"
+            "    const dictionary& dict\n"
+            ")\n"
+        )   << "\n    patch type '" << p.type()
+            << "' not type '" << directMappedPatchBase::typeName << "'"
+            << "\n    for patch " << p.name()
+            << " of field " << dimensionedInternalField().name()
+            << " in file " << dimensionedInternalField().objectPath()
+            << exit(FatalError);
+    }
+
+    fvPatchScalarField::operator=(scalarField("value", dict, p.size()));
+
+    if (dict.found("refValue"))
+    {
+        // Full restart
+        refValue() = scalarField("refValue", dict, p.size());
+        refGrad() = scalarField("refGradient", dict, p.size());
+        valueFraction() = scalarField("valueFraction", dict, p.size());
+    }
+    else
+    {
+        // Start from user entered data. Assume fixedValue.
+        refValue() = *this;
+        refGrad() = 0.0;
+        valueFraction() = 1.0;
+    }
+}
+
+
+turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::
+turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+(
+    const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField& wtcsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mixedFvPatchScalarField(wtcsf, iF),
+    neighbourFieldName_(wtcsf.neighbourFieldName_),
+    KName_(wtcsf.KName_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+tmp<scalarField>
+turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::K() const
+{
+    const fvMesh& mesh = patch().boundaryMesh().mesh();
+
+    if (KName_ == "none")
+    {
+        const compressible::RASModel& model =
+            db().lookupObject<compressible::RASModel>("RASProperties");
+
+        tmp<volScalarField> talpha = model.alphaEff();
+
+        const basicThermo& thermo =
+            db().lookupObject<basicThermo>("thermophysicalProperties");
+
+        return
+            talpha().boundaryField()[patch().index()]
+           *thermo.Cp()().boundaryField()[patch().index()];
+    }
+    else if (mesh.objectRegistry::foundObject<volScalarField>(KName_))
+    {
+        return patch().lookupPatchField<volScalarField, scalar>(KName_);
+    }
+    else if (mesh.objectRegistry::foundObject<volSymmTensorField>(KName_))
+    {
+        const symmTensorField& KWall =
+            patch().lookupPatchField<volSymmTensorField, scalar>(KName_);
+
+        vectorField n = patch().nf();
+
+        return n & KWall & n;
+    }
+    else
+    {
+        FatalErrorIn
+        (
+            "turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::K()"
+            " const"
+        )   << "Did not find field " << KName_
+            << " on mesh " << mesh.name() << " patch " << patch().name()
+            << endl
+            << "Please set 'K' to 'none', a valid volScalarField"
+            << " or a valid volSymmTensorField." << exit(FatalError);
+
+        return scalarField(0);
+    }
+}
+
+
+void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    // Get the coupling information from the directMappedPatchBase
+    const directMappedPatchBase& mpp = refCast<const directMappedPatchBase>
+    (
+        patch().patch()
+    );
+    const polyMesh& nbrMesh = mpp.sampleMesh();
+    const fvPatch& nbrPatch = refCast<const fvMesh>
+    (
+        nbrMesh
+    ).boundary()[mpp.samplePolyPatch().index()];
+
+    // Force recalculation of mapping and schedule
+    const mapDistribute& distMap = mpp.map();
+
+    tmp<scalarField> intFld = patchInternalField();
+
+
+    // Calculate the temperature by harmonic averaging
+    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField& nbrField =
+    refCast
+    <
+        const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+    >
+    (
+        nbrPatch.lookupPatchField<volScalarField, scalar>
+        (
+            neighbourFieldName_
+        )
+    );
+
+    // Swap to obtain full local values of neighbour internal field
+    scalarField nbrIntFld = nbrField.patchInternalField();
+    mapDistribute::distribute
+    (
+        Pstream::defaultCommsType,
+        distMap.schedule(),
+        distMap.constructSize(),
+        distMap.subMap(),           // what to send
+        distMap.constructMap(),     // what to receive
+        nbrIntFld
+    );
+
+    // Swap to obtain full local values of neighbour K*delta
+    scalarField nbrKDelta = nbrField.K()*nbrPatch.deltaCoeffs();
+    mapDistribute::distribute
+    (
+        Pstream::defaultCommsType,
+        distMap.schedule(),
+        distMap.constructSize(),
+        distMap.subMap(),           // what to send
+        distMap.constructMap(),     // what to receive
+        nbrKDelta
+    );
+
+    tmp<scalarField> myKDelta = K()*patch().deltaCoeffs();
+
+
+    // Both sides agree on
+    // - temperature : (myKDelta*fld + nbrKDelta*nbrFld)/(myKDelta+nbrKDelta)
+    // - gradient    : (temperature-fld)*delta
+    // We've got a degree of freedom in how to implement this in a mixed bc.
+    // (what gradient, what fixedValue and mixing coefficient)
+    // Two reasonable choices:
+    // 1. specify above temperature on one side (preferentially the high side)
+    //    and above gradient on the other. So this will switch between pure
+    //    fixedvalue and pure fixedgradient
+    // 2. specify gradient and temperature such that the equations are the
+    //    same on both sides. This leads to the choice of
+    //    - refGradient = zero gradient
+    //    - refValue = neighbour value
+    //    - mixFraction = nbrKDelta / (nbrKDelta + myKDelta())
+
+
+    this->refValue() = nbrIntFld;
+
+    this->refGrad() = 0.0;
+
+    this->valueFraction() = nbrKDelta / (nbrKDelta + myKDelta());
+
+    mixedFvPatchScalarField::updateCoeffs();
+
+
+    if (debug)
+    {
+        scalar Q = gSum(K()*patch().magSf()*snGrad());
+
+        Info<< patch().boundaryMesh().mesh().name() << ':'
+            << patch().name() << ':'
+            << this->dimensionedInternalField().name() << " -> "
+            << nbrMesh.name() << ':'
+            << nbrPatch.name() << ':'
+            << this->dimensionedInternalField().name() << " :"
+            << " heatFlux:" << Q
+            << " walltemperature "
+            << " min:" << gMin(*this)
+            << " max:" << gMax(*this)
+            << " avg:" << gAverage(*this)
+            << endl;
+    }
+}
+
+
+void turbulentTemperatureCoupledBaffleMixedFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    mixedFvPatchScalarField::write(os);
+    os.writeKeyword("neighbourFieldName")<< neighbourFieldName_
+        << token::END_STATEMENT << nl;
+    os.writeKeyword("K") << KName_ << token::END_STATEMENT << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
new file mode 100644
index 000000000..b56823d7a
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/turbulentTemperatureCoupledBaffleMixed/turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.H
@@ -0,0 +1,186 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+
+Description
+    Mixed boundary condition for temperature, to be used for heat-transfer
+    on back-to-back baffles.
+
+    If my temperature is T1, neighbour is T2:
+
+    T1 > T2: my side becomes fixedValue T2 bc, other side becomes fixedGradient.
+
+
+    Example usage:
+        myInterfacePatchName
+        {
+            type        compressible::turbulentTemperatureCoupledBaffleMixed;
+            neighbourFieldName  T;
+            K           K; // or none
+            value       uniform 300;
+        }
+
+    Needs to be on underlying directMapped(Wall)FvPatch.
+
+    Note: if K is "none" looks up RASModel and basicThermo, otherwise expects
+    the solver to calculate a 'K' field.
+
+    Note: runs in parallel with arbitrary decomposition. Uses directMapped
+    functionality to calculate exchange.
+
+    Note: lags interface data so both sides use same data.
+    - problem: schedule to calculate average would interfere
+    with standard processor swaps.
+    - so: updateCoeffs sets both to same Twall. Only need to do
+    this for last outer iteration but don't have access to this.
+
+SourceFiles
+    turbulentTemperatureCoupledBaffleMixedFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef turbulentTemperatureCoupledBaffleMixedFvPatchScalarField_H
+#define turbulentTemperatureCoupledBaffleMixedFvPatchScalarField_H
+
+#include "mixedFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+/*---------------------------------------------------------------------------*\
+   Class turbulentTemperatureCoupledBaffleMixedFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+:
+    public mixedFvPatchScalarField
+{
+    // Private data
+
+        //- Name of field on the neighbour region
+        const word neighbourFieldName_;
+
+        //- Name of thermal conductivity field
+        const word KName_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::turbulentTemperatureCoupledBaffleMixed");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  turbulentTemperatureCoupledBaffleMixedFvPatchScalarField onto a
+        //  new patch
+        turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+        (
+            const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+        (
+            const turbulentTemperatureCoupledBaffleMixedFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentTemperatureCoupledBaffleMixedFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        //- Get corresponding K field
+        tmp<scalarField> K() const;
+
+        //- Update the coefficients associated with the patch field
+        virtual void updateCoeffs();
+
+        //- Write
+        virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..b21f9e5ae
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.C
@@ -0,0 +1,147 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "alphatWallFunctionFvPatchScalarField.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+alphatWallFunctionFvPatchScalarField::
+alphatWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    mutName_("mut"),
+    Prt_(0.85)
+{}
+
+
+alphatWallFunctionFvPatchScalarField::
+alphatWallFunctionFvPatchScalarField
+(
+    const alphatWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    mutName_(ptf.mutName_),
+    Prt_(ptf.Prt_)
+{}
+
+
+alphatWallFunctionFvPatchScalarField::
+alphatWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    mutName_(dict.lookupOrDefault<word>("mut", "mut")),
+    Prt_(dict.lookupOrDefault<scalar>("Prt", 0.85))
+{}
+
+
+alphatWallFunctionFvPatchScalarField::
+alphatWallFunctionFvPatchScalarField
+(
+    const alphatWallFunctionFvPatchScalarField& awfpsf
+)
+:
+    fixedValueFvPatchScalarField(awfpsf),
+    mutName_(awfpsf.mutName_),
+    Prt_(awfpsf.Prt_)
+{}
+
+
+alphatWallFunctionFvPatchScalarField::
+alphatWallFunctionFvPatchScalarField
+(
+    const alphatWallFunctionFvPatchScalarField& awfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(awfpsf, iF),
+    mutName_(awfpsf.mutName_),
+    Prt_(awfpsf.Prt_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void alphatWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const scalarField& mutw =
+        patch().lookupPatchField<volScalarField, scalar>(mutName_);
+
+    operator==(mutw/Prt_);
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+void alphatWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
+    os.writeKeyword("Prt") << Prt_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, alphatWallFunctionFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..e415602f1
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/alphatWallFunctions/alphatWallFunction/alphatWallFunctionFvPatchScalarField.H
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::RASModels::alphatWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for turbulent thermal diffusivity when using wall
+    functions
+    - replicates OpenFOAM v1.5 (and earlier) behaviour
+    - Turbulent Prandtl number defaults to 0.85 if unspecified
+
+SourceFiles
+    alphatWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleAlphatWallFunctionFvPatchScalarField_H
+#define compressibleAlphatWallFunctionFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+            Class alphatWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class alphatWallFunctionFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+    // Private data
+
+        //- Name of turbulent viscosity field
+        word mutName_;
+
+        //- Turbulent Prandtl number
+        scalar Prt_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("alphatWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        alphatWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        alphatWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  alphatWallFunctionFvPatchScalarField
+        //  onto a new patch
+        alphatWallFunctionFvPatchScalarField
+        (
+            const alphatWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        alphatWallFunctionFvPatchScalarField
+        (
+            const alphatWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphatWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        alphatWallFunctionFvPatchScalarField
+        (
+            const alphatWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new alphatWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..d4176e8d8
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -0,0 +1,277 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "epsilonWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void epsilonWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn("epsilonWallFunctionFvPatchScalarField::checkType()")
+            << "Invalid wall function specification" << nl
+            << "    Patch type for patch " << patch().name()
+            << " must be wall" << nl
+            << "    Current patch type is " << patch().type() << nl << endl
+            << abort(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedInternalValueFvPatchField<scalar>(p, iF),
+    UName_("U"),
+    kName_("k"),
+    GName_("RASModel::G"),
+    rhoName_("rho"),
+    muName_("mu"),
+    mutName_("mut"),
+    Cmu_(0.09),
+    kappa_(0.41),
+    E_(9.8)
+{
+    checkType();
+}
+
+
+epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
+(
+    const epsilonWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    kName_(ptf.kName_),
+    GName_(ptf.GName_),
+    rhoName_(ptf.rhoName_),
+    muName_(ptf.muName_),
+    mutName_(ptf.mutName_),
+    Cmu_(ptf.Cmu_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_)
+{
+    checkType();
+}
+
+
+epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedInternalValueFvPatchField<scalar>(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
+    GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu")),
+    mutName_(dict.lookupOrDefault<word>("mut", "mut")),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8))
+{
+    checkType();
+}
+
+
+epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
+(
+    const epsilonWallFunctionFvPatchScalarField& ewfpsf
+)
+:
+    fixedInternalValueFvPatchField<scalar>(ewfpsf),
+    UName_(ewfpsf.UName_),
+    kName_(ewfpsf.kName_),
+    GName_(ewfpsf.GName_),
+    rhoName_(ewfpsf.rhoName_),
+    muName_(ewfpsf.muName_),
+    mutName_(ewfpsf.mutName_),
+    Cmu_(ewfpsf.Cmu_),
+    kappa_(ewfpsf.kappa_),
+    E_(ewfpsf.E_)
+{
+    checkType();
+}
+
+
+epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
+(
+    const epsilonWallFunctionFvPatchScalarField& ewfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedInternalValueFvPatchField<scalar>(ewfpsf, iF),
+    UName_(ewfpsf.UName_),
+    kName_(ewfpsf.kName_),
+    GName_(ewfpsf.GName_),
+    rhoName_(ewfpsf.rhoName_),
+    muName_(ewfpsf.muName_),
+    mutName_(ewfpsf.mutName_),
+    Cmu_(ewfpsf.Cmu_),
+    kappa_(ewfpsf.kappa_),
+    E_(ewfpsf.E_)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+
+    const scalar Cmu25 = pow(Cmu_, 0.25);
+    const scalar Cmu75 = pow(Cmu_, 0.75);
+    const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
+
+    const scalarField& y = rasModel.y()[patch().index()];
+
+    volScalarField& G = const_cast<volScalarField&>
+        (db().lookupObject<volScalarField>(GName_));
+
+    volScalarField& epsilon = const_cast<volScalarField&>
+        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
+
+    const volScalarField& k = db().lookupObject<volScalarField>(kName_);
+
+    const scalarField& rhow =
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+
+    const scalarField& muw =
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
+
+    const scalarField& mutw =
+        patch().lookupPatchField<volScalarField, scalar>(mutName_);
+
+    const fvPatchVectorField& Uw =
+        patch().lookupPatchField<volVectorField, vector>(UName_);
+
+    const scalarField magGradUw = mag(Uw.snGrad());
+
+    // Set epsilon and G
+    forAll(mutw, faceI)
+    {
+        label faceCellI = patch().faceCells()[faceI];
+
+        scalar yPlus =
+            Cmu25*y[faceI]*sqrt(k[faceCellI])
+           /(muw[faceI]/rhow[faceI]);
+
+        epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]);
+
+        if (yPlus > yPlusLam)
+        {
+            G[faceCellI] =
+                (mutw[faceI] + muw[faceI])
+               *magGradUw[faceI]
+               *Cmu25*sqrt(k[faceCellI])
+               /(kappa_*y[faceI]);
+        }
+        else
+        {
+            G[faceCellI] = 0.0;
+        }
+    }
+
+    // TODO: perform averaging for cells sharing more than one boundary face
+
+    fixedInternalValueFvPatchField<scalar>::updateCoeffs();
+}
+
+
+void epsilonWallFunctionFvPatchScalarField::evaluate
+(
+    const Pstream::commsTypes commsType
+)
+{
+    fixedInternalValueFvPatchField<scalar>::evaluate(commsType);
+}
+
+
+void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fixedInternalValueFvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
+    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+    writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    epsilonWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..290bc74dd
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
@@ -0,0 +1,193 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::RASModels::epsilonWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for epsilon when using wall functions
+    - calculates epsilon and G
+    - epsilon values added directly into the matrix to act as a constraint
+
+SourceFiles
+    epsilonWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleEpsilonWallFunctionFvPatchScalarField_H
+#define compressibleEpsilonWallFunctionFvPatchScalarField_H
+
+#include "fixedInternalValueFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+           Class epsilonWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class epsilonWallFunctionFvPatchScalarField
+:
+    public fixedInternalValueFvPatchField<scalar>
+{
+    // Private data
+
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
+        //- Name of turbulence generation field
+        word GName_;
+
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
+        //- Name of turbulent viscosity field
+        word mutName_;
+
+        //- Cmu coefficient
+        scalar Cmu_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+
+    // Private member functions
+
+        //- Check the type of the patch
+        void checkType();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::epsilonWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        epsilonWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        epsilonWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  epsilonWallFunctionFvPatchScalarField
+        //  onto a new patch
+        epsilonWallFunctionFvPatchScalarField
+        (
+            const epsilonWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        epsilonWallFunctionFvPatchScalarField
+        (
+            const epsilonWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new epsilonWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        epsilonWallFunctionFvPatchScalarField
+        (
+            const epsilonWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new epsilonWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+            //- Evaluate the patchField
+            virtual void evaluate(const Pstream::commsTypes);
+
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
new file mode 100644
index 000000000..8acc00069
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
@@ -0,0 +1,153 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "kqRWallFunctionFvPatchField.H"
+#include "fvPatchFieldMapper.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+void kqRWallFunctionFvPatchField<Type>::checkType()
+{
+    if (!isA<wallFvPatch>(this->patch()))
+    {
+        FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")
+            << "Invalid wall function specification" << nl
+            << "    Patch type for patch " << this->patch().name()
+            << " must be wall" << nl
+            << "    Current patch type is " << this->patch().type() << nl << endl
+            << abort(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    zeroGradientFvPatchField<Type>(p, iF)
+{
+    checkType();
+}
+
+
+template<class Type>
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const kqRWallFunctionFvPatchField& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    zeroGradientFvPatchField<Type>(ptf, p, iF, mapper)
+{
+    checkType();
+}
+
+
+template<class Type>
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    zeroGradientFvPatchField<Type>(p, iF, dict)
+{
+    checkType();
+}
+
+
+template<class Type>
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const kqRWallFunctionFvPatchField& tkqrwfpf
+)
+:
+    zeroGradientFvPatchField<Type>(tkqrwfpf)
+{
+    checkType();
+}
+
+
+template<class Type>
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const kqRWallFunctionFvPatchField& tkqrwfpf,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    zeroGradientFvPatchField<Type>(tkqrwfpf, iF)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void kqRWallFunctionFvPatchField<Type>::evaluate
+(
+    const Pstream::commsTypes commsType
+)
+{
+    zeroGradientFvPatchField<Type>::evaluate(commsType);
+}
+
+
+template<class Type>
+void kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
+{
+    zeroGradientFvPatchField<Type>::write(os);
+    this->writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
new file mode 100644
index 000000000..88e045b39
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -0,0 +1,170 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::RASModels::kqRWallFunctionFvPatchField
+
+Description
+    Boundary condition for turbulence k, Q, and R when using wall functions.
+    Simply acts as a zero gradient condition.
+
+SourceFiles
+    kqRWallFunctionFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressiblekqRWallFunctionFvPatchField_H
+#define compressiblekqRWallFunctionFvPatchField_H
+
+#include "zeroGradientFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+                Class kqRWallFunctionFvPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class kqRWallFunctionFvPatchField
+:
+    public zeroGradientFvPatchField<Type>
+{
+
+    // Private member functions
+
+        //- Check the type of the patch
+        void checkType();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::kqRWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        kqRWallFunctionFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        kqRWallFunctionFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        // kqRWallFunctionFvPatchField
+        //  onto a new patch
+        kqRWallFunctionFvPatchField
+        (
+            const kqRWallFunctionFvPatchField&,
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        kqRWallFunctionFvPatchField
+        (
+            const kqRWallFunctionFvPatchField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<Type> > clone() const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new kqRWallFunctionFvPatchField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        kqRWallFunctionFvPatchField
+        (
+            const kqRWallFunctionFvPatchField&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<Type> > clone
+        (
+            const DimensionedField<Type, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new kqRWallFunctionFvPatchField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Evaluate the patchField
+            virtual void evaluate
+            (
+                const Pstream::commsTypes commsType=Pstream::Pstream::blocking
+            );
+
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "kqRWallFunctionFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
new file mode 100644
index 000000000..ace22bc3b
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "kqRWallFunctionFvPatchFields.H"
+#include "fvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(kqRWallFunction);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/applications/test/List/ListTest.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
similarity index 70%
rename from applications/test/List/ListTest.C
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
index 05ce6d0c7..f0856b88f 100644
--- a/applications/test/List/ListTest.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
@@ -22,40 +22,35 @@ License
     along with OpenFOAM; if not, write to the Free Software Foundation,
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
-Application
-    
-Description
-
 \*---------------------------------------------------------------------------*/
 
-#include "OSspecific.H"
+#ifndef kqRWallFunctionFvPatchFields_H
+#define kqRWallFunctionFvPatchFields_H
 
-#include "IOstreams.H"
-#include "IStringStream.H"
-#include "scalar.H"
-#include "vector.H"
-#include "ListOps.H"
-
-using namespace Foam;
+#include "kqRWallFunctionFvPatchField.H"
+#include "fieldTypes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-//  Main program:
 
-int main(int argc, char *argv[])
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
 {
-    List<vector> list(IStringStream("1 ((0 1 2))")());
-    Info<< list << endl;
 
-    List<vector> list2(IStringStream("((0 1 2) (3 4 5) (3 4 5))")());
-    Info<< list2 << endl;
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    Info<< findIndex(list2, vector(3, 4, 5)) << endl;
+makePatchTypeFieldTypedefs(kqRWallFunction)
 
-    list2.setSize(10, vector(1, 2, 3));
-    Info<< list2 << endl;
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    return 0;
-}
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..c8d7b0d9a
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.C
@@ -0,0 +1,118 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "mutLowReWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<scalarField> mutLowReWallFunctionFvPatchScalarField::calcMut() const
+{
+    return tmp<scalarField>(new scalarField(patch().size(), 0.0));
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+mutLowReWallFunctionFvPatchScalarField::mutLowReWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mutWallFunctionFvPatchScalarField(p, iF)
+{}
+
+
+mutLowReWallFunctionFvPatchScalarField::mutLowReWallFunctionFvPatchScalarField
+(
+    const mutLowReWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+mutLowReWallFunctionFvPatchScalarField::mutLowReWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mutWallFunctionFvPatchScalarField(p, iF, dict)
+{}
+
+
+mutLowReWallFunctionFvPatchScalarField::mutLowReWallFunctionFvPatchScalarField
+(
+    const mutLowReWallFunctionFvPatchScalarField& mlrwfpsf
+)
+:
+    mutWallFunctionFvPatchScalarField(mlrwfpsf)
+{}
+
+
+mutLowReWallFunctionFvPatchScalarField::mutLowReWallFunctionFvPatchScalarField
+(
+    const mutLowReWallFunctionFvPatchScalarField& mlrwfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mutWallFunctionFvPatchScalarField(mlrwfpsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    mutLowReWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..daba1cec5
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutLowReWallFunction/mutLowReWallFunctionFvPatchScalarField.H
@@ -0,0 +1,149 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::RASModels::mutLowReWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for turbulent (kinematic) viscosity when for use with
+    low Reynolds number models.
+
+    Sets mut to zero, and provides an access to calculate y+.
+
+SourceFiles
+    mutLowReWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleMutLowReWallFunctionFvPatchScalarField_H
+#define compressibleMutLowReWallFunctionFvPatchScalarField_H
+
+#include "mutWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+          Class mutLowReWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class mutLowReWallFunctionFvPatchScalarField
+:
+    public mutWallFunctionFvPatchScalarField
+{
+protected:
+
+    // Private member functions
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcMut() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("mutLowReWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        mutLowReWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        mutLowReWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  mutLowReWallFunctionFvPatchScalarField
+        //  onto a new patch
+        mutLowReWallFunctionFvPatchScalarField
+        (
+            const mutLowReWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        mutLowReWallFunctionFvPatchScalarField
+        (
+            const mutLowReWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutLowReWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        mutLowReWallFunctionFvPatchScalarField
+        (
+            const mutLowReWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutLowReWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..f98b08b44
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.C
@@ -0,0 +1,235 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "mutRoughWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+scalar mutRoughWallFunctionFvPatchScalarField::fnRough
+(
+    const scalar KsPlus,
+    const scalar Cs
+) const
+{
+    // Return fn based on non-dimensional roughness height
+
+    if (KsPlus < 90.0)
+    {
+        return pow
+        (
+            (KsPlus - 2.25)/87.75 + Cs*KsPlus,
+            sin(0.4258*(log(KsPlus) - 0.811))
+        );
+    }
+    else
+    {
+        return (1.0 + Cs*KsPlus);
+    }
+}
+
+
+tmp<scalarField> mutRoughWallFunctionFvPatchScalarField::calcMut() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+
+    const scalar Cmu25 = pow(Cmu_, 0.25);
+
+    tmp<scalarField> tmutw(new scalarField(*this));
+    scalarField& mutw = tmutw();
+
+    forAll(mutw, faceI)
+    {
+        label faceCellI = patch().faceCells()[faceI];
+
+        scalar uStar = Cmu25*sqrt(k[faceCellI]);
+
+        scalar yPlus = uStar*y[faceI]/(muw[faceI]/rhow[faceI]);
+
+        scalar KsPlus = uStar*Ks_[faceI]/(muw[faceI]/rhow[faceI]);
+
+        scalar Edash = E_;
+        scalar yPlusLamNew = yPlusLam_;
+        if (KsPlus > 2.25)
+        {
+            Edash /= fnRough(KsPlus, Cs_[faceI]);
+            yPlusLamNew = rasModel.yPlusLam(kappa_, Edash);
+        }
+
+        if (debug)
+        {
+            Info<< "yPlus = " << yPlus
+                << ", KsPlus = " << KsPlus
+                << ", Edash = " << Edash
+                << ", yPlusLam = " << yPlusLam_
+                << endl;
+        }
+
+        if (yPlus > yPlusLamNew)
+        {
+            mutw[faceI] =
+                muw[faceI]*(yPlus*kappa_/log(max(Edash*yPlus, 1+1e-4)) - 1);
+        }
+    }
+
+    return tmutw;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mutWallFunctionFvPatchScalarField(p, iF),
+    Ks_(p.size(), 0.0),
+    Cs_(p.size(), 0.0)
+{}
+
+
+mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
+(
+    const mutRoughWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    Ks_(ptf.Ks_, mapper),
+    Cs_(ptf.Cs_, mapper)
+{}
+
+
+mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mutWallFunctionFvPatchScalarField(p, iF, dict),
+    Ks_("Ks", dict, p.size()),
+    Cs_("Cs", dict, p.size())
+{}
+
+
+mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
+(
+    const mutRoughWallFunctionFvPatchScalarField& rwfpsf
+)
+:
+    mutWallFunctionFvPatchScalarField(rwfpsf),
+    Ks_(rwfpsf.Ks_),
+    Cs_(rwfpsf.Cs_)
+{}
+
+
+mutRoughWallFunctionFvPatchScalarField::mutRoughWallFunctionFvPatchScalarField
+(
+    const mutRoughWallFunctionFvPatchScalarField& rwfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mutWallFunctionFvPatchScalarField(rwfpsf, iF),
+    Ks_(rwfpsf.Ks_),
+    Cs_(rwfpsf.Cs_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void mutRoughWallFunctionFvPatchScalarField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    mutWallFunctionFvPatchScalarField::autoMap(m);
+    Ks_.autoMap(m);
+    Cs_.autoMap(m);
+}
+
+
+void mutRoughWallFunctionFvPatchScalarField::rmap
+(
+    const fvPatchScalarField& ptf,
+    const labelList& addr
+)
+{
+    mutWallFunctionFvPatchScalarField::rmap(ptf, addr);
+
+    const mutRoughWallFunctionFvPatchScalarField& nrwfpsf =
+        refCast<const mutRoughWallFunctionFvPatchScalarField>(ptf);
+
+    Cs_.rmap(nrwfpsf.Cs_, addr);
+    Ks_.rmap(nrwfpsf.Ks_, addr);
+}
+
+
+void mutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    Cs_.writeEntry("Cs", os);
+    Ks_.writeEntry("Ks", os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, mutRoughWallFunctionFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..aa9207deb
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutRoughWallFunction/mutRoughWallFunctionFvPatchScalarField.H
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::RASModels::mutRoughWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for turbulent (kinematic) viscosity when using wall
+    functions for rough walls.
+
+    Manipulates the E parameter to account for roughness effects, based on
+    KsPlus.
+
+    - roughness height = sand-grain roughness (0 for smooth walls)
+    - roughness constant = 0.5-1.0 (0.5 default)
+
+SourceFiles
+    mutRoughWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleMutRoughWallFunctionFvPatchScalarField_H
+#define compressibleMutRoughWallFunctionFvPatchScalarField_H
+
+#include "mutWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+          Class mutRoughWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class mutRoughWallFunctionFvPatchScalarField
+:
+    public mutWallFunctionFvPatchScalarField
+{
+protected:
+
+    // Protected data
+
+        //- Roughness height
+        scalarField Ks_;
+
+        //- Roughness constant
+        scalarField Cs_;
+
+
+    // Private member functions
+
+        //- Compute the roughness function
+        virtual scalar fnRough(const scalar KsPlus, const scalar Cs) const;
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcMut() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("mutRoughWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        mutRoughWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        mutRoughWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  mutRoughWallFunctionFvPatchScalarField
+        //  onto a new patch
+        mutRoughWallFunctionFvPatchScalarField
+        (
+            const mutRoughWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        mutRoughWallFunctionFvPatchScalarField
+        (
+            const mutRoughWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutRoughWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        mutRoughWallFunctionFvPatchScalarField
+        (
+            const mutRoughWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutRoughWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchScalarField&,
+                const labelList&
+            );
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
similarity index 50%
rename from src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
index ff5c1ffe1..189b0b3a2 100644
--- a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
@@ -24,10 +24,10 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "mutStandardRoughWallFunctionFvPatchScalarField.H"
-#include "RASModel.H"
+#include "mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
+#include "RASModel.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -39,120 +39,27 @@ namespace compressible
 namespace RASModels
 {
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
-mutStandardRoughWallFunctionFvPatchScalarField::
-mutStandardRoughWallFunctionFvPatchScalarField
+tmp<scalarField>
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
 (
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(p, iF),
-    UName_("undefined"),
-    roughnessHeight_(pTraits<scalar>::zero),
-    roughnessConstant_(pTraits<scalar>::zero),
-    roughnessFudgeFactor_(pTraits<scalar>::zero)
-{}
-
-
-mutStandardRoughWallFunctionFvPatchScalarField::
-mutStandardRoughWallFunctionFvPatchScalarField
-(
-    const mutStandardRoughWallFunctionFvPatchScalarField& ptf,
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
-)
-:
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
-    UName_(ptf.UName_),
-    roughnessHeight_(ptf.roughnessHeight_),
-    roughnessConstant_(ptf.roughnessConstant_),
-    roughnessFudgeFactor_(ptf.roughnessFudgeFactor_)
-{}
-
-
-mutStandardRoughWallFunctionFvPatchScalarField::
-mutStandardRoughWallFunctionFvPatchScalarField
-(
-    const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const dictionary& dict
-)
-:
-    fixedValueFvPatchScalarField(p, iF, dict),
-    UName_(dict.lookupOrDefault<word>("U", "U")),
-    roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
-    roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
-    roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor")))
-{}
-
-
-mutStandardRoughWallFunctionFvPatchScalarField::
-mutStandardRoughWallFunctionFvPatchScalarField
-(
-    const mutStandardRoughWallFunctionFvPatchScalarField& tppsf
-)
-:
-    fixedValueFvPatchScalarField(tppsf),
-    UName_(tppsf.UName_),
-    roughnessHeight_(tppsf.roughnessHeight_),
-    roughnessConstant_(tppsf.roughnessConstant_),
-    roughnessFudgeFactor_(tppsf.roughnessFudgeFactor_)
-{}
-
-
-mutStandardRoughWallFunctionFvPatchScalarField::
-mutStandardRoughWallFunctionFvPatchScalarField
-(
-    const mutStandardRoughWallFunctionFvPatchScalarField& tppsf,
-    const DimensionedField<scalar, volMesh>& iF
-)
-:
-    fixedValueFvPatchScalarField(tppsf, iF),
-    UName_(tppsf.UName_),
-    roughnessHeight_(tppsf.roughnessHeight_),
-    roughnessConstant_(tppsf.roughnessConstant_),
-    roughnessFudgeFactor_(tppsf.roughnessFudgeFactor_)
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-void mutStandardRoughWallFunctionFvPatchScalarField::evaluate
-(
-    const Pstream::commsTypes
-)
+    const scalarField& magUp
+) const
 {
-    const RASModel& rasModel
-        = db().lookupObject<RASModel>("RASProperties");
+    const label patchI = patch().index();
 
-    const scalar kappa = rasModel.kappa().value();
-    const scalar E = rasModel.E().value();
-    const scalar yPlusLam = 11.225;
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+    const fvPatchScalarField& rho = rasModel.rho().boundaryField()[patchI];
 
-    // The reciprical of the distance to the adjacent cell centre.
-    const scalarField& ry = patch().deltaCoeffs();
+    tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
+    scalarField& yPlus = tyPlus();
 
-    const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>(UName_);
-
-    const fvPatchScalarField& rho =
-        patch().lookupPatchField<volScalarField, scalar>("rho");
-
-    // The flow velocity at the adjacent cell centre.
-    scalarField magUp = mag(U.patchInternalField() - U);
-
-    const scalarField& muw =
-        patch().lookupPatchField<volScalarField, scalar>("mu");
-    scalarField& mutw = *this;
-
-    scalarField magFaceGradU = mag(U.snGrad());
-
-    if(roughnessHeight_ > 0.0)
+    if (roughnessHeight_ > 0.0)
     {
-        // Rough Walls.
+        // Rough Walls
         const scalar c_1 = 1/(90 - 2.25) + roughnessConstant_;
         static const scalar c_2 = 2.25/(90 - 2.25);
         static const scalar c_3 = 2.0*atan(1.0)/log(90/2.25);
@@ -161,39 +68,38 @@ void mutStandardRoughWallFunctionFvPatchScalarField::evaluate
         //if (KsPlusBasedOnYPlus_)
         {
             // If KsPlus is based on YPlus the extra term added to the law
-            // of the wall will depend on yPlus.
-            forAll(mutw, facei)
+            // of the wall will depend on yPlus
+            forAll(yPlus, facei)
             {
                 const scalar magUpara = magUp[facei];
-                const scalar Re = rho[facei]*magUpara/(muw[facei]*ry[facei]);
-                const scalar kappaRe = kappa*Re;
+                const scalar Re = rho[facei]*magUpara*y[facei]/muw[facei];
+                const scalar kappaRe = kappa_*Re;
 
-                scalar yPlus = yPlusLam;
-                const scalar ryPlusLam = 1.0/yPlus;
+                scalar yp = yPlusLam_;
+                const scalar ryPlusLam = 1.0/yp;
 
                 int iter = 0;
                 scalar yPlusLast = 0.0;
-                scalar dKsPlusdYPlus = roughnessHeight_*ry[facei];
+                scalar dKsPlusdYPlus = roughnessHeight_/y[facei];
 
                 // Enforce the roughnessHeight to be less than the distance to
                 // the first cell centre.
-                if(dKsPlusdYPlus > 1)
+                if (dKsPlusdYPlus > 1)
                 {
                     dKsPlusdYPlus = 1;
                 }
 
-                // Fudge factor to get results to be similar to fluent
-                // (at least difference between rough and smooth).
+                // Additional tuning parameter (fudge factor) - nominally = 1
                 dKsPlusdYPlus *= roughnessFudgeFactor_;
 
                 do
                 {
-                    yPlusLast = yPlus;
+                    yPlusLast = yp;
 
-                    // The non-dimensional roughness height.
-                    scalar KsPlus = yPlus*dKsPlusdYPlus;
+                    // The non-dimensional roughness height
+                    scalar KsPlus = yp*dKsPlusdYPlus;
 
-                    // The extra term in the law-of-the-wall.
+                    // The extra term in the law-of-the-wall
                     scalar G = 0.0;
 
                     scalar yPlusGPrime = 0.0;
@@ -215,82 +121,185 @@ void mutStandardRoughWallFunctionFvPatchScalarField::evaluate
                             (c_1*sint_2*KsPlus/t_1) + (c_3*logt_1*cos(t_2));
                     }
 
-                    scalar denom = 1.0 + log(E* yPlus) - G - yPlusGPrime;
-                    if(mag(denom) > VSMALL)
+                    scalar denom = 1.0 + log(E_*yp) - G - yPlusGPrime;
+                    if (mag(denom) > VSMALL)
                     {
-                        yPlus = (kappaRe + yPlus*(1 - yPlusGPrime))/denom;
-                        if( yPlus < 0 )
-                        {
-                            yPlus = 0;
-                        }
-                    }
-                    else
-                    {
-                        // Ensure immediate end and mutw = 0.
-                        yPlus = 0;
+                        yp = (kappaRe + yp*(1 - yPlusGPrime))/denom;
                     }
 
                 } while
                 (
-                    mag(ryPlusLam*(yPlus - yPlusLast)) > 0.0001
+                    mag(ryPlusLam*(yp - yPlusLast)) > 0.0001
                  && ++iter < 10
-                 && yPlus > VSMALL
+                 && yp > VSMALL
                 );
 
-                if (yPlus > yPlusLam)
-                {
-                    mutw[facei] = muw[facei]*(yPlus*yPlus/Re - 1);
-                }
-                else
-                {
-                    mutw[facei] = 0.0;
-                }
+                yPlus[facei] = max(0.0, yp);
             }
         }
     }
     else
     {
-        // Smooth Walls.
-        forAll(mutw, facei)
+        // Smooth Walls
+        forAll(yPlus, facei)
         {
             const scalar magUpara = magUp[facei];
-            const scalar Re = rho[facei]*magUpara/(muw[facei]*ry[facei]);
-            const scalar kappaRe = kappa*Re;
+            const scalar Re = rho[facei]*magUpara*y[facei]/muw[facei];
+            const scalar kappaRe = kappa_*Re;
 
-            scalar yPlus = yPlusLam;
-            const scalar ryPlusLam = 1.0/yPlus;
+            scalar yp = yPlusLam_;
+            const scalar ryPlusLam = 1.0/yp;
 
             int iter = 0;
             scalar yPlusLast = 0.0;
 
             do
             {
-                yPlusLast = yPlus;
-                yPlus = (kappaRe + yPlus)/(1.0 + log(E*yPlus));
+                yPlusLast = yp;
+                yp = (kappaRe + yp)/(1.0 + log(E_*yp));
 
             } while
             (
-                mag(ryPlusLam*(yPlus - yPlusLast)) > 0.0001
+                mag(ryPlusLam*(yp - yPlusLast)) > 0.0001
              && ++iter < 10
             );
 
-            if (yPlus > yPlusLam)
-            {
-                mutw[facei] = muw[facei]*(yPlus*yPlus/Re - 1);
-            }
-            else
-            {
-                mutw[facei] = 0.0;
-            }
+            yPlus[facei] = max(0.0, yp);
         }
     }
+
+    return tyPlus;
 }
 
 
-void mutStandardRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
+tmp<scalarField>
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcMut() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+    const fvPatchScalarField& rho = rasModel.rho().boundaryField()[patchI];
+
+    scalarField magUp = mag(Uw.patchInternalField() - Uw);
+
+    tmp<scalarField> tyPlus = calcYPlus(magUp);
+    scalarField& yPlus = tyPlus();
+
+    tmp<scalarField> tmutw(new scalarField(patch().size(), 0.0));
+    scalarField& mutw = tmutw();
+
+    forAll(yPlus, facei)
+    {
+        if (yPlus[facei] > yPlusLam_)
+        {
+            const scalar Re = rho[facei]*magUp[facei]*y[facei]/muw[facei];
+            mutw[facei] = muw[facei]*(sqr(yPlus[facei])/Re - 1);
+        }
+    }
+
+    return tmutw;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mutWallFunctionFvPatchScalarField(p, iF),
+    roughnessHeight_(pTraits<scalar>::zero),
+    roughnessConstant_(pTraits<scalar>::zero),
+    roughnessFudgeFactor_(pTraits<scalar>::zero)
+{}
+
+
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+(
+    const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    roughnessHeight_(ptf.roughnessHeight_),
+    roughnessConstant_(ptf.roughnessConstant_),
+    roughnessFudgeFactor_(ptf.roughnessFudgeFactor_)
+{}
+
+
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mutWallFunctionFvPatchScalarField(p, iF, dict),
+    roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
+    roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
+    roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor")))
+{}
+
+
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+(
+    const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf
+)
+:
+    mutWallFunctionFvPatchScalarField(rwfpsf),
+    roughnessHeight_(rwfpsf.roughnessHeight_),
+    roughnessConstant_(rwfpsf.roughnessConstant_),
+    roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
+{}
+
+
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+(
+    const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mutWallFunctionFvPatchScalarField(rwfpsf, iF),
+    roughnessHeight_(rwfpsf.roughnessHeight_),
+    roughnessConstant_(rwfpsf.roughnessConstant_),
+    roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+tmp<scalarField>
+mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField magUp = mag(Uw.patchInternalField() - Uw);
+
+    return calcYPlus(magUp);
+}
+
+
+void mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
 {
     fixedValueFvPatchScalarField::write(os);
-    os.writeKeyword("U") << UName_ << token::END_STATEMENT << nl;
+    writeLocalEntries(os);
     os.writeKeyword("roughnessHeight")
         << roughnessHeight_ << token::END_STATEMENT << nl;
     os.writeKeyword("roughnessConstant")
@@ -305,7 +314,7 @@ void mutStandardRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
 makePatchTypeField
 (
     fvPatchScalarField,
-    mutStandardRoughWallFunctionFvPatchScalarField
+    mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 );
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
similarity index 59%
rename from src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
index 8403b63d7..55a75e5ac 100644
--- a/src/turbulenceModels/RAS/compressible/wallFunctions/mutWallFunctions/mutStandardRoughWallFunction/mutStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardRoughWallFunction/mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
@@ -23,20 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::compressible::RASModels::mutStandardRoughWallFunctionFvPatchScalarField
+    Foam::compressible::RASModels::
+        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 
 Description
     Wall function boundary condition for rough walls
 
 SourceFiles
-    mutStandardWallFunctionFvPatchScalarField.C
+    mutSpalartAllamarasStandardWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef mutStandardRoughWallFunctionFvPatchScalarField_H
-#define mutStandardRoughWallFunctionFvPatchScalarField_H
+#ifndef compressibleMutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H
+#define compressibleMutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H
 
-#include "fixedValueFvPatchFields.H"
+#include "mutWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,61 +49,76 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class mutWallFunctionFvPatch Declaration
+Class mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class mutStandardRoughWallFunctionFvPatchScalarField
+class mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 :
-    public fixedValueFvPatchScalarField
+    public mutWallFunctionFvPatchScalarField
 {
-    // Private data
+protected:
 
-        //- Name of the velocity field
-        word UName_;
+    // Protected data
 
-        scalar roughnessHeight_;
-        scalar roughnessConstant_;
-        scalar roughnessFudgeFactor_;
+        // Roughness parameters
+
+            //- Height
+            scalar roughnessHeight_;
+
+            //- Constant
+            scalar roughnessConstant_;
+
+            //- Scale factor
+            scalar roughnessFudgeFactor_;
+
+
+    // Protected member functions
+
+        //- Calculate yPLus
+        virtual tmp<scalarField> calcYPlus(const scalarField& magUp) const;
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcMut() const;
 
 
 public:
 
     //- Runtime type information
-    TypeName("mutStandardRoughWallFunction");
+    TypeName("mutSpalartAllmarasStandardRoughWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        mutStandardRoughWallFunctionFvPatchScalarField
+        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        mutStandardRoughWallFunctionFvPatchScalarField
+        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const dictionary&
         );
 
-        //- Construct by mapping given 
-        //  mutStandardRoughWallFunctionFvPatchScalarField
+        //- Construct by mapping given
+        //  mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         //  onto a new patch
-        mutStandardRoughWallFunctionFvPatchScalarField
+        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         (
-            const mutStandardRoughWallFunctionFvPatchScalarField&,
+            const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        mutStandardRoughWallFunctionFvPatchScalarField
+        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         (
-            const mutStandardRoughWallFunctionFvPatchScalarField&
+            const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -110,14 +126,17 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutStandardRoughWallFunctionFvPatchScalarField(*this)
+                new mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+                (
+                    *this
+                )
             );
         }
 
         //- Construct as copy setting internal field reference
-        mutStandardRoughWallFunctionFvPatchScalarField
+        mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         (
-            const mutStandardRoughWallFunctionFvPatchScalarField&,
+            const mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -129,7 +148,11 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new mutStandardRoughWallFunctionFvPatchScalarField(*this, iF)
+                new mutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+                (
+                   *this,
+                    iF
+                )
             );
         }
 
@@ -138,44 +161,38 @@ public:
 
         // Access
 
-            //- Return the name of the velocity field
-            const word& UName() const
-            {
-                return UName_;
-            }
-
-            //- Return the fluctuation scale
+            //- Return the roughness height scale
             const scalar& roughnessHeight() const
             {
                 return roughnessHeight_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness height to allow adjustment
             scalar& roughnessHeight()
             {
                 return roughnessHeight_;
             }
 
-
-            //- Return the fluctuation scale
+            //- Return the roughness constant scale
             const scalar& roughnessConstant() const
             {
                 return roughnessConstant_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness constant to allow adjustment
             scalar& roughnessConstant()
             {
                 return roughnessConstant_;
             }
 
-            //- Return the fluctuation scale
+            //- Return the roughness scale factor
             const scalar& roughnessFudgeFactor() const
             {
                 return roughnessFudgeFactor_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness scale factor to allow
+            //  adjustment
             scalar& roughnessFudgeFactor()
             {
                 return roughnessFudgeFactor_;
@@ -184,15 +201,14 @@ public:
 
         // Evaluation functions
 
-            //- Evaluate the patchField
-            virtual void evaluate
-            (
-                const Pstream::commsTypes commsType=Pstream::blocking
-            );
+            //- Calculate and return the yPlus at the boundary
+            virtual tmp<scalarField> yPlus() const;
 
 
-        //- Write
-        virtual void write(Ostream& os) const;
+        // I-O
+
+            //- Write
+            virtual void write(Ostream& os) const;
 };
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..4008ed9cf
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
@@ -0,0 +1,211 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<scalarField>
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus
+(
+    const scalarField& magUp
+) const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const fvPatchScalarField& rhow = rasModel.rho().boundaryField()[patchI];
+    const fvPatchScalarField& muw = rasModel.mu().boundaryField()[patchI];
+
+    tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
+    scalarField& yPlus = tyPlus();
+
+    forAll(yPlus, faceI)
+    {
+        scalar kappaRe = kappa_*magUp[faceI]*y[faceI]/(muw[faceI]/rhow[faceI]);
+
+        scalar yp = yPlusLam_;
+        scalar ryPlusLam = 1.0/yp;
+
+        int iter = 0;
+        scalar yPlusLast = 0.0;
+
+        do
+        {
+            yPlusLast = yp;
+            yp = (kappaRe + yp)/(1.0 + log(E_*yp));
+
+        } while (mag(ryPlusLam*(yp - yPlusLast)) > 0.01 && ++iter < 10);
+
+        yPlus[faceI] = max(0.0, yp);
+    }
+
+    return tyPlus;
+}
+
+
+tmp<scalarField>
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcMut() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField magUp = mag(Uw.patchInternalField() - Uw);
+    const fvPatchScalarField& muw = rasModel.mu().boundaryField()[patchI];
+
+    tmp<scalarField> tyPlus = calcYPlus(magUp);
+    scalarField& yPlus = tyPlus();
+
+    tmp<scalarField> tmutw(new scalarField(patch().size(), 0.0));
+    scalarField& mutw = tmutw();
+
+    forAll(yPlus, faceI)
+    {
+        if (yPlus[faceI] > yPlusLam_)
+        {
+            mutw[faceI] =
+                muw[faceI]*(yPlus[faceI]*kappa_/log(E_*yPlus[faceI]) - 1.0);
+        }
+    }
+
+    return tmutw;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mutWallFunctionFvPatchScalarField(p, iF)
+{}
+
+
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+(
+    const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mutWallFunctionFvPatchScalarField(p, iF, dict)
+{}
+
+
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+(
+    const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf
+)
+:
+    mutWallFunctionFvPatchScalarField(sawfpsf)
+{}
+
+
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+(
+    const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mutWallFunctionFvPatchScalarField(sawfpsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+tmp<scalarField>
+mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const
+{
+    const label patchI = patch().index();
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField magUp = mag(Uw.patchInternalField() - Uw);
+
+    return calcYPlus(magUp);
+}
+
+
+void mutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..d46715c04
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasStandardWallFunction/mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::RASModels::
+    mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+
+Description
+    Wall function boundary condition for walls
+
+SourceFiles
+    mutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleMutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H
+#define compressibleMutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H
+
+#include "mutWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+  Class mutSpalartAllmarasStandardWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+:
+    public mutWallFunctionFvPatchScalarField
+{
+protected:
+
+    // Protected member functions
+
+        //- Calculate yPLus
+        virtual tmp<scalarField> calcYPlus(const scalarField& magUp) const;
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcMut() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("mutSpalartAllmarasStandardWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        //  onto a new patch
+        mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        (
+            const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        (
+            const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        (
+            const mutSpalartAllmarasStandardWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Calculate and return the yPlus at the boundary
+            virtual tmp<scalarField> yPlus() const;
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..28bda7a5a
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.C
@@ -0,0 +1,224 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "mutSpalartAllmarasWallFunctionFvPatchScalarField.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "RASModel.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<scalarField> mutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
+(
+    const scalarField& magGradU
+) const
+{
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patch().index()];
+
+    const fvPatchVectorField& Uw =
+        rasModel.U().boundaryField()[patch().index()];
+
+    scalarField magUp = mag(Uw.patchInternalField() - Uw);
+
+    const fvPatchScalarField& rhow =
+        rasModel.rho().boundaryField()[patch().index()];
+
+    const fvPatchScalarField& muw =
+        rasModel.mu().boundaryField()[patch().index()];
+    const scalarField& mutw = *this;
+
+    tmp<scalarField> tuTau(new scalarField(patch().size(), 0.0));
+    scalarField& uTau = tuTau();
+
+    forAll(mutw, faceI)
+    {
+        scalar magUpara = magUp[faceI];
+
+        scalar ut =
+            sqrt((mutw[faceI] + muw[faceI])*magGradU[faceI]/rhow[faceI]);
+
+        if (ut > VSMALL)
+        {
+            int iter = 0;
+            scalar err = GREAT;
+
+            do
+            {
+                scalar kUu = min(kappa_*magUpara/ut, 50);
+                scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
+
+                scalar f =
+                    - ut*y[faceI]/(muw[faceI]/rhow[faceI])
+                    + magUpara/ut
+                    + 1/E_*(fkUu - 1.0/6.0*kUu*sqr(kUu));
+
+                scalar df =
+                    y[faceI]/(muw[faceI]/rhow[faceI])
+                  + magUpara/sqr(ut)
+                  + 1/E_*kUu*fkUu/ut;
+
+                scalar uTauNew = ut + f/df;
+                err = mag((ut - uTauNew)/ut);
+                ut = uTauNew;
+
+            } while (ut > VSMALL && err > 0.01 && ++iter < 10);
+
+            uTau[faceI] = max(0.0, ut);
+        }
+    }
+
+    return tuTau;
+}
+
+
+tmp<scalarField>
+mutSpalartAllmarasWallFunctionFvPatchScalarField::calcMut() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField magGradU = mag(Uw.snGrad());
+    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+
+    return max
+    (
+        scalar(0),
+        rhow*sqr(calcUTau(magGradU))/(magGradU + ROOTVSMALL) - muw
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+mutSpalartAllmarasWallFunctionFvPatchScalarField::
+mutSpalartAllmarasWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mutWallFunctionFvPatchScalarField(p, iF)
+{}
+
+
+mutSpalartAllmarasWallFunctionFvPatchScalarField::
+mutSpalartAllmarasWallFunctionFvPatchScalarField
+(
+    const mutSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    mutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+mutSpalartAllmarasWallFunctionFvPatchScalarField::
+mutSpalartAllmarasWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    mutWallFunctionFvPatchScalarField(p, iF, dict)
+{}
+
+
+mutSpalartAllmarasWallFunctionFvPatchScalarField::
+mutSpalartAllmarasWallFunctionFvPatchScalarField
+(
+    const mutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf
+)
+:
+    mutWallFunctionFvPatchScalarField(wfpsf)
+{}
+
+
+mutSpalartAllmarasWallFunctionFvPatchScalarField::
+mutSpalartAllmarasWallFunctionFvPatchScalarField
+(
+    const mutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    mutWallFunctionFvPatchScalarField(wfpsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+tmp<scalarField>
+mutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+
+    return y*calcUTau(mag(Uw.snGrad()))/(muw/rhow);
+}
+
+
+void mutSpalartAllmarasWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, mutSpalartAllmarasWallFunctionFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..69451280f
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutSpalartAllmarasWallFunction/mutSpalartAllmarasWallFunctionFvPatchScalarField.H
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::RASModels::
+    mutSpalartAllmarasWallFunctionFvPatchScalarField
+
+Description
+    Wall function boundary condition for walls
+
+SourceFiles
+    mutSpalartAllmarasWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleMutSpalartAllmarasWallFunctionFvPatchScalarField_H
+#define compressibleMutSpalartAllmarasWallFunctionFvPatchScalarField_H
+
+#include "mutWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+      Class mutSpalartAllmarasWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class mutSpalartAllmarasWallFunctionFvPatchScalarField
+:
+    public mutWallFunctionFvPatchScalarField
+{
+protected:
+
+    // Protected member functions
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcMut() const;
+
+        //- Calculate the friction velocity
+        virtual tmp<scalarField> calcUTau(const scalarField& magGradU) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("mutSpalartAllmarasWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        mutSpalartAllmarasWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        mutSpalartAllmarasWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  mutSpalartAllmarasWallFunctionFvPatchScalarField
+        //  onto a new patch
+        mutSpalartAllmarasWallFunctionFvPatchScalarField
+        (
+            const mutSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        mutSpalartAllmarasWallFunctionFvPatchScalarField
+        (
+            const mutSpalartAllmarasWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutSpalartAllmarasWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        mutSpalartAllmarasWallFunctionFvPatchScalarField
+        (
+            const mutSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutSpalartAllmarasWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Calculate and return the yPlus at the boundary
+            virtual tmp<scalarField> yPlus() const;
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..7e50dede2
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.C
@@ -0,0 +1,235 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "mutWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "wallFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void mutWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn("mutWallFunctionFvPatchScalarField::checkType()")
+            << "Invalid wall function specification" << nl
+            << "    Patch type for patch " << patch().name()
+            << " must be wall" << nl
+            << "    Current patch type is " << patch().type() << nl << endl
+            << abort(FatalError);
+    }
+}
+
+
+scalar mutWallFunctionFvPatchScalarField::calcYPlusLam
+(
+    const scalar kappa,
+    const scalar E
+) const
+{
+    scalar ypl = 11.0;
+
+    for (int i=0; i<10; i++)
+    {
+        ypl = log(E*ypl)/kappa;
+    }
+
+    return ypl;
+}
+
+
+tmp<scalarField> mutWallFunctionFvPatchScalarField::calcMut() const
+{
+    const label patchI = patch().index();
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+
+    const scalar Cmu25 = pow(Cmu_, 0.25);
+
+    tmp<scalarField> tmutw(new scalarField(patch().size(), 0.0));
+    scalarField& mutw = tmutw();
+
+    forAll(mutw, faceI)
+    {
+        label faceCellI = patch().faceCells()[faceI];
+
+        scalar yPlus =
+            Cmu25*y[faceI]*sqrt(k[faceCellI])/(muw[faceI]/rhow[faceI]);
+
+        if (yPlus > yPlusLam_)
+        {
+            mutw[faceI] = muw[faceI]*(yPlus*kappa_/log(E_*yPlus) - 1);
+        }
+    }
+
+    return tmutw;
+}
+
+
+void mutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+{
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    Cmu_(0.09),
+    kappa_(0.41),
+    E_(9.8),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+{}
+
+
+mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
+(
+    const mutWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    Cmu_(ptf.Cmu_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_),
+    yPlusLam_(ptf.yPlusLam_)
+{}
+
+
+mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+{}
+
+
+mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
+(
+    const mutWallFunctionFvPatchScalarField& wfpsf
+)
+:
+    fixedValueFvPatchScalarField(wfpsf),
+    Cmu_(wfpsf.Cmu_),
+    kappa_(wfpsf.kappa_),
+    E_(wfpsf.E_),
+    yPlusLam_(wfpsf.yPlusLam_)
+{}
+
+
+mutWallFunctionFvPatchScalarField::mutWallFunctionFvPatchScalarField
+(
+    const mutWallFunctionFvPatchScalarField& wfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(wfpsf, iF),
+    Cmu_(wfpsf.Cmu_),
+    kappa_(wfpsf.kappa_),
+    E_(wfpsf.E_),
+    yPlusLam_(wfpsf.yPlusLam_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void mutWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    operator==(calcMut());
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+tmp<scalarField> mutWallFunctionFvPatchScalarField::yPlus() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
+    const scalarField kwc = k.boundaryField()[patchI].patchInternalField();
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
+
+    return pow(Cmu_, 0.25)*y*sqrt(kwc)/(muw/rhow);
+}
+
+
+void mutWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, mutWallFunctionFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..886129509
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutWallFunction/mutWallFunctionFvPatchScalarField.H
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::RASModels::mutWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for turbulent (kinematic) viscosity when using wall
+    functions
+    - replicates OpenFOAM v1.5 (and earlier) behaviour
+
+SourceFiles
+    mutWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleMutWallFunctionFvPatchScalarField_H
+#define compressibleMutWallFunctionFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+             Class mutWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class mutWallFunctionFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+protected:
+
+    // Protected data
+
+        //- Cmu coefficient
+        scalar Cmu_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+        //- Y+ at the edge of the laminar sublayer
+        scalar yPlusLam_;
+
+
+    // Protected member functions
+
+        //- Check the type of the patch
+        virtual void checkType();
+
+        //- Calculate the Y+ at the edge of the laminar sublayer
+        virtual scalar calcYPlusLam(const scalar kappa, const scalar E) const;
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcMut() const;
+
+        //- Write local wall function variables
+        virtual void writeLocalEntries(Ostream&) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("mutWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        mutWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        mutWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  mutWallFunctionFvPatchScalarField
+        //  onto a new patch
+        mutWallFunctionFvPatchScalarField
+        (
+            const mutWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        mutWallFunctionFvPatchScalarField
+        (
+            const mutWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        mutWallFunctionFvPatchScalarField
+        (
+            const mutWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Calculate and return the yPlus at the boundary
+            virtual tmp<scalarField> yPlus() const;
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..00a00b4ce
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.C
@@ -0,0 +1,240 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "mutkWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "wallFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void mutkWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn("mutkWallFunctionFvPatchScalarField::checkType()")
+            << "Invalid wall function specification" << nl
+            << "    Patch type for patch " << patch().name()
+            << " must be wall" << nl
+            << "    Current patch type is " << patch().type() << nl << endl
+            << abort(FatalError);
+    }
+}
+
+
+scalar mutkWallFunctionFvPatchScalarField::calcYPlusLam
+(
+    const scalar kappa,
+    const scalar E
+) const
+{
+    scalar ypl = 11.0;
+
+    for (int i=0; i<10; i++)
+    {
+        ypl = log(E*ypl)/kappa;
+    }
+
+    return ypl;
+}
+
+
+tmp<scalarField> mutkWallFunctionFvPatchScalarField::calcMut() const
+{
+    const label patchI = patch().index();
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+
+    const scalar Cmu25 = pow(Cmu_, 0.25);
+
+    tmp<scalarField> tmutw(new scalarField(patch().size(), 0.0));
+    scalarField& mutw = tmutw();
+
+    forAll(mutw, faceI)
+    {
+        label faceCellI = patch().faceCells()[faceI];
+
+        scalar yPlus =
+            Cmu25*y[faceI]*sqrt(k[faceCellI])/(muw[faceI]/rhow[faceI]);
+
+        if (yPlus > yPlusLam_)
+        {
+            mutw[faceI] = muw[faceI]*(yPlus*kappa_/log(E_*yPlus) - 1);
+        }
+    }
+
+    return tmutw;
+}
+
+
+void mutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+{
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    Cmu_(0.09),
+    kappa_(0.41),
+    E_(9.8),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+{}
+
+
+mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
+(
+    const mutkWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    Cmu_(ptf.Cmu_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_),
+    yPlusLam_(ptf.yPlusLam_)
+{}
+
+
+mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+{}
+
+
+mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
+(
+    const mutkWallFunctionFvPatchScalarField& wfpsf
+)
+:
+    fixedValueFvPatchScalarField(wfpsf),
+    Cmu_(wfpsf.Cmu_),
+    kappa_(wfpsf.kappa_),
+    E_(wfpsf.E_),
+    yPlusLam_(wfpsf.yPlusLam_)
+{}
+
+
+mutkWallFunctionFvPatchScalarField::mutkWallFunctionFvPatchScalarField
+(
+    const mutkWallFunctionFvPatchScalarField& wfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(wfpsf, iF),
+    Cmu_(wfpsf.Cmu_),
+    kappa_(wfpsf.kappa_),
+    E_(wfpsf.E_),
+    yPlusLam_(wfpsf.yPlusLam_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void mutkWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    operator==(calcMut());
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+tmp<scalarField> mutkWallFunctionFvPatchScalarField::yPlus() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
+    const scalarField kwc = k.boundaryField()[patchI].patchInternalField();
+    const scalarField& muw = rasModel.mu().boundaryField()[patchI];
+    const scalarField& rhow = rasModel.rho().boundaryField()[patchI];
+
+    return pow(Cmu_, 0.25)*y*sqrt(kwc)/(muw/rhow);
+}
+
+
+void mutkWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, mutkWallFunctionFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..670388b41
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/mutWallFunctions/mutkWallFunction/mutkWallFunctionFvPatchScalarField.H
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::RASModels::mutkWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for turbulent (kinematic) viscosity when using wall
+    functions, based on turbulence kinetic energy.
+    - replicates OpenFOAM v1.5 (and earlier) behaviour
+
+SourceFiles
+    mutkWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleMutkWallFunctionFvPatchScalarField_H
+#define compressibleMutkWallFunctionFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+             Class mutkWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class mutkWallFunctionFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+protected:
+
+    // Protected data
+
+        //- Cmu coefficient
+        scalar Cmu_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+        //- Y+ at the edge of the laminar sublayer
+        scalar yPlusLam_;
+
+
+    // Protected member functions
+
+        //- Check the type of the patch
+        virtual void checkType();
+
+        //- Calculate the Y+ at the edge of the laminar sublayer
+        virtual scalar calcYPlusLam(const scalar kappa, const scalar E) const;
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcMut() const;
+
+        //- Write local wall function variables
+        virtual void writeLocalEntries(Ostream&) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("mutkWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        mutkWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        mutkWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  mutkWallFunctionFvPatchScalarField
+        //  onto a new patch
+        mutkWallFunctionFvPatchScalarField
+        (
+            const mutkWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        mutkWallFunctionFvPatchScalarField
+        (
+            const mutkWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutkWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        mutkWallFunctionFvPatchScalarField
+        (
+            const mutkWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new mutkWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Calculate and return the yPlus at the boundary
+            virtual tmp<scalarField> yPlus() const;
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..44998e87b
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -0,0 +1,276 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "omegaWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void omegaWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn("omegaWallFunctionFvPatchScalarField::checkType()")
+            << "Invalid wall function specification" << nl
+            << "    Patch type for patch " << patch().name()
+            << " must be wall" << nl
+            << "    Current patch type is " << patch().type() << nl << endl
+            << abort(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedInternalValueFvPatchField<scalar>(p, iF),
+    UName_("U"),
+    rhoName_("rho"),
+    kName_("k"),
+    GName_("RASModel::G"),
+    muName_("mu"),
+    mutName_("mut"),
+    Cmu_(0.09),
+    kappa_(0.41),
+    E_(9.8),
+    beta1_(0.075)
+{
+    checkType();
+}
+
+
+omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
+(
+    const omegaWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    rhoName_(ptf.rhoName_),
+    kName_(ptf.kName_),
+    GName_(ptf.GName_),
+    muName_(ptf.muName_),
+    mutName_(ptf.mutName_),
+    Cmu_(ptf.Cmu_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_),
+    beta1_(ptf.beta1_)
+{
+    checkType();
+}
+
+
+omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedInternalValueFvPatchField<scalar>(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    rhoName_(dict.lookupOrDefault<word>("rho", "rho")),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
+    GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+    muName_(dict.lookupOrDefault<word>("mu", "mu")),
+    mutName_(dict.lookupOrDefault<word>("mut", "mut")),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    beta1_(dict.lookupOrDefault<scalar>("beta1", 0.075))
+{
+    checkType();
+}
+
+
+omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
+(
+    const omegaWallFunctionFvPatchScalarField& owfpsf
+)
+:
+    fixedInternalValueFvPatchField<scalar>(owfpsf),
+    UName_(owfpsf.UName_),
+    rhoName_(owfpsf.rhoName_),
+    kName_(owfpsf.kName_),
+    GName_(owfpsf.GName_),
+    muName_(owfpsf.muName_),
+    mutName_(owfpsf.mutName_),
+    Cmu_(owfpsf.Cmu_),
+    kappa_(owfpsf.kappa_),
+    E_(owfpsf.E_),
+    beta1_(owfpsf.beta1_)
+{
+    checkType();
+}
+
+
+omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
+(
+    const omegaWallFunctionFvPatchScalarField& owfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedInternalValueFvPatchField<scalar>(owfpsf, iF),
+    UName_(owfpsf.UName_),
+    rhoName_(owfpsf.rhoName_),
+    kName_(owfpsf.kName_),
+    GName_(owfpsf.GName_),
+    muName_(owfpsf.muName_),
+    mutName_(owfpsf.mutName_),
+    Cmu_(owfpsf.Cmu_),
+    kappa_(owfpsf.kappa_),
+    E_(owfpsf.E_),
+    beta1_(owfpsf.beta1_)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void omegaWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
+    const scalarField& y = rasModel.y()[patch().index()];
+
+    const scalar Cmu25 = pow(Cmu_, 0.25);
+
+    volScalarField& G = const_cast<volScalarField&>
+        (db().lookupObject<volScalarField>(GName_));
+
+    volScalarField& omega = const_cast<volScalarField&>
+        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
+
+    const scalarField& k = db().lookupObject<volScalarField>(kName_);
+
+    const scalarField& rhow =
+        patch().lookupPatchField<volScalarField, scalar>(rhoName_);
+
+    const scalarField& muw =
+        patch().lookupPatchField<volScalarField, scalar>(muName_);
+
+    const scalarField& mutw =
+        patch().lookupPatchField<volScalarField, scalar>(mutName_);
+
+    const fvPatchVectorField& Uw =
+        patch().lookupPatchField<volVectorField, vector>(UName_);
+
+    const scalarField magGradUw = mag(Uw.snGrad());
+
+    // Set omega and G
+    forAll(mutw, faceI)
+    {
+        label faceCellI = patch().faceCells()[faceI];
+
+        scalar yPlus =
+            Cmu25*y[faceI]*sqrt(k[faceCellI])
+           /(muw[faceI]/rhow[faceI]);
+
+        scalar omegaVis = 6.0*(muw[faceI]/rhow[faceI])/(beta1_*sqr(y[faceI]));
+
+        scalar omegaLog = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]);
+
+        omega[faceCellI] = sqrt(sqr(omegaVis) + sqr(omegaLog));
+
+        if (yPlus > yPlusLam)
+        {
+            G[faceCellI] =
+                (mutw[faceI] + muw[faceI])
+               *magGradUw[faceI]
+               *Cmu25*sqrt(k[faceCellI])
+               /(kappa_*y[faceI]);
+        }
+        else
+        {
+            G[faceCellI] = 0.0;
+        }
+    }
+
+    // TODO: perform averaging for cells sharing more than one boundary face
+
+    fixedInternalValueFvPatchField<scalar>::updateCoeffs();
+}
+
+
+void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fixedInternalValueFvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "rho", "rho", rhoName_);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
+    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    writeEntryIfDifferent<word>(os, "mu", "mu", muName_);
+    writeEntryIfDifferent<word>(os, "mut", "mut", mutName_);
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    os.writeKeyword("beta1") << beta1_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    omegaWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..d683f1c6d
--- /dev/null
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
@@ -0,0 +1,207 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::RASModels::omegaWallFunctionFvPatchScalarField
+
+Description
+    Provides a wall function boundary condition/constraint on omega
+
+    Computed value is:
+
+        omega = sqrt(omega_vis^2 + omega_log^2)
+
+    where
+        omega_vis = omega in viscous region
+        omega_log = omega in logarithmic region
+
+    Model described by Eq.(15) of:
+    @verbatim
+        Menter, F., Esch, T.
+        "Elements of Industrial Heat Transfer Prediction"
+        16th Brazilian Congress of Mechanical Engineering (COBEM),
+        Nov. 2001
+    @endverbatim
+
+SourceFiles
+    omegaWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleOmegaWallFunctionFvPatchScalarField_H
+#define compressibleOmegaWallFunctionFvPatchScalarField_H
+
+#include "fixedInternalValueFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+           Class omegaWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class omegaWallFunctionFvPatchScalarField
+:
+    public fixedInternalValueFvPatchField<scalar>
+{
+    // Private data
+
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of density field
+        word rhoName_;
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
+        //- Name of turbulence generation field
+        word GName_;
+
+        //- Name of laminar viscosity field
+        word muName_;
+
+        //- Name of turbulent viscosity field
+        word mutName_;
+
+        //- Cmu coefficient
+        scalar Cmu_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+        //- beta1 coefficient
+        scalar beta1_;
+
+
+    // Private member functions
+
+        //- Check the type of the patch
+        void checkType();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("compressible::omegaWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        omegaWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        omegaWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        // omegaWallFunctionFvPatchScalarField
+        //  onto a new patch
+        omegaWallFunctionFvPatchScalarField
+        (
+            const omegaWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        omegaWallFunctionFvPatchScalarField
+        (
+            const omegaWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new omegaWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        omegaWallFunctionFvPatchScalarField
+        (
+            const omegaWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new omegaWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
similarity index 78%
rename from src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C
rename to src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
index cf4f33e25..58953d267 100644
--- a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.C
@@ -26,7 +26,8 @@ License
 
 #include "kEpsilon.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,7 +50,7 @@ kEpsilon::kEpsilon
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),
@@ -90,29 +91,29 @@ kEpsilon::kEpsilon
             -0.33
         )
     ),
-    alphak_
+    sigmak_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphak",
+            "sigmak",
             coeffDict_,
             1.0
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
-    alphah_
+    Prt_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphah",
+            "Prt",
             coeffDict_,
             1.0
         )
@@ -125,12 +126,11 @@ kEpsilon::kEpsilon
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -138,12 +138,11 @@ kEpsilon::kEpsilon
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
-
     mut_
     (
         IOobject
@@ -152,12 +151,28 @@ kEpsilon::kEpsilon
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::AUTO_WRITE
         ),
-        Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
+        autoCreateMut("mut", mesh_)
+    ),
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
     )
 {
-#   include "wallViscosityI.H"
+    mut_ = Cmu_*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_.correctBoundaryConditions();
+
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 
     printCoeffs();
 }
@@ -220,13 +235,13 @@ bool kEpsilon::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        C3_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        C3_.readIfPresent(coeffDict());
+        sigmak_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -239,16 +254,16 @@ bool kEpsilon::read()
 
 void kEpsilon::correct()
 {
-    // Bound in case of topological change.  Signalling currently not available
-    // HJ, 22/Aug/2007
-    bound(k_, k0_);
-    bound(epsilon_, epsilon0_);
-
     if (!turbulence_)
     {
         // Re-calculate viscosity
         mut_ = rho_*Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
-#       include "wallViscosityI.H"
+        mut_.correctBoundaryConditions();
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
+
         return;
     }
 
@@ -262,10 +277,11 @@ void kEpsilon::correct()
     }
 
     tmp<volTensorField> tgradU = fvc::grad(U_);
-    volScalarField G = mut_*(tgradU() && dev(twoSymm(tgradU())));
+    volScalarField G("RASModel::G", mut_*(tgradU() && dev(twoSymm(tgradU()))));
     tgradU.clear();
 
-#   include "wallFunctionsI.H"
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
@@ -279,10 +295,10 @@ void kEpsilon::correct()
       - fvm::Sp(C2_*rho_*epsilon_/k_, epsilon_)
     );
 
-#   include "wallDissipationI.H"
-
     epsEqn().relax();
 
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
+
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
 
@@ -307,9 +323,11 @@ void kEpsilon::correct()
 
     // Re-calculate viscosity
     mut_ = rho_*Cmu_*sqr(k_)/epsilon_;
+    mut_.correctBoundaryConditions();
 
-#   include "wallViscosityI.H"
-
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
similarity index 78%
rename from src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
rename to src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
index dcbe30bd5..796ad9069 100644
--- a/src/turbulenceModels/RAS/compressible/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/compressible/RAS/kEpsilon/kEpsilon.H
@@ -36,9 +36,9 @@ Description
             C1          1.44;
             C2          1.92;
             C3          -0.33;  // only for compressible
-            alphak      1.0;    // only for compressible
-            alphaEps    0.76923;
-            alphah      1.0;    // only for compressible
+            sigmak      1.0;    // only for compressible
+            sigmaEps    1.3;
+            Prt         1.0;    // only for compressible
         }
     @endverbatim
 
@@ -74,20 +74,20 @@ class kEpsilon
 
         // Model coefficients
 
-//            dimensionedScalar Cmu;
             dimensionedScalar Cmu_;
             dimensionedScalar C1_;
             dimensionedScalar C2_;
             dimensionedScalar C3_;
-            dimensionedScalar alphak_;
-            dimensionedScalar alphaEps_;
-            dimensionedScalar alphah_;
+            dimensionedScalar sigmak_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar Prt_;
 
         // Fields
 
             volScalarField k_;
             volScalarField epsilon_;
             volScalarField mut_;
+            volScalarField alphat_;
 
 
 public:
@@ -97,36 +97,29 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         kEpsilon
         (
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
-    // Destructor
-
-        ~kEpsilon()
-        {}
+    //- Destructor
+    virtual ~kEpsilon()
+    {}
 
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", alphak_*mut_ + mu())
+                new volScalarField("DkEff", mut_/sigmak_ + mu())
             );
         }
 
@@ -135,45 +128,51 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*mut_ + mu())
+                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
             );
         }
 
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> mut() const
+        {
+            return mut_;
+        }
+
         //- Return the effective turbulent thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphat_ + alpha())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
similarity index 82%
rename from src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C
rename to src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
index fddb29106..8ac7849f1 100644
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.C
@@ -26,7 +26,8 @@ License
 
 #include "kOmegaSST.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -92,7 +93,7 @@ kOmegaSST::kOmegaSST
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),
@@ -133,11 +134,11 @@ kOmegaSST::kOmegaSST
             0.85616
         )
     ),
-    alphah_
+    Prt_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphah",
+            "Prt",
             coeffDict_,
             1.0
         )
@@ -206,19 +207,6 @@ kOmegaSST::kOmegaSST
         )
     ),
 
-    omega0_("omega0", dimless/dimTime, SMALL),
-    omegaSmall_("omegaSmall", dimless/dimTime, SMALL),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-
     y_(mesh_),
 
     k_
@@ -228,12 +216,11 @@ kOmegaSST::kOmegaSST
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     omega_
     (
         IOobject
@@ -241,12 +228,11 @@ kOmegaSST::kOmegaSST
             "omega",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateOmega("omega", mesh_)
     ),
-
     mut_
     (
         IOobject
@@ -255,12 +241,30 @@ kOmegaSST::kOmegaSST
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::AUTO_WRITE
         ),
-        a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))))
+        autoCreateMut("mut", mesh_)
+    ),
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
     )
 {
-#   include "kOmegaWallViscosityI.H"
+    bound(omega_, omega0_);
+
+    mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
+    mut_.correctBoundaryConditions();
+
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 
     printCoeffs();
 }
@@ -322,19 +326,18 @@ bool kOmegaSST::read()
 {
     if (RASModel::read())
     {
-        alphaK1_.readIfPresent(coeffDict_);
-        alphaK2_.readIfPresent(coeffDict_);
-        alphaOmega1_.readIfPresent(coeffDict_);
-        alphaOmega2_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
-        gamma1_.readIfPresent(coeffDict_);
-        gamma2_.readIfPresent(coeffDict_);
-        beta1_.readIfPresent(coeffDict_);
-        beta2_.readIfPresent(coeffDict_);
-        betaStar_.readIfPresent(coeffDict_);
-        a1_.readIfPresent(coeffDict_);
-        c1_.readIfPresent(coeffDict_);
-        Cmu_.readIfPresent(coeffDict_);
+        alphaK1_.readIfPresent(coeffDict());
+        alphaK2_.readIfPresent(coeffDict());
+        alphaOmega1_.readIfPresent(coeffDict());
+        alphaOmega2_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
+        gamma1_.readIfPresent(coeffDict());
+        gamma2_.readIfPresent(coeffDict());
+        beta1_.readIfPresent(coeffDict());
+        beta2_.readIfPresent(coeffDict());
+        betaStar_.readIfPresent(coeffDict());
+        a1_.readIfPresent(coeffDict());
+        c1_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -353,7 +356,12 @@ void kOmegaSST::correct()
         mut_ =
             a1_*rho_*k_
            /max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
-#       include "kOmegaWallViscosityI.H"
+        mut_.correctBoundaryConditions();
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
+
         return;
     }
 
@@ -374,10 +382,11 @@ void kOmegaSST::correct()
     tmp<volTensorField> tgradU = fvc::grad(U_);
     volScalarField S2 = magSqr(symm(tgradU()));
     volScalarField GbyMu = (tgradU() && dev(twoSymm(tgradU())));
-    volScalarField G = mut_*GbyMu;
+    volScalarField G("RASModel::G", mut_*GbyMu);
     tgradU.clear();
 
-#   include "kOmegaWallFunctionsI.H"
+    // Update omega and G at the wall
+    omega_.boundaryField().updateCoeffs();
 
     volScalarField CDkOmega =
         (2*alphaOmega2_)*(fvc::grad(k_) & fvc::grad(omega_))/omega_;
@@ -404,7 +413,7 @@ void kOmegaSST::correct()
 
     omegaEqn().relax();
 
-#   include "wallOmegaI.H"
+    omegaEqn().boundaryManipulate(omega_.boundaryField());
 
     solve(omegaEqn);
     bound(omega_, omega0_);
@@ -428,9 +437,11 @@ void kOmegaSST::correct()
 
     // Re-calculate viscosity
     mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(S2));
+    mut_.correctBoundaryConditions();
 
-#   include "kOmegaWallViscosityI.H"
-
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
similarity index 77%
rename from src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
rename to src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
index 2060ca501..7d77f0e7c 100644
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST/kOmegaSST.H
@@ -54,14 +54,13 @@ Description
 
     The default model coefficients correspond to the following:
     @verbatim
-        kOmegaSST
+        kOmegaSSTCoeffs
         {
-            Cmu         0.09;
             alphaK1     0.85034;
             alphaK2     1.0;
             alphaOmega1 0.5;
             alphaOmega2 0.85616;
-            alphah      1.0;    // only for compressible
+            Prt         1.0;    // only for compressible
             beta1       0.075;
             beta2       0.0828;
             betaStar    0.09;
@@ -96,7 +95,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class kOmega Declaration
+                          Class kOmegaSST Declaration
 \*---------------------------------------------------------------------------*/
 
 class kOmegaSST
@@ -105,35 +104,38 @@ class kOmegaSST
 {
     // Private data
 
-        dimensionedScalar alphaK1_;
-        dimensionedScalar alphaK2_;
+        // Model coefficients
 
-        dimensionedScalar alphaOmega1_;
-        dimensionedScalar alphaOmega2_;
+            dimensionedScalar alphaK1_;
+            dimensionedScalar alphaK2_;
 
-        dimensionedScalar alphah_;
+            dimensionedScalar alphaOmega1_;
+            dimensionedScalar alphaOmega2_;
 
-        dimensionedScalar gamma1_;
-        dimensionedScalar gamma2_;
+            dimensionedScalar Prt_;
 
-        dimensionedScalar beta1_;
-        dimensionedScalar beta2_;
+            dimensionedScalar gamma1_;
+            dimensionedScalar gamma2_;
 
-        dimensionedScalar betaStar_;
+            dimensionedScalar beta1_;
+            dimensionedScalar beta2_;
 
-        dimensionedScalar a1_;
-        dimensionedScalar c1_;
+            dimensionedScalar betaStar_;
 
-        dimensionedScalar omega0_;
-        dimensionedScalar omegaSmall_;
+            dimensionedScalar a1_;
+            dimensionedScalar c1_;
 
-        dimensionedScalar Cmu_;
 
+        //- Wall distance
+        //  Note: different to wall distance in parent RASModel
         wallDist y_;
 
-        volScalarField k_;
-        volScalarField omega_;
-        volScalarField mut_;
+        // Fields
+
+            volScalarField k_;
+            volScalarField omega_;
+            volScalarField mut_;
+            volScalarField alphat_;
 
 
     // Private member functions
@@ -151,34 +153,22 @@ class kOmegaSST
             return F1*(psi1 - psi2) + psi2;
         }
 
-        tmp<volScalarField> alphaK
-        (
-            const volScalarField& F1
-        ) const
+        tmp<volScalarField> alphaK(const volScalarField& F1) const
         {
             return blend(F1, alphaK1_, alphaK2_);
         }
 
-        tmp<volScalarField> alphaOmega
-        (
-            const volScalarField& F1
-        ) const
+        tmp<volScalarField> alphaOmega(const volScalarField& F1) const
         {
             return blend(F1, alphaOmega1_, alphaOmega2_);
         }
 
-        tmp<volScalarField> beta
-        (
-            const volScalarField& F1
-        ) const
+        tmp<volScalarField> beta(const volScalarField& F1) const
         {
             return blend(F1, beta1_, beta2_);
         }
 
-        tmp<volScalarField> gamma
-        (
-            const volScalarField& F1
-        ) const
+        tmp<volScalarField> gamma(const volScalarField& F1) const
         {
             return blend(F1, gamma1_, gamma2_);
         }
@@ -198,23 +188,17 @@ public:
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
-    // Destructor
-
-        ~kOmegaSST()
-        {}
+    //- Destructor
+    virtual ~kOmegaSST()
+    {}
 
 
     // Member Functions
 
-        tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff(const volScalarField& F1) const
         {
@@ -233,28 +217,33 @@ public:
             );
         }
 
+        virtual tmp<volScalarField> mut() const
+        {
+            return mut_;
+        }
+
         //- Return the effective turbulent thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphat_ + alpha())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
-        tmp<volScalarField> omega() const
+        virtual tmp<volScalarField> omega() const
         {
             return omega_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return tmp<volScalarField>
             (
@@ -273,19 +262,19 @@ public:
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/kOmegaSST_LowRe.C b/src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.C
similarity index 85%
rename from src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/kOmegaSST_LowRe.C
rename to src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.C
index 636f3ead1..29a3a3866 100644
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/kOmegaSST_LowRe.C
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.C
@@ -26,7 +26,8 @@ License
 
 #include "kOmegaSST_LowRe.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -92,7 +93,7 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),
@@ -133,11 +134,11 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
             0.85616
         )
     ),
-    alphah_
+    Prt_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphah",
+            "Prt",
             coeffDict_,
             1.0
         )
@@ -206,19 +207,6 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
         )
     ),
 
-    omega0_("omega0", dimless/dimTime, SMALL),
-    omegaSmall_("omegaSmall", dimless/dimTime, SMALL),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-
     y_(mesh_),
 
     k_
@@ -255,11 +243,31 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::AUTO_WRITE
         ),
         a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))))
+    ),
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
     )
 {
+    bound(omega_, omega0_);
+
+    mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
+    mut_.correctBoundaryConditions();
+
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -320,19 +328,18 @@ bool kOmegaSST_LowRe::read()
 {
     if (RASModel::read())
     {
-        alphaK1_.readIfPresent(coeffDict_);
-        alphaK2_.readIfPresent(coeffDict_);
-        alphaOmega1_.readIfPresent(coeffDict_);
-        alphaOmega2_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
-        gamma1_.readIfPresent(coeffDict_);
-        gamma2_.readIfPresent(coeffDict_);
-        beta1_.readIfPresent(coeffDict_);
-        beta2_.readIfPresent(coeffDict_);
-        betaStar_.readIfPresent(coeffDict_);
-        a1_.readIfPresent(coeffDict_);
-        c1_.readIfPresent(coeffDict_);
-        Cmu_.readIfPresent(coeffDict_);
+        alphaK1_.readIfPresent(coeffDict());
+        alphaK2_.readIfPresent(coeffDict());
+        alphaOmega1_.readIfPresent(coeffDict());
+        alphaOmega2_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
+        gamma1_.readIfPresent(coeffDict());
+        gamma2_.readIfPresent(coeffDict());
+        beta1_.readIfPresent(coeffDict());
+        beta2_.readIfPresent(coeffDict());
+        betaStar_.readIfPresent(coeffDict());
+        a1_.readIfPresent(coeffDict());
+        c1_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -351,6 +358,11 @@ void kOmegaSST_LowRe::correct()
         mut_ =
             a1_*rho_*k_
            /max(a1_*omega_, F2()*sqrt(magSqr(symm(fvc::grad(U_)))));
+        mut_.correctBoundaryConditions();
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
 
         return;
     }
@@ -372,7 +384,7 @@ void kOmegaSST_LowRe::correct()
     tmp<volTensorField> tgradU = fvc::grad(U_);
     volScalarField S2 = magSqr(symm(tgradU()));
     volScalarField GbyMu = (tgradU() && dev(twoSymm(tgradU())));
-    volScalarField G = mut_*GbyMu;
+    volScalarField G("RASModel::G", mut_*GbyMu);
     tgradU.clear();
 
 #   include "kOmega_LowReI.H"
@@ -426,6 +438,11 @@ void kOmegaSST_LowRe::correct()
 
     // Re-calculate viscosity
     mut_ = a1_*rho_*k_/max(a1_*omega_, F2()*sqrt(S2));
+    mut_.correctBoundaryConditions();
+
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/kOmegaSST_LowRe.H b/src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.H
similarity index 78%
rename from src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/kOmegaSST_LowRe.H
rename to src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.H
index 820d08b78..4f2c03d8b 100644
--- a/src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/kOmegaSST_LowRe.H
+++ b/src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.H
@@ -56,12 +56,11 @@ Description
     @verbatim
         kOmegaSST_LowRe
         {
-            Cmu         0.09;
             alphaK1     0.85034;
             alphaK2     1.0;
             alphaOmega1 0.5;
             alphaOmega2 0.85616;
-            alphah      1.0;    // only for compressible
+            Prt         1.0;    // only for compressible
             beta1       0.075;
             beta2       0.0828;
             betaStar    0.09;
@@ -96,7 +95,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class kOmega Declaration
+                    Class kOmegaSST_LowRe Declaration
 \*---------------------------------------------------------------------------*/
 
 class kOmegaSST_LowRe
@@ -105,35 +104,38 @@ class kOmegaSST_LowRe
 {
     // Private data
 
-        dimensionedScalar alphaK1_;
-        dimensionedScalar alphaK2_;
+        // Model coefficients
 
-        dimensionedScalar alphaOmega1_;
-        dimensionedScalar alphaOmega2_;
+            dimensionedScalar alphaK1_;
+            dimensionedScalar alphaK2_;
 
-        dimensionedScalar alphah_;
+            dimensionedScalar alphaOmega1_;
+            dimensionedScalar alphaOmega2_;
 
-        dimensionedScalar gamma1_;
-        dimensionedScalar gamma2_;
+            dimensionedScalar Prt_;
 
-        dimensionedScalar beta1_;
-        dimensionedScalar beta2_;
+            dimensionedScalar gamma1_;
+            dimensionedScalar gamma2_;
 
-        dimensionedScalar betaStar_;
+            dimensionedScalar beta1_;
+            dimensionedScalar beta2_;
 
-        dimensionedScalar a1_;
-        dimensionedScalar c1_;
+            dimensionedScalar betaStar_;
 
-        dimensionedScalar omega0_;
-        dimensionedScalar omegaSmall_;
+            dimensionedScalar a1_;
+            dimensionedScalar c1_;
 
-        dimensionedScalar Cmu_;
 
+        //- Wall distance
+        //  Note: different to wall distance in parent RASModel
         wallDist y_;
 
-        volScalarField k_;
-        volScalarField omega_;
-        volScalarField mut_;
+        // Fields
+
+            volScalarField k_;
+            volScalarField omega_;
+            volScalarField mut_;
+            volScalarField alphat_;
 
 
     // Private member functions
@@ -151,34 +153,22 @@ class kOmegaSST_LowRe
             return F1*(psi1 - psi2) + psi2;
         }
 
-        tmp<volScalarField> alphaK
-        (
-            const volScalarField& F1
-        ) const
+        tmp<volScalarField> alphaK(const volScalarField& F1) const
         {
             return blend(F1, alphaK1_, alphaK2_);
         }
 
-        tmp<volScalarField> alphaOmega
-        (
-            const volScalarField& F1
-        ) const
+        tmp<volScalarField> alphaOmega(const volScalarField& F1) const
         {
             return blend(F1, alphaOmega1_, alphaOmega2_);
         }
 
-        tmp<volScalarField> beta
-        (
-            const volScalarField& F1
-        ) const
+        tmp<volScalarField> beta(const volScalarField& F1) const
         {
             return blend(F1, beta1_, beta2_);
         }
 
-        tmp<volScalarField> gamma
-        (
-            const volScalarField& F1
-        ) const
+        tmp<volScalarField> gamma(const volScalarField& F1) const
         {
             return blend(F1, gamma1_, gamma2_);
         }
@@ -198,23 +188,18 @@ public:
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~kOmegaSST_LowRe()
+        virtual ~kOmegaSST_LowRe()
         {}
 
 
     // Member Functions
 
-        tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff(const volScalarField& F1) const
         {
@@ -233,28 +218,33 @@ public:
             );
         }
 
+        virtual tmp<volScalarField> mut() const
+        {
+            return mut_;
+        }
+
         //- Return the effective turbulent thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphat_ + alpha())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
-        tmp<volScalarField> omega() const
+        virtual tmp<volScalarField> omega() const
         {
             return omega_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return tmp<volScalarField>
             (
@@ -273,19 +263,19 @@ public:
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/kOmega_LowReI.H b/src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/kOmega_LowReI.H
similarity index 100%
rename from src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/kOmega_LowReI.H
rename to src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/kOmega_LowReI.H
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/wallOmega_LowReI.H b/src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/wallOmega_LowReI.H
similarity index 100%
rename from src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/wallOmega_LowReI.H
rename to src/turbulenceModels/compressible/RAS/kOmegaSST_LowRe/wallOmega_LowReI.H
diff --git a/src/turbulenceModels/RAS/compressible/laminar/laminar.C b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
similarity index 97%
rename from src/turbulenceModels/RAS/compressible/laminar/laminar.C
rename to src/turbulenceModels/compressible/RAS/laminar/laminar.C
index cbe3cf7d1..1aba91e7d 100644
--- a/src/turbulenceModels/RAS/compressible/laminar/laminar.C
+++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.C
@@ -48,7 +48,7 @@ laminar::laminar
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel)
@@ -171,7 +171,8 @@ tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
 {
     return
     (
-      - fvm::laplacian(muEff(), U) - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+      - fvm::laplacian(muEff(), U)
+      - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
     );
 }
 
diff --git a/src/turbulenceModels/RAS/compressible/laminar/laminar.H b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
similarity index 81%
rename from src/turbulenceModels/RAS/compressible/laminar/laminar.H
rename to src/turbulenceModels/compressible/RAS/laminar/laminar.H
index 8a5b59194..f49f73ca9 100644
--- a/src/turbulenceModels/RAS/compressible/laminar/laminar.H
+++ b/src/turbulenceModels/compressible/RAS/laminar/laminar.H
@@ -30,12 +30,11 @@ Description
 
 SourceFiles
     laminar.C
-    laminarCorrect.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef compressibleLaminar_H
-#define compressibleLaminar_H
+#ifndef compressibleRasLaminar_H
+#define compressibleRasLaminar_H
 
 #include "RASModel.H"
 
@@ -64,61 +63,61 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         laminar
         (
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~laminar()
+        virtual ~laminar()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity, i.e. 0 for laminar flow
-        tmp<volScalarField> mut() const;
+        virtual tmp<volScalarField> mut() const;
 
         //- Return the effective viscosity, i.e. the laminar viscosity
-        tmp<volScalarField> muEff() const
+        virtual tmp<volScalarField> muEff() const
         {
             return tmp<volScalarField>(new volScalarField("muEff", mu()));
         }
 
         //- Return the effective turbulent thermal diffusivity,
         //  i.e. the laminar thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>(new volScalarField("alphaEff", alpha()));
         }
 
         //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
-        tmp<volScalarField> k() const;
+        virtual tmp<volScalarField> k() const;
 
         //- Return the turbulence kinetic energy dissipation rate,
         //  i.e. 0 for laminar flow
-        tmp<volScalarField> epsilon() const;
+        virtual tmp<volScalarField> epsilon() const;
 
         //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor, i.e. the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Correct the laminar viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
similarity index 81%
rename from src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C
rename to src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
index 6d45ea04c..f38b5a3a7 100644
--- a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.C
@@ -26,7 +26,8 @@ License
 
 #include "realizableKE.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -90,7 +91,7 @@ realizableKE::realizableKE
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
 )
 :
     RASModel(typeName, rho, U, phi, thermophysicalModel),
@@ -122,29 +123,29 @@ realizableKE::realizableKE
             1.9
         )
     ),
-    alphak_
+    sigmak_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphak",
+            "sigmak",
             coeffDict_,
             1.0
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.833333
+            1.2
         )
     ),
-    alphah_
+    Prt_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphah",
+            "Prt",
             coeffDict_,
             1.0
         )
@@ -157,12 +158,11 @@ realizableKE::realizableKE
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -170,12 +170,11 @@ realizableKE::realizableKE
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
-
     mut_
     (
         IOobject
@@ -184,14 +183,31 @@ realizableKE::realizableKE
             runTime_.timeName(),
             mesh_,
             IOobject::NO_READ,
-            IOobject::NO_WRITE
+            IOobject::AUTO_WRITE
         ),
-        rCmu(fvc::grad(U_))*rho_*sqr(k_)/(epsilon_ + epsilonSmall_)
+        autoCreateMut("mut", mesh_)
+    ),
+    alphat_
+    (
+        IOobject
+        (
+            "alphat",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateAlphat("alphat", mesh_)
     )
 {
     bound(k_, k0_);
     bound(epsilon_, epsilon0_);
-#   include "wallViscosityI.H"
+
+    mut_ = rCmu(fvc::grad(U_))*rho_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    mut_.correctBoundaryConditions();
+
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 
     printCoeffs();
 }
@@ -253,12 +269,12 @@ bool realizableKE::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        A0_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        alphah_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        A0_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmak_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        Prt_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -275,6 +291,12 @@ void realizableKE::correct()
     {
         // Re-calculate viscosity
         mut_ = rCmu(fvc::grad(U_))*rho_*sqr(k_)/epsilon_;
+        mut_.correctBoundaryConditions();
+
+        // Re-calculate thermal diffusivity
+        alphat_ = mut_/Prt_;
+        alphat_.correctBoundaryConditions();
+
         return;
     }
 
@@ -294,9 +316,10 @@ void realizableKE::correct()
     volScalarField eta = magS*k_/epsilon_;
     volScalarField C1 = max(eta/(scalar(5) + eta), scalar(0.43));
 
-    volScalarField G = mut_*(gradU && dev(twoSymm(gradU)));
+    volScalarField G("RASModel::G", mut_*(gradU && dev(twoSymm(gradU))));
 
-#   include "wallFunctionsI.H"
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
@@ -315,7 +338,7 @@ void realizableKE::correct()
 
     epsEqn().relax();
 
-#   include "wallDissipationI.H"
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
@@ -339,9 +362,11 @@ void realizableKE::correct()
 
     // Re-calculate viscosity
     mut_ = rCmu(gradU, S2, magS)*rho_*sqr(k_)/epsilon_;
+    mut_.correctBoundaryConditions();
 
-#   include "wallViscosityI.H"
-
+    // Re-calculate thermal diffusivity
+    alphat_ = mut_/Prt_;
+    alphat_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
similarity index 73%
rename from src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
rename to src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
index 5c1facb12..c6cbb71d8 100644
--- a/src/turbulenceModels/RAS/compressible/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/compressible/RAS/realizableKE/realizableKE.H
@@ -41,14 +41,14 @@ Description
 
     The default model coefficients correspond to the following:
     @verbatim
-        realizableKE
+        realizableKECoeffs
         {
             Cmu         0.09;
             A0          4.0;
             C2          1.9;
-            alphak      1.0;
-            alphaEps    0.833333;
-            alphah      1.0;    // only for compressible
+            sigmak      1.0;
+            sigmaEps    1.2;
+            Prt         1.0;    // only for compressible
         }
     @endverbatim
 
@@ -72,7 +72,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class realizableKE Declaration
+                        Class realizableKE Declaration
 \*---------------------------------------------------------------------------*/
 
 class realizableKE
@@ -81,16 +81,25 @@ class realizableKE
 {
     // Private data
 
-        dimensionedScalar Cmu_;
-        dimensionedScalar A0_;
-        dimensionedScalar C2_;
-        dimensionedScalar alphak_;
-        dimensionedScalar alphaEps_;
-        dimensionedScalar alphah_;
+        // Model coefficients
 
-        volScalarField k_;
-        volScalarField epsilon_;
-        volScalarField mut_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar A0_;
+            dimensionedScalar C2_;
+            dimensionedScalar sigmak_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar Prt_;
+
+
+        // Fields
+
+            volScalarField k_;
+            volScalarField epsilon_;
+            volScalarField mut_;
+            volScalarField alphat_;
+
+
+   // Private member functions
 
         tmp<volScalarField> rCmu
         (
@@ -99,10 +108,8 @@ class realizableKE
             const volScalarField& magS
         );
 
-        tmp<volScalarField> rCmu
-        (
-            const volTensorField& gradU
-        );
+        tmp<volScalarField> rCmu(const volTensorField& gradU);
+
 
 public:
 
@@ -111,35 +118,30 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         realizableKE
         (
             const volScalarField& rho,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            basicThermo& thermophysicalModel
+            const basicThermo& thermophysicalModel
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~realizableKE(){}
+        virtual ~realizableKE()
+        {}
 
 
     // Member Functions
 
-        //- Return the turbulence viscosity
-        tmp<volScalarField> mut() const
-        {
-            return mut_;
-        }
-
         //- Return the effective diffusivity for k
         tmp<volScalarField> DkEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", alphak_*mut_ + mu())
+                new volScalarField("DkEff", mut_/sigmak_ + mu())
             );
         }
 
@@ -148,45 +150,51 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*mut_ + mu())
+                new volScalarField("DepsilonEff", mut_/sigmaEps_ + mu())
             );
         }
 
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> mut() const
+        {
+            return mut_;
+        }
+
         //- Return the effective turbulent thermal diffusivity
-        tmp<volScalarField> alphaEff() const
+        virtual tmp<volScalarField> alphaEff() const
         {
             return tmp<volScalarField>
             (
-                new volScalarField("alphaEff", alphah_*mut_ + alpha())
+                new volScalarField("alphaEff", alphat_ + alpha())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devRhoReff() const;
+        virtual tmp<volSymmTensorField> devRhoReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/compressible/turbulenceModel/Make/files b/src/turbulenceModels/compressible/turbulenceModel/Make/files
new file mode 100644
index 000000000..3f01b2035
--- /dev/null
+++ b/src/turbulenceModels/compressible/turbulenceModel/Make/files
@@ -0,0 +1,4 @@
+turbulenceModel.C
+laminar/laminar.C
+
+LIB = $(FOAM_LIBBIN)/libcompressibleTurbulenceModel
diff --git a/src/turbulenceModels/RAS/compressible/Make/options b/src/turbulenceModels/compressible/turbulenceModel/Make/options
similarity index 61%
rename from src/turbulenceModels/RAS/compressible/Make/options
rename to src/turbulenceModels/compressible/turbulenceModel/Make/options
index 6c12c9d78..075a03796 100644
--- a/src/turbulenceModels/RAS/compressible/Make/options
+++ b/src/turbulenceModels/compressible/turbulenceModel/Make/options
@@ -1,8 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude
 
 LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
+    -lfiniteVolume
+
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
new file mode 100644
index 000000000..4f5a54e59
--- /dev/null
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.C
@@ -0,0 +1,215 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "laminar.H"
+#include "Time.H"
+#include "volFields.H"
+#include "fvcGrad.H"
+#include "fvcDiv.H"
+#include "fvmLaplacian.H"
+#include "addToRunTimeSelectionTable.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(laminar, 0);
+addToRunTimeSelectionTable(turbulenceModel, laminar, turbulenceModel);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+laminar::laminar
+(
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const basicThermo& thermophysicalModel
+)
+:
+    turbulenceModel(rho, U, phi, thermophysicalModel)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+autoPtr<laminar> laminar::New
+(
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const basicThermo& thermophysicalModel
+)
+{
+    return autoPtr<laminar>(new laminar(rho, U, phi, thermophysicalModel));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+tmp<volScalarField> laminar::mut() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "mut",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar("mut", mu().dimensions(), 0.0)
+        )
+    );
+}
+
+
+tmp<volScalarField> laminar::k() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "k",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar("k", sqr(U_.dimensions()), 0.0)
+        )
+    );
+}
+
+
+tmp<volScalarField> laminar::epsilon() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "epsilon",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar
+            (
+                "epsilon", sqr(U_.dimensions())/dimTime, 0.0
+            )
+        )
+    );
+}
+
+
+tmp<volSymmTensorField> laminar::R() const
+{
+    return tmp<volSymmTensorField>
+    (
+        new volSymmTensorField
+        (
+            IOobject
+            (
+                "R",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedSymmTensor
+            (
+                "R", sqr(U_.dimensions()), symmTensor::zero
+            )
+        )
+    );
+}
+
+
+tmp<volSymmTensorField> laminar::devRhoReff() const
+{
+    return tmp<volSymmTensorField>
+    (
+        new volSymmTensorField
+        (
+            IOobject
+            (
+                "devRhoReff",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+           -mu()*dev(twoSymm(fvc::grad(U_)))
+        )
+    );
+}
+
+
+tmp<fvVectorMatrix> laminar::divDevRhoReff(volVectorField& U) const
+{
+    return
+    (
+      - fvm::laplacian(muEff(), U)
+      - fvc::div(muEff()*dev2(fvc::grad(U)().T()))
+    );
+}
+
+
+bool laminar::read()
+{
+    return true;
+}
+
+
+void laminar::correct()
+{
+    turbulenceModel::correct();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
new file mode 100644
index 000000000..66f1d799a
--- /dev/null
+++ b/src/turbulenceModels/compressible/turbulenceModel/laminar/laminar.H
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::compressible::laminar
+
+Description
+    Turbulence model for laminar compressible flow.
+
+SourceFiles
+    laminar.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleLaminar_H
+#define compressibleLaminar_H
+
+#include "turbulenceModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace compressible
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class laminar Declaration
+\*---------------------------------------------------------------------------*/
+
+class laminar
+:
+    public turbulenceModel
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("laminar");
+
+    // Constructors
+
+        //- Construct from components
+        laminar
+        (
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const basicThermo& thermophysicalModel
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected turbulence model
+        static autoPtr<laminar> New
+        (
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const basicThermo& thermophysicalModel
+        );
+
+
+    //- Destructor
+    virtual ~laminar()
+    {}
+
+
+    // Member Functions
+
+        //- Return the turbulence viscosity, i.e. 0 for laminar flow
+        virtual tmp<volScalarField> mut() const;
+
+        //- Return the effective viscosity, i.e. the laminar viscosity
+        virtual tmp<volScalarField> muEff() const
+        {
+            return tmp<volScalarField>(new volScalarField("muEff", mu()));
+        }
+
+        //- Return the effective turbulent thermal diffusivity,
+        //  i.e. the laminar thermal diffusivity
+        virtual tmp<volScalarField> alphaEff() const
+        {
+            return tmp<volScalarField>(new volScalarField("alphaEff", alpha()));
+        }
+
+        //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
+        virtual tmp<volScalarField> k() const;
+
+        //- Return the turbulence kinetic energy dissipation rate,
+        //  i.e. 0 for laminar flow
+        virtual tmp<volScalarField> epsilon() const;
+
+        //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
+        virtual tmp<volSymmTensorField> R() const;
+
+        //- Return the effective stress tensor, i.e. the laminar stress
+        virtual tmp<volSymmTensorField> devRhoReff() const;
+
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const;
+
+        //- Correct the laminar viscosity
+        virtual void correct();
+
+        //- Read turbulenceProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/RASModel/newRASModel.C b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
similarity index 53%
rename from src/turbulenceModels/RAS/compressible/RASModel/newRASModel.C
rename to src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
index 5d242b595..17860f3e6 100644
--- a/src/turbulenceModels/RAS/compressible/RASModel/newRASModel.C
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.C
@@ -24,7 +24,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "RASModel.H"
+#include "turbulenceModel.H"
+#include "volFields.H"
+#include "surfaceFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -33,27 +35,52 @@ namespace Foam
 namespace compressible
 {
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-autoPtr<RASModel> RASModel::New
+defineTypeNameAndDebug(turbulenceModel, 0);
+defineRunTimeSelectionTable(turbulenceModel, turbulenceModel);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+turbulenceModel::turbulenceModel
 (
     const volScalarField& rho,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    basicThermo& thermophysicalModel
+    const basicThermo& thermophysicalModel
+)
+:
+    runTime_(U.time()),
+    mesh_(U.mesh()),
+
+    rho_(rho),
+    U_(U),
+    phi_(phi),
+    thermophysicalModel_(thermophysicalModel)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+autoPtr<turbulenceModel> turbulenceModel::New
+(
+    const volScalarField& rho,
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    const basicThermo& thermophysicalModel
 )
 {
-    word RASModelTypeName;
+    word modelName;
 
-    // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the RASModel is created otherwise the dictionary
-    // is entered in the database twice
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
     {
-        IOdictionary turbulencePropertiesDict
+        IOdictionary dict
         (
             IOobject
             (
-                "RASProperties",
+                "turbulenceProperties",
                 U.time().constant(),
                 U.db(),
                 IOobject::MUST_READ,
@@ -61,36 +88,41 @@ autoPtr<RASModel> RASModel::New
             )
         );
 
-        turbulencePropertiesDict.lookup("RASModel")
-            >> RASModelTypeName;
+        dict.lookup("simulationType") >> modelName;
     }
 
-    Info<< "Selecting RAS turbulence model " << RASModelTypeName << endl;
+    Info<< "Selecting turbulence model type " << modelName << endl;
 
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(RASModelTypeName);
+    turbulenceModelConstructorTable::iterator cstrIter =
+        turbulenceModelConstructorTablePtr_->find(modelName);
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if (cstrIter == turbulenceModelConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "RASModel::New(const volScalarField& rho, "
-            "const volVectorField& U, const surfaceScalarField& phi, "
+            "turbulenceModel::New(const volScalarField&, "
+            "const volVectorField&, const surfaceScalarField&, "
             "basicThermo&)"
-        )   << "Unknown RASModel type " << RASModelTypeName
+        )   << "Unknown turbulenceModel type " << modelName
             << endl << endl
-            << "Valid RASModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << "Valid turbulenceModel types are :" << endl
+            << turbulenceModelConstructorTablePtr_->toc()
             << exit(FatalError);
     }
 
-    return autoPtr<RASModel>
+    return autoPtr<turbulenceModel>
     (
         cstrIter()(rho, U, phi, thermophysicalModel)
     );
 }
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void turbulenceModel::correct()
+{}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace compressible
diff --git a/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
new file mode 100644
index 000000000..d843a55bc
--- /dev/null
+++ b/src/turbulenceModels/compressible/turbulenceModel/turbulenceModel.H
@@ -0,0 +1,230 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Namespace
+    Foam::compressible::turbulenceModels
+
+Description
+    Namespace for compressible turbulence turbulence models.
+
+
+Class
+    Foam::compressible::turbulenceModel
+
+Description
+    Abstract base class for compressible turbulence models
+    (RAS, LES and laminar).
+
+
+SourceFiles
+    turbulenceModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef compressibleturbulenceModel_H
+#define compressibleturbulenceModel_H
+
+#include "primitiveFieldsFwd.H"
+#include "volFieldsFwd.H"
+#include "surfaceFieldsFwd.H"
+#include "fvMatricesFwd.H"
+#include "basicThermo.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declarations
+class fvMesh;
+
+namespace compressible
+{
+
+/*---------------------------------------------------------------------------*\
+                       Class turbulenceModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class turbulenceModel
+{
+
+protected:
+
+    // Protected data
+
+        const Time& runTime_;
+        const fvMesh& mesh_;
+
+        const volScalarField& rho_;
+        const volVectorField& U_;
+        const surfaceScalarField& phi_;
+
+        const basicThermo& thermophysicalModel_;
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        turbulenceModel(const turbulenceModel&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const turbulenceModel&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("turbulenceModel");
+
+
+    // Declare run-time constructor selection table
+
+        declareRunTimeNewSelectionTable
+        (
+            autoPtr,
+            turbulenceModel,
+            turbulenceModel,
+            (
+                const volScalarField& rho,
+                const volVectorField& U,
+                const surfaceScalarField& phi,
+                const basicThermo& thermoPhysicalModel
+            ),
+            (rho, U, phi, thermoPhysicalModel)
+        );
+
+
+    // Constructors
+
+        //- Construct from components
+        turbulenceModel
+        (
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const basicThermo& thermoPhysicalModel
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected turbulence model
+        static autoPtr<turbulenceModel> New
+        (
+            const volScalarField& rho,
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            const basicThermo& thermoPhysicalModel
+        );
+
+
+    //- Destructor
+    virtual ~turbulenceModel()
+    {}
+
+
+    // Member Functions
+
+        //- Access function to density field
+        const volScalarField& rho() const
+        {
+            return rho_;
+        }
+
+        //- Access function to velocity field
+        const volVectorField& U() const
+        {
+            return U_;
+        }
+
+        //- Access function to flux field
+        const surfaceScalarField& phi() const
+        {
+            return phi_;
+        }
+
+        //- Access function to thermophysical model
+        const basicThermo& thermo() const
+        {
+             return thermophysicalModel_;
+        }
+
+        //- Return the laminar viscosity
+        const volScalarField& mu() const
+        {
+            return thermophysicalModel_.mu();
+        }
+
+        //- Return the laminar thermal conductivity
+        const volScalarField& alpha() const
+        {
+            return thermophysicalModel_.alpha();
+        }
+
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> mut() const = 0;
+
+        //- Return the effective viscosity
+        virtual tmp<volScalarField> muEff() const = 0;
+
+        //- Return the effective turbulent thermal diffusivity
+        virtual tmp<volScalarField> alphaEff() const = 0;
+
+        //- Return the turbulence kinetic energy
+        virtual tmp<volScalarField> k() const = 0;
+
+        //- Return the turbulence kinetic energy dissipation rate
+        virtual tmp<volScalarField> epsilon() const = 0;
+
+        //- Return the Reynolds stress tensor
+        virtual tmp<volSymmTensorField> R() const = 0;
+
+        //- Return the effective stress tensor including the laminar stress
+        virtual tmp<volSymmTensorField> devRhoReff() const = 0;
+
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevRhoReff(volVectorField& U) const = 0;
+
+        //- Solve the turbulence equations and correct the turbulence viscosity
+        virtual void correct() = 0;
+
+        //- Read turbulenceProperties dictionary
+        virtual bool read() = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace compressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
similarity index 91%
rename from src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C
rename to src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
index 3de430a6e..5d1159cc1 100644
--- a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.C
+++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.C
@@ -41,9 +41,17 @@ namespace LESModels
 defineTypeNameAndDebug(DeardorffDiffStress, 0);
 addToRunTimeSelectionTable(LESModel, DeardorffDiffStress, dictionary);
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void DeardorffDiffStress::updateSubGridScaleFields(const volScalarField& K)
+{
+    nuSgs_ = ck_*sqrt(K)*delta();
+    nuSgs_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 DeardorffDiffStress::DeardorffDiffStress
 (
     const volVectorField& U,
@@ -59,7 +67,7 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.094
         )
     ),
@@ -68,11 +76,13 @@ DeardorffDiffStress::DeardorffDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cm",
-            coeffDict(),
+            coeffDict_,
             4.13
         )
     )
 {
+    updateSubGridScaleFields(0.5*tr(B_));
+
     printCoeffs();
 }
 
@@ -92,7 +102,7 @@ void DeardorffDiffStress::correct(const tmp<volTensorField>& tgradU)
     volScalarField K = 0.5*tr(B_);
     volScalarField Epsilon = 2*nuEff()*magSqr(D);
 
-    solve
+    fvSymmTensorMatrix BEqn
     (
         fvm::ddt(B_)
       + fvm::div(phi(), B_)
@@ -104,6 +114,8 @@ void DeardorffDiffStress::correct(const tmp<volTensorField>& tgradU)
       - (2*ce_ - 0.667*cm_)*I*Epsilon
     );
 
+    BEqn.relax();
+    BEqn.solve();
 
     // Bounding the component kinetic energies
 
@@ -120,8 +132,7 @@ void DeardorffDiffStress::correct(const tmp<volTensorField>& tgradU)
     K = 0.5*tr(B_);
     bound(K, k0());
 
-    nuSgs_ = ck_*sqrt(K)*delta();
-    nuSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields(K);
 }
 
 
diff --git a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
similarity index 91%
rename from src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
rename to src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
index be36cffbd..c5d2278ed 100644
--- a/src/turbulenceModels/LES/incompressible/DeardorffDiffStress/DeardorffDiffStress.H
+++ b/src/turbulenceModels/incompressible/LES/DeardorffDiffStress/DeardorffDiffStress.H
@@ -81,6 +81,9 @@ class DeardorffDiffStress
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields(const volScalarField& K);
+
         // Disallow default bitwise copy construct and assignment
         DeardorffDiffStress(const DeardorffDiffStress&);
         DeardorffDiffStress& operator=(const DeardorffDiffStress&);
@@ -93,7 +96,7 @@ public:
 
     // Constructors
 
-        //- Constructor from components
+        //- Construct from components
         DeardorffDiffStress
         (
             const volVectorField& U,
@@ -102,10 +105,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~DeardorffDiffStress()
-        {}
+    //- Destructor
+    virtual ~DeardorffDiffStress()
+    {}
 
 
     // Member Functions
@@ -120,10 +122,10 @@ public:
         }
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
similarity index 99%
rename from src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C
rename to src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
index 539a8defa..82256dff9 100644
--- a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.C
@@ -51,7 +51,7 @@ GenEddyVisc::GenEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            coeffDict(),
+            coeffDict_,
             1.048
         )
     ),
diff --git a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
similarity index 96%
rename from src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H
rename to src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
index 85f8d11af..e876f6a5b 100644
--- a/src/turbulenceModels/LES/incompressible/GenEddyVisc/GenEddyVisc.H
+++ b/src/turbulenceModels/incompressible/LES/GenEddyVisc/GenEddyVisc.H
@@ -86,10 +86,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~GenEddyVisc()
-        {}
+    //- Destructor
+    virtual ~GenEddyVisc()
+    {}
 
 
     // Member Functions
@@ -123,8 +122,8 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
similarity index 98%
rename from src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C
rename to src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
index b222cd1d4..8560e45f2 100644
--- a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.C
+++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.C
@@ -51,7 +51,7 @@ GenSGSStress::GenSGSStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ce",
-            coeffDict(),
+            coeffDict_,
             1.048
         )
     ),
@@ -61,7 +61,7 @@ GenSGSStress::GenSGSStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "couplingFactor",
-            coeffDict(),
+            coeffDict_,
             0.0
         )
     ),
diff --git a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
similarity index 95%
rename from src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H
rename to src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
index 2662685ed..5b3c9a208 100644
--- a/src/turbulenceModels/LES/incompressible/GenSGSStress/GenSGSStress.H
+++ b/src/turbulenceModels/incompressible/LES/GenSGSStress/GenSGSStress.H
@@ -81,7 +81,7 @@ public:
 
     // Constructors
 
-        //- Constructor from components
+        //- Construct from components
         GenSGSStress
         (
             const volVectorField& U,
@@ -90,10 +90,9 @@ public:
         );
 
 
-    // Destructor
-
-        virtual ~GenSGSStress()
-        {}
+    //- Destructor
+    virtual ~GenSGSStress()
+    {}
 
 
     // Member Functions
@@ -131,8 +130,8 @@ public:
         // This is the additional term due to the filtering of the NSE.
         virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/LESModel/LESModel.C b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
similarity index 60%
rename from src/turbulenceModels/LES/incompressible/LESModel/LESModel.C
rename to src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
index dc6ef59b4..de959b356 100644
--- a/src/turbulenceModels/LES/incompressible/LESModel/LESModel.C
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.C
@@ -25,7 +25,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "LESModel.H"
-#include "wallDist.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,6 +38,7 @@ namespace incompressible
 
 defineTypeNameAndDebug(LESModel, 0);
 defineRunTimeSelectionTable(LESModel, dictionary);
+addToRunTimeSelectionTable(turbulenceModel, LESModel, turbulenceModel);
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
@@ -57,9 +58,11 @@ LESModel::LESModel
     const word& type,
     const volVectorField& U,
     const surfaceScalarField& phi,
-    transportModel& transport
+    transportModel& lamTransportModel
 )
 :
+    turbulenceModel(U, phi, lamTransportModel),
+
     IOdictionary
     (
         IOobject
@@ -72,25 +75,69 @@ LESModel::LESModel
         )
     ),
 
-    runTime_(U.time()),
-    mesh_(U.mesh()),
-
-    U_(U),
-    phi_(phi),
-    transport_(transport),
-
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-
-    coeffDict_(subDict(type + "Coeffs")),
+    coeffDict_(subOrEmptyDict(type + "Coeffs")),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
-
     delta_(LESdelta::New("delta", U.mesh(), *this))
 {
-    if (found("k0"))
+    readIfPresent("k0", k0_);
+
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+autoPtr<LESModel> LESModel::New
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    transportModel& transport
+)
+{
+    word modelName;
+
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
     {
-        lookup("k0") >> k0_;
+        IOdictionary dict
+        (
+            IOobject
+            (
+                "LESProperties",
+                U.time().constant(),
+                U.db(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        dict.lookup("LESModel") >> modelName;
     }
+
+    Info<< "Selecting LES turbulence model " << modelName << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(modelName);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "LESModel::New(const volVectorField& U, const "
+            "surfaceScalarField& phi, transportModel&)"
+        )   << "Unknown LESModel type " << modelName
+            << endl << endl
+            << "Valid LESModel types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<LESModel>(cstrIter()(U, phi, transport));
 }
 
 
@@ -98,8 +145,8 @@ LESModel::LESModel
 
 void LESModel::correct(const tmp<volTensorField>&)
 {
+    turbulenceModel::correct();
     delta_().correct();
-    transport_.correct();
 }
 
 
@@ -113,14 +160,14 @@ bool LESModel::read()
 {
     if (regIOobject::read())
     {
-        coeffDict_ = subDict(type() + "Coeffs");
+        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
+        {
+            coeffDict_ <<= *dictPtr;
+        }
 
         delta_().read(*this);
 
-        if (found("k0"))
-        {
-            lookup("k0") >> k0_;
-        }
+        readIfPresent("k0", k0_);
 
         return true;
     }
diff --git a/src/turbulenceModels/LES/incompressible/LESModel/LESModel.H b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
similarity index 71%
rename from src/turbulenceModels/LES/incompressible/LESModel/LESModel.H
rename to src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
index 3085ab527..5b90e0a7d 100644
--- a/src/turbulenceModels/LES/incompressible/LESModel/LESModel.H
+++ b/src/turbulenceModels/incompressible/LES/LESModel/LESModel.H
@@ -28,7 +28,6 @@ Namespace
 Description
     Namespace for incompressible LES models.
 
-
 Class
     Foam::incompressible::LESModel
 
@@ -36,20 +35,20 @@ Description
     Base class for all incompressible flow LES SGS models.
 
     This class defines the basic interface for an incompressible flow SGS
-    model, and encapsulates data of value to all possible models. In
-    particular this includes references to all the dependent fields (U,
-    phi), the physical viscosity nu, and the turbulenceProperties
-    dictionary which contains the model selection and model coefficients.
+    model, and encapsulates data of value to all possible models.
+    In particular this includes references to all the dependent fields
+    (U, phi), the physical viscosity nu, and the LESProperties
+    dictionary, which contains the model selection and model coefficients.
 
 SourceFiles
     LESModel.C
-    newIsoLESModel.C
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef LESModel_H
 #define LESModel_H
 
+#include "incompressible/turbulenceModel/turbulenceModel.H"
 #include "LESdelta.H"
 #include "fvm.H"
 #include "fvc.H"
@@ -73,6 +72,7 @@ namespace incompressible
 
 class LESModel
 :
+    public turbulenceModel,
     public IOdictionary
 {
 
@@ -80,19 +80,6 @@ protected:
 
     // Protected data
 
-        const Time& runTime_;
-        const fvMesh& mesh_;
-
-
-private:
-
-    // Private data
-
-        const volVectorField& U_;
-        const surfaceScalarField& phi_;
-
-        transportModel& transport_;
-
         Switch printCoeffs_;
         dictionary coeffDict_;
 
@@ -101,21 +88,23 @@ private:
         autoPtr<LESdelta> delta_;
 
 
-    // Private Member Functions
-
-        // Disallow default bitwise copy construct and assignment
-        LESModel(const LESModel&);
-        LESModel& operator=(const LESModel&);
-
-
-protected:
-
     // Protected member functions
 
         //- Print model coefficients
         virtual void printCoeffs();
 
 
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        LESModel(const LESModel&);
+
+        //- Disallow default bitwise assignment
+        LESModel& operator=(const LESModel&);
+
+
 public:
 
     //- Runtime type information
@@ -132,9 +121,9 @@ public:
             (
                 const volVectorField& U,
                 const surfaceScalarField& phi,
-                transportModel& transport
+                transportModel& lamTransportModel
             ),
-            (U, phi, transport)
+            (U, phi, lamTransportModel)
         );
 
 
@@ -146,7 +135,7 @@ public:
             const word& type,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            transportModel& transport
+            transportModel& lamTransportModel
         );
 
 
@@ -157,68 +146,42 @@ public:
         (
             const volVectorField& U,
             const surfaceScalarField& phi,
-            transportModel& transport
+            transportModel& lamTransportModel
         );
 
 
-    // Destructor
-
-        virtual ~LESModel()
-        {}
+    //- Destructor
+    virtual ~LESModel()
+    {}
 
 
     // Member Functions
 
-        // Access
+        //- Const access to the coefficients dictionary,
+        //  which provides info. about choice of models,
+        //  and all related data (particularly model coefficients).
+        inline const dictionary& coeffDict() const
+        {
+            return coeffDict_;
+        }
 
-            //- Access function to velocity field
-            inline const volVectorField& U() const
-            {
-                return U_;
-            }
+        //- Access function to filter width
+        inline const volScalarField& delta() const
+        {
+            return delta_();
+        }
 
-            //- Access function to flux field
-            inline const surfaceScalarField& phi() const
-            {
-                return phi_;
-            }
+        //- Return the value of k0 which k is not allowed to be less than
+        const dimensionedScalar& k0() const
+        {
+            return k0_;
+        }
 
-            //- Access function to incompressible transport model
-            inline transportModel& transport() const
-            {
-                return transport_;
-            }
-
-            //- Access the dictionary which provides info. about choice of
-            //  models, and all related data (particularly model coefficients).
-            inline dictionary& coeffDict()
-            {
-                return coeffDict_;
-            }
-
-            //- Access function to filter width
-            inline const volScalarField& delta() const
-            {
-                return delta_();
-            }
-
-            //- Access function to incompressible viscosity
-            inline const volScalarField& nu() const
-            {
-                return transport_.nu();
-            }
-
-            //- Return the value of k0 which k is not allowed to be less than
-            const dimensionedScalar& k0() const
-            {
-                return k0_;
-            }
-
-            //- Allow k0 to be changed
-            dimensionedScalar& k0()
-            {
-                return k0_;
-            }
+        //- Allow k0 to be changed
+        dimensionedScalar& k0()
+        {
+            return k0_;
+        }
 
 
         //- Return the SGS turbulent kinetic energy.
@@ -250,15 +213,43 @@ public:
         //  This is the additional term due to the filtering of the NSE.
         virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const = 0;
 
-        //- Correct Eddy-Viscosity and related properties
-        virtual void correct(const tmp<volTensorField>& gradU);
+
+        // RAS compatibility functions for the turbulenceModel base class
+
+            //- Return the turbulence viscosity
+            virtual tmp<volScalarField> nut() const
+            {
+                return nuSgs();
+            }
+
+            //- Return the Reynolds stress tensor
+            virtual tmp<volSymmTensorField> R() const
+            {
+                return B();
+            }
+
+            //- Return the effective stress tensor including the laminar stress
+            virtual tmp<volSymmTensorField> devReff() const
+            {
+                return devBeff();
+            }
+
+            //- Return the source term for the momentum equation
+            virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const
+            {
+                return divDevBeff(U);
+            }
+
 
         //- Correct Eddy-Viscosity and related properties.
         //  This calls correct(const tmp<volTensorField>& gradU) by supplying
         //  gradU calculated locally.
         void correct();
 
-        //- Read turbulenceProperties dictionary
+        //- Correct Eddy-Viscosity and related properties
+        virtual void correct(const tmp<volTensorField>& gradU);
+
+        //- Read LESProperties dictionary
         virtual bool read() = 0;
 };
 
diff --git a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
similarity index 91%
rename from src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
rename to src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
index 30dff605a..ed5c58d03 100644
--- a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.C
+++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.C
@@ -41,9 +41,17 @@ namespace LESModels
 defineTypeNameAndDebug(LRRDiffStress, 0);
 addToRunTimeSelectionTable(LESModel, LRRDiffStress, dictionary);
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void LRRDiffStress::updateSubGridScaleFields(const volScalarField& K)
+{
+    nuSgs_ = ck_*sqrt(K)*delta();
+    nuSgs_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 LRRDiffStress::LRRDiffStress
 (
     const volVectorField& U,
@@ -59,7 +67,7 @@ LRRDiffStress::LRRDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.09
         )
     ),
@@ -68,7 +76,7 @@ LRRDiffStress::LRRDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "c1",
-            coeffDict(),
+            coeffDict_,
             1.8
         )
     ),
@@ -77,11 +85,13 @@ LRRDiffStress::LRRDiffStress
         dimensioned<scalar>::lookupOrAddToDict
         (
             "c2",
-            coeffDict(),
+            coeffDict_,
             0.6
         )
     )
 {
+    updateSubGridScaleFields(0.5*tr(B_));
+
     printCoeffs();
 }
 
@@ -101,7 +111,7 @@ void LRRDiffStress::correct(const tmp<volTensorField>& tgradU)
     volScalarField K = 0.5*tr(B_);
     volScalarField Epsilon = 2*nuEff()*magSqr(D);
 
-    solve
+    fvSymmTensorMatrix BEqn
     (
         fvm::ddt(B_)
       + fvm::div(phi(), B_)
@@ -114,6 +124,8 @@ void LRRDiffStress::correct(const tmp<volTensorField>& tgradU)
       - (0.667 - 2*c1_)*I*pow(K, 1.5)/delta()
     );
 
+    BEqn.relax();
+    BEqn.solve();
 
     // Bounding the component kinetic energies
 
@@ -130,8 +142,7 @@ void LRRDiffStress::correct(const tmp<volTensorField>& tgradU)
     K = 0.5*tr(B_);
     bound(K, k0());
 
-    nuSgs_ = ck_*sqrt(K)*delta();
-    nuSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields(K);
 }
 
 
diff --git a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
similarity index 91%
rename from src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H
rename to src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
index fb1ed738e..ac54a7c64 100644
--- a/src/turbulenceModels/LES/incompressible/LRRDiffStress/LRRDiffStress.H
+++ b/src/turbulenceModels/incompressible/LES/LRRDiffStress/LRRDiffStress.H
@@ -80,6 +80,9 @@ class LRRDiffStress
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields(const volScalarField& K);
+
         // Disallow default bitwise copy construct and assignment
         LRRDiffStress(const LRRDiffStress&);
         LRRDiffStress& operator=(const LRRDiffStress&);
@@ -92,7 +95,7 @@ public:
 
     // Constructors
 
-        //- Constructors from components
+        //- Construct from components
         LRRDiffStress
         (
             const volVectorField& U,
@@ -101,10 +104,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~LRRDiffStress()
-        {}
+    //- Destructor
+    virtual ~LRRDiffStress()
+    {}
 
 
     // Member Functions
@@ -119,10 +121,10 @@ public:
         }
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/Make/files b/src/turbulenceModels/incompressible/LES/Make/files
similarity index 62%
rename from src/turbulenceModels/LES/incompressible/Make/files
rename to src/turbulenceModels/incompressible/LES/Make/files
index ed45e8ffb..186324fde 100644
--- a/src/turbulenceModels/LES/incompressible/Make/files
+++ b/src/turbulenceModels/incompressible/LES/Make/files
@@ -1,14 +1,15 @@
 vanDriestDelta/vanDriestDelta.C
-wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
 
 LESModel/LESModel.C
-LESModel/newLESModel.C
 
 GenEddyVisc/GenEddyVisc.C
 GenSGSStress/GenSGSStress.C
 
 laminar/laminar.C
 SpalartAllmaras/SpalartAllmaras.C
+SpalartAllmarasDDES/SpalartAllmarasDDES.C
+SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
+SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
 
 oneEqEddy/oneEqEddy.C
 dynOneEqEddy/dynOneEqEddy.C
@@ -25,4 +26,13 @@ dynMixedSmagorinsky/dynMixedSmagorinsky.C
 
 /*Smagorinsky2/Smagorinsky2.C*/
 
+kOmegaSSTSAS/kOmegaSSTSAS.C
+
+/* Wall functions */
+wallFunctions=derivedFvPatchFields/wallFunctions
+
+nuSgsWallFunctions=$(wallFunctions)/nuSgsWallFunctions
+$(nuSgsWallFunctions)/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
+
+
 LIB = $(FOAM_LIBBIN)/libincompressibleLESModels
diff --git a/src/turbulenceModels/incompressible/LES/Make/options b/src/turbulenceModels/incompressible/LES/Make/options
new file mode 100644
index 000000000..2699300b5
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/Make/options
@@ -0,0 +1,14 @@
+EXE_INC = \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/turbulenceModels/LES/LESdeltas/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels/LES/LESfilters/lnInclude \
+    -I$(LIB_SRC)/transportModels \
+    -I$(LIB_SRC)/finiteVolume/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
+
+LIB_LIBS = \
+    -lincompressibleTurbulenceModel \
+    -lLESdeltas \
+    -lLESfilters\
+    -lfiniteVolume \
+    -lmeshTools
diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
similarity index 90%
rename from src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C
rename to src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
index ffe640b35..9d9ca71dd 100644
--- a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.C
@@ -41,6 +41,15 @@ namespace LESModels
 defineTypeNameAndDebug(Smagorinsky, 0);
 addToRunTimeSelectionTable(LESModel, Smagorinsky, dictionary);
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Smagorinsky::updateSubGridScaleFields(const volTensorField& gradU)
+{
+    nuSgs_ = ck_*delta()*sqrt(k(gradU));
+    nuSgs_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Smagorinsky::Smagorinsky
@@ -58,11 +67,15 @@ Smagorinsky::Smagorinsky
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.094
         )
     )
-{}
+{
+    updateSubGridScaleFields(fvc::grad(U));
+
+    printCoeffs();
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -70,9 +83,7 @@ Smagorinsky::Smagorinsky
 void Smagorinsky::correct(const tmp<volTensorField>& gradU)
 {
     GenEddyVisc::correct(gradU);
-
-    nuSgs_ = ck_*delta()*sqrt(k(gradU));
-    nuSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields(gradU());
 }
 
 
diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
similarity index 93%
rename from src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H
rename to src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
index 188ae9f7e..8c7737717 100644
--- a/src/turbulenceModels/LES/incompressible/Smagorinsky/Smagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky/Smagorinsky.H
@@ -77,6 +77,9 @@ class Smagorinsky
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields(const volTensorField& gradU);
+
         // Disallow default bitwise copy construct and assignment
         Smagorinsky(const Smagorinsky&);
         Smagorinsky& operator=(const Smagorinsky&);
@@ -98,10 +101,9 @@ public:
         );
 
 
-    // Destructor
-
-        ~Smagorinsky()
-        {}
+    //- Destructor
+    virtual ~Smagorinsky()
+    {}
 
 
     // Member Functions
@@ -114,7 +116,7 @@ public:
         }
 
         //- Return SGS kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k(fvc::grad(U()));
         }
@@ -123,7 +125,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         virtual bool read();
 };
 
diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
similarity index 99%
rename from src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C
rename to src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
index b65d3af9c..0dc3cb01c 100644
--- a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.C
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.C
@@ -58,7 +58,7 @@ Smagorinsky2::Smagorinsky2
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cD2",
-            coeffDict(),
+            coeffDict_,
             0.02
         )
     )
diff --git a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
similarity index 92%
rename from src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H
rename to src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
index b32f6a39c..3ab25988f 100644
--- a/src/turbulenceModels/LES/incompressible/Smagorinsky2/Smagorinsky2.H
+++ b/src/turbulenceModels/incompressible/LES/Smagorinsky2/Smagorinsky2.H
@@ -98,23 +98,22 @@ public:
         );
 
 
-    // Destructor
-
-        ~Smagorinsky2()
-        {}
+    //- Destructor
+    virtual ~Smagorinsky2()
+    {}
 
 
     // Member Functions
 
         //- Return B.
-        tmp<volSymmTensorField> B() const;
+        virtual tmp<volSymmTensorField> B() const;
 
         //- Returns div(B).
         // This is the additional term due to the filtering of the NSE.
-        tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
similarity index 69%
rename from src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C
rename to src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
index 93d9d847e..fffaf819a 100644
--- a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.C
@@ -26,7 +26,6 @@ License
 
 #include "SpalartAllmaras.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -42,8 +41,16 @@ namespace LESModels
 defineTypeNameAndDebug(SpalartAllmaras, 0);
 addToRunTimeSelectionTable(LESModel, SpalartAllmaras, dictionary);
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+void SpalartAllmaras::updateSubGridScaleFields()
+{
+    nuSgs_.internalField() = fv1()*nuTilda_.internalField();
+    nuSgs_.correctBoundaryConditions();
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
 
 tmp<volScalarField> SpalartAllmaras::fv1() const
 {
@@ -54,9 +61,7 @@ tmp<volScalarField> SpalartAllmaras::fv1() const
 
 tmp<volScalarField> SpalartAllmaras::fv2() const
 {
-    volScalarField chi = nuTilda_/nu();
-    //return scalar(1) - chi/(scalar(1) + chi*fv1());
-    return 1.0/pow3(scalar(1) + chi/Cv2_);
+    return 1/pow3(scalar(1) + nuTilda_/(Cv2_*nu()));
 }
 
 
@@ -73,22 +78,68 @@ tmp<volScalarField> SpalartAllmaras::fv3() const
 }
 
 
-tmp<volScalarField> SpalartAllmaras::fw(const volScalarField& Stilda) const
+tmp<volScalarField> SpalartAllmaras::S(const volTensorField& gradU) const
 {
-    volScalarField r = min
+    return sqrt(2.0)*mag(skew(gradU));
+}
+
+
+tmp<volScalarField> SpalartAllmaras::STilda
+(
+    const volScalarField& S,
+    const volScalarField& dTilda
+) const
+{
+    return fv3()*S + fv2()*nuTilda_/sqr(kappa_*dTilda);
+}
+
+
+tmp<volScalarField> SpalartAllmaras::r
+(
+    const volScalarField& visc,
+    const volScalarField& S,
+    const volScalarField& dTilda
+) const
+{
+    return min
     (
-        nuTilda_
+        visc
        /(
-           max(Stilda, dimensionedScalar("SMALL", Stilda.dimensions(), SMALL))
-          *sqr(kappa_*dTilda_)
+           max
+           (
+               S,
+               dimensionedScalar("SMALL", S.dimensions(), SMALL)
+           )
+          *sqr(kappa_*dTilda)
+         + dimensionedScalar
+           (
+               "ROOTVSMALL",
+               dimensionSet(0, 2 , -1, 0, 0),
+               ROOTVSMALL
+           )
         ),
-        scalar(10.0)
+        scalar(10)
     );
-    r.boundaryField() == 0.0;
+}
+
+
+tmp<volScalarField> SpalartAllmaras::fw
+(
+    const volScalarField& S,
+    const volScalarField& dTilda
+) const
+{
+    volScalarField r = this->r(nuTilda_, S, dTilda);
 
     volScalarField g = r + Cw2_*(pow6(r) - r);
 
-    return g*pow((1.0 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0);
+    return g*pow((1 + pow6(Cw3_))/(pow6(g) + pow6(Cw3_)), 1.0/6.0);
+}
+
+
+tmp<volScalarField> SpalartAllmaras::dTilda(const volScalarField&) const
+{
+    return min(CDES_*delta(), y_);
 }
 
 
@@ -98,19 +149,28 @@ SpalartAllmaras::SpalartAllmaras
 (
     const volVectorField& U,
     const surfaceScalarField& phi,
-    transportModel& transport
+    transportModel& transport,
+    const word& modelName
 )
 :
-    LESModel(typeName, U, phi, transport),
+    LESModel(modelName, U, phi, transport),
 
-
-    alphaNut_
+    sigmaNut_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaNut",
-            coeffDict(),
-            1.5
+            "sigmaNut",
+            coeffDict_,
+            0.66666
+        )
+    ),
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            coeffDict_,
+            0.41
         )
     ),
     Cb1_
@@ -118,7 +178,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb1",
-            coeffDict(),
+            coeffDict_,
             0.1355
         )
     ),
@@ -127,7 +187,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cb2",
-            coeffDict(),
+            coeffDict_,
             0.622
         )
     ),
@@ -136,7 +196,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv1",
-            coeffDict(),
+            coeffDict_,
             7.1
         )
     ),
@@ -145,7 +205,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cv2",
-            coeffDict(),
+            coeffDict_,
             5.0
         )
     ),
@@ -154,7 +214,7 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "CDES",
-            coeffDict(),
+            coeffDict_,
             0.65
         )
     ),
@@ -163,26 +223,17 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.07
         )
     ),
-    kappa_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "kappa",
-            *this,
-            0.4187
-        )
-    ),
-    Cw1_(Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_)),
+    Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
     Cw2_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw2",
-            coeffDict(),
+            coeffDict_,
             0.3
         )
     ),
@@ -191,11 +242,13 @@ SpalartAllmaras::SpalartAllmaras
         dimensioned<scalar>::lookupOrAddToDict
         (
             "Cw3",
-            coeffDict(),
+            coeffDict_,
             2.0
         )
     ),
 
+    y_(mesh_),
+
     nuTilda_
     (
         IOobject
@@ -209,8 +262,6 @@ SpalartAllmaras::SpalartAllmaras
         mesh_
     ),
 
-    dTilda_(min(CDES_*delta(), wallDist(mesh_).y())),
-
     nuSgs_
     (
         IOobject
@@ -224,7 +275,7 @@ SpalartAllmaras::SpalartAllmaras
         mesh_
     )
 {
-    printCoeffs();
+    updateSubGridScaleFields();
 }
 
 
@@ -236,33 +287,43 @@ void SpalartAllmaras::correct(const tmp<volTensorField>& gradU)
 
     if (mesh_.changing())
     {
-        dTilda_ = min(CDES_*delta(), wallDist(mesh_).y());
+        y_.correct();
+        y_.boundaryField() = max(y_.boundaryField(), VSMALL);
     }
 
-    volScalarField Stilda =
-        fv3()*::sqrt(2.0)*mag(skew(gradU)) + fv2()*nuTilda_/sqr(kappa_*dTilda_);
+    const volScalarField S = this->S(gradU);
+    const volScalarField dTilda = this->dTilda(S);
+    const volScalarField STilda = this->STilda(S, dTilda);
 
-    solve
+    fvScalarMatrix nuTildaEqn
     (
         fvm::ddt(nuTilda_)
       + fvm::div(phi(), nuTilda_)
       - fvm::laplacian
         (
-            alphaNut_*(nuTilda_ + nu()),
+            (nuTilda_ + nu())/sigmaNut_,
             nuTilda_,
             "laplacian(DnuTildaEff,nuTilda)"
         )
-      - alphaNut_*Cb2_*magSqr(fvc::grad(nuTilda_))
+      - Cb2_/sigmaNut_*magSqr(fvc::grad(nuTilda_))
      ==
-        Cb1_*Stilda*nuTilda_
-      - fvm::Sp(Cw1_*fw(Stilda)*nuTilda_/sqr(dTilda_), nuTilda_)
+        Cb1_*STilda*nuTilda_
+      - fvm::Sp(Cw1_*fw(STilda, dTilda)*nuTilda_/sqr(dTilda), nuTilda_)
     );
 
+    nuTildaEqn.relax();
+    nuTildaEqn.solve();
+
     bound(nuTilda_, dimensionedScalar("zero", nuTilda_.dimensions(), 0.0));
     nuTilda_.correctBoundaryConditions();
 
-    nuSgs_.internalField() = fv1()*nuTilda_.internalField();
-    nuSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields();
+}
+
+
+tmp<volScalarField> SpalartAllmaras::k() const
+{
+    return sqr(nuSgs()/ck_/dTilda(S(fvc::grad(U()))));
 }
 
 
@@ -297,17 +358,17 @@ bool SpalartAllmaras::read()
 {
     if (LESModel::read())
     {
-        alphaNut_.readIfPresent(coeffDict());
+        sigmaNut_.readIfPresent(coeffDict());
+        kappa_.readIfPresent(*this);
         Cb1_.readIfPresent(coeffDict());
         Cb2_.readIfPresent(coeffDict());
-        Cw1_ = Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_);
-        Cw2_.readIfPresent(coeffDict());
-        Cw3_.readIfPresent(coeffDict());
         Cv1_.readIfPresent(coeffDict());
         Cv2_.readIfPresent(coeffDict());
         CDES_.readIfPresent(coeffDict());
         ck_.readIfPresent(coeffDict());
-        kappa_.readIfPresent(*this);
+        Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
+        Cw2_.readIfPresent(coeffDict());
+        Cw3_.readIfPresent(coeffDict());
 
         return true;
     }
diff --git a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
similarity index 57%
rename from src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H
rename to src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
index 2b3e30f11..b69d571ff 100644
--- a/src/turbulenceModels/LES/incompressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmaras/SpalartAllmaras.H
@@ -23,10 +23,10 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LESModels::SpalartAllmaras
+    Foam::LESmodels::SpalartAllmaras
 
 Description
-    SpalartAllmaras for incompressible flows
+    SpalartAllmaras DES (SA + LES) turbulence model for incompressible flows
 
 SourceFiles
     SpalartAllmaras.C
@@ -38,6 +38,7 @@ SourceFiles
 
 #include "LESModel.H"
 #include "volFields.H"
+#include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -49,43 +50,79 @@ namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class SpalartAllmaras Declaration
+                        Class SpalartAllmaras Declaration
 \*---------------------------------------------------------------------------*/
 
 class SpalartAllmaras
 :
     public LESModel
 {
-    // Private data
-
-        dimensionedScalar alphaNut_;
-
-        dimensionedScalar Cb1_;
-        dimensionedScalar Cb2_;
-        dimensionedScalar Cv1_;
-        dimensionedScalar Cv2_;
-        dimensionedScalar CDES_;
-        dimensionedScalar ck_;
-        dimensionedScalar kappa_;
-        dimensionedScalar Cw1_;
-        dimensionedScalar Cw2_;
-        dimensionedScalar Cw3_;
-
-
     // Private member functions
 
-        tmp<volScalarField> fv1() const;
-        tmp<volScalarField> fv2() const;
-        tmp<volScalarField> fv3() const;
-        tmp<volScalarField> fw(const volScalarField& Stilda) const;
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields();
 
         // Disallow default bitwise copy construct and assignment
         SpalartAllmaras(const SpalartAllmaras&);
         SpalartAllmaras& operator=(const SpalartAllmaras&);
 
-        volScalarField nuTilda_;
-        volScalarField dTilda_;
-        volScalarField nuSgs_;
+
+protected:
+
+    // Protected data
+
+        dimensionedScalar sigmaNut_;
+        dimensionedScalar kappa_;
+
+
+        // Model constants
+
+            dimensionedScalar Cb1_;
+            dimensionedScalar Cb2_;
+            dimensionedScalar Cv1_;
+            dimensionedScalar Cv2_;
+            dimensionedScalar CDES_;
+            dimensionedScalar ck_;
+            dimensionedScalar Cw1_;
+            dimensionedScalar Cw2_;
+            dimensionedScalar Cw3_;
+
+
+        // Fields
+
+            wallDist y_;
+            volScalarField nuTilda_;
+            volScalarField nuSgs_;
+
+
+    // Protected member functions
+
+        virtual tmp<volScalarField> fv1() const;
+        virtual tmp<volScalarField> fv2() const;
+        virtual tmp<volScalarField> fv3() const;
+        virtual tmp<volScalarField> S(const volTensorField& gradU) const;
+
+        virtual tmp<volScalarField> STilda
+        (
+            const volScalarField& S,
+            const volScalarField& dTilda
+        ) const;
+
+        virtual tmp<volScalarField> r
+        (
+            const volScalarField& visc,
+            const volScalarField& S,
+            const volScalarField& dTilda
+        ) const;
+
+        virtual tmp<volScalarField> fw
+        (
+            const volScalarField& S,
+            const volScalarField& dTilda
+        ) const;
+
+        //- Length scale
+        virtual tmp<volScalarField> dTilda(const volScalarField& S) const;
 
 
 public:
@@ -96,31 +133,28 @@ public:
 
     // Constructors
 
-        //- Constructor from components
+        //- Construct from components
         SpalartAllmaras
         (
             const volVectorField& U,
             const surfaceScalarField& phi,
-            transportModel& transport
+            transportModel& transport,
+            const word& modelName = typeName
         );
 
 
-    // Destructor
-
-        ~SpalartAllmaras()
-        {}
+    //- Destructor
+    virtual ~SpalartAllmaras()
+    {}
 
 
     // Member Functions
 
         //- Return SGS kinetic energy
-        tmp<volScalarField> k() const
-        {
-            return sqr(nuSgs()/ck_/dTilda_);
-        }
+        virtual tmp<volScalarField> k() const;
 
         //- Return sub-grid disipation rate
-        tmp<volScalarField> epsilon() const;
+        virtual tmp<volScalarField> epsilon() const;
 
         tmp<volScalarField> nuTilda() const
         {
@@ -128,27 +162,27 @@ public:
         }
 
         //- Return SGS viscosity
-        tmp<volScalarField> nuSgs() const
+        virtual tmp<volScalarField> nuSgs() const
         {
             return nuSgs_;
         }
 
         //- Return the sub-grid stress tensor.
-        tmp<volSymmTensorField> B() const;
+        virtual tmp<volSymmTensorField> B() const;
 
         //- Return the effective sub-grid turbulence stress tensor
         //  including the laminar stress
-        tmp<volSymmTensorField> devBeff() const;
+        virtual tmp<volSymmTensorField> devBeff() const;
 
         //- Return the deviatoric part of the divergence of Beff
         //  i.e. the additional term in the filtered NSE.
-        tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
 
         //- Correct nuTilda and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
new file mode 100644
index 000000000..25b2d39e2
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.C
@@ -0,0 +1,110 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "SpalartAllmarasDDES.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(SpalartAllmarasDDES, 0);
+addToRunTimeSelectionTable(LESModel, SpalartAllmarasDDES, dictionary);
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<volScalarField> SpalartAllmarasDDES::rd
+(
+    const volScalarField& visc,
+    const volScalarField& S
+) const
+{
+    return min
+    (
+        visc
+        /(
+            max
+            (
+                S,
+                dimensionedScalar("SMALL", S.dimensions(), SMALL)
+            )*sqr(kappa_*y_)
+          + dimensionedScalar
+            (
+                "ROOTVSMALL",
+                dimensionSet(0, 2 , -1, 0, 0),
+                ROOTVSMALL
+            )
+        ),
+        scalar(10)
+    );
+}
+
+
+tmp<volScalarField> SpalartAllmarasDDES::fd(const volScalarField& S) const
+{
+    return 1 - tanh(pow3(8*rd(nuEff(), S)));
+}
+
+
+tmp<volScalarField> SpalartAllmarasDDES::dTilda(const volScalarField& S) const
+{
+    return max
+    (
+        y_
+      - fd(S)
+       *max(y_ - CDES_*delta(), dimensionedScalar("zero", dimLength, 0)),
+        dimensionedScalar("small", dimLength, SMALL)
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+SpalartAllmarasDDES::SpalartAllmarasDDES
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    transportModel& transport
+)
+:
+    SpalartAllmaras(U, phi, transport, typeName)
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
new file mode 100644
index 000000000..a8ce0c0a0
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasDDES/SpalartAllmarasDDES.H
@@ -0,0 +1,119 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::LESmodels::SpalartAllmarasDDES
+
+Description
+    SpalartAllmaras DDES LES turbulence model for incompressible flows
+
+    Reference:
+    P.R. Spalart, S. Deck, S., M.L.Shur, K.D. Squires, M.Kh Strelets, and
+    A. Travin. `A new version of detached-eddy simulation, resistant to
+    ambiguous grid densities'. Theor. Comp. Fluid Dyn., 20:181-195, 2006.
+
+SourceFiles
+    SpalartAllmarasDDES.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SpalartAllmarasDDES_H
+#define SpalartAllmarasDDES_H
+
+#include "SpalartAllmaras.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class SpalartAllmarasDDES Declaration
+\*---------------------------------------------------------------------------*/
+
+class SpalartAllmarasDDES
+:
+    public SpalartAllmaras
+{
+    // Private member functions
+
+        tmp<volScalarField> fd(const volScalarField& S) const;
+
+        tmp<volScalarField> rd
+        (
+            const volScalarField& visc,
+            const volScalarField& S
+        ) const;
+
+        // Disallow default bitwise copy construct and assignment
+        SpalartAllmarasDDES(const SpalartAllmarasDDES&);
+        SpalartAllmarasDDES& operator=(const SpalartAllmarasDDES&);
+
+
+protected:
+
+    // Protected member functions
+
+        //- Length scale
+        virtual tmp<volScalarField> dTilda(const volScalarField& S) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("SpalartAllmarasDDES");
+
+
+    // Constructors
+
+        //- Construct from components
+        SpalartAllmarasDDES
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            transportModel& transport
+        );
+
+
+    //- Destructor
+    virtual ~SpalartAllmarasDDES()
+    {}
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
new file mode 100644
index 000000000..851150980
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.C
@@ -0,0 +1,148 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "IDDESDelta.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallDist.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    defineTypeNameAndDebug(IDDESDelta, 0);
+    addToRunTimeSelectionTable(LESdelta, IDDESDelta, dictionary);
+}
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void Foam::IDDESDelta::calcDelta()
+{
+    label nD = mesh().nGeometricD();
+
+    // initialise hwn as wall distance
+    volScalarField hwn = wallDist(mesh()).y();
+
+    scalar deltamaxTmp = 0.;
+
+    const cellList& cells = mesh().cells();
+
+    forAll(cells,cellI)
+    {
+        scalar deltaminTmp = 1.e10;
+        const labelList& cFaces = mesh().cells()[cellI];
+        const point& centrevector = mesh().cellCentres()[cellI];
+
+        forAll(cFaces, cFaceI)
+        {
+            label faceI = cFaces[cFaceI];
+            const point& facevector = mesh().faceCentres()[faceI];
+            scalar tmp = mag(facevector - centrevector);
+
+            if (tmp > deltamaxTmp)
+            {
+                deltamaxTmp = tmp;
+            }
+            if (tmp < deltaminTmp)
+            {
+                deltaminTmp = tmp;
+            }
+        }
+        hwn[cellI] = 2.0*deltaminTmp;
+    }
+
+    dimensionedScalar deltamax("deltamax",dimLength,2.0*deltamaxTmp);
+
+    if (nD == 3)
+    {
+        delta_.internalField() =
+            deltaCoeff_
+           *min
+            (
+                max(max(cw_*wallDist(mesh()).y(), cw_*deltamax), hwn),
+                deltamax
+            );
+    }
+    else if (nD == 2)
+    {
+        WarningIn("IDDESDelta::calcDelta()")
+            << "Case is 2D, LES is not strictly applicable\n"
+            << endl;
+
+        delta_.internalField() =
+            deltaCoeff_
+           *min
+            (
+                max(max(cw_*wallDist(mesh()).y(), cw_*deltamax), hwn),
+                deltamax
+            );
+    }
+    else
+    {
+        FatalErrorIn("IDDESDelta::calcDelta()")
+            << "Case is not 3D or 2D, LES is not strictly applicable"
+            << exit(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::IDDESDelta::IDDESDelta
+(
+    const word& name,
+    const fvMesh& mesh,
+    const dictionary& dd
+)
+:
+    LESdelta(name, mesh),
+    deltaCoeff_(readScalar(dd.subDict(type() + "Coeffs").lookup("deltaCoeff"))),
+    cw_(0)
+{
+    dd.subDict(type() + "Coeffs").readIfPresent("cw", cw_);
+    calcDelta();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::IDDESDelta::read(const dictionary& dd)
+{
+    dd.subDict(type() + "Coeffs").lookup("deltaCoeff") >> deltaCoeff_;
+    calcDelta();
+}
+
+
+void Foam::IDDESDelta::correct()
+{
+    if (mesh_.changing())
+    {
+        calcDelta();
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
new file mode 100644
index 000000000..cfdcf8d65
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/IDDESDelta/IDDESDelta.H
@@ -0,0 +1,113 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::IDDESDelta
+
+Description
+    IDDESDelta used by the IDDES (improved low Re Spalart-Allmaras DES model)
+    The min and max delta are calculated using the double distance of the min or
+    max from the face centre to the cell centre.
+
+SourceFiles
+    IDDESDelta.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef IDDESDeltaDelta_H
+#define IDDESDeltaDelta_H
+
+#include "LESdelta.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class IDDESDelta Declaration
+\*---------------------------------------------------------------------------*/
+
+class IDDESDelta
+:
+    public LESdelta
+{
+    // Private data
+
+        scalar deltaCoeff_;
+        scalar cw_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct and assignment
+        IDDESDelta(const IDDESDelta&);
+        void operator=(const IDDESDelta&);
+
+        //- Calculate the delta values
+        void calcDelta();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("IDDESDelta");
+
+
+    // Constructors
+
+        //- Construct from name, mesh and IOdictionary
+        IDDESDelta
+        (
+            const word& name,
+            const fvMesh& mesh,
+            const dictionary&
+        );
+
+
+    // Destructor
+
+        ~IDDESDelta()
+        {}
+
+
+    // Member Functions
+
+        //- Read the LESdelta dictionary
+        void read(const dictionary&);
+
+        // Correct values
+        void correct();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
new file mode 100644
index 000000000..f4e9cf80d
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.C
@@ -0,0 +1,206 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "SpalartAllmarasIDDES.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(SpalartAllmarasIDDES, 0);
+addToRunTimeSelectionTable(LESModel, SpalartAllmarasIDDES, dictionary);
+
+// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
+
+tmp<volScalarField> SpalartAllmarasIDDES::alpha() const
+{
+    return max
+    (
+        0.25 - y_/dimensionedScalar("hMax", dimLength, max(cmptMax(delta()))),
+        scalar(-5)
+    );
+}
+
+
+tmp<volScalarField> SpalartAllmarasIDDES::ft
+(
+    const volScalarField& S
+) const
+{
+    return tanh(pow3(sqr(ct_)*rd(nuSgs_, S)));
+}
+
+
+tmp<volScalarField> SpalartAllmarasIDDES::fl
+(
+    const volScalarField& S
+) const
+{
+    return tanh(pow(sqr(cl_)*rd(nu(), S), 10));
+}
+
+
+tmp<volScalarField> SpalartAllmarasIDDES::rd
+(
+    const volScalarField& visc,
+    const volScalarField& S
+) const
+{
+    return min
+    (
+        visc
+       /(
+           max
+           (
+               S,
+               dimensionedScalar("SMALL", S.dimensions(), SMALL)
+           )*sqr(kappa_*y_)
+         + dimensionedScalar
+           (
+               "ROOTVSMALL",
+               dimensionSet(0, 2 , -1, 0, 0),
+               ROOTVSMALL
+           )
+       ),
+       scalar(10)
+    );
+}
+
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<volScalarField> SpalartAllmarasIDDES::fd(const volScalarField& S) const
+{
+    return 1 - tanh(pow3(8*rd(nuEff(), S)));
+}
+
+
+tmp<volScalarField> SpalartAllmarasIDDES::dTilda(const volScalarField& S) const
+{
+    volScalarField alpha = this->alpha();
+    volScalarField expTerm = exp(sqr(alpha));
+
+    volScalarField fHill =
+        2*(pos(alpha)*pow(expTerm, -11.09) + neg(alpha)*pow(expTerm, -9.0));
+
+    volScalarField fStep = min(2*pow(expTerm, -9.0), scalar(1));
+    volScalarField fHyb = max(1 - fd(S), fStep);
+    volScalarField fAmp = 1 - max(ft(S), fl(S));
+    volScalarField fRestore = max(fHill - 1, scalar(0))*fAmp;
+
+    // IGNORING ft2 terms
+    volScalarField Psi = sqrt
+    (
+        min
+        (
+            scalar(100),
+            (1 - Cb1_/(Cw1_*sqr(kappa_)*fwStar_)*fv2())/max(SMALL, fv1())
+        )
+    );
+
+    return max
+    (
+        dimensionedScalar("SMALL", dimLength, SMALL),
+        fHyb*(1 + fRestore*Psi)*y_
+      + (1 - fHyb)*CDES_*Psi*delta()
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+SpalartAllmarasIDDES::SpalartAllmarasIDDES
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    transportModel& transport
+)
+:
+    SpalartAllmaras(U, phi, transport, typeName),
+
+    fwStar_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "fwStar",
+            coeffDict_,
+            0.424
+        )
+    ),
+    cl_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "cl",
+            coeffDict_,
+            3.55
+        )
+    ),
+    ct_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "ct",
+            coeffDict_,
+            1.63
+        )
+    )
+
+{}
+
+
+bool SpalartAllmarasIDDES::read()
+{
+    if (SpalartAllmaras::read())
+    {
+        fwStar_.readIfPresent(coeffDict());
+        cl_.readIfPresent(coeffDict());
+        ct_.readIfPresent(coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
new file mode 100644
index 000000000..f27f6bace
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/SpalartAllmarasIDDES/SpalartAllmarasIDDES.H
@@ -0,0 +1,134 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::LESmodels::SpalartAllmarasIDDES
+
+Description
+    SpalartAllmarasIDDES LES turbulence model for incompressible flows
+
+SourceFiles
+    SpalartAllmarasIDDES.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef SpalartAllmarasIDDES_H
+#define SpalartAllmarasIDDES_H
+
+#include "SpalartAllmaras.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class SpalartAllmarasIDDES Declaration
+\*---------------------------------------------------------------------------*/
+
+class SpalartAllmarasIDDES
+:
+    public SpalartAllmaras
+{
+    // Private data
+
+        // Model constants
+
+            dimensionedScalar fwStar_;
+            dimensionedScalar cl_;
+            dimensionedScalar ct_;
+
+
+    // Private member functions
+
+        tmp<volScalarField> alpha() const;
+        tmp<volScalarField> ft(const volScalarField& S) const;
+        tmp<volScalarField> fl(const volScalarField& S) const;
+
+        tmp<volScalarField> rd
+        (
+            const volScalarField& visc,
+            const volScalarField& S
+        ) const;
+
+        //- Delay function
+        tmp<volScalarField> fd(const volScalarField& S) const;
+
+        // Disallow default bitwise copy construct and assignment
+        SpalartAllmarasIDDES(const SpalartAllmarasIDDES&);
+        SpalartAllmarasIDDES& operator=(const SpalartAllmarasIDDES&);
+
+
+protected:
+
+    // Protected member functions
+
+        //- Length scale
+        virtual tmp<volScalarField> dTilda(const volScalarField& S) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("SpalartAllmarasIDDES");
+
+
+    // Constructors
+
+        //- Construct from components
+        SpalartAllmarasIDDES
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            transportModel& transport
+        );
+
+
+    //- Destructor
+    virtual ~SpalartAllmarasIDDES()
+    {}
+
+
+    // Member Functions
+
+        //- Read LESProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
similarity index 63%
rename from src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
index 42aaefc59..a87359613 100644
--- a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.C
@@ -25,7 +25,6 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "nuSgsWallFunctionFvPatchScalarField.H"
-#include "LESModel.H"
 #include "fvPatchFieldMapper.H"
 #include "volFields.H"
 #include "addToRunTimeSelectionTable.H"
@@ -41,17 +40,23 @@ namespace LESModels
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
+nuSgsWallFunctionFvPatchScalarField::
+nuSgsWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(p, iF)
+    fixedValueFvPatchScalarField(p, iF),
+    UName_("U"),
+    nuName_("nu"),
+    kappa_(0.41),
+    E_(9.8)
 {}
 
 
-nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
+nuSgsWallFunctionFvPatchScalarField::
+nuSgsWallFunctionFvPatchScalarField
 (
     const nuSgsWallFunctionFvPatchScalarField& ptf,
     const fvPatch& p,
@@ -59,37 +64,56 @@ nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
     const fvPatchFieldMapper& mapper
 )
 :
-    fixedValueFvPatchScalarField(ptf, p, iF, mapper)
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    nuName_(ptf.nuName_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_)
 {}
 
 
-nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
+nuSgsWallFunctionFvPatchScalarField::
+nuSgsWallFunctionFvPatchScalarField
 (
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const dictionary& dict
 )
 :
-    fixedValueFvPatchScalarField(p, iF, dict)
+    fixedValueFvPatchScalarField(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu")),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8))
 {}
 
 
-nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
+nuSgsWallFunctionFvPatchScalarField::
+nuSgsWallFunctionFvPatchScalarField
 (
-    const nuSgsWallFunctionFvPatchScalarField& tppsf
+    const nuSgsWallFunctionFvPatchScalarField& nwfpsf
 )
 :
-    fixedValueFvPatchScalarField(tppsf)
+    fixedValueFvPatchScalarField(nwfpsf),
+    UName_(nwfpsf.UName_),
+    nuName_(nwfpsf.nuName_),
+    kappa_(nwfpsf.kappa_),
+    E_(nwfpsf.E_)
 {}
 
 
-nuSgsWallFunctionFvPatchScalarField::nuSgsWallFunctionFvPatchScalarField
+nuSgsWallFunctionFvPatchScalarField::
+nuSgsWallFunctionFvPatchScalarField
 (
-    const nuSgsWallFunctionFvPatchScalarField& tppsf,
+    const nuSgsWallFunctionFvPatchScalarField& nwfpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    fixedValueFvPatchScalarField(tppsf, iF)
+    fixedValueFvPatchScalarField(nwfpsf, iF),
+    UName_(nwfpsf.UName_),
+    nuName_(nwfpsf.nuName_),
+    kappa_(nwfpsf.kappa_),
+    E_(nwfpsf.E_)
 {}
 
 
@@ -100,24 +124,17 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
     const Pstream::commsTypes
 )
 {
-    const LESModel& sgsModel
-        = db().lookupObject<LESModel>("LESProperties");
-
-    scalar kappa = readScalar(sgsModel.lookup("kappa"));
-
-    scalar E = readScalar(sgsModel.subDict("wallFunctionCoeffs").lookup("E"));
-
     const scalarField& ry = patch().deltaCoeffs();
 
     const fvPatchVectorField& U =
-        patch().lookupPatchField<volVectorField, vector>("U");
+        patch().lookupPatchField<volVectorField, vector>(UName_);
 
     scalarField magUp = mag(U.patchInternalField() - U);
 
     const scalarField& nuw =
-        patch().lookupPatchField<volScalarField, scalar>("nu");
-    scalarField& nuSgsw = *this;
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
 
+    scalarField& nuSgsw = *this;
 
     scalarField magFaceGradU = mag(U.snGrad());
 
@@ -127,25 +144,25 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
 
         scalar utau = sqrt((nuSgsw[facei] + nuw[facei])*magFaceGradU[facei]);
 
-        if(utau > VSMALL)
+        if (utau > VSMALL)
         {
             int iter = 0;
             scalar err = GREAT;
 
             do
             {
-                scalar kUu = min(kappa*magUpara/utau, 50);
+                scalar kUu = min(kappa_*magUpara/utau, 50);
                 scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
 
                 scalar f =
                     - utau/(ry[facei]*nuw[facei])
                     + magUpara/utau
-                    + 1/E*(fkUu - 1.0/6.0*kUu*sqr(kUu));
+                    + 1/E_*(fkUu - 1.0/6.0*kUu*sqr(kUu));
 
                 scalar df =
                     - 1.0/(ry[facei]*nuw[facei])
                     - magUpara/sqr(utau)
-                    - 1/E*kUu*fkUu/utau;
+                    - 1/E_*kUu*fkUu/utau;
 
                 scalar utauNew = utau - f/df;
                 err = mag((utau - utauNew)/utau);
@@ -161,12 +178,29 @@ void nuSgsWallFunctionFvPatchScalarField::evaluate
             nuSgsw[facei] = 0;
         }
     }
+
+    fixedValueFvPatchScalarField::evaluate();
+}
+
+
+void nuSgsWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
 }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-makePatchTypeField(fvPatchScalarField, nuSgsWallFunctionFvPatchScalarField);
+makePatchTypeField
+(
+    fvPatchScalarField,
+    nuSgsWallFunctionFvPatchScalarField
+);
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
similarity index 84%
rename from src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
index fb624b630..a58d6bbce 100644
--- a/src/turbulenceModels/LES/incompressible/wallFunc/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/LES/derivedFvPatchFields/wallFunctions/nuSgsWallFunctions/nuSgsWallFunction/nuSgsWallFunctionFvPatchScalarField.H
@@ -23,10 +23,11 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::LESModels::nuSgsWallFunctionFvPatchScalarField
+    Foam::incompressible::LESModels::
+        nuSgsWallFunctionFvPatchScalarField
 
 Description
-    wall function boundary condition for incompressible flows
+    Spalart Allmaras wall function boundary condition for incompressible flows
 
 SourceFiles
     nuSgsWallFunctionFvPatchScalarField.C
@@ -48,7 +49,7 @@ namespace LESModels
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class nuSgsWallFunctionFvPatch Declaration
+     Class nuSgsWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
 class nuSgsWallFunctionFvPatchScalarField
@@ -57,6 +58,18 @@ class nuSgsWallFunctionFvPatchScalarField
 {
     // Private data
 
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E constant
+        scalar E_;
+
 
 public:
 
@@ -81,7 +94,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given nuSgsWallFunctionFvPatchScalarField
+        //- Construct by mapping given
+        //  nuSgsWallFunctionFvPatchScalarField
         //  onto a new patch
         nuSgsWallFunctionFvPatchScalarField
         (
@@ -121,7 +135,11 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nuSgsWallFunctionFvPatchScalarField(*this, iF)
+                new nuSgsWallFunctionFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
             );
         }
 
@@ -135,6 +153,12 @@ public:
             (
                 const Pstream::commsTypes commsType=Pstream::blocking
             );
+
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C
similarity index 98%
rename from src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C
rename to src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C
index e36bcb756..081b15610 100644
--- a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.C
@@ -113,7 +113,7 @@ tmp<fvVectorMatrix> dynMixedSmagorinsky::divDevBeff(volVectorField& U) const
 void dynMixedSmagorinsky::correct(const tmp<volTensorField>& gradU)
 {
     scaleSimilarity::correct(gradU);
-    dynSmagorinsky::correct(gradU);
+    dynSmagorinsky::correct(gradU());
 }
 
 
diff --git a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
similarity index 98%
rename from src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
rename to src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
index 11f04e720..4783915ae 100644
--- a/src/turbulenceModels/LES/incompressible/dynMixedSmagorinsky/dynMixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/dynMixedSmagorinsky/dynMixedSmagorinsky.H
@@ -132,7 +132,7 @@ public:
         //- Correct Eddy-Viscosity and related properties
         void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         bool read();
 };
 
diff --git a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
similarity index 95%
rename from src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C
rename to src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
index 601192b2a..2bc1234a6 100644
--- a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.C
@@ -43,6 +43,13 @@ addToRunTimeSelectionTable(LESModel, dynOneEqEddy, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+void dynOneEqEddy::updateSubGridScaleFields(const volSymmTensorField& D)
+{
+    nuSgs_ = ck(D)*sqrt(k_)*delta();
+    nuSgs_.correctBoundaryConditions();
+}
+
+
 dimensionedScalar dynOneEqEddy::ck(const volSymmTensorField& D) const
 {
     volScalarField KK = 0.5*(filter_(magSqr(U())) - magSqr(filter_(U())));
@@ -120,16 +127,12 @@ dynOneEqEddy::dynOneEqEddy
     filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
     filter_(filterPtr_())
 {
+    updateSubGridScaleFields(symm(fvc::grad(U)));
+
     printCoeffs();
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-dynOneEqEddy::~dynOneEqEddy()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void dynOneEqEddy::correct(const tmp<volTensorField>& gradU)
@@ -140,7 +143,7 @@ void dynOneEqEddy::correct(const tmp<volTensorField>& gradU)
 
     volScalarField P = 2.0*nuSgs_*magSqr(D);
 
-    solve
+    fvScalarMatrix kEqn
     (
        fvm::ddt(k_)
      + fvm::div(phi(), k_)
@@ -150,10 +153,12 @@ void dynOneEqEddy::correct(const tmp<volTensorField>& gradU)
      - fvm::Sp(ce(D)*sqrt(k_)/delta(), k_)
     );
 
+    kEqn.relax();
+    kEqn.solve();
+
     bound(k_, k0());
 
-    nuSgs_ = ck(D)*sqrt(k_)*delta();
-    nuSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields(D);
 }
 
 
diff --git a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
similarity index 90%
rename from src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H
rename to src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
index 3c82f8efb..31292eec7 100644
--- a/src/turbulenceModels/LES/incompressible/dynOneEqEddy/dynOneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/dynOneEqEddy/dynOneEqEddy.H
@@ -47,7 +47,7 @@ Description
         D = symm(grad(U));
         nuSgs = ck*sqrt(k)*delta
         nuEff = nuSgs + nu
-    @endverabtim
+    @endverbatim
 
 SourceFiles
     dynOneEqEddy.C
@@ -87,6 +87,9 @@ class dynOneEqEddy
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields(const volSymmTensorField& D);
+
         //- Calculate ck, ce by filtering the velocity field U.
         dimensionedScalar ck(const volSymmTensorField& D) const;
         dimensionedScalar ce(const volSymmTensorField& D) const;
@@ -103,7 +106,7 @@ public:
 
     // Constructors
 
-        //- Constructor from components
+        //- Construct from components
         dynOneEqEddy
         (
             const volVectorField& U,
@@ -112,15 +115,15 @@ public:
         );
 
 
-    // Destructor
-
-        ~dynOneEqEddy();
+    //- Destructor
+    virtual ~dynOneEqEddy()
+    {}
 
 
     // Member Functions
 
         //- Return SGS kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
@@ -135,10 +138,10 @@ public:
         }
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C
similarity index 93%
rename from src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C
rename to src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C
index d2dd696a2..396efdb85 100644
--- a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.C
+++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.C
@@ -43,6 +43,13 @@ addToRunTimeSelectionTable(LESModel, dynSmagorinsky, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+void dynSmagorinsky::updateSubGridScaleFields(const volSymmTensorField& D)
+{
+    nuSgs_ = cD(D)*sqr(delta())*sqrt(magSqr(D));
+    nuSgs_.correctBoundaryConditions();
+}
+
+
 dimensionedScalar dynSmagorinsky::cD(const volSymmTensorField& D) const
 {
     volSymmTensorField LL = dev(filter_(sqr(U())) - (sqr(filter_(U()))));
@@ -111,16 +118,12 @@ dynSmagorinsky::dynSmagorinsky
     filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
     filter_(filterPtr_())
 {
+    updateSubGridScaleFields(dev(symm(fvc::grad(U))));
+
     printCoeffs();
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-dynSmagorinsky::~dynSmagorinsky()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void dynSmagorinsky::correct(const tmp<volTensorField>& gradU)
@@ -128,12 +131,10 @@ void dynSmagorinsky::correct(const tmp<volTensorField>& gradU)
     LESModel::correct(gradU);
 
     volSymmTensorField D = dev(symm(gradU));
-    volScalarField magSqrD = magSqr(D);
 
-    k_ = cI(D)*sqr(delta())*magSqrD;
+    k_ = cI(D)*sqr(delta())*magSqr(D);
 
-    nuSgs_ = cD(D)*sqr(delta())*sqrt(magSqrD);
-    nuSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields(D);
 }
 
 
diff --git a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
similarity index 91%
rename from src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H
rename to src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
index dd9f480b4..38d933e0f 100644
--- a/src/turbulenceModels/LES/incompressible/dynSmagorinsky/dynSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/dynSmagorinsky/dynSmagorinsky.H
@@ -96,6 +96,9 @@ class dynSmagorinsky
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields(const volSymmTensorField& D);
+
         //- Calculate coefficients cD, cI from filtering velocity field
         dimensionedScalar cD(const volSymmTensorField& D) const;
         dimensionedScalar cI(const volSymmTensorField& D) const;
@@ -112,7 +115,7 @@ public:
 
     // Constructors
 
-        //- Constructor from components
+        //- Construct from components
         dynSmagorinsky
         (
             const volVectorField& U,
@@ -121,24 +124,24 @@ public:
         );
 
 
-    // Destructor
-
-        ~dynSmagorinsky();
+    //- Destructor
+    virtual ~dynSmagorinsky()
+    {}
 
 
     // Member Functions
 
         //- Return SGS kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
new file mode 100644
index 000000000..8acaa3288
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -0,0 +1,477 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "kOmegaSSTSAS.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallDist.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace LESModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(kOmegaSSTSAS, 0);
+addToRunTimeSelectionTable(LESModel, kOmegaSSTSAS, dictionary);
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void kOmegaSSTSAS::updateSubGridScaleFields(const volScalarField& S2)
+{
+    nuSgs_ == a1_*k_/max(a1_*omega_, F2()*sqrt(S2));
+    nuSgs_.correctBoundaryConditions();
+}
+
+
+tmp<volScalarField> kOmegaSSTSAS::F1(const volScalarField& CDkOmega) const
+{
+    volScalarField CDkOmegaPlus = max
+    (
+        CDkOmega,
+        dimensionedScalar("1.0e-10", dimless/sqr(dimTime), 1.0e-10)
+    );
+
+    volScalarField arg1 = min
+    (
+        min
+        (
+            max
+            (
+                (scalar(1)/betaStar_)*sqrt(k_)/(omega_*y_),
+                scalar(500)*nu()/(sqr(y_)*omega_)
+            ),
+            (4*alphaOmega2_)*k_/(CDkOmegaPlus*sqr(y_))
+        ),
+        scalar(10)
+    );
+
+    return tanh(pow4(arg1));
+}
+
+
+tmp<volScalarField> kOmegaSSTSAS::F2() const
+{
+    volScalarField arg2 = min
+    (
+        max
+        (
+            (scalar(2)/betaStar_)*sqrt(k_)/(omega_*y_),
+            scalar(500)*nu()/(sqr(y_)*omega_)
+        ),
+        scalar(100)
+    );
+
+    return tanh(sqr(arg2));
+}
+
+
+tmp<volScalarField> kOmegaSSTSAS::Lvk2
+(
+    const volScalarField& S2
+) const
+{
+    return max
+    (
+        kappa_*sqrt(S2)
+       /(
+            mag(fvc::laplacian(U()))
+          + dimensionedScalar
+            (
+                "ROOTVSMALL",
+                dimensionSet(0, -1 , -1, 0, 0, 0, 0),
+                ROOTVSMALL
+            )
+        ),
+        Cs_*delta()
+    );
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+kOmegaSSTSAS::kOmegaSSTSAS
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    transportModel& transport,
+    const word& modelName
+)
+:
+    LESModel(modelName, U, phi, transport),
+
+    alphaK1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaK1",
+            coeffDict_,
+            0.85034
+        )
+    ),
+    alphaK2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaK2",
+            coeffDict_,
+            1.0
+        )
+    ),
+    alphaOmega1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaOmega1",
+            coeffDict_,
+            0.5
+        )
+    ),
+    alphaOmega2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaOmega2",
+            coeffDict_,
+            0.85616
+        )
+    ),
+    gamma1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "gamma1",
+            coeffDict_,
+            0.5532
+        )
+    ),
+    gamma2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "gamma2",
+            coeffDict_,
+            0.4403
+        )
+    ),
+    beta1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "beta1",
+            coeffDict_,
+            0.075
+        )
+    ),
+    beta2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "beta2",
+            coeffDict_,
+            0.0828
+        )
+    ),
+    betaStar_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "betaStar",
+            coeffDict_,
+            0.09
+        )
+    ),
+    a1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "a1",
+            coeffDict_,
+            0.31
+        )
+    ),
+    c1_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "c1",
+            coeffDict_,
+            10.0
+        )
+    ),
+    Cs_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cs",
+            coeffDict_,
+            0.262
+        )
+    ),
+    alphaPhi_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaPhi",
+            coeffDict_,
+            0.666667
+        )
+    ),
+    zetaTilda2_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "zetaTilda2",
+            coeffDict_,
+            1.755
+        )
+    ),
+    FSAS_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "FSAS",
+            coeffDict_,
+            1.25
+        )
+    ),
+
+    omega0_("omega0", dimless/dimTime, SMALL),
+    omegaSmall_("omegaSmall", dimless/dimTime, SMALL),
+    y_(mesh_),
+    Cmu_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cmu",
+            coeffDict_,
+            0.09
+         )
+    ),
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            *this,
+            0.41
+        )
+    ),
+
+    k_
+    (
+        IOobject
+        (
+            "k",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+
+    omega_
+    (
+        IOobject
+        (
+            "omega",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    ),
+
+    nuSgs_
+    (
+        IOobject
+        (
+            "nuSgs",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh_
+    )
+{
+    updateSubGridScaleFields(magSqr(symm(fvc::grad(U))));
+
+    printCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void kOmegaSSTSAS::correct(const tmp<volTensorField>& gradU)
+{
+    LESModel::correct(gradU);
+
+    if (mesh_.changing())
+    {
+        y_.correct();
+    }
+
+    volScalarField S2 = magSqr(symm(gradU()));
+    gradU.clear();
+
+    volVectorField gradK = fvc::grad(k_);
+    volVectorField gradOmega = fvc::grad(omega_);
+    volScalarField L = sqrt(k_)/(pow(Cmu_, 0.25)*(omega_ + omegaSmall_));
+    volScalarField CDkOmega =
+        (2.0*alphaOmega2_)*(gradK & gradOmega)/(omega_ + omegaSmall_);
+    volScalarField F1 = this->F1(CDkOmega);
+    volScalarField G = nuSgs_*2.0*S2;
+
+    // Turbulent kinetic energy equation
+    {
+        fvScalarMatrix kEqn
+        (
+            fvm::ddt(k_)
+          + fvm::div(phi(), k_)
+          - fvm::Sp(fvc::div(phi()), k_)
+          - fvm::laplacian(DkEff(F1), k_)
+        ==
+            min(G, c1_*betaStar_*k_*omega_)
+          - fvm::Sp(betaStar_*omega_, k_)
+        );
+
+        kEqn.relax();
+        kEqn.solve();
+    }
+    bound(k_, k0());
+
+    volScalarField grad_omega_k = max
+    (
+        magSqr(gradOmega)/
+        sqr(omega_ + omegaSmall_),
+        magSqr(gradK)/
+        sqr(k_ + k0())
+    );
+
+    // Turbulent frequency equation
+    {
+        fvScalarMatrix omegaEqn
+        (
+            fvm::ddt(omega_)
+          + fvm::div(phi(), omega_)
+          - fvm::Sp(fvc::div(phi()), omega_)
+          - fvm::laplacian(DomegaEff(F1), omega_)
+        ==
+            gamma(F1)*2.0*S2
+          - fvm::Sp(beta(F1)*omega_, omega_)
+          - fvm::SuSp       // cross diffusion term
+            (
+                (F1 - scalar(1))*CDkOmega/omega_,
+                omega_
+            )
+          + FSAS_
+           *max
+            (
+                dimensionedScalar("zero",dimensionSet(0, 0 , -2, 0, 0),0. ),
+                zetaTilda2_*kappa_*S2*(L/Lvk2(S2))
+              - 2.0/alphaPhi_*k_*grad_omega_k
+            )
+        );
+
+        omegaEqn.relax();
+        omegaEqn.solve();
+    }
+    bound(omega_, omega0_);
+
+    updateSubGridScaleFields(S2);
+}
+
+
+tmp<volScalarField> kOmegaSSTSAS::epsilon() const
+{
+    return 2.0*nuEff()*magSqr(symm(fvc::grad(U())));
+}
+
+
+tmp<volSymmTensorField> kOmegaSSTSAS::B() const
+{
+    return ((2.0/3.0)*I)*k() - nuSgs()*twoSymm(fvc::grad(U()));
+}
+
+
+tmp<volSymmTensorField> kOmegaSSTSAS::devBeff() const
+{
+    return -nuEff()*dev(twoSymm(fvc::grad(U())));
+}
+
+
+tmp<fvVectorMatrix> kOmegaSSTSAS::divDevBeff(volVectorField& U) const
+{
+    return
+    (
+      - fvm::laplacian(nuEff(), U) - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+    );
+}
+
+
+bool kOmegaSSTSAS::read()
+{
+    if (LESModel::read())
+    {
+        alphaK1_.readIfPresent(coeffDict());
+        alphaK2_.readIfPresent(coeffDict());
+        alphaOmega1_.readIfPresent(coeffDict());
+        alphaOmega2_.readIfPresent(coeffDict());
+        gamma1_.readIfPresent(coeffDict());
+        gamma2_.readIfPresent(coeffDict());
+        beta1_.readIfPresent(coeffDict());
+        beta2_.readIfPresent(coeffDict());
+        betaStar_.readIfPresent(coeffDict());
+        a1_.readIfPresent(coeffDict());
+        c1_.readIfPresent(coeffDict());
+        Cs_.readIfPresent(coeffDict());
+        alphaPhi_.readIfPresent(coeffDict());
+        zetaTilda2_.readIfPresent(coeffDict());
+        FSAS_.readIfPresent(coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
new file mode 100644
index 000000000..da7b0638c
--- /dev/null
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.H
@@ -0,0 +1,268 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::LESmodels::kOmegaSSTSAS
+
+Description
+    kOmegaSSTSAS LES turbulence model for incompressible flows
+
+    Reference:
+    DESider A European Effort on Hybrid RANS-LES Modelling:
+    Results of the European-Union Funded Project, 2004 - 2007
+    (Notes on Numerical Fluid Mechanics and Multidisciplinary Design).
+    Chapter 8 Formulation of the Scale-Adaptive Simulation (SAS) Model during
+    the DESIDER Project.
+    F. R. Menter and Y. Egorov.
+
+SourceFiles
+    kOmegaSSTSAS.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef kOmegaSSTSAS_H
+#define kOmegaSSTSAS_H
+
+#include "LESModel.H"
+#include "volFields.H"
+#include "wallDist.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace LESModels
+{
+
+/*---------------------------------------------------------------------------*\
+                        Class kOmegaSSTSAS Declaration
+\*---------------------------------------------------------------------------*/
+
+class kOmegaSSTSAS
+:
+    public LESModel
+{
+    // Private member functions
+
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields(const volScalarField& D);
+
+        // Disallow default bitwise copy construct and assignment
+        kOmegaSSTSAS(const kOmegaSSTSAS&);
+        kOmegaSSTSAS& operator=(const kOmegaSSTSAS&);
+
+
+protected:
+
+    // Protected data
+
+        // Model constants
+
+            dimensionedScalar alphaK1_;
+            dimensionedScalar alphaK2_;
+
+            dimensionedScalar alphaOmega1_;
+            dimensionedScalar alphaOmega2_;
+
+            dimensionedScalar gamma1_;
+            dimensionedScalar gamma2_;
+
+            dimensionedScalar beta1_;
+            dimensionedScalar beta2_;
+
+            dimensionedScalar betaStar_;
+
+            dimensionedScalar a1_;
+            dimensionedScalar c1_;
+            dimensionedScalar Cs_;
+
+            dimensionedScalar alphaPhi_;
+            dimensionedScalar zetaTilda2_;
+            dimensionedScalar FSAS_;
+
+            dimensionedScalar omega0_;
+            dimensionedScalar omegaSmall_;
+
+            wallDist y_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar kappa_;
+
+
+        // Fields
+
+            volScalarField k_;
+            volScalarField omega_;
+            volScalarField nuSgs_;
+
+
+    // Protected member functions
+
+        tmp<volScalarField> Lvk2
+        (
+            const volScalarField& S2
+        ) const;
+
+        tmp<volScalarField> F1(const volScalarField& CDkOmega) const;
+        tmp<volScalarField> F2() const;
+
+        tmp<volScalarField> blend
+        (
+            const volScalarField& F1,
+            const dimensionedScalar& psi1,
+            const dimensionedScalar& psi2
+        ) const
+        {
+            return F1*(psi1 - psi2) + psi2;
+        }
+
+        tmp<volScalarField> alphaK
+        (
+            const volScalarField& F1
+        ) const
+        {
+            return blend(F1, alphaK1_, alphaK2_);
+        }
+
+        tmp<volScalarField> alphaOmega
+        (
+             const volScalarField& F1
+        ) const
+        {
+            return blend(F1, alphaOmega1_, alphaOmega2_);
+        }
+
+        tmp<volScalarField> beta
+        (
+            const volScalarField& F1
+        ) const
+        {
+            return blend(F1, beta1_, beta2_);
+        }
+
+        tmp<volScalarField> gamma
+        (
+            const volScalarField& F1
+        ) const
+        {
+            return blend(F1, gamma1_, gamma2_);
+        }
+
+
+public:
+
+    //- Runtime type information
+    TypeName("kOmegaSSTSAS");
+
+
+    // Constructors
+
+        //- Construct from components
+        kOmegaSSTSAS
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            transportModel& transport,
+            const word& modelName = typeName
+        );
+
+
+    //- Destructor
+    virtual ~kOmegaSSTSAS()
+    {}
+
+
+    // Member Functions
+
+        //- Return SGS kinetic energy
+        virtual tmp<volScalarField> k() const
+        {
+            return k_;
+        }
+
+        //- Return omega
+        virtual tmp<volScalarField> omega() const
+        {
+            return omega_;
+        }
+
+        //- Return the effective diffusivity for k
+        tmp<volScalarField> DkEff(const volScalarField& F1) const
+        {
+            return tmp<volScalarField>
+            (
+                 new volScalarField("DkEff", alphaK(F1)*nuSgs_ + nu())
+            );
+        }
+
+        //- Return the effective diffusivity for omega
+        tmp<volScalarField> DomegaEff(const volScalarField& F1) const
+        {
+            return tmp<volScalarField>
+            (
+                new volScalarField("DomegaEff", alphaOmega(F1)*nuSgs_ + nu())
+            );
+        }
+
+        //- Return sub-grid disipation rate
+        virtual tmp<volScalarField> epsilon() const;
+
+        //- Return SGS viscosity
+        virtual tmp<volScalarField> nuSgs() const
+        {
+            return nuSgs_;
+        }
+
+        //- Return the sub-grid stress tensor.
+        virtual tmp<volSymmTensorField> B() const;
+
+        //- Return the effective sub-grid turbulence stress tensor
+        //  including the laminar stress
+        virtual tmp<volSymmTensorField> devBeff() const;
+
+        //- Return the deviatoric part of the divergence of Beff
+        //  i.e. the additional term in the filtered NSE.
+        virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
+
+        //- Solve the turbulence equations (k-w) and correct the turbulence
+        //  viscosity
+        virtual void correct(const tmp<volTensorField>& gradU);
+
+        //- Read LESProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace LESModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/LES/incompressible/laminar/laminar.C b/src/turbulenceModels/incompressible/LES/laminar/laminar.C
similarity index 99%
rename from src/turbulenceModels/LES/incompressible/laminar/laminar.C
rename to src/turbulenceModels/incompressible/LES/laminar/laminar.C
index d2bf88e39..47fa91ff2 100644
--- a/src/turbulenceModels/LES/incompressible/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.C
@@ -26,7 +26,6 @@ License
 
 #include "laminar.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/turbulenceModels/LES/incompressible/laminar/laminar.H b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
similarity index 87%
rename from src/turbulenceModels/LES/incompressible/laminar/laminar.H
rename to src/turbulenceModels/incompressible/LES/laminar/laminar.H
index ba0df181e..16f0e9560 100644
--- a/src/turbulenceModels/LES/incompressible/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/LES/laminar/laminar.H
@@ -34,8 +34,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef laminar_H
-#define laminar_H
+#ifndef lesLaminar_H
+#define lesLaminar_H
 
 #include "LESModel.H"
 #include "volFields.H"
@@ -72,7 +72,7 @@ public:
 
     // Constructors
 
-        //- Constructor from components
+        //- Construct from components
         laminar
         (
             const volVectorField& U,
@@ -81,25 +81,24 @@ public:
         );
 
 
-    // Destructor
-
-        ~laminar()
-        {}
+    //- Destructor
+    virtual ~laminar()
+    {}
 
 
     // Member Functions
 
         //- Return SGS kinetic energy
-        tmp<volScalarField> k() const;
+        virtual tmp<volScalarField> k() const;
 
         //- Return sub-grid disipation rate
-        tmp<volScalarField> epsilon() const;
+        virtual tmp<volScalarField> epsilon() const;
 
         //- Return SGS viscosity
-        tmp<volScalarField> nuSgs() const;
+        virtual tmp<volScalarField> nuSgs() const;
 
         //- Return the effective viscosity
-        tmp<volScalarField> nuEff() const;
+        virtual tmp<volScalarField> nuEff() const;
 
         //- Return the sub-grid stress tensor B.
         virtual tmp<volSymmTensorField> B() const;
@@ -110,9 +109,9 @@ public:
 
         //- Return the deviatoric part of the divergence of Beff
         //  i.e. the additional term in the filtered NSE.
-        tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
 
-        //- Read turbulenceProperties dictionary
+        //- Read LESProperties dictionary
         bool read();
 };
 
diff --git a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C
similarity index 92%
rename from src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C
rename to src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C
index b095997de..244084dc6 100644
--- a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.C
@@ -43,6 +43,17 @@ addToRunTimeSelectionTable(LESModel, locDynOneEqEddy, dictionary);
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
+void locDynOneEqEddy::updateSubGridScaleFields
+(
+    const volSymmTensorField& D,
+    const volScalarField& KK
+)
+{
+    nuSgs_ = ck(D, KK)*sqrt(k_)*delta();
+    nuSgs_.correctBoundaryConditions();
+}
+
+
 volScalarField locDynOneEqEddy::ck
 (
     const volSymmTensorField& D,
@@ -108,16 +119,13 @@ locDynOneEqEddy::locDynOneEqEddy
     filterPtr_(LESfilter::New(U.mesh(), coeffDict())),
     filter_(filterPtr_())
 {
+    volScalarField KK = 0.5*(filter_(magSqr(U)) - magSqr(filter_(U)));
+    updateSubGridScaleFields(symm(fvc::grad(U)), KK);
+
     printCoeffs();
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-locDynOneEqEddy::~locDynOneEqEddy()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 void locDynOneEqEddy::correct(const tmp<volTensorField>& gradU)
@@ -131,7 +139,7 @@ void locDynOneEqEddy::correct(const tmp<volTensorField>& gradU)
 
     volScalarField P = 2.0*nuSgs_*magSqr(D);
 
-    solve
+    fvScalarMatrix kEqn
     (
        fvm::ddt(k_)
      + fvm::div(phi(), k_)
@@ -141,10 +149,12 @@ void locDynOneEqEddy::correct(const tmp<volTensorField>& gradU)
      - fvm::Sp(ce(D, KK)*sqrt(k_)/delta(), k_)
     );
 
+    kEqn.relax();
+    kEqn.solve();
+
     bound(k_, k0());
 
-    nuSgs_ = ck(D, KK)*sqrt(k_)*delta();
-    nuSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields(D, KK);
 }
 
 
diff --git a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
similarity index 90%
rename from src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
rename to src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
index 246c71a2a..3fd55dfb9 100644
--- a/src/turbulenceModels/LES/incompressible/locDynOneEqEddy/locDynOneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/locDynOneEqEddy/locDynOneEqEddy.H
@@ -96,6 +96,13 @@ class locDynOneEqEddy
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields
+        (
+            const volSymmTensorField& D,
+            const volScalarField& KK
+        );
+
         //- Calculate ck, ce by filtering the velocity field U.
         volScalarField ck
         (
@@ -121,7 +128,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         locDynOneEqEddy
         (
             const volVectorField& U,
@@ -130,15 +137,15 @@ public:
         );
 
 
-    // Destructor
-
-        ~locDynOneEqEddy();
+    //- Destructor
+    virtual ~locDynOneEqEddy()
+    {}
 
 
     // Member Functions
 
         //- Return SGS kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
@@ -153,10 +160,10 @@ public:
         }
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
similarity index 100%
rename from src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.C
rename to src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.C
diff --git a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
similarity index 88%
rename from src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
rename to src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
index 36d16cb0e..94052cc7f 100644
--- a/src/turbulenceModels/LES/incompressible/mixedSmagorinsky/mixedSmagorinsky.H
+++ b/src/turbulenceModels/incompressible/LES/mixedSmagorinsky/mixedSmagorinsky.H
@@ -95,7 +95,7 @@ public:
 
     // Constructors
 
-        //- Constructor from components
+        //- Construct from components
         mixedSmagorinsky
         (
             const volVectorField& U,
@@ -104,42 +104,41 @@ public:
         );
 
 
-    // Destructor
-
-        ~mixedSmagorinsky()
-        {}
+    //- Destructor
+    virtual ~mixedSmagorinsky()
+    {}
 
 
     // Member Functions
 
         //- Return the SGS turbulent kinetic energy.
-        tmp<volScalarField> k() const;
+        virtual tmp<volScalarField> k() const;
 
         //- Return the SGS turbulent disipation rate.
-        tmp<volScalarField> epsilon() const;
+        virtual tmp<volScalarField> epsilon() const;
 
         //- Return the SGS viscosity.
-        tmp<volScalarField> nuSgs() const
+        virtual tmp<volScalarField> nuSgs() const
         {
             return nuSgs_;
         }
 
         //- Return the sub-grid stress tensor.
-        tmp<volSymmTensorField> B() const;
+        virtual tmp<volSymmTensorField> B() const;
 
         //- Return the effective sub-grid turbulence stress tensor
         //  including the laminar stress
-        tmp<volSymmTensorField> devBeff() const;
+        virtual tmp<volSymmTensorField> devBeff() const;
 
         //- Implementation of div(B). This is necessary to override
         // (and include) the div(B) terms from both the parent classes.
-        tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
similarity index 91%
rename from src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C
rename to src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
index 620330a60..05e84c788 100644
--- a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.C
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.C
@@ -41,6 +41,16 @@ namespace LESModels
 defineTypeNameAndDebug(oneEqEddy, 0);
 addToRunTimeSelectionTable(LESModel, oneEqEddy, dictionary);
 
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void oneEqEddy::updateSubGridScaleFields()
+{
+    nuSgs_ = ck_*sqrt(k_)*delta();
+    nuSgs_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 oneEqEddy::oneEqEddy
@@ -71,11 +81,13 @@ oneEqEddy::oneEqEddy
         dimensioned<scalar>::lookupOrAddToDict
         (
             "ck",
-            coeffDict(),
+            coeffDict_,
             0.094
         )
     )
 {
+    updateSubGridScaleFields();
+
     printCoeffs();
 }
 
@@ -88,7 +100,7 @@ void oneEqEddy::correct(const tmp<volTensorField>& gradU)
 
     volScalarField G = 2.0*nuSgs_*magSqr(symm(gradU));
 
-    solve
+    fvScalarMatrix kEqn
     (
        fvm::ddt(k_)
      + fvm::div(phi(), k_)
@@ -98,10 +110,12 @@ void oneEqEddy::correct(const tmp<volTensorField>& gradU)
      - fvm::Sp(ce_*sqrt(k_)/delta(), k_)
     );
 
+    kEqn.relax();
+    kEqn.solve();
+
     bound(k_, k0());
 
-    nuSgs_ = ck_*sqrt(k_)*delta();
-    nuSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields();
 }
 
 
diff --git a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
similarity index 90%
rename from src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H
rename to src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
index c70d4afe7..44153249c 100644
--- a/src/turbulenceModels/LES/incompressible/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
@@ -83,6 +83,9 @@ class oneEqEddy
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields();
+
         // Disallow default bitwise copy construct and assignment
         oneEqEddy(const oneEqEddy&);
         oneEqEddy& operator=(const oneEqEddy&);
@@ -95,7 +98,7 @@ public:
 
     // Constructors
 
-        //- Constructor from components
+        //- Construct from components
         oneEqEddy
         (
             const volVectorField& U,
@@ -104,16 +107,15 @@ public:
         );
 
 
-    // Destructor
-
-        ~oneEqEddy()
-        {}
+    //- Destructor
+    virtual ~oneEqEddy()
+    {}
 
 
     // Member Functions
 
         //- Return SGS kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
@@ -128,10 +130,10 @@ public:
         }
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>& gradU);
+        virtual void correct(const tmp<volTensorField>& gradU);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
similarity index 96%
rename from src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C
rename to src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
index badd5002c..12d915005 100644
--- a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.C
+++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.C
@@ -56,12 +56,6 @@ scaleSimilarity::scaleSimilarity
 }
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-scaleSimilarity::~scaleSimilarity()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 tmp<volScalarField> scaleSimilarity::k() const
diff --git a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
similarity index 88%
rename from src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H
rename to src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
index 27153e250..0c369a0e1 100644
--- a/src/turbulenceModels/LES/incompressible/scaleSimilarity/scaleSimilarity.H
+++ b/src/turbulenceModels/incompressible/LES/scaleSimilarity/scaleSimilarity.H
@@ -89,35 +89,35 @@ public:
         );
 
 
-    // Destructor
-
-        ~scaleSimilarity();
+    //- Destructor
+    virtual ~scaleSimilarity()
+    {}
 
 
     // Member Functions
 
         //- Return the SGS turbulent kinetic energy.
-        tmp<volScalarField> k() const;
+        virtual tmp<volScalarField> k() const;
 
         //- Return the SGS turbulent dissipation.
-        tmp<volScalarField> epsilon() const;
+        virtual tmp<volScalarField> epsilon() const;
 
         //- Return the sub-grid stress tensor.
-        tmp<volSymmTensorField> B() const;
+        virtual tmp<volSymmTensorField> B() const;
 
         //- Return the deviatoric part of the effective sub-grid
         //  turbulence stress tensor including the laminar stress
-        tmp<volSymmTensorField> devBeff() const;
+        virtual tmp<volSymmTensorField> devBeff() const;
 
         //- Return the deviatoric part of the divergence of Beff
         //  i.e. the additional term in the filtered NSE.
-        tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevBeff(volVectorField& U) const;
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>&);
+        virtual void correct(const tmp<volTensorField>&);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
similarity index 84%
rename from src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C
rename to src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
index 796f63988..49a4182b5 100644
--- a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.C
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.C
@@ -41,9 +41,27 @@ namespace LESModels
 defineTypeNameAndDebug(spectEddyVisc, 0);
 addToRunTimeSelectionTable(LESModel, spectEddyVisc, dictionary);
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void spectEddyVisc::updateSubGridScaleFields(const volTensorField& gradU)
+{
+    volScalarField Re = sqr(delta())*mag(symm(gradU))/nu();
+    for (label i=0; i<5; i++)
+    {
+        nuSgs_ =
+            nu()
+           /(
+                 scalar(1)
+               - exp(-cB_*pow(nu()/(nuSgs_ + nu()), 1.0/3.0)*pow(Re, -2.0/3.0))
+            );
+    }
+
+    nuSgs_.correctBoundaryConditions();
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 spectEddyVisc::spectEddyVisc
 (
     const volVectorField& U,
@@ -60,7 +78,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cB",
-            coeffDict(),
+            coeffDict_,
             8.22
         )
     ),
@@ -69,7 +87,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK1",
-            coeffDict(),
+            coeffDict_,
             0.83
         )
     ),
@@ -78,7 +96,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK2",
-            coeffDict(),
+            coeffDict_,
             1.03
         )
     ),
@@ -87,7 +105,7 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK3",
-            coeffDict(),
+            coeffDict_,
             4.75
         )
     ),
@@ -96,12 +114,14 @@ spectEddyVisc::spectEddyVisc
         dimensioned<scalar>::lookupOrAddToDict
         (
             "cK4",
-            coeffDict(),
+            coeffDict_,
             2.55
         )
     )
 {
     printCoeffs();
+
+    updateSubGridScaleFields(fvc::grad(U));
 }
 
 
@@ -109,33 +129,20 @@ spectEddyVisc::spectEddyVisc
 
 tmp<volScalarField> spectEddyVisc::k() const
 {
-    volScalarField Eps = 2*nuEff()*magSqr(symm(fvc::grad(U())));
+    volScalarField eps = 2*nuEff()*magSqr(symm(fvc::grad(U())));
 
     return
-        cK1_*pow(delta(), 2.0/3.0)*pow(Eps, 2.0/3.0)
-        *exp(-cK2_*pow(delta(), -4.0/3.0)*nu()/pow(Eps, 1.0/3.0))
-      - cK3_*pow(Eps*nu(), 1.0/2.0)
-       *erfc(cK4_*pow(delta(), -2.0/3.0)*pow(Eps, -1.0/6.0));
+        cK1_*pow(delta()*eps, 2.0/3.0)
+       *exp(-cK2_*pow(delta(), -4.0/3.0)*nu()/pow(eps, 1.0/3.0))
+      - cK3_*sqrt(eps*nu())
+       *erfc(cK4_*pow(delta(), -2.0/3.0)*sqrt(nu())*pow(eps, -1.0/6.0));
 }
 
 
 void spectEddyVisc::correct(const tmp<volTensorField>& gradU)
 {
     GenEddyVisc::correct(gradU);
-
-    volScalarField Re = sqr(delta())*mag(symm(gradU))/nu();
-
-    for (label i=0; i<5; i++)
-    {
-        nuSgs_ =
-            nu()
-           /(
-               scalar(1)
-               - exp(-cB_*pow(nu()/(nuSgs_ + nu()), 1.0/3.0)*pow(Re, -2.0/3.0))
-            );
-    }
-
-    nuSgs_.correctBoundaryConditions();
+    updateSubGridScaleFields(gradU());
 }
 
 
diff --git a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
similarity index 90%
rename from src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H
rename to src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
index 6cf18b330..7a4c2d494 100644
--- a/src/turbulenceModels/LES/incompressible/spectEddyVisc/spectEddyVisc.H
+++ b/src/turbulenceModels/incompressible/LES/spectEddyVisc/spectEddyVisc.H
@@ -85,6 +85,9 @@ class spectEddyVisc
 
     // Private Member Functions
 
+        //- Update sub-grid scale fields
+        void updateSubGridScaleFields(const volTensorField& gradU);
+
         // Disallow default bitwise copy construct and assignment
         spectEddyVisc(const spectEddyVisc&);
         spectEddyVisc& operator=(const spectEddyVisc&);
@@ -97,7 +100,7 @@ public:
 
     // Constructors
 
-        // from components
+        // Construct from components
         spectEddyVisc
         (
             const volVectorField& U,
@@ -106,22 +109,21 @@ public:
         );
 
 
-    // Destructor
-
-        ~spectEddyVisc()
-        {}
+    //- Destructor
+    virtual ~spectEddyVisc()
+    {}
 
 
     // Member Functions
 
         //- Return SGS kinetic energy
-        tmp<volScalarField> k() const;
+        virtual tmp<volScalarField> k() const;
 
         //- Correct Eddy-Viscosity and related properties
-        void correct(const tmp<volTensorField>&);
+        virtual void correct(const tmp<volTensorField>&);
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read LESProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
similarity index 86%
rename from src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C
rename to src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
index 90bff934d..5fce20d58 100644
--- a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.C
+++ b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.C
@@ -49,12 +49,11 @@ addToRunTimeSelectionTable(LESdelta, vanDriestDelta, dictionary);
 
 void vanDriestDelta::calcDelta()
 {
-    const LESModel& sgsModel
-        = mesh_.lookupObject<LESModel>("LESProperties");
+    const LESModel& lesModel = mesh_.lookupObject<LESModel>("LESProperties");
 
-    const volVectorField& U = sgsModel.U();
-    const volScalarField& nu = sgsModel.nu();
-    tmp<volScalarField> nuSgs = sgsModel.nuSgs();
+    const volVectorField& U = lesModel.U();
+    const volScalarField& nu = lesModel.nu();
+    tmp<volScalarField> nuSgs = lesModel.nuSgs();
 
     volScalarField ystar
     (
@@ -71,7 +70,7 @@ void vanDriestDelta::calcDelta()
     const fvPatchList& patches = mesh_.boundary();
     forAll(patches, patchi)
     {
-        if (isType<wallFvPatch>(patches[patchi]))
+        if (isA<wallFvPatch>(patches[patchi]))
         {
             const fvPatchVectorField& Uw = U.boundaryField()[patchi];
             const scalarField& nuw = nu.boundaryField()[patchi];
@@ -107,7 +106,7 @@ vanDriestDelta::vanDriestDelta
     (
         LESdelta::New("geometricDelta", mesh, dd.subDict(type() + "Coeffs"))
     ),
-    kappa_(dd.lookupOrDefault<scalar>("kappa", 0.4187)),
+    kappa_(dd.lookupOrDefault<scalar>("kappa", 0.41)),
     Aplus_
     (
         dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Aplus", 26.0)
@@ -115,6 +114,10 @@ vanDriestDelta::vanDriestDelta
     Cdelta_
     (
         dd.subDict(type() + "Coeffs").lookupOrDefault<scalar>("Cdelta", 0.158)
+    ),
+    calcInterval_
+    (
+        dd.subDict(type() + "Coeffs").lookupOrDefault<label>("calcInterval", 1)
     )
 {
     delta_ = geometricDelta_();
@@ -131,14 +134,18 @@ void vanDriestDelta::read(const dictionary& d)
     d.readIfPresent<scalar>("kappa", kappa_);
     dd.readIfPresent<scalar>("Aplus", Aplus_);
     dd.readIfPresent<scalar>("Cdelta", Cdelta_);
+    dd.readIfPresent<label>("calcInterval", calcInterval_);
     calcDelta();
 }
 
 
 void vanDriestDelta::correct()
 {
-    geometricDelta_().correct();
-    calcDelta();
+    if (mesh().time().timeIndex() % calcInterval_ == 0)
+    {
+        geometricDelta_().correct();
+        calcDelta();
+    }
 }
 
 
diff --git a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.H
similarity index 92%
rename from src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H
rename to src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.H
index 5117669a8..ec7fe706c 100644
--- a/src/turbulenceModels/LES/incompressible/vanDriestDelta/vanDriestDelta.H
+++ b/src/turbulenceModels/incompressible/LES/vanDriestDelta/vanDriestDelta.H
@@ -61,6 +61,7 @@ class vanDriestDelta
         scalar kappa_;
         scalar Aplus_;
         scalar Cdelta_;
+        label calcInterval_;
 
 
     // Private Member Functions
@@ -81,23 +82,22 @@ public:
 
     // Constructors
 
-        //- from name, mesh and IOdictionary
+        //- Construct from name, mesh and IOdictionary
         vanDriestDelta(const word& name, const fvMesh& mesh, const dictionary&);
 
 
-    // Destructor
-
-        ~vanDriestDelta()
-        {}
+    //- Destructor
+    virtual ~vanDriestDelta()
+    {}
 
 
     // Member Functions
 
         //- Read the LESdelta dictionary
-        void read(const dictionary&);
+        virtual void read(const dictionary&);
 
         // Correct values
-        void correct();
+        virtual void correct();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LRR/LRR.C b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
similarity index 86%
rename from src/turbulenceModels/RAS/incompressible/LRR/LRR.C
rename to src/turbulenceModels/incompressible/RAS/LRR/LRR.C
index 0ffe562dd..ebef56e47 100644
--- a/src/turbulenceModels/RAS/incompressible/LRR/LRR.C
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.C
@@ -28,6 +28,8 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "wallFvPatch.H"
 
+#include "backwardsCompatibilityWallFunctions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -44,7 +46,6 @@ addToRunTimeSelectionTable(RASModel, LRR, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 LRR::LRR
 (
     const volVectorField& U,
@@ -117,13 +118,13 @@ LRR::LRR
             0.15
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
     couplingFactor_
@@ -143,12 +144,11 @@ LRR::LRR
             "R",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateR("R", mesh_)
     ),
-
     k_
     (
         IOobject
@@ -156,12 +156,11 @@ LRR::LRR
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -169,15 +168,26 @@ LRR::LRR
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
-
-    nut_(Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    )
 {
-#   include "wallViscosityI.H"
+    nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_.correctBoundaryConditions();
 
     if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
     {
@@ -249,16 +259,16 @@ bool LRR::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        Clrr1_.readIfPresent(coeffDict_);
-        Clrr2_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        Cs_.readIfPresent(coeffDict_);
-        Ceps_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        Clrr1_.readIfPresent(coeffDict());
+        Clrr2_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        Cs_.readIfPresent(coeffDict());
+        Ceps_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
 
-        couplingFactor_.readIfPresent(coeffDict_);
+        couplingFactor_.readIfPresent(coeffDict());
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
@@ -279,26 +289,25 @@ bool LRR::read()
 
 void LRR::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
-    volScalarField G = 0.5*mag(tr(P));
+    volScalarField G("RASModel::G", 0.5*mag(tr(P)));
 
-#   include "wallFunctionsI.H"
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
     (
         fvm::ddt(epsilon_)
       + fvm::div(phi_, epsilon_)
-      + fvm::SuSp(-fvc::div(phi_), epsilon_)
+      - fvm::Sp(fvc::div(phi_), epsilon_)
     //- fvm::laplacian(Ceps*(K/epsilon_)*R, epsilon_)
       - fvm::laplacian(DepsilonEff(), epsilon_)
       ==
@@ -308,7 +317,7 @@ void LRR::correct()
 
     epsEqn().relax();
 
-#   include "wallDissipationI.H"
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
@@ -322,7 +331,7 @@ void LRR::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -372,8 +381,7 @@ void LRR::correct()
 
     // Re-calculate viscosity
     nut_ = Cmu_*sqr(k_)/epsilon_;
-
-#   include "wallViscosityI.H"
+    nut_.correctBoundaryConditions();
 
 
     // Correct wall shear stresses
@@ -382,7 +390,7 @@ void LRR::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             symmTensorField& Rw = R_.boundaryField()[patchi];
 
diff --git a/src/turbulenceModels/RAS/incompressible/LRR/LRR.H b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
similarity index 77%
rename from src/turbulenceModels/RAS/incompressible/LRR/LRR.H
rename to src/turbulenceModels/incompressible/RAS/LRR/LRR.H
index 819c445e5..98c64c25b 100644
--- a/src/turbulenceModels/RAS/incompressible/LRR/LRR.H
+++ b/src/turbulenceModels/incompressible/RAS/LRR/LRR.H
@@ -40,9 +40,7 @@ Description
             C2          1.92;
             Cs          0.25;
             Ceps        0.15;
-            alphah      1.0;    // only for compressible
-            alphaEps    0.76923;
-            alphaR      1.22;   // only for compressible
+            sigmaEps    1.3;
             couplingFactor  0.0;    // only for incompressible
         }
     @endverbatim
@@ -76,23 +74,28 @@ class LRR
 {
     // Private data
 
-        dimensionedScalar Cmu_;
+        // Model coefficients
 
-        dimensionedScalar Clrr1_;
-        dimensionedScalar Clrr2_;
+            dimensionedScalar Cmu_;
 
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar Cs_;
-        dimensionedScalar Ceps_;
-        dimensionedScalar alphaEps_;
+            dimensionedScalar Clrr1_;
+            dimensionedScalar Clrr2_;
 
-        dimensionedScalar couplingFactor_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar Cs_;
+            dimensionedScalar Ceps_;
+            dimensionedScalar sigmaEps_;
 
-        volSymmTensorField R_;
-        volScalarField k_;
-        volScalarField epsilon_;
-        volScalarField nut_;
+            dimensionedScalar couplingFactor_;
+
+
+        // Fields
+
+            volSymmTensorField R_;
+            volScalarField k_;
+            volScalarField epsilon_;
+            volScalarField nut_;
 
 
 public:
@@ -102,7 +105,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         LRR
         (
             const volVectorField& U,
@@ -111,16 +114,16 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~LRR()
+        virtual ~LRR()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -139,39 +142,39 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const
+        virtual tmp<volSymmTensorField> R() const
         {
             return R_;
         }
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
similarity index 88%
rename from src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C
rename to src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
index 5d2a68b83..5597df705 100644
--- a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.C
@@ -27,6 +27,8 @@ License
 #include "LamBremhorstKE.H"
 #include "addToRunTimeSelectionTable.H"
 
+#include "backwardsCompatibilityWallFunctions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -43,7 +45,6 @@ addToRunTimeSelectionTable(RASModel, LamBremhorstKE, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 LamBremhorstKE::LamBremhorstKE
 (
     const volVectorField& U,
@@ -80,13 +81,13 @@ LamBremhorstKE::LamBremhorstKE
             1.92
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
             "alphaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
 
@@ -126,8 +127,22 @@ LamBremhorstKE::LamBremhorstKE
        *(scalar(1) + 20.5/(Rt_ + SMALL))
     ),
 
-    nut_(Cmu_*fMu_*sqr(k_)/(epsilon_ + epsilonSmall_))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateLowReNut("nut", mesh_)
+    )
 {
+    nut_ = Cmu_*fMu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -189,10 +204,10 @@ bool LamBremhorstKE::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -205,29 +220,27 @@ bool LamBremhorstKE::read()
 
 void LamBremhorstKE::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     if (mesh_.changing())
     {
         y_.correct();
     }
 
-    volScalarField 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
 
     Rt_ = sqr(k_)/(nu()*epsilon_);
     volScalarField Ry = sqrt(k_)*y_/nu();
 
-    fMu_ = sqr(scalar(1) - exp(-0.0165*Ry))
-        *(scalar(1) + 20.5/(Rt_ + SMALL));
+    fMu_ = sqr(scalar(1) - exp(-0.0165*Ry))*(scalar(1) + 20.5/(Rt_ + SMALL));
 
     volScalarField f1 = scalar(1) + pow(0.05/(fMu_ + SMALL), 3);
     volScalarField f2 = scalar(1) - exp(-sqr(Rt_));
@@ -269,7 +282,7 @@ void LamBremhorstKE::correct()
 
 
     // Re-calculate viscosity
-    nut_ = Cmu_*fMu_*sqr(k_)/epsilon_;
+    nut_ == Cmu_*fMu_*sqr(k_)/epsilon_;
 }
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
similarity index 84%
rename from src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
rename to src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
index 6c7d1efab..3a58e3d1f 100644
--- a/src/turbulenceModels/RAS/incompressible/LamBremhorstKE/LamBremhorstKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LamBremhorstKE/LamBremhorstKE.H
@@ -50,7 +50,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class LamBremhorstKE Declaration
+                      Class LamBremhorstKE Declaration
 \*---------------------------------------------------------------------------*/
 
 class LamBremhorstKE
@@ -62,7 +62,7 @@ class LamBremhorstKE
         dimensionedScalar Cmu_;
         dimensionedScalar C1_;
         dimensionedScalar C2_;
-        dimensionedScalar alphaEps_;
+        dimensionedScalar sigmaEps_;
 
         volScalarField k_;
         volScalarField epsilon_;
@@ -82,7 +82,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         LamBremhorstKE
         (
             const volVectorField& U,
@@ -91,16 +91,16 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~LamBremhorstKE()
+        virtual ~LamBremhorstKE()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -119,36 +119,36 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
similarity index 85%
rename from src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
rename to src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
index 3bf6cd5f9..94a037f50 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.C
@@ -28,6 +28,8 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "wallFvPatch.H"
 
+#include "backwardsCompatibilityWallFunctions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -44,7 +46,6 @@ addToRunTimeSelectionTable(RASModel, LaunderGibsonRSTM, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 LaunderGibsonRSTM::LaunderGibsonRSTM
 (
     const volVectorField& U,
@@ -63,6 +64,15 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             0.09
         )
     ),
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            coeffDict_,
+            0.41
+        )
+    ),
     Clg1_
     (
         dimensioned<scalar>::lookupOrAddToDict
@@ -117,22 +127,22 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             0.15
         )
     ),
-    alphaR_
+    sigmaR_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaR",
+            "sigmaR",
             coeffDict_,
-            1.22
+            0.81967
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
     C1Ref_
@@ -172,12 +182,11 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             "R",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateR("R", mesh_)
     ),
-
     k_
     (
         IOobject
@@ -185,12 +194,11 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -198,15 +206,26 @@ LaunderGibsonRSTM::LaunderGibsonRSTM
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
-
-    nut_(Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    )
 {
-#   include "wallViscosityI.H"
+    nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_.correctBoundaryConditions();
 
     if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
     {
@@ -273,19 +292,19 @@ bool LaunderGibsonRSTM::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        Clg1_.readIfPresent(coeffDict_);
-        Clg2_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        Cs_.readIfPresent(coeffDict_);
-        Ceps_.readIfPresent(coeffDict_);
-        alphaR_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        C1Ref_.readIfPresent(coeffDict_);
-        C2Ref_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        Clg1_.readIfPresent(coeffDict());
+        Clg2_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        Cs_.readIfPresent(coeffDict());
+        Ceps_.readIfPresent(coeffDict());
+        sigmaR_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        C1Ref_.readIfPresent(coeffDict());
+        C2Ref_.readIfPresent(coeffDict());
 
-        couplingFactor_.readIfPresent(coeffDict_);
+        couplingFactor_.readIfPresent(coeffDict());
 
         if (couplingFactor_.value() < 0.0 || couplingFactor_.value() > 1.0)
         {
@@ -306,24 +325,23 @@ bool LaunderGibsonRSTM::read()
 
 void LaunderGibsonRSTM::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     if (mesh_.changing())
     {
         yr_.correct();
     }
 
     volSymmTensorField P = -twoSymm(R_ & fvc::grad(U_));
-    volScalarField G = 0.5*mag(tr(P));
+    volScalarField G("RASModel::G", 0.5*mag(tr(P)));
 
-#   include "wallFunctionsI.H"
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
@@ -340,7 +358,7 @@ void LaunderGibsonRSTM::correct()
 
     epsEqn().relax();
 
-#   include "wallDissipationI.H"
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
@@ -354,7 +372,7 @@ void LaunderGibsonRSTM::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -413,9 +431,7 @@ void LaunderGibsonRSTM::correct()
 
     // Re-calculate turbulent viscosity
     nut_ = Cmu_*sqr(k_)/epsilon_;
-
-
-#   include "wallViscosityI.H"
+    nut_.correctBoundaryConditions();
 
 
     // Correct wall shear stresses
@@ -424,7 +440,7 @@ void LaunderGibsonRSTM::correct()
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (typeid(curPatch) == typeid(wallFvPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             symmTensorField& Rw = R_.boundaryField()[patchi];
 
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
similarity index 73%
rename from src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
rename to src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
index dfaa66fec..a8496df0b 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderGibsonRSTM/LaunderGibsonRSTM.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderGibsonRSTM/LaunderGibsonRSTM.H
@@ -33,6 +33,7 @@ Description
         LaunderGibsonRSTMCoeffs
         {
             Cmu         0.09;
+            kappa       0.41;
             Clg1        1.8;
             Clg2        0.6;
             C1          1.44;
@@ -41,9 +42,8 @@ Description
             C2Ref       0.3;
             Cs          0.25;
             Ceps        0.15;
-            alphah      1.0;    // only for compressible
-            alphaEps    0.76923;
-            alphaR      1.22;
+            sigmaEps    1.3;
+            sigmaR      0.81967;
             couplingFactor  0.0;
         }
     @endverbatim
@@ -78,29 +78,35 @@ class LaunderGibsonRSTM
 {
     // Private data
 
-        dimensionedScalar Cmu_;
+        // Model coefficients
 
-        dimensionedScalar Clg1_;
-        dimensionedScalar Clg2_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar kappa_;
 
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar Cs_;
-        dimensionedScalar Ceps_;
-        dimensionedScalar alphaR_;
-        dimensionedScalar alphaEps_;
+            dimensionedScalar Clg1_;
+            dimensionedScalar Clg2_;
 
-        dimensionedScalar C1Ref_;
-        dimensionedScalar C2Ref_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar Cs_;
+            dimensionedScalar Ceps_;
+            dimensionedScalar sigmaR_;
+            dimensionedScalar sigmaEps_;
 
-        dimensionedScalar couplingFactor_;
+            dimensionedScalar C1Ref_;
+            dimensionedScalar C2Ref_;
 
-        wallDistReflection yr_;
+            dimensionedScalar couplingFactor_;
 
-        volSymmTensorField R_;
-        volScalarField k_;
-        volScalarField epsilon_;
-        volScalarField nut_;
+
+        // Fields
+
+            wallDistReflection yr_;
+
+            volSymmTensorField R_;
+            volScalarField k_;
+            volScalarField epsilon_;
+            volScalarField nut_;
 
 
 public:
@@ -110,7 +116,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         LaunderGibsonRSTM
         (
             const volVectorField& U,
@@ -119,16 +125,16 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~LaunderGibsonRSTM()
+        virtual ~LaunderGibsonRSTM()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -138,7 +144,7 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DREff", alphaR_*nut_ + nu())
+                new volScalarField("DREff", nut_/sigmaR_ + nu())
             );
         }
 
@@ -147,39 +153,39 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const
+        virtual tmp<volSymmTensorField> R() const
         {
             return R_;
         }
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
similarity index 89%
rename from src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C
rename to src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
index c272d697b..0d1713fd8 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.C
@@ -27,6 +27,8 @@ License
 #include "LaunderSharmaKE.H"
 #include "addToRunTimeSelectionTable.H"
 
+#include "backwardsCompatibilityWallFunctions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -95,13 +97,13 @@ LaunderSharmaKE::LaunderSharmaKE
             1.92
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
 
@@ -131,8 +133,22 @@ LaunderSharmaKE::LaunderSharmaKE
         mesh_
     ),
 
-    nut_(Cmu_*fMu()*sqr(k_)/(epsilonTilda_ + epsilonSmall_))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateLowReNut("nut", mesh_)
+    )
 {
+    nut_ = Cmu_*fMu()*sqr(k_)/(epsilonTilda_ + epsilonSmall_);
+    nut_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -194,10 +210,10 @@ bool LaunderSharmaKE::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -210,18 +226,16 @@ bool LaunderSharmaKE::read()
 
 void LaunderSharmaKE::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     volScalarField S2 = 2*magSqr(symm(fvc::grad(U_)));
 
-    volScalarField G = nut_*S2;
+    volScalarField G("RASModel::G", nut_*S2);
 
     volScalarField E = 2.0*nu()*nut_*fvc::magSqrGradGrad(U_);
     volScalarField D = 2.0*nu()*magSqr(fvc::grad(sqrt(k_)));
@@ -264,7 +278,7 @@ void LaunderSharmaKE::correct()
 
 
     // Re-calculate viscosity
-    nut_ = Cmu_*fMu()*sqr(k_)/epsilonTilda_;
+    nut_ == Cmu_*fMu()*sqr(k_)/epsilonTilda_;
 }
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
similarity index 80%
rename from src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
rename to src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
index 81c99aca4..97882a59f 100644
--- a/src/turbulenceModels/RAS/incompressible/LaunderSharmaKE/LaunderSharmaKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LaunderSharmaKE/LaunderSharmaKE.H
@@ -37,9 +37,7 @@ Description
             C1          1.44;
             C2          1.92;
             C3          -0.33;
-            alphah      1.0;    // only for compressible
-            alphahk     1.0;    // only for compressible
-            alphaEps    0.76923;
+            sigmaEps    1.3;
         }
     @endverbatim
 
@@ -63,7 +61,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class LaunderSharmaKE Declaration
+                       Class LaunderSharmaKE Declaration
 \*---------------------------------------------------------------------------*/
 
 class LaunderSharmaKE
@@ -72,15 +70,19 @@ class LaunderSharmaKE
 {
     // Private data
 
-        dimensionedScalar Cmu_;
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar alphaEps_;
+        // Model coefficients
 
-        volScalarField k_;
-        volScalarField epsilonTilda_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar sigmaEps_;
 
-        volScalarField nut_;
+
+        // Fields
+
+            volScalarField k_;
+            volScalarField epsilonTilda_;
+            volScalarField nut_;
 
 
     // Private member functions
@@ -96,7 +98,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         LaunderSharmaKE
         (
             const volVectorField& U,
@@ -105,16 +107,15 @@ public:
         );
 
 
-    // Destructor
-
-        ~LaunderSharmaKE()
-        {}
+    //- Destructor
+    virtual ~LaunderSharmaKE()
+    {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -133,37 +134,37 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Note that epsilonTilda is returned as epsilon.
         //  This is the appropriate variable for most purposes.
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilonTilda_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
similarity index 84%
rename from src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C
rename to src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
index 3ff528a5f..4b298520e 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.C
@@ -26,7 +26,8 @@ License
 
 #include "LienCubicKE.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,7 +45,6 @@ addToRunTimeSelectionTable(RASModel, LienCubicKE, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 LienCubicKE::LienCubicKE
 (
     const volVectorField& U,
@@ -72,22 +72,22 @@ LienCubicKE::LienCubicKE
             1.92
         )
     ),
-    alphak_
+    sigmak_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphak",
+            "sigmak",
             coeffDict_,
             1.0
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
     A1_
@@ -152,12 +152,11 @@ LienCubicKE::LienCubicKE
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -165,10 +164,10 @@ LienCubicKE::LienCubicKE
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
 
     gradU_(fvc::grad(U)),
@@ -179,13 +178,25 @@ LienCubicKE::LienCubicKE
 
     C5viscosity_
     (
-        -2.0*pow(Cmu_, 3.0)*pow(k_, 4.0)/pow(epsilon_, 3.0)*
-        (magSqr(gradU_ + gradU_.T()) - magSqr(gradU_ - gradU_.T()))
+      - 2.0*pow3(Cmu_)*pow4(k_)/pow3(epsilon_)
+       *(
+            magSqr(gradU_ + gradU_.T())
+          - magSqr(gradU_ - gradU_.T())
+        )
     ),
 
-    // C5 term, implicit
-    nut_(Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_) + C5viscosity_),
-    // turbulent viscosity, with implicit part of C5
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    ),
 
     nonlinearStress_
     (
@@ -215,7 +226,8 @@ LienCubicKE::LienCubicKE
         )
     )
 {
-#   include "wallNonlinearViscosityI.H"
+    nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_) + C5viscosity_;
+    nut_.correctBoundaryConditions();
 
     printCoeffs();
 }
@@ -279,16 +291,16 @@ bool LienCubicKE::read()
 {
     if (RASModel::read())
     {
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        A1_.readIfPresent(coeffDict_);
-        A2_.readIfPresent(coeffDict_);
-        Ctau1_.readIfPresent(coeffDict_);
-        Ctau2_.readIfPresent(coeffDict_);
-        Ctau3_.readIfPresent(coeffDict_);
-        alphaKsi_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmak_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        A1_.readIfPresent(coeffDict());
+        A2_.readIfPresent(coeffDict());
+        Ctau1_.readIfPresent(coeffDict());
+        Ctau2_.readIfPresent(coeffDict());
+        Ctau3_.readIfPresent(coeffDict());
+        alphaKsi_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -301,23 +313,26 @@ bool LienCubicKE::read()
 
 void LienCubicKE::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     gradU_ = fvc::grad(U_);
 
     // generation term
     volScalarField S2 = symm(gradU_) && gradU_;
 
-    volScalarField G = Cmu_*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU_);
+    volScalarField G
+    (
+        "RASModel::G",
+        Cmu_*sqr(k_)/epsilon_*S2 - (nonlinearStress_ && gradU_)
+    );
 
-#   include "nonLinearWallFunctionsI.H"
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
@@ -333,7 +348,7 @@ void LienCubicKE::correct()
 
     epsEqn().relax();
 
-#   include "wallDissipationI.H"
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
@@ -369,8 +384,7 @@ void LienCubicKE::correct()
        *(magSqr(gradU_ + gradU_.T()) - magSqr(gradU_ - gradU_.T()));
 
     nut_ = Cmu_*sqr(k_)/epsilon_ + C5viscosity_;
-
-#   include "wallNonlinearViscosityI.H"
+    nut_.correctBoundaryConditions();
 
     nonlinearStress_ = symm
     (
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
similarity index 71%
rename from src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
rename to src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
index 6ed1d7a84..47be90423 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKE/LienCubicKE.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKE/LienCubicKE.H
@@ -57,30 +57,35 @@ class LienCubicKE
 {
     // Private data
 
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar alphak_;
-        dimensionedScalar alphaEps_;
-        dimensionedScalar A1_;
-        dimensionedScalar A2_;
-        dimensionedScalar Ctau1_;
-        dimensionedScalar Ctau2_;
-        dimensionedScalar Ctau3_;
-        dimensionedScalar alphaKsi_;
+        // Model coefficients
 
-        volScalarField k_;
-        volScalarField epsilon_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar sigmak_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar A1_;
+            dimensionedScalar A2_;
+            dimensionedScalar Ctau1_;
+            dimensionedScalar Ctau2_;
+            dimensionedScalar Ctau3_;
+            dimensionedScalar alphaKsi_;
 
-        volTensorField gradU_;
-        volScalarField eta_;
-        volScalarField ksi_;
-        volScalarField Cmu_;
-        volScalarField fEta_;
-        volScalarField C5viscosity_;
 
-        volScalarField nut_;
+        // Fields
 
-        volSymmTensorField nonlinearStress_;
+            volScalarField k_;
+            volScalarField epsilon_;
+
+            volTensorField gradU_;
+            volScalarField eta_;
+            volScalarField ksi_;
+            volScalarField Cmu_;
+            volScalarField fEta_;
+            volScalarField C5viscosity_;
+
+            volScalarField nut_;
+
+            volSymmTensorField nonlinearStress_;
 
 
 public:
@@ -90,7 +95,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         LienCubicKE
         (
             const volVectorField& U,
@@ -101,14 +106,14 @@ public:
 
     // Destructor
 
-        ~LienCubicKE()
+        virtual ~LienCubicKE()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -118,7 +123,7 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", alphak_*nut_ + nu())
+                new volScalarField("DkEff", nut_/sigmak_ + nu())
             );
         }
 
@@ -127,36 +132,36 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
similarity index 89%
rename from src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
rename to src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
index 79254f4f2..820a8569c 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.C
@@ -28,6 +28,8 @@ License
 #include "wallFvPatch.H"
 #include "addToRunTimeSelectionTable.H"
 
+#include "backwardsCompatibilityWallFunctions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -44,7 +46,6 @@ addToRunTimeSelectionTable(RASModel, LienCubicKELowRe, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 LienCubicKELowRe::LienCubicKELowRe
 (
     const volVectorField& U,
@@ -72,22 +73,22 @@ LienCubicKELowRe::LienCubicKELowRe
             1.92
         )
     ),
-    alphak_
+    sigmak_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphak",
+            "sigmak",
             coeffDict_,
             1.0
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
     A1_
@@ -153,6 +154,15 @@ LienCubicKELowRe::LienCubicKELowRe
             0.09
         )
     ),
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            coeffDict_,
+            0.41
+        )
+    ),
     Am_
     (
         dimensioned<scalar>::lookupOrAddToDict
@@ -225,20 +235,16 @@ LienCubicKELowRe::LienCubicKELowRe
 
     nut_
     (
-        Cmu_
-       *(
-            scalar(1) - exp(-Am_*yStar_))
-           /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL
-        )
-       *sqr(k_)/(epsilon_ + epsilonSmall_)
-        // cubic term C5, implicit part
-      + max
+        IOobject
         (
-            C5viscosity_,
-            dimensionedScalar("0", C5viscosity_.dimensions(), 0.0)
-        )
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateLowReNut("nut", mesh_)
     ),
-    // turbulent viscosity, with implicit part of C5
 
     nonlinearStress_
     (
@@ -274,6 +280,21 @@ LienCubicKELowRe::LienCubicKELowRe
         )
     )
 {
+    nut_ = Cmu_
+       *(
+            scalar(1) - exp(-Am_*yStar_))
+           /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL
+        )
+       *sqr(k_)/(epsilon_ + epsilonSmall_)
+        // cubic term C5, implicit part
+      + max
+        (
+            C5viscosity_,
+            dimensionedScalar("0", C5viscosity_.dimensions(), 0.0)
+        );
+
+    nut_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -336,20 +357,21 @@ bool LienCubicKELowRe::read()
 {
     if (RASModel::read())
     {
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        A1_.readIfPresent(coeffDict_);
-        A2_.readIfPresent(coeffDict_);
-        Ctau1_.readIfPresent(coeffDict_);
-        Ctau2_.readIfPresent(coeffDict_);
-        Ctau3_.readIfPresent(coeffDict_);
-        alphaKsi_.readIfPresent(coeffDict_);
-        CmuWall_.readIfPresent(coeffDict_);
-        Am_.readIfPresent(coeffDict_);
-        Aepsilon_.readIfPresent(coeffDict_);
-        Amu_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmak_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        A1_.readIfPresent(coeffDict());
+        A2_.readIfPresent(coeffDict());
+        Ctau1_.readIfPresent(coeffDict());
+        Ctau2_.readIfPresent(coeffDict());
+        Ctau3_.readIfPresent(coeffDict());
+        alphaKsi_.readIfPresent(coeffDict());
+        CmuWall_.readIfPresent(coeffDict());
+        kappa_.readIfPresent(coeffDict());
+        Am_.readIfPresent(coeffDict());
+        Aepsilon_.readIfPresent(coeffDict());
+        Amu_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -362,15 +384,13 @@ bool LienCubicKELowRe::read()
 
 void LienCubicKELowRe::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     if (mesh_.changing())
     {
         y_.correct();
@@ -424,6 +444,7 @@ void LienCubicKELowRe::correct()
     (
         fvm::ddt(k_)
       + fvm::div(phi_, k_)
+      + fvm::SuSp(-fvc::div(phi_), k_)
       - fvm::laplacian(DkEff(), k_)
       ==
         G
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
similarity index 70%
rename from src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
rename to src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
index cb7c97f1b..78c3e0b99 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowRe.H
@@ -41,7 +41,7 @@ Description
         Etemad, S., et al.,
         "Turbulent flow and heat transfer in a square-sectioned U bend"
         Progress in compuational fluid dynamics 6, 89-100. 2006.
-    @verbatim
+    @endverbatim
 
 SourceFiles
     LienCubicKELowRe.C
@@ -73,40 +73,47 @@ class LienCubicKELowRe
 {
     // Private data
 
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar alphak_;
-        dimensionedScalar alphaEps_;
-        dimensionedScalar A1_;
-        dimensionedScalar A2_;
-        dimensionedScalar Ctau1_;
-        dimensionedScalar Ctau2_;
-        dimensionedScalar Ctau3_;
-        dimensionedScalar alphaKsi_;
+        // Model coefficients
 
-        dimensionedScalar CmuWall_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar sigmak_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar A1_;
+            dimensionedScalar A2_;
+            dimensionedScalar Ctau1_;
+            dimensionedScalar Ctau2_;
+            dimensionedScalar Ctau3_;
+            dimensionedScalar alphaKsi_;
 
-        dimensionedScalar Am_;
-        dimensionedScalar Aepsilon_;
-        dimensionedScalar Amu_;
+            dimensionedScalar CmuWall_;
+            dimensionedScalar kappa_;
 
-        volScalarField k_;
-        volScalarField epsilon_;
+            dimensionedScalar Am_;
+            dimensionedScalar Aepsilon_;
+            dimensionedScalar Amu_;
 
-        wallDist y_;
 
-        volTensorField gradU_;
-        volScalarField eta_;
-        volScalarField ksi_;
-        volScalarField Cmu_;
-        volScalarField fEta_;
-        volScalarField C5viscosity_;
+        // Fields
 
-        volScalarField yStar_;
+            volScalarField k_;
+            volScalarField epsilon_;
 
-        volScalarField nut_;
+            wallDist y_;
+
+            volTensorField gradU_;
+            volScalarField eta_;
+            volScalarField ksi_;
+            volScalarField Cmu_;
+            volScalarField fEta_;
+            volScalarField C5viscosity_;
+
+            volScalarField yStar_;
+
+            volScalarField nut_;
+
+            volSymmTensorField nonlinearStress_;
 
-        volSymmTensorField nonlinearStress_;
 
 public:
 
@@ -115,7 +122,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         LienCubicKELowRe
         (
             const volVectorField& U,
@@ -124,16 +131,16 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~LienCubicKELowRe()
+        virtual ~LienCubicKELowRe()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -143,7 +150,7 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", alphak_*nut_ + nu())
+                new volScalarField("DkEff", nut_/sigmak_ + nu())
             );
         }
 
@@ -152,36 +159,36 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
similarity index 93%
rename from src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
rename to src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
index ef216dcf6..a150d52b9 100644
--- a/src/turbulenceModels/RAS/incompressible/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
+++ b/src/turbulenceModels/incompressible/RAS/LienCubicKELowRe/LienCubicKELowReSetWallDissipation.H
@@ -14,7 +14,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -29,7 +29,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -58,7 +58,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
diff --git a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
similarity index 67%
rename from src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
rename to src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
index e6ba71f4c..91ea566b7 100644
--- a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.C
@@ -28,6 +28,8 @@ License
 #include "wallFvPatch.H"
 #include "addToRunTimeSelectionTable.H"
 
+#include "backwardsCompatibilityWallFunctions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -44,7 +46,6 @@ addToRunTimeSelectionTable(RASModel, LienLeschzinerLowRe, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 LienLeschzinerLowRe::LienLeschzinerLowRe
 (
     const volVectorField& U,
@@ -54,20 +55,87 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
 :
     RASModel(typeName, U, phi, lamTransportModel),
 
-    C1(coeffDict_.lookupOrAddDefault<scalar>("C1", 1.44)),
-    C2(coeffDict_.lookupOrAddDefault<scalar>("C2", 1.92)),
-    alphak(coeffDict_.lookupOrAddDefault<scalar>("alphak", 1.0)),
-    alphaEps
+    C1_
     (
-        coeffDict_.lookupOrAddDefault<scalar>("alphaEps", 0.76923)
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "C1",
+            coeffDict_,
+            1.44
+        )
     ),
-    Cmu(coeffDict_.lookupOrAddDefault<scalar>("Cmu", 0.09)),
-    Am(coeffDict_.lookupOrAddDefault<scalar>("Am", 0.016)),
-    Aepsilon
+    C2_
     (
-        coeffDict_.lookupOrAddDefault<scalar>("Aepsilon", 0.263)
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "C2",
+            coeffDict_,
+            1.92
+        )
+    ),
+    sigmak_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "sigmak",
+            coeffDict_,
+            1.0
+        )
+    ),
+    sigmaEps_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "sigmaEps",
+            coeffDict_,
+            1.3
+        )
+    ),
+    Cmu_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Cmu",
+            coeffDict_,
+            0.09
+        )
+    ),
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            coeffDict_,
+            0.41
+        )
+    ),
+    Am_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Am",
+            coeffDict_,
+            0.016
+        )
+    ),
+    Aepsilon_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Aepsilon",
+            coeffDict_,
+            0.263
+        )
+    ),
+    Amu_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "Amu",
+            coeffDict_,
+            0.00222
+        )
     ),
-    Amu(coeffDict_.lookupOrAddDefault<scalar>("Amu", 0.00222)),
 
     k_
     (
@@ -101,11 +169,22 @@ LienLeschzinerLowRe::LienLeschzinerLowRe
 
     nut_
     (
-        Cmu*(scalar(1) - exp(-Am*yStar_))
-       /(scalar(1) - exp(-Aepsilon*yStar_) + SMALL)*sqr(k_)
-       /(epsilon_ + epsilonSmall_)
+        IOobject
+        (
+            "epsilon",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateLowReNut("nut", mesh_)
     )
 {
+    nut_ = Cmu_*(scalar(1) - exp(-Am_*yStar_))
+       /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL)*sqr(k_)
+       /(epsilon_ + epsilonSmall_);
+    nut_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -170,14 +249,15 @@ bool LienLeschzinerLowRe::read()
 {
     if (RASModel::read())
     {
-        coeffDict_.readIfPresent<scalar>("C1", C1);
-        coeffDict_.readIfPresent<scalar>("C2", C2);
-        coeffDict_.readIfPresent<scalar>("alphak", alphak);
-        coeffDict_.readIfPresent<scalar>("alphaEps", alphaEps);
-        coeffDict_.readIfPresent<scalar>("Cmu", Cmu);
-        coeffDict_.readIfPresent<scalar>("Am", Am);
-        coeffDict_.readIfPresent<scalar>("Aepsilon", Aepsilon);
-        coeffDict_.readIfPresent<scalar>("Amu", Amu);
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmak_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        Cmu_.readIfPresent(coeffDict());
+        kappa_.readIfPresent(coeffDict());
+        Am_.readIfPresent(coeffDict());
+        Aepsilon_.readIfPresent(coeffDict());
+        Amu_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -190,21 +270,19 @@ bool LienLeschzinerLowRe::read()
 
 void LienLeschzinerLowRe::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     if (mesh_.changing())
     {
         y_.correct();
     }
 
-    scalar Cmu75 = pow(Cmu, 0.75);
+    scalar Cmu75 = pow(Cmu_.value(), 0.75);
 
     volTensorField gradU = fvc::grad(U_);
 
@@ -215,12 +293,12 @@ void LienLeschzinerLowRe::correct()
     volScalarField Rt = sqr(k_)/(nu()*epsilon_);
 
     volScalarField fMu =
-        (scalar(1) - exp(-Am*yStar_))
-       /(scalar(1) - exp(-Aepsilon*yStar_) + SMALL);
+        (scalar(1) - exp(-Am_*yStar_))
+       /(scalar(1) - exp(-Aepsilon_*yStar_) + SMALL);
 
     volScalarField f2 = scalar(1) - 0.3*exp(-sqr(Rt));
 
-    volScalarField G = Cmu*fMu*sqr(k_)/epsilon_*S2;
+    volScalarField G("RASModel::G", Cmu_*fMu*sqr(k_)/epsilon_*S2);
 
 
     // Dissipation equation
@@ -231,12 +309,12 @@ void LienLeschzinerLowRe::correct()
       + fvm::SuSp(-fvc::div(phi_), epsilon_)
       - fvm::laplacian(DepsilonEff(), epsilon_)
       ==
-        C1*G*epsilon_/k_
+        C1_*G*epsilon_/k_
         // E-term
-        + C2*f2*Cmu75*pow(k_, scalar(0.5))
-        /(kappa_*y_*(scalar(1) - exp(-Aepsilon*yStar_)))
-       *exp(-Amu*sqr(yStar_))*epsilon_
-      - fvm::Sp(C2*f2*epsilon_/k_, epsilon_)
+        + C2_*f2*Cmu75*sqrt(k_)
+        /(kappa_*y_*(scalar(1) - exp(-Aepsilon_*yStar_)))
+       *exp(-Amu_*sqr(yStar_))*epsilon_
+      - fvm::Sp(C2_*f2*epsilon_/k_, epsilon_)
     );
 
     epsEqn().relax();
@@ -267,7 +345,7 @@ void LienLeschzinerLowRe::correct()
 
 
     // Re-calculate viscosity
-    nut_ = Cmu*fMu*sqr(k_)/epsilon_;
+    nut_ = Cmu_*fMu*sqr(k_)/epsilon_;
 }
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
similarity index 74%
rename from src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
rename to src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
index 999034f74..739362d53 100644
--- a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowRe.H
@@ -59,24 +59,30 @@ class LienLeschzinerLowRe
 {
     // Private data
 
-        scalar C1;
-        scalar C2;
-        scalar alphak;
-        scalar alphaEps;
-        scalar Cmu;
+        // Model coefficients
 
-        scalar Am;
-        scalar Aepsilon;
-        scalar Amu;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar sigmak_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar kappa_;
 
-        volScalarField k_;
-        volScalarField epsilon_;
+            dimensionedScalar Am_;
+            dimensionedScalar Aepsilon_;
+            dimensionedScalar Amu_;
 
-        wallDist y_;
 
-        volScalarField yStar_;
+        // Fields
 
-        volScalarField nut_;
+            volScalarField k_;
+            volScalarField epsilon_;
+
+            wallDist y_;
+
+            volScalarField yStar_;
+
+            volScalarField nut_;
 
 
 public:
@@ -85,7 +91,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         LienLeschzinerLowRe
         (
             const volVectorField& U,
@@ -94,16 +100,16 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~LienLeschzinerLowRe()
+        virtual ~LienLeschzinerLowRe()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -113,7 +119,7 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", alphak*nut_ + nu())
+                new volScalarField("DkEff", nut_/sigmak_ + nu())
             );
         }
 
@@ -122,36 +128,36 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
similarity index 84%
rename from src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
rename to src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
index a998d3af8..54ef9356c 100644
--- a/src/turbulenceModels/RAS/incompressible/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
+++ b/src/turbulenceModels/incompressible/RAS/LienLeschzinerLowRe/LienLeschzinerLowReSetWallDissipation.H
@@ -5,7 +5,7 @@
     labelList cellBoundaryFaceCount(epsilon_.size(), 0);
 
     //- use constant Cmu for epsilon in the near-wall cell
-    scalar Cmu75 = pow(Cmu, 0.75);
+    scalar Cmu75 = pow(Cmu_.value(), 0.75);
 
     const fvPatchList& patches = mesh_.boundary();
 
@@ -14,7 +14,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -29,7 +29,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -44,9 +44,9 @@
                      Cmu75*pow(k_[faceCelli], 1.5)
                     /(
                          kappa_.value()*y_[faceCelli]
-                         *(1.0 - exp(-Aepsilon*yStar_[faceCelli]))
+                         *(1.0 - exp(-Aepsilon_.value()*yStar_[faceCelli]))
                      )
-                    *exp(-Amu*sqr(yStar_[faceCelli]));
+                    *exp(-Amu_.value()*sqr(yStar_[faceCelli]));
 
             }
         }
@@ -58,7 +58,7 @@
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
diff --git a/src/turbulenceModels/incompressible/RAS/Make/files b/src/turbulenceModels/incompressible/RAS/Make/files
new file mode 100644
index 000000000..18f52c82a
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/Make/files
@@ -0,0 +1,51 @@
+/* RAS turbulence models */
+RASModel/RASModel.C
+
+laminar/laminar.C
+kEpsilon/kEpsilon.C
+RNGkEpsilon/RNGkEpsilon.C
+realizableKE/realizableKE.C
+kOmega/kOmega.C
+kOmegaSST/kOmegaSST.C
+SpalartAllmaras/SpalartAllmaras.C
+LRR/LRR.C
+LaunderGibsonRSTM/LaunderGibsonRSTM.C
+LaunderSharmaKE/LaunderSharmaKE.C
+qZeta/qZeta.C
+LienCubicKE/LienCubicKE.C
+LienCubicKELowRe/LienCubicKELowRe.C
+NonlinearKEShih/NonlinearKEShih.C
+LienLeschzinerLowRe/LienLeschzinerLowRe.C
+LamBremhorstKE/LamBremhorstKE.C
+kOmegaSST_LowRe/kOmegaSST_LowRe.C
+
+/* Wall functions */
+wallFunctions = derivedFvPatchFields/wallFunctions
+
+nutWallFunctions = $(wallFunctions)/nutWallFunctions
+$(nutWallFunctions)/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutWallFunction/nutWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
+$(nutWallFunctions)/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
+
+epsilonWallFunctions = $(wallFunctions)/epsilonWallFunctions
+$(epsilonWallFunctions)/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
+
+omegaWallFunctions = $(wallFunctions)/omegaWallFunctions
+$(omegaWallFunctions)/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
+
+kqRWallFunctions = $(wallFunctions)/kqRWallFunctions
+$(kqRWallFunctions)/kqRWallFunction/kqRWallFunctionFvPatchFields.C
+
+
+/* Patch fields */
+derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
+derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+
+backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
+
+LIB = $(FOAM_LIBBIN)/libincompressibleRASModels
diff --git a/applications/test/nearWallDist-wave/Make/options b/src/turbulenceModels/incompressible/RAS/Make/options
similarity index 51%
rename from applications/test/nearWallDist-wave/Make/options
rename to src/turbulenceModels/incompressible/RAS/Make/options
index d27c95d03..73454e7e3 100644
--- a/applications/test/nearWallDist-wave/Make/options
+++ b/src/turbulenceModels/incompressible/RAS/Make/options
@@ -1,7 +1,10 @@
 EXE_INC = \
+    -I$(LIB_SRC)/turbulenceModels \
+    -I$(LIB_SRC)/transportModels \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude
 
-EXE_LIBS = \
+LIB_LIBS = \
+    -lincompressibleTurbulenceModel \
     -lfiniteVolume \
     -lmeshTools
diff --git a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
similarity index 88%
rename from src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C
rename to src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
index 514bb7fe9..a50595aa2 100644
--- a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.C
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.C
@@ -44,7 +44,6 @@ addToRunTimeSelectionTable(RASModel, NonlinearKEShih, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
 NonlinearKEShih::NonlinearKEShih
 (
     const volVectorField& U,
@@ -72,22 +71,22 @@ NonlinearKEShih::NonlinearKEShih
             1.92
         )
     ),
-    alphak_
+    sigmak_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphak",
+            "sigmak",
             coeffDict_,
             1.0
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
     A1_
@@ -145,6 +144,25 @@ NonlinearKEShih::NonlinearKEShih
         )
     ),
 
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa_",
+            coeffDict_,
+            0.41
+        )
+    ),
+    E_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "E",
+            coeffDict_,
+            9.8
+        )
+    ),
+
     k_
     (
         IOobject
@@ -177,7 +195,7 @@ NonlinearKEShih::NonlinearKEShih
     Cmu_(2.0/(3.0*(A1_ + eta_ + alphaKsi_*ksi_))),
     fEta_(A2_ + pow(eta_, 3.0)),
 
-    nut_(Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_)),
+    nut_("nut", Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_)),
 
     nonlinearStress_
     (
@@ -263,16 +281,19 @@ bool NonlinearKEShih::read()
 {
     if (RASModel::read())
     {
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        A1_.readIfPresent(coeffDict_);
-        A2_.readIfPresent(coeffDict_);
-        Ctau1_.readIfPresent(coeffDict_);
-        Ctau2_.readIfPresent(coeffDict_);
-        Ctau3_.readIfPresent(coeffDict_);
-        alphaKsi_.readIfPresent(coeffDict_);
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmak_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        A1_.readIfPresent(coeffDict());
+        A2_.readIfPresent(coeffDict());
+        Ctau1_.readIfPresent(coeffDict());
+        Ctau2_.readIfPresent(coeffDict());
+        Ctau3_.readIfPresent(coeffDict());
+        alphaKsi_.readIfPresent(coeffDict());
+
+        kappa_.readIfPresent(coeffDict());
+        E_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -285,23 +306,24 @@ bool NonlinearKEShih::read()
 
 void NonlinearKEShih::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     gradU_ = fvc::grad(U_);
 
     // generation term
     volScalarField S2 = symm(gradU_) && gradU_;
 
-    volScalarField G =
+    volScalarField G
+    (
+        "RASModel::G",
         Cmu_*sqr(k_)/epsilon_*S2
-      - (nonlinearStress_ && gradU_);
+      - (nonlinearStress_ && gradU_)
+    );
 
 #   include "nonLinearWallFunctionsI.H"
 
@@ -310,7 +332,6 @@ void NonlinearKEShih::correct()
     (
         fvm::ddt(epsilon_)
       + fvm::div(phi_, epsilon_)
-      + fvm::SuSp(-fvc::div(phi_), epsilon_)
       - fvm::laplacian(DepsilonEff(), epsilon_)
       ==
         C1_*G*epsilon_/k_
diff --git a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
similarity index 69%
rename from src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
rename to src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
index 1aae74413..25ad2e011 100644
--- a/src/turbulenceModels/RAS/incompressible/NonlinearKEShih/NonlinearKEShih.H
+++ b/src/turbulenceModels/incompressible/RAS/NonlinearKEShih/NonlinearKEShih.H
@@ -49,7 +49,7 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class NonlinearKEShih Declaration
+                      Class NonlinearKEShih Declaration
 \*---------------------------------------------------------------------------*/
 
 class NonlinearKEShih
@@ -58,29 +58,38 @@ class NonlinearKEShih
 {
     // Private data
 
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar alphak_;
-        dimensionedScalar alphaEps_;
-        dimensionedScalar A1_;
-        dimensionedScalar A2_;
-        dimensionedScalar Ctau1_;
-        dimensionedScalar Ctau2_;
-        dimensionedScalar Ctau3_;
-        dimensionedScalar alphaKsi_;
+        // Model coefficients
 
-        volScalarField k_;
-        volScalarField epsilon_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar sigmak_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar A1_;
+            dimensionedScalar A2_;
+            dimensionedScalar Ctau1_;
+            dimensionedScalar Ctau2_;
+            dimensionedScalar Ctau3_;
+            dimensionedScalar alphaKsi_;
 
-        volTensorField gradU_;
-        volScalarField eta_;
-        volScalarField ksi_;
-        volScalarField Cmu_;
-        volScalarField fEta_;
+            dimensionedScalar kappa_;
+            dimensionedScalar E_;
 
-        volScalarField nut_;
 
-        volSymmTensorField nonlinearStress_;
+        // Fields
+
+            volScalarField k_;
+            volScalarField epsilon_;
+
+            volTensorField gradU_;
+            volScalarField eta_;
+            volScalarField ksi_;
+            volScalarField Cmu_;
+            volScalarField fEta_;
+
+            volScalarField nut_;
+
+            volSymmTensorField nonlinearStress_;
+
 
 public:
 
@@ -89,7 +98,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         NonlinearKEShih
         (
             const volVectorField& U,
@@ -98,16 +107,16 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~NonlinearKEShih()
+        virtual ~NonlinearKEShih()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -117,7 +126,7 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", alphak_*nut_ + nu())
+                new volScalarField("DkEff", nut_/sigmak_ + nu())
             );
         }
 
@@ -126,36 +135,36 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.C b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
similarity index 57%
rename from src/turbulenceModels/RAS/incompressible/RASModel/RASModel.C
rename to src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
index d649b81fd..89fd02d87 100644
--- a/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.C
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.C
@@ -26,6 +26,7 @@ License
 
 #include "RASModel.H"
 #include "wallFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -38,6 +39,7 @@ namespace incompressible
 
 defineTypeNameAndDebug(RASModel, 0);
 defineRunTimeSelectionTable(RASModel, dictionary);
+addToRunTimeSelectionTable(turbulenceModel, RASModel, turbulenceModel);
 
 // * * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * //
 
@@ -45,7 +47,7 @@ void RASModel::printCoeffs()
 {
     if (printCoeffs_)
     {
-        Info<< type() << "Coeffs" << coeffDict_ << endl;;
+        Info<< type() << "Coeffs" << coeffDict_ << endl;
     }
 }
 
@@ -60,6 +62,8 @@ RASModel::RASModel
     transportModel& lamTransportModel
 )
 :
+    turbulenceModel(U, phi, lamTransportModel),
+
     IOdictionary
     (
         IOobject
@@ -72,77 +76,103 @@ RASModel::RASModel
         )
     ),
 
-    runTime_(U.time()),
-    mesh_(U.mesh()),
-
-    U_(U),
-    phi_(phi),
-    transportModel_(lamTransportModel),
-
     turbulence_(lookup("turbulence")),
     printCoeffs_(lookupOrDefault<Switch>("printCoeffs", false)),
-    coeffDict_(subDict(type + "Coeffs")),
-
-    kappa_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "kappa",
-            subDict("wallFunctionCoeffs"),
-            0.4187
-        )
-    ),
-    E_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "E",
-            subDict("wallFunctionCoeffs"),
-            9.0
-        )
-    ),
-
-    yPlusLam_(yPlusLam(kappa_.value(), E_.value())),
+    coeffDict_(subOrEmptyDict(type + "Coeffs")),
 
     k0_("k0", dimVelocity*dimVelocity, SMALL),
-    epsilon0_("epsilon", k0_.dimensions()/dimTime, SMALL),
+    epsilon0_("epsilon0", k0_.dimensions()/dimTime, SMALL),
     epsilonSmall_("epsilonSmall", epsilon0_.dimensions(), SMALL),
+    omega0_("omega0", dimless/dimTime, SMALL),
+    omegaSmall_("omegaSmall", omega0_.dimensions(), SMALL),
 
     y_(mesh_)
-{}
+{
+    // Force the construction of the mesh deltaCoeffs which may be needed
+    // for the construction of the derived models and BCs
+    mesh_.deltaCoeffs();
+}
 
 
-RASModel::~RASModel()
-{}
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+autoPtr<RASModel> RASModel::New
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    transportModel& transport
+)
+{
+    word modelName;
+
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
+    {
+        IOdictionary dict
+        (
+            IOobject
+            (
+                "RASProperties",
+                U.time().constant(),
+                U.db(),
+                IOobject::MUST_READ,
+                IOobject::NO_WRITE
+            )
+        );
+
+        dict.lookup("RASModel") >> modelName;
+    }
+
+    Info<< "Selecting RAS turbulence model " << modelName << endl;
+
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(modelName);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorIn
+        (
+            "RASModel::New(const volVectorField&, "
+            "const surfaceScalarField&, transportModel&)"
+        )   << "Unknown RASModel type " << modelName
+            << endl << endl
+            << "Valid RASModel types are :" << endl
+            << dictionaryConstructorTablePtr_->toc()
+            << exit(FatalError);
+    }
+
+    return autoPtr<RASModel>(cstrIter()(U, phi, transport));
+}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-scalar RASModel::yPlusLam(const scalar kappa, const scalar E)
+
+scalar RASModel::yPlusLam(const scalar kappa, const scalar E) const
 {
     scalar ypl = 11.0;
 
     for (int i=0; i<10; i++)
     {
-        ypl = log(E*ypl)/kappa;
+        ypl = log(max(E*ypl, 1))/kappa;
     }
 
     return ypl;
 }
 
 
-tmp<scalarField> RASModel::yPlus(const label patchNo) const
+tmp<scalarField> RASModel::yPlus(const label patchNo, const scalar Cmu) const
 {
     const fvPatch& curPatch = mesh_.boundary()[patchNo];
 
     tmp<scalarField> tYp(new scalarField(curPatch.size()));
     scalarField& Yp = tYp();
 
-    if (typeid(curPatch) == typeid(wallFvPatch))
+    if (isA<wallFvPatch>(curPatch))
     {
-        scalar Cmu(readScalar(coeffDict_.lookup("Cmu")));
-
-        Yp = pow(Cmu, 0.25)*y_[patchNo]
+        Yp = pow(Cmu, 0.25)
+            *y_[patchNo]
             *sqrt(k()().boundaryField()[patchNo].patchInternalField())
             /nu().boundaryField()[patchNo];
     }
@@ -150,10 +180,9 @@ tmp<scalarField> RASModel::yPlus(const label patchNo) const
     {
         WarningIn
         (
-            "tmp<scalarField> RASModel::yPlus(const label patchNo)"
-        )   << "const : " << endl
-            << "Patch " << patchNo << " is not a wall.  Returning blank field"
-            << endl;
+            "tmp<scalarField> RASModel::yPlus(const label patchNo) const"
+        )   << "Patch " << patchNo << " is not a wall. Returning null field"
+            << nl << endl;
 
         Yp.setSize(0);
     }
@@ -164,7 +193,9 @@ tmp<scalarField> RASModel::yPlus(const label patchNo) const
 
 void RASModel::correct()
 {
-    if (mesh_.changing())
+    turbulenceModel::correct();
+
+    if (turbulence_ && mesh_.changing())
     {
         y_.correct();
     }
@@ -176,16 +207,17 @@ bool RASModel::read()
     if (regIOobject::read())
     {
         lookup("turbulence") >> turbulence_;
-        coeffDict_ = subDict(type() + "Coeffs");
 
-        kappa_.readIfPresent(subDict("wallFunctionCoeffs"));
-        E_.readIfPresent(subDict("wallFunctionCoeffs"));
-
-        yPlusLam_ = yPlusLam(kappa_.value(), E_.value());
+        if (const dictionary* dictPtr = subDictPtr(type() + "Coeffs"))
+        {
+            coeffDict_ <<= *dictPtr;
+        }
 
         k0_.readIfPresent(*this);
         epsilon0_.readIfPresent(*this);
         epsilonSmall_.readIfPresent(*this);
+        omega0_.readIfPresent(*this);
+        omegaSmall_.readIfPresent(*this);
 
         return true;
     }
diff --git a/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
similarity index 76%
rename from src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
rename to src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
index 45424bab3..a8b2a0eb3 100644
--- a/src/turbulenceModels/RAS/incompressible/RASModel/RASModel.H
+++ b/src/turbulenceModels/incompressible/RAS/RASModel/RASModel.H
@@ -36,13 +36,13 @@ Description
 
 SourceFiles
     RASModel.C
-    newTurbulenceModel.C
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef RASModel_H
 #define RASModel_H
 
+#include "incompressible/turbulenceModel/turbulenceModel.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "nearWallDist.H"
@@ -69,6 +69,7 @@ namespace incompressible
 
 class RASModel
 :
+    public turbulenceModel,
     public IOdictionary
 {
 
@@ -76,28 +77,31 @@ protected:
 
     // Protected data
 
-        const Time& runTime_;
-        const fvMesh& mesh_;
-
-        const volVectorField& U_;
-        const surfaceScalarField& phi_;
-
-        transportModel& transportModel_;
-
+        //- Turbulence on/off flag
         Switch turbulence_;
+
+        //- Flag to print the model coeffs at run-time
         Switch printCoeffs_;
+
+        //- Model coefficients dictionary
         dictionary coeffDict_;
 
-        dimensionedScalar kappa_;
-        dimensionedScalar E_;
-
-        scalar yPlusLam(const scalar kappa, const scalar E);
-        scalar yPlusLam_;
-
+        //- Lower limit of k
         dimensionedScalar k0_;
+
+        //- Lower limit of epsilon
         dimensionedScalar epsilon0_;
+
+        //- Small epsilon value used to avoid divide by zero
         dimensionedScalar epsilonSmall_;
 
+        //- Lower limit for omega
+        dimensionedScalar omega0_;
+
+        //- Small omega value used to avoid divide by zero
+        dimensionedScalar omegaSmall_;
+
+        //- Near wall distance boundary field
         nearWallDist y_;
 
 
@@ -134,9 +138,9 @@ public:
             (
                 const volVectorField& U,
                 const surfaceScalarField& phi,
-                transportModel& transport
+                transportModel& lamTransportModel
             ),
-            (U, phi, transport)
+            (U, phi, lamTransportModel)
         );
 
 
@@ -148,22 +152,22 @@ public:
             const word& type,
             const volVectorField& U,
             const surfaceScalarField& phi,
-            transportModel& transport
+            transportModel& lamTransportModel
         );
 
 
     // Selectors
 
-        //- Return a reference to the selected turbulence model
+        //- Return a reference to the selected RAS model
         static autoPtr<RASModel> New
         (
             const volVectorField& U,
             const surfaceScalarField& phi,
-            transportModel& transport
+            transportModel& lamTransportModel
         );
 
 
-    // Destructor
+    //- Destructor
 
         virtual ~RASModel();
 
@@ -192,6 +196,19 @@ public:
                 return epsilonSmall_;
             }
 
+            //- Return the value of omega0 which epsilon is not allowed to be
+            //  less than
+            const dimensionedScalar& omega0() const
+            {
+                return omega0_;
+            }
+
+            //- Return the value of omegaSmall which is added to epsilon when
+            //  calculating nut
+            const dimensionedScalar& omegaSmall() const
+            {
+                return omegaSmall_;
+            }
 
             //- Allow k0 to be changed
             dimensionedScalar& k0()
@@ -211,39 +228,33 @@ public:
                 return epsilonSmall_;
             }
 
-
-            //- Return kappa for use in wall-functions
-            dimensionedScalar kappa() const
+            //- Allow omega0 to be changed
+            dimensionedScalar& omega0()
             {
-                return kappa_;
+                return omega0_;
             }
 
-            //- Return E for use in wall-functions
-            dimensionedScalar E() const
+            //- Allow omegaSmall to be changed
+            dimensionedScalar& omegaSmall()
             {
-                return E_;
+                return omegaSmall_;
             }
 
-            //- Return y+ at the edge of the laminar sublayer
-            //  for use in wall-functions
-            scalar yPlusLam() const
+            //- Return the near wall distances
+            const nearWallDist& y() const
             {
-                return yPlusLam_;
+                return y_;
             }
 
+            //- Calculate y+ at the edge of the laminar sublayer
+            scalar yPlusLam(const scalar kappa, const scalar E) const;
+
             //- Const access to the coefficients dictionary
             const dictionary& coeffDict() const
             {
                 return coeffDict_;
             }
 
-
-        //- Return the laminar viscosity
-        const volScalarField& nu() const
-        {
-            return transportModel_.nu();
-        }
-
         //- Return the turbulence viscosity
         virtual tmp<volScalarField> nut() const = 0;
 
@@ -272,12 +283,16 @@ public:
         virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const = 0;
 
         //- Return yPlus for the given patch
-        virtual tmp<scalarField> yPlus(const label patchI) const;
+        virtual tmp<scalarField> yPlus
+        (
+            const label patchI,
+            const scalar Cmu
+        ) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
         virtual void correct() = 0;
 
-        //- Read turbulenceProperties dictionary
+        //- Read RASProperties dictionary
         virtual bool read() = 0;
 };
 
diff --git a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
similarity index 83%
rename from src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C
rename to src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
index 23e5ec123..234b1f99e 100644
--- a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.C
@@ -26,7 +26,8 @@ License
 
 #include "RNGkEpsilon.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -80,22 +81,22 @@ RNGkEpsilon::RNGkEpsilon
             1.68
         )
     ),
-    alphak_
+    sigmak_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphak",
+            "sigmak",
             coeffDict_,
-            1.39
+            0.71942
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            1.39
+            0.71942
         )
     ),
     eta0_
@@ -124,12 +125,11 @@ RNGkEpsilon::RNGkEpsilon
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -137,15 +137,26 @@ RNGkEpsilon::RNGkEpsilon
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
-
-    nut_(Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    )
 {
-#   include "wallViscosityI.H"
+    nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_.correctBoundaryConditions();
 
     printCoeffs();
 }
@@ -209,13 +220,13 @@ bool RNGkEpsilon::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
-        eta0_.readIfPresent(coeffDict_);
-        beta_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmak_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
+        eta0_.readIfPresent(coeffDict());
+        beta_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -228,24 +239,23 @@ bool RNGkEpsilon::read()
 
 void RNGkEpsilon::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     volScalarField S2 = 2*magSqr(symm(fvc::grad(U_)));
 
-    volScalarField G = nut_*S2;
+    volScalarField G("RASModel::G", nut_*S2);
 
     volScalarField eta = sqrt(S2)*k_/epsilon_;
     volScalarField R =
         ((eta*(scalar(1) - eta/eta0_))/(scalar(1) + beta_*eta*sqr(eta)));
 
-#   include "wallFunctionsI.H"
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
@@ -262,7 +272,7 @@ void RNGkEpsilon::correct()
 
     epsEqn().relax();
 
-#   include "wallDissipationI.H"
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
@@ -287,9 +297,7 @@ void RNGkEpsilon::correct()
 
     // Re-calculate viscosity
     nut_ = Cmu_*sqr(k_)/epsilon_;
-
-#   include "wallViscosityI.H"
-
+    nut_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
similarity index 77%
rename from src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
rename to src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
index 1b3d1f69e..61d4c12ad 100644
--- a/src/turbulenceModels/RAS/incompressible/RNGkEpsilon/RNGkEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/RNGkEpsilon/RNGkEpsilon.H
@@ -35,10 +35,8 @@ Description
             Cmu         0.0845;
             C1          1.42;
             C2          1.68;
-            C3          -0.33;  // only for compressible
-            alphah      1.0;    // only for compressible
-            alphak      1.39;
-            alphaEps    1.39;
+            sigmak      0.71942;
+            sigmaEps    0.71942;
             eta0        4.38;
             beta        0.012;
         }
@@ -73,17 +71,22 @@ class RNGkEpsilon
 {
     // Private data
 
-        dimensionedScalar Cmu_;
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar alphak_;
-        dimensionedScalar alphaEps_;
-        dimensionedScalar eta0_;
-        dimensionedScalar beta_;
+        // Model coefficients
 
-        volScalarField k_;
-        volScalarField epsilon_;
-        volScalarField nut_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar sigmak_;
+            dimensionedScalar sigmaEps_;
+            dimensionedScalar eta0_;
+            dimensionedScalar beta_;
+
+
+        // Fields
+
+            volScalarField k_;
+            volScalarField epsilon_;
+            volScalarField nut_;
 
 
 public:
@@ -93,7 +96,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         RNGkEpsilon
         (
             const volVectorField& U,
@@ -102,16 +105,15 @@ public:
         );
 
 
-    // Destructor
-
-        ~RNGkEpsilon()
-        {}
+    //- Destructor
+    virtual ~RNGkEpsilon()
+    {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -121,7 +123,7 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", alphak_*nut_ + nu())
+                new volScalarField("DkEff", nut_/sigmak_ + nu())
             );
         }
 
@@ -130,36 +132,36 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
similarity index 90%
rename from src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C
rename to src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
index a07b8565c..b58a91fff 100644
--- a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.C
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.C
@@ -26,7 +26,6 @@ License
 
 #include "SpalartAllmaras.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallDist.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,6 +62,8 @@ tmp<volScalarField> SpalartAllmaras::fv2
     const volScalarField& fv1
 ) const
 {
+    // Model adjustment, Eric Paterson: boundedness of
+    // turbulent viscosity.  HJ, 24/Aug/2010
     return 1.0 - chi/(1.0 + chi*fv1);
     //return 1.0/pow3(scalar(1) + chi/Cv2);
 }
@@ -114,13 +115,22 @@ SpalartAllmaras::SpalartAllmaras
 :
     RASModel(typeName, U, phi, lamTransportModel),
 
-    alphaNut_
+    sigmaNut_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaNut",
+            "sigmaNut",
             coeffDict_,
-            1.5
+            0.66666
+        )
+    ),
+    kappa_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "kappa",
+            coeffDict_,
+            0.41
         )
     ),
 
@@ -142,7 +152,7 @@ SpalartAllmaras::SpalartAllmaras
             0.622
         )
     ),
-    Cw1_(Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_)),
+    Cw1_(Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_),
     Cw2_
     (
         dimensioned<scalar>::lookupOrAddToDict
@@ -218,7 +228,7 @@ tmp<volScalarField> SpalartAllmaras::DnuTildaEff() const
 {
     return tmp<volScalarField>
     (
-        new volScalarField("DnuTildaEff", alphaNut_*nuTilda_ + nu())
+        new volScalarField("DnuTildaEff", nuTilda_/sigmaNut_ + nu())
     );
 }
 
@@ -250,7 +260,7 @@ tmp<volScalarField> SpalartAllmaras::epsilon() const
         (
             IOobject
             (
-                "epslion",
+                "epsilon",
                 runTime_.timeName(),
                 mesh_
             ),
@@ -317,15 +327,15 @@ bool SpalartAllmaras::read()
 {
     if (RASModel::read())
     {
-        alphaNut_.readIfPresent(coeffDict_);
+        sigmaNut_.readIfPresent(coeffDict());
 
-        Cb1_.readIfPresent(coeffDict_);
-        Cb2_.readIfPresent(coeffDict_);
-        Cw1_ = Cb1_/sqr(kappa_) + alphaNut_*(1.0 + Cb2_);
-        Cw2_.readIfPresent(coeffDict_);
-        Cw3_.readIfPresent(coeffDict_);
-        Cv1_.readIfPresent(coeffDict_);
-        Cv2_.readIfPresent(coeffDict_);
+        Cb1_.readIfPresent(coeffDict());
+        Cb2_.readIfPresent(coeffDict());
+        Cw1_ = Cb1_/sqr(kappa_) + (1.0 + Cb2_)/sigmaNut_;
+        Cw2_.readIfPresent(coeffDict());
+        Cw3_.readIfPresent(coeffDict());
+        Cv1_.readIfPresent(coeffDict());
+        Cv2_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -338,15 +348,13 @@ bool SpalartAllmaras::read()
 
 void SpalartAllmaras::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     if (mesh_.changing())
     {
         d_.correct();
@@ -365,7 +373,7 @@ void SpalartAllmaras::correct()
       + fvm::div(phi_, nuTilda_)
       + fvm::SuSp(-fvc::div(phi_), nuTilda_)
       - fvm::laplacian(DnuTildaEff(), nuTilda_)
-      - alphaNut_*Cb2_*magSqr(fvc::grad(nuTilda_))
+      - Cb2_/sigmaNut_*magSqr(fvc::grad(nuTilda_))
      ==
         Cb1_*Stilda*nuTilda_
       - fvm::Sp(Cw1_*fw(Stilda)*nuTilda_/sqr(d_), nuTilda_)
diff --git a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
similarity index 80%
rename from src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
rename to src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
index 357be0f66..f536315d5 100644
--- a/src/turbulenceModels/RAS/incompressible/SpalartAllmaras/SpalartAllmaras.H
+++ b/src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H
@@ -54,8 +54,8 @@ Description
             Cw3         2.0;
             Cv1         7.1;
             Cv2         5.0;
-            alphaNut    1.5;
-            alphah      1.0;    // only for compressible
+            sigmaNut    0.66666;
+            kappa       0.41;
         }
     @endverbatim
 
@@ -89,36 +89,46 @@ class SpalartAllmaras
 {
     // Private data
 
-        dimensionedScalar alphaNut_;
+        // Model coefficients
 
-        dimensionedScalar Cb1_;
-        dimensionedScalar Cb2_;
-        dimensionedScalar Cw1_;
-        dimensionedScalar Cw2_;
-        dimensionedScalar Cw3_;
-        dimensionedScalar Cv1_;
-        dimensionedScalar Cv2_;
+            dimensionedScalar sigmaNut_;
+            dimensionedScalar kappa_;
 
-        volScalarField nuTilda_;
-        volScalarField nut_;
+            dimensionedScalar Cb1_;
+            dimensionedScalar Cb2_;
+            dimensionedScalar Cw1_;
+            dimensionedScalar Cw2_;
+            dimensionedScalar Cw3_;
+            dimensionedScalar Cv1_;
+            dimensionedScalar Cv2_;
 
-        wallDist d_;
+
+        // Fields
+
+            volScalarField nuTilda_;
+            volScalarField nut_;
+
+            wallDist d_;
 
 
     // Private member functions
 
         tmp<volScalarField> chi() const;
+
         tmp<volScalarField> fv1(const volScalarField& chi) const;
+
         tmp<volScalarField> fv2
         (
             const volScalarField& chi,
             const volScalarField& fv1
         ) const;
+
         tmp<volScalarField> fv3
         (
             const volScalarField& chi,
             const volScalarField& fv1
         ) const;
+
         tmp<volScalarField> fw(const volScalarField& Stilda) const;
 
 
@@ -130,7 +140,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         SpalartAllmaras
         (
             const volVectorField& U,
@@ -141,14 +151,14 @@ public:
 
     // Destructor
 
-        ~SpalartAllmaras()
+        virtual ~SpalartAllmaras()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -157,25 +167,25 @@ public:
         tmp<volScalarField> DnuTildaEff() const;
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const;
+        virtual tmp<volScalarField> k() const;
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const;
+        virtual tmp<volScalarField> epsilon() const;
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
new file mode 100644
index 000000000..14241079a
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.C
@@ -0,0 +1,286 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "backwardsCompatibilityWallFunctions.H"
+
+#include "calculatedFvPatchField.H"
+#include "nutWallFunctionFvPatchScalarField.H"
+#include "nutLowReWallFunctionFvPatchScalarField.H"
+#include "epsilonWallFunctionFvPatchScalarField.H"
+#include "kqRWallFunctionFvPatchField.H"
+#include "omegaWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+tmp<volScalarField> autoCreateNut
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    IOobject nutHeader
+    (
+        fieldName,
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (nutHeader.headerOk())
+    {
+        return tmp<volScalarField>(new volScalarField(nutHeader, mesh));
+    }
+    else
+    {
+        Info<< "--> Creating " << fieldName
+            << " to employ run-time selectable wall functions" << endl;
+
+        const fvBoundaryMesh& bm = mesh.boundary();
+
+        wordList nutBoundaryTypes(bm.size());
+
+        forAll(bm, patchI)
+        {
+            if (isA<wallFvPatch>(bm[patchI]))
+            {
+                nutBoundaryTypes[patchI] =
+                    RASModels::nutWallFunctionFvPatchScalarField::typeName;
+            }
+            else
+            {
+                nutBoundaryTypes[patchI] =
+                    calculatedFvPatchField<scalar>::typeName;
+            }
+        }
+
+        tmp<volScalarField> nut
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh,
+                dimensionedScalar("zero", dimArea/dimTime, 0.0),
+                nutBoundaryTypes
+            )
+        );
+
+        Info<< "    Writing new " << fieldName << endl;
+        nut().write();
+
+        return nut;
+    }
+}
+
+
+tmp<volScalarField> autoCreateLowReNut
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    IOobject nutHeader
+    (
+        fieldName,
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ,
+        IOobject::NO_WRITE,
+        false
+    );
+
+    if (nutHeader.headerOk())
+    {
+        return tmp<volScalarField>(new volScalarField(nutHeader, mesh));
+    }
+    else
+    {
+        Info<< "--> Creating " << fieldName
+            << " to employ run-time selectable wall functions" << endl;
+
+        const fvBoundaryMesh& bm = mesh.boundary();
+
+        wordList nutBoundaryTypes(bm.size());
+
+        forAll(bm, patchI)
+        {
+            if (isA<wallFvPatch>(bm[patchI]))
+            {
+                nutBoundaryTypes[patchI] =
+                    RASModels::nutLowReWallFunctionFvPatchScalarField::typeName;
+            }
+            else
+            {
+                nutBoundaryTypes[patchI] =
+                    calculatedFvPatchField<scalar>::typeName;
+            }
+        }
+
+        tmp<volScalarField> nut
+        (
+            new volScalarField
+            (
+                IOobject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh,
+                dimensionedScalar("zero", dimArea/dimTime, 0.0),
+                nutBoundaryTypes
+            )
+        );
+
+        Info<< "    Writing new " << fieldName << endl;
+        nut().write();
+
+        return nut;
+    }
+}
+
+
+tmp<volScalarField> autoCreateEpsilon
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    return
+        autoCreateWallFunctionField
+        <
+            scalar,
+            RASModels::epsilonWallFunctionFvPatchScalarField
+        >
+        (
+            fieldName,
+            mesh
+        );
+}
+
+
+tmp<volScalarField> autoCreateOmega
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    return
+        autoCreateWallFunctionField
+        <
+            scalar,
+            RASModels::omegaWallFunctionFvPatchScalarField
+        >
+        (
+            fieldName,
+            mesh
+        );
+}
+
+
+tmp<volScalarField> autoCreateK
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    return
+        autoCreateWallFunctionField
+        <
+            scalar,
+            RASModels::kqRWallFunctionFvPatchField<scalar>
+        >
+        (
+            fieldName,
+            mesh
+        );
+}
+
+
+tmp<volScalarField> autoCreateQ
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    return
+        autoCreateWallFunctionField
+        <
+            scalar,
+            RASModels::kqRWallFunctionFvPatchField<scalar>
+        >
+        (
+            fieldName,
+            mesh
+        );
+}
+
+
+tmp<volSymmTensorField> autoCreateR
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    return
+        autoCreateWallFunctionField
+        <
+            symmTensor,
+            RASModels::kqRWallFunctionFvPatchField<symmTensor>
+        >
+        (
+            fieldName,
+            mesh
+        );
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
+
diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
new file mode 100644
index 000000000..fdcec0552
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctions.H
@@ -0,0 +1,123 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible
+
+Description
+    Auto creation of fields to provide backwards compatibility with
+    runtime selectable wall functions
+
+SourceFiles
+    backwardsCompatibilityWallFunctions.C
+    backwardsCompatibilityWallFunctionsTemplates.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef backwardsCompatibilityWallFunctions_H
+#define backwardsCompatibilityWallFunctions_H
+
+#include "fvMesh.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+    //- nut
+    tmp<volScalarField> autoCreateNut
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- nut for Low-Reynolds number models
+    tmp<volScalarField> autoCreateLowReNut
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- epsilon
+    tmp<volScalarField> autoCreateEpsilon
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- omega
+    tmp<volScalarField> autoCreateOmega
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- k
+    tmp<volScalarField> autoCreateK
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- Q
+    tmp<volScalarField> autoCreateQ
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- R
+    tmp<volSymmTensorField> autoCreateR
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+    //- Helper function to create the new field
+    template<class Type, class PatchType>
+    tmp<GeometricField<Type, fvPatchField, volMesh> >
+    autoCreateWallFunctionField
+    (
+        const word& fieldName,
+        const fvMesh& mesh
+    );
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "backwardsCompatibilityWallFunctionsTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
new file mode 100644
index 000000000..cc88c36a5
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/backwardsCompatibility/wallFunctions/backwardsCompatibilityWallFunctionsTemplates.C
@@ -0,0 +1,170 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "backwardsCompatibilityWallFunctions.H"
+#include "Time.H"
+#include "OSspecific.H"
+
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type, class PatchType>
+tmp<GeometricField<Type, fvPatchField, volMesh> >
+autoCreateWallFunctionField
+(
+    const word& fieldName,
+    const fvMesh& mesh
+)
+{
+    IOobject nutHeader
+    (
+        "nut",
+        mesh.time().timeName(),
+        mesh,
+        IOobject::MUST_READ
+    );
+
+    typedef GeometricField<Type, fvPatchField, volMesh> fieldType;
+
+    if (nutHeader.headerOk())
+    {
+        return tmp<fieldType>
+        (
+            new fieldType
+            (
+                IOobject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::MUST_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh
+            )
+        );
+    }
+    else
+    {
+        Info<< "--> Upgrading " << fieldName
+            << " to employ run-time selectable wall functions" << endl;
+
+        // Read existing field
+        IOobject ioObj
+        (
+            fieldName,
+            mesh.time().timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE,
+            false
+        );
+
+        tmp<fieldType> fieldOrig
+        (
+            new fieldType
+            (
+                ioObj,
+                mesh
+            )
+        );
+
+        // rename file
+        Info<< "    Backup original " << fieldName << " to "
+            << fieldName << ".old" << endl;
+        mvBak(ioObj.objectPath(), "old");
+
+
+        PtrList<fvPatchField<Type> > newPatchFields(mesh.boundary().size());
+
+        forAll(newPatchFields, patchI)
+        {
+            if (isA<wallFvPatch>(mesh.boundary()[patchI]))
+            {
+                newPatchFields.set
+                (
+                    patchI,
+                    new PatchType
+                    (
+                        mesh.boundary()[patchI],
+                        fieldOrig().dimensionedInternalField()
+                    )
+                );
+                newPatchFields[patchI] == fieldOrig().boundaryField()[patchI];
+            }
+            else
+            {
+                newPatchFields.set
+                (
+                    patchI,
+                    fieldOrig().boundaryField()[patchI].clone()
+                );
+            }
+        }
+
+        tmp<fieldType> fieldNew
+        (
+            new fieldType
+            (
+                IOobject
+                (
+                    fieldName,
+                    mesh.time().timeName(),
+                    mesh,
+                    IOobject::NO_READ,
+                    IOobject::NO_WRITE,
+                    false
+                ),
+                mesh,
+                fieldOrig().dimensions(),
+                fieldOrig().internalField(),
+                newPatchFields
+            )
+        );
+
+        Info<< "    Writing updated " << fieldName << endl;
+        fieldNew().write();
+
+        return fieldNew;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
new file mode 100644
index 000000000..97684cdf5
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.C
@@ -0,0 +1,191 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "turbulentHeatFluxTemperatureFvPatchScalarField.H"
+#include "addToRunTimeSelectionTable.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+turbulentHeatFluxTemperatureFvPatchScalarField::
+turbulentHeatFluxTemperatureFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedGradientFvPatchScalarField(p, iF),
+    q_(p.size(), 0.0),
+    alphaEffName_("undefinedAlphaEff"),
+    CpName_("undefinedCp")
+{}
+
+
+turbulentHeatFluxTemperatureFvPatchScalarField::
+turbulentHeatFluxTemperatureFvPatchScalarField
+(
+    const turbulentHeatFluxTemperatureFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedGradientFvPatchScalarField(ptf, p, iF, mapper),
+    q_(ptf.q_, mapper),
+    alphaEffName_(ptf.alphaEffName_),
+    CpName_(ptf.CpName_)
+{}
+
+
+turbulentHeatFluxTemperatureFvPatchScalarField::
+turbulentHeatFluxTemperatureFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedGradientFvPatchScalarField(p, iF),
+    q_("q", dict, p.size()),
+    alphaEffName_(dict.lookup("alphaEff")),
+    CpName_(dict.lookup("Cp"))
+{
+    fvPatchField<scalar>::operator=(patchInternalField());
+    gradient() = 0.0;
+}
+
+
+turbulentHeatFluxTemperatureFvPatchScalarField::
+turbulentHeatFluxTemperatureFvPatchScalarField
+(
+    const turbulentHeatFluxTemperatureFvPatchScalarField& thftpsf
+)
+:
+    fixedGradientFvPatchScalarField(thftpsf),
+    q_(thftpsf.q_),
+    alphaEffName_(thftpsf.alphaEffName_),
+    CpName_(thftpsf.CpName_)
+{}
+
+
+turbulentHeatFluxTemperatureFvPatchScalarField::
+turbulentHeatFluxTemperatureFvPatchScalarField
+(
+    const turbulentHeatFluxTemperatureFvPatchScalarField& thftpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedGradientFvPatchScalarField(thftpsf, iF),
+    q_(thftpsf.q_),
+    alphaEffName_(thftpsf.alphaEffName_),
+    CpName_(thftpsf.CpName_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void turbulentHeatFluxTemperatureFvPatchScalarField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    scalarField::autoMap(m);
+    q_.autoMap(m);
+}
+
+
+void turbulentHeatFluxTemperatureFvPatchScalarField::rmap
+(
+    const fvPatchScalarField& ptf,
+    const labelList& addr
+)
+{
+    fixedGradientFvPatchScalarField::rmap(ptf, addr);
+
+    const turbulentHeatFluxTemperatureFvPatchScalarField& thftptf =
+        refCast<const turbulentHeatFluxTemperatureFvPatchScalarField>
+        (
+            ptf
+        );
+
+    q_.rmap(thftptf.q_, addr);
+}
+
+
+void turbulentHeatFluxTemperatureFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const scalarField& alphaEffp =
+        patch().lookupPatchField<volScalarField, scalar>(alphaEffName_);
+
+    const scalarField& Cpp =
+        patch().lookupPatchField<volScalarField, scalar>(CpName_);
+
+    gradient() = q_/(Cpp*alphaEffp);
+
+    fixedGradientFvPatchScalarField::updateCoeffs();
+}
+
+
+void turbulentHeatFluxTemperatureFvPatchScalarField::write(Ostream& os) const
+{
+    fixedGradientFvPatchScalarField::write(os);
+    q_.writeEntry("q", os);
+    os.writeKeyword("alphaEff") << alphaEffName_ << token::END_STATEMENT << nl;
+    os.writeKeyword("Cp") << CpName_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    turbulentHeatFluxTemperatureFvPatchScalarField
+);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+
+// ************************************************************************* //
+
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
new file mode 100644
index 000000000..4f50df680
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentHeatFluxTemperature/turbulentHeatFluxTemperatureFvPatchScalarField.H
@@ -0,0 +1,179 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::turbulentHeatFluxTemperatureFvPatchScalarField
+
+Description
+    Fixed heat flux boundary condition for temperature.
+
+SourceFiles
+    turbulentHeatFluxTemperatureFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef turbulentHeatFluxTemperatureFvPatchScalarFields_H
+#define turbulentHeatFluxTemperatureFvPatchScalarFields_H
+
+#include "fvPatchFields.H"
+#include "fixedGradientFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+/*---------------------------------------------------------------------------*\
+       Class turbulentHeatFluxTemperatureFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class turbulentHeatFluxTemperatureFvPatchScalarField
+:
+    public fixedGradientFvPatchScalarField
+{
+// Private data
+
+    //- Heat flux [W/m2]
+    scalarField q_;
+
+    //- Name of effective thermal diffusivity field
+    word alphaEffName_;
+
+    //- Name of specific heat capacity field
+    word CpName_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("turbulentHeatFluxTemperature");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        turbulentHeatFluxTemperatureFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        turbulentHeatFluxTemperatureFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  turbulentHeatFluxTemperatureFvPatchScalarField onto
+        //  a new patch
+        turbulentHeatFluxTemperatureFvPatchScalarField
+        (
+            const turbulentHeatFluxTemperatureFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        turbulentHeatFluxTemperatureFvPatchScalarField
+        (
+            const turbulentHeatFluxTemperatureFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentHeatFluxTemperatureFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        turbulentHeatFluxTemperatureFvPatchScalarField
+        (
+            const turbulentHeatFluxTemperatureFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new turbulentHeatFluxTemperatureFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap(const fvPatchFieldMapper&);
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchScalarField&,
+                const labelList&
+            );
+
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
similarity index 92%
rename from src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
index c45c24175..7b67cdbbd 100644
--- a/src/turbulenceModels/RAS/incompressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.C
@@ -35,6 +35,8 @@ License
 
 namespace Foam
 {
+namespace incompressible
+{
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -106,16 +108,17 @@ void turbulentMixingLengthDissipationRateInletFvPatchScalarField::updateCoeffs()
     }
 
     // Lookup Cmu corresponding to the turbulence model selected
-    const incompressible::RASModel& RAS =
-        db().lookupObject<incompressible::RASModel>("RASProperties");
-    scalar Cmu = readScalar(RAS.coeffDict().lookup("Cmu"));
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar Cmu75 = pow(Cmu, 0.75);
+    const scalar Cmu =
+        rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
 
-    const fvPatchField<scalar>& k =
+    const scalar Cmu75 = pow(Cmu, 0.75);
+
+    const fvPatchField<scalar>& kp =
         patch().lookupPatchField<volScalarField, scalar>("k");
 
-    operator==(Cmu75*k*sqrt(k)/mixingLength_);
+    operator==(Cmu75*kp*sqrt(kp)/mixingLength_);
 
     fixedValueFvPatchField<scalar>::updateCoeffs();
 }
@@ -144,6 +147,7 @@ makePatchTypeField
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace incompressible
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
similarity index 94%
rename from src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
index 312433657..bcc31e04e 100644
--- a/src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthDissipationRateInlet/turbulentMixingLengthDissipationRateInletFvPatchScalarField.H
@@ -23,7 +23,8 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::turbulentMixingLengthDissipationRateInletFvPatchScalarField
+    Foam::incompressible::
+        turbulentMixingLengthDissipationRateInletFvPatchScalarField
 
 Description
     Calculate epsilon via the mixing length [m]
@@ -43,8 +44,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef turbulentMixingLengthDissipationRateInletFvPatchScalarField_H
-#define turbulentMixingLengthDissipationRateInletFvPatchScalarField_H
+#ifndef incompressibleturbulentMixingLengthDissipationRateInlet_H
+#define incompressibleturbulentMixingLengthDissipationRateInlet_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -52,6 +53,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace incompressible
+{
 
 /*---------------------------------------------------------------------------*\
        Class turbulentMixingLengthDissipationRateInletFvPatch Declaration
@@ -154,6 +157,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
similarity index 93%
rename from src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
index b226f8f19..7f4e8333e 100644
--- a/src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.C
@@ -35,6 +35,8 @@ License
 
 namespace Foam
 {
+namespace incompressible
+{
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -74,7 +76,7 @@ turbulentMixingLengthFrequencyInletFvPatchScalarField
 :
     fixedValueFvPatchField<scalar>(p, iF, dict),
     mixingLength_(readScalar(dict.lookup("mixingLength"))),
-    kName_(dict.lookup("k"))
+    kName_(dict.lookupOrDefault<word>("k", "k"))
 {}
 
 turbulentMixingLengthFrequencyInletFvPatchScalarField::
@@ -111,11 +113,12 @@ void turbulentMixingLengthFrequencyInletFvPatchScalarField::updateCoeffs()
     }
 
     // Lookup Cmu corresponding to the turbulence model selected
-    const compressible::RASModel& RAS =
-        db().lookupObject<compressible::RASModel>("RASProperties");
-    scalar Cmu = readScalar(RAS.coeffDict().lookup("Cmu"));
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
 
-    scalar Cmu25 = pow(Cmu, 0.25);
+    const scalar Cmu =
+        rasModel.coeffDict().lookupOrDefault<scalar>("Cmu", 0.09);
+
+    const scalar Cmu25 = pow(Cmu, 0.25);
 
     const fvPatchField<scalar>& kp =
         patch().lookupPatchField<volScalarField, scalar>(kName_);
@@ -150,6 +153,7 @@ makePatchTypeField
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace incompressible
 } // End namespace Foam
 
 // ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
similarity index 94%
rename from src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
index 8c7589447..50aa9d909 100644
--- a/src/turbulenceModels/RAS/compressible/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/turbulentMixingLengthFrequencyInlet/turbulentMixingLengthFrequencyInletFvPatchScalarField.H
@@ -23,7 +23,7 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::turbulentMixingLengthFrequencyInletFvPatchScalarField
+    Foam::incompressible::turbulentMixingLengthFrequencyInletFvPatchScalarField
 
 Description
     Calculate omega via the mixing length
@@ -44,8 +44,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef turbulentMixingLengthFrequencyInletFvPatchScalarField_H
-#define turbulentMixingLengthFrequencyInletFvPatchScalarField_H
+#ifndef incompressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
+#define incompressibleturbulentMixingLengthFrequencyInletFvPatchScalarField_H
 
 #include "fixedValueFvPatchFields.H"
 
@@ -53,6 +53,8 @@ SourceFiles
 
 namespace Foam
 {
+namespace incompressible
+{
 
 /*---------------------------------------------------------------------------*\
     Class turbulentMixingLengthFrequencyInletFvPatchScalarField Declaration
@@ -159,6 +161,7 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+} // End namespace incompressible
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..c62b0999a
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.C
@@ -0,0 +1,265 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "epsilonWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void epsilonWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn("epsilonWallFunctionFvPatchScalarField::checkType()")
+            << "Invalid wall function specification" << nl
+            << "    Patch type for patch " << patch().name()
+            << " must be wall" << nl
+            << "    Current patch type is " << patch().type() << nl << endl
+            << abort(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedInternalValueFvPatchField<scalar>(p, iF),
+    UName_("U"),
+    kName_("k"),
+    GName_("RASModel::G"),
+    nuName_("nu"),
+    nutName_("nut"),
+    Cmu_(0.09),
+    kappa_(0.41),
+    E_(9.8)
+{
+    checkType();
+}
+
+
+epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
+(
+    const epsilonWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    kName_(ptf.kName_),
+    GName_(ptf.GName_),
+    nuName_(ptf.nuName_),
+    nutName_(ptf.nutName_),
+    Cmu_(ptf.Cmu_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_)
+{
+    checkType();
+}
+
+
+epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedInternalValueFvPatchField<scalar>(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
+    GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu")),
+    nutName_(dict.lookupOrDefault<word>("nut", "nut")),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8))
+{
+    checkType();
+}
+
+
+epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
+(
+    const epsilonWallFunctionFvPatchScalarField& ewfpsf
+)
+:
+    fixedInternalValueFvPatchField<scalar>(ewfpsf),
+    UName_(ewfpsf.UName_),
+    kName_(ewfpsf.kName_),
+    GName_(ewfpsf.GName_),
+    nuName_(ewfpsf.nuName_),
+    nutName_(ewfpsf.nutName_),
+    Cmu_(ewfpsf.Cmu_),
+    kappa_(ewfpsf.kappa_),
+    E_(ewfpsf.E_)
+{
+    checkType();
+}
+
+
+epsilonWallFunctionFvPatchScalarField::epsilonWallFunctionFvPatchScalarField
+(
+    const epsilonWallFunctionFvPatchScalarField& ewfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedInternalValueFvPatchField<scalar>(ewfpsf, iF),
+    UName_(ewfpsf.UName_),
+    kName_(ewfpsf.kName_),
+    GName_(ewfpsf.GName_),
+    nuName_(ewfpsf.nuName_),
+    nutName_(ewfpsf.nutName_),
+    Cmu_(ewfpsf.Cmu_),
+    kappa_(ewfpsf.kappa_),
+    E_(ewfpsf.E_)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void epsilonWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
+    const scalarField& y = rasModel.y()[patch().index()];
+
+    const scalar Cmu25 = pow(Cmu_, 0.25);
+    const scalar Cmu75 = pow(Cmu_, 0.75);
+
+    volScalarField& G = const_cast<volScalarField&>
+        (db().lookupObject<volScalarField>(GName_));
+
+    volScalarField& epsilon = const_cast<volScalarField&>
+        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
+
+    const volScalarField& k = db().lookupObject<volScalarField>(kName_);
+
+    const scalarField& nuw =
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
+
+    const scalarField& nutw =
+        patch().lookupPatchField<volScalarField, scalar>(nutName_);
+
+    const fvPatchVectorField& Uw =
+        patch().lookupPatchField<volVectorField, vector>(UName_);
+
+    const scalarField magGradUw = mag(Uw.snGrad());
+
+    // Set epsilon and G
+    forAll(nutw, faceI)
+    {
+        label faceCellI = patch().faceCells()[faceI];
+
+        scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
+
+        epsilon[faceCellI] = Cmu75*pow(k[faceCellI], 1.5)/(kappa_*y[faceI]);
+
+        if (yPlus > yPlusLam)
+        {
+            G[faceCellI] =
+                (nutw[faceI] + nuw[faceI])
+               *magGradUw[faceI]
+               *Cmu25*sqrt(k[faceCellI])
+               /(kappa_*y[faceI]);
+        }
+        else
+        {
+            G[faceCellI] = 0.0;
+        }
+    }
+
+    // TODO: perform averaging for cells sharing more than one boundary face
+
+    fixedInternalValueFvPatchField<scalar>::updateCoeffs();
+}
+
+
+void epsilonWallFunctionFvPatchScalarField::evaluate
+(
+    const Pstream::commsTypes commsType
+)
+{
+    fixedInternalValueFvPatchField<scalar>::evaluate(commsType);
+}
+
+
+void epsilonWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fixedInternalValueFvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
+    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+    writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    epsilonWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..b5b7e0b61
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/epsilonWallFunctions/epsilonWallFunction/epsilonWallFunctionFvPatchScalarField.H
@@ -0,0 +1,190 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible::RASModels::epsilonWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for epsilon when using wall functions
+    - calculates epsilon and G
+    - epsilon values added directly into the matrix to act as a constraint
+
+SourceFiles
+    epsilonWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef epsilonWallFunctionFvPatchScalarField_H
+#define epsilonWallFunctionFvPatchScalarField_H
+
+#include "fixedInternalValueFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+           Class epsilonWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class epsilonWallFunctionFvPatchScalarField
+:
+    public fixedInternalValueFvPatchField<scalar>
+{
+    // Private data
+
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
+        //- Name of turbulence generation field
+        word GName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
+        //- Name of turbulent viscosity field
+        word nutName_;
+
+        //- Cmu coefficient
+        scalar Cmu_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+
+    // Private member functions
+
+        //- Check the type of the patch
+        void checkType();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("epsilonWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        epsilonWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        epsilonWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  epsilonWallFunctionFvPatchScalarField
+        //  onto a new patch
+        epsilonWallFunctionFvPatchScalarField
+        (
+            const epsilonWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        epsilonWallFunctionFvPatchScalarField
+        (
+            const epsilonWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new epsilonWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        epsilonWallFunctionFvPatchScalarField
+        (
+            const epsilonWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new epsilonWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+            //- Evaluate the patchField
+            virtual void evaluate(const Pstream::commsTypes);
+
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
new file mode 100644
index 000000000..98dfa140c
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.C
@@ -0,0 +1,153 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "kqRWallFunctionFvPatchField.H"
+#include "fvPatchFieldMapper.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type>
+void kqRWallFunctionFvPatchField<Type>::checkType()
+{
+    if (!isA<wallFvPatch>(this->patch()))
+    {
+        FatalErrorIn("kqRWallFunctionFvPatchField::checkType()")
+            << "Invalid wall function specification" << nl
+            << "    Patch type for patch " << this->patch().name()
+            << " must be wall" << nl
+            << "    Current patch type is " << this->patch().type() << nl << endl
+            << abort(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class Type>
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    zeroGradientFvPatchField<Type>(p, iF)
+{
+    checkType();
+}
+
+
+template<class Type>
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const kqRWallFunctionFvPatchField& ptf,
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    zeroGradientFvPatchField<Type>(ptf, p, iF, mapper)
+{
+    checkType();
+}
+
+
+template<class Type>
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const fvPatch& p,
+    const DimensionedField<Type, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    zeroGradientFvPatchField<Type>(p, iF, dict)
+{
+    checkType();
+}
+
+
+template<class Type>
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const kqRWallFunctionFvPatchField& tkqrwfpf
+)
+:
+    zeroGradientFvPatchField<Type>(tkqrwfpf)
+{
+    checkType();
+}
+
+
+template<class Type>
+kqRWallFunctionFvPatchField<Type>::kqRWallFunctionFvPatchField
+(
+    const kqRWallFunctionFvPatchField& tkqrwfpf,
+    const DimensionedField<Type, volMesh>& iF
+)
+:
+    zeroGradientFvPatchField<Type>(tkqrwfpf, iF)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+template<class Type>
+void kqRWallFunctionFvPatchField<Type>::evaluate
+(
+    const Pstream::commsTypes commsType
+)
+{
+    zeroGradientFvPatchField<Type>::evaluate(commsType);
+}
+
+
+template<class Type>
+void kqRWallFunctionFvPatchField<Type>::write(Ostream& os) const
+{
+    zeroGradientFvPatchField<Type>::write(os);
+    this->writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
new file mode 100644
index 000000000..44e4ee7bc
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchField.H
@@ -0,0 +1,170 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible::RASModels::kqRWallFunctionFvPatchField
+
+Description
+    Boundary condition for turbulence k, Q, and R when using wall functions.
+    Simply acts as a zero gradient condition.
+
+SourceFiles
+    kqRWallFunctionFvPatchField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef kqRWallFunctionFvPatchField_H
+#define kqRWallFunctionFvPatchField_H
+
+#include "zeroGradientFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+                Class kqRWallFunctionFvPatchField Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class Type>
+class kqRWallFunctionFvPatchField
+:
+    public zeroGradientFvPatchField<Type>
+{
+
+    // Private member functions
+
+        //- Check the type of the patch
+        void checkType();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("kqRWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        kqRWallFunctionFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        kqRWallFunctionFvPatchField
+        (
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        // kqRWallFunctionFvPatchField
+        //  onto a new patch
+        kqRWallFunctionFvPatchField
+        (
+            const kqRWallFunctionFvPatchField&,
+            const fvPatch&,
+            const DimensionedField<Type, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        kqRWallFunctionFvPatchField
+        (
+            const kqRWallFunctionFvPatchField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchField<Type> > clone() const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new kqRWallFunctionFvPatchField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        kqRWallFunctionFvPatchField
+        (
+            const kqRWallFunctionFvPatchField&,
+            const DimensionedField<Type, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchField<Type> > clone
+        (
+            const DimensionedField<Type, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchField<Type> >
+            (
+                new kqRWallFunctionFvPatchField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Evaluate the patchField
+            virtual void evaluate
+            (
+                const Pstream::commsTypes commsType=Pstream::Pstream::blocking
+            );
+
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "kqRWallFunctionFvPatchField.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
new file mode 100644
index 000000000..4ea90ab1f
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.C
@@ -0,0 +1,51 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "kqRWallFunctionFvPatchFields.H"
+#include "fvPatchFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "volFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+makePatchFields(kqRWallFunction);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
new file mode 100644
index 000000000..5ff1af211
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/kqRWallFunctions/kqRWallFunction/kqRWallFunctionFvPatchFields.H
@@ -0,0 +1,56 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef kqRWallFunctionFvPatchFields_H
+#define kqRWallFunctionFvPatchFields_H
+
+#include "kqRWallFunctionFvPatchField.H"
+#include "fieldTypes.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeFieldTypedefs(kqRWallFunction)
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..b41d68bb7
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.C
@@ -0,0 +1,114 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "nutLowReWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<scalarField> nutLowReWallFunctionFvPatchScalarField::calcNut() const
+{
+    return tmp<scalarField>(new scalarField(patch().size(), 0.0));
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    nutWallFunctionFvPatchScalarField(p, iF)
+{}
+
+
+nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField
+(
+    const nutLowReWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    nutWallFunctionFvPatchScalarField(p, iF, dict)
+{}
+
+
+nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField
+(
+    const nutLowReWallFunctionFvPatchScalarField& nlrwfpsf
+)
+:
+    nutWallFunctionFvPatchScalarField(nlrwfpsf)
+{}
+
+
+nutLowReWallFunctionFvPatchScalarField::nutLowReWallFunctionFvPatchScalarField
+(
+    const nutLowReWallFunctionFvPatchScalarField& nlrwfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    nutWallFunctionFvPatchScalarField(nlrwfpsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, nutLowReWallFunctionFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..3a03a843a
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutLowReWallFunction/nutLowReWallFunctionFvPatchScalarField.H
@@ -0,0 +1,149 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible::RASModels::nutLowReWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for turbulent (kinematic) viscosity when for use with
+    low Reynolds number models.
+
+    Sets nut to zero, and provides an access function to calculate y+.
+
+SourceFiles
+    nutLowReWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nutLowReWallFunctionFvPatchScalarField_H
+#define nutLowReWallFunctionFvPatchScalarField_H
+
+#include "nutWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+           Class nutLowReWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class nutLowReWallFunctionFvPatchScalarField
+:
+    public nutWallFunctionFvPatchScalarField
+{
+protected:
+
+    // Protected member functions
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcNut() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("nutLowReWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        nutLowReWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        nutLowReWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  nutLowReWallFunctionFvPatchScalarField
+        //  onto a new patch
+        nutLowReWallFunctionFvPatchScalarField
+        (
+            const nutLowReWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        nutLowReWallFunctionFvPatchScalarField
+        (
+            const nutLowReWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new nutLowReWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        nutLowReWallFunctionFvPatchScalarField
+        (
+            const nutLowReWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new nutLowReWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..2de20a05c
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.C
@@ -0,0 +1,242 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "nutRoughWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+scalar nutRoughWallFunctionFvPatchScalarField::fnRough
+(
+    const scalar KsPlus,
+    const scalar Cs
+) const
+{
+    // Return fn based on non-dimensional roughness height
+
+    if (KsPlus < 90.0)
+    {
+        return pow
+        (
+            (KsPlus - 2.25)/87.75 + Cs*KsPlus,
+            sin(0.4258*(log(KsPlus) - 0.811))
+        );
+    }
+    else
+    {
+        return (1.0 + Cs*KsPlus);
+    }
+}
+
+
+tmp<scalarField> nutRoughWallFunctionFvPatchScalarField::calcNut() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    const scalar Cmu25 = pow(Cmu_, 0.25);
+
+    tmp<scalarField> tnutw(new scalarField(*this));
+    scalarField& nutw = tnutw();
+
+    forAll(nutw, faceI)
+    {
+        label faceCellI = patch().faceCells()[faceI];
+
+        scalar uStar = Cmu25*sqrt(k[faceCellI]);
+        scalar yPlus = uStar*y[faceI]/nuw[faceI];
+        scalar KsPlus = uStar*Ks_[faceI]/nuw[faceI];
+
+        scalar Edash = E_;
+
+        if (KsPlus > 2.25)
+        {
+            Edash /= fnRough(KsPlus, Cs_[faceI]);
+        }
+
+        if (yPlus > yPlusLam_)
+        {
+            scalar limitingNutw = max(nutw[faceI], nuw[faceI]);
+
+            // To avoid oscillations limit the change in the wall viscosity
+            // which is particularly important if it temporarily becomes zero
+            nutw[faceI] =
+                max
+                (
+                    min
+                    (
+                        nuw[faceI]
+                       *(yPlus*kappa_/log(max(Edash*yPlus, 1+1e-4)) - 1),
+                        2*limitingNutw
+                    ), 0.5*limitingNutw
+                );
+        }
+
+        if (debug)
+        {
+            Info<< "yPlus = " << yPlus
+                << ", KsPlus = " << KsPlus
+                << ", Edash = " << Edash
+                << ", nutw = " << nutw[faceI]
+                << endl;
+        }
+    }
+
+    return tnutw;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    nutWallFunctionFvPatchScalarField(p, iF),
+    Ks_(p.size(), 0.0),
+    Cs_(p.size(), 0.0)
+{}
+
+
+nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
+(
+    const nutRoughWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    Ks_(ptf.Ks_, mapper),
+    Cs_(ptf.Cs_, mapper)
+{}
+
+
+nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    nutWallFunctionFvPatchScalarField(p, iF, dict),
+    Ks_("Ks", dict, p.size()),
+    Cs_("Cs", dict, p.size())
+{}
+
+
+nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
+(
+    const nutRoughWallFunctionFvPatchScalarField& rwfpsf
+)
+:
+    nutWallFunctionFvPatchScalarField(rwfpsf),
+    Ks_(rwfpsf.Ks_),
+    Cs_(rwfpsf.Cs_)
+{}
+
+
+nutRoughWallFunctionFvPatchScalarField::nutRoughWallFunctionFvPatchScalarField
+(
+    const nutRoughWallFunctionFvPatchScalarField& rwfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    nutWallFunctionFvPatchScalarField(rwfpsf, iF),
+    Ks_(rwfpsf.Ks_),
+    Cs_(rwfpsf.Cs_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void nutRoughWallFunctionFvPatchScalarField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    nutWallFunctionFvPatchScalarField::autoMap(m);
+    Ks_.autoMap(m);
+    Cs_.autoMap(m);
+}
+
+
+void nutRoughWallFunctionFvPatchScalarField::rmap
+(
+    const fvPatchScalarField& ptf,
+    const labelList& addr
+)
+{
+    nutWallFunctionFvPatchScalarField::rmap(ptf, addr);
+
+    const nutRoughWallFunctionFvPatchScalarField& nrwfpsf =
+        refCast<const nutRoughWallFunctionFvPatchScalarField>(ptf);
+
+    Ks_.rmap(nrwfpsf.Ks_, addr);
+    Cs_.rmap(nrwfpsf.Cs_, addr);
+}
+
+
+void nutRoughWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    Cs_.writeEntry("Cs", os);
+    Ks_.writeEntry("Ks", os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, nutRoughWallFunctionFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..7296a8b40
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutRoughWallFunction/nutRoughWallFunctionFvPatchScalarField.H
@@ -0,0 +1,186 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible::RASModels::nutRoughWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for turbulent (kinematic) viscosity when using wall
+    functions for rough walls.
+
+    Manipulates the E parameter to account for roughness effects, based on
+    KsPlus.
+
+    - roughness height = sand-grain roughness (0 for smooth walls)
+    - roughness constant = 0.5-1.0 (0.5 default)
+
+SourceFiles
+    nutRoughWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nutRoughWallFunctionFvPatchScalarField_H
+#define nutRoughWallFunctionFvPatchScalarField_H
+
+#include "nutWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+           Class nutRoughWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class nutRoughWallFunctionFvPatchScalarField
+:
+    public nutWallFunctionFvPatchScalarField
+{
+protected:
+
+    // Protected data
+
+        //- Roughness height
+        scalarField Ks_;
+
+        //- Roughness constant
+        scalarField Cs_;
+
+
+    // Protected member functions
+
+        //- Compute the roughness function
+        virtual scalar fnRough(const scalar KsPlus, const scalar Cs) const;
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcNut() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("nutRoughWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        nutRoughWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        nutRoughWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  nutRoughWallFunctionFvPatchScalarField
+        //  onto a new patch
+        nutRoughWallFunctionFvPatchScalarField
+        (
+            const nutRoughWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        nutRoughWallFunctionFvPatchScalarField
+        (
+            const nutRoughWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new nutRoughWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        nutRoughWallFunctionFvPatchScalarField
+        (
+            const nutRoughWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new nutRoughWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap(const fvPatchFieldMapper&);
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchScalarField&,
+                const labelList&
+            );
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..2e9843b17
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.C
@@ -0,0 +1,321 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<scalarField>
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcNut() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    // The flow velocity at the adjacent cell centre
+    const scalarField magUp = mag(Uw.patchInternalField() - Uw);
+
+    tmp<scalarField> tyPlus = calcYPlus(magUp);
+    scalarField& yPlus = tyPlus();
+
+    tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
+    scalarField& nutw = tnutw();
+
+    forAll(yPlus, facei)
+    {
+        if (yPlus[facei] > yPlusLam_)
+        {
+            const scalar Re = magUp[facei]*y[facei]/nuw[facei];
+            nutw[facei] = nuw[facei]*(sqr(yPlus[facei])/Re - 1);
+        }
+    }
+
+    return tnutw;
+}
+
+
+tmp<scalarField>
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::calcYPlus
+(
+    const scalarField& magUp
+) const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
+    scalarField& yPlus = tyPlus();
+
+    if (roughnessHeight_ > 0.0)
+    {
+        // Rough Walls
+        const scalar c_1 = 1/(90 - 2.25) + roughnessConstant_;
+        static const scalar c_2 = 2.25/(90 - 2.25);
+        static const scalar c_3 = 2.0*atan(1.0)/log(90/2.25);
+        static const scalar c_4 = c_3*log(2.25);
+
+        //if (KsPlusBasedOnYPlus_)
+        {
+            // If KsPlus is based on YPlus the extra term added to the law
+            // of the wall will depend on yPlus
+            forAll(yPlus, facei)
+            {
+                const scalar magUpara = magUp[facei];
+                const scalar Re = magUpara*y[facei]/nuw[facei];
+                const scalar kappaRe = kappa_*Re;
+
+                scalar yp = yPlusLam_;
+                const scalar ryPlusLam = 1.0/yp;
+
+                int iter = 0;
+                scalar yPlusLast = 0.0;
+                scalar dKsPlusdYPlus = roughnessHeight_/y[facei];
+
+                // Enforce the roughnessHeight to be less than the distance to
+                // the first cell centre
+                if (dKsPlusdYPlus > 1)
+                {
+                    dKsPlusdYPlus = 1;
+                }
+
+                // Additional tuning parameter (fudge factor) - nominally = 1
+                dKsPlusdYPlus *= roughnessFudgeFactor_;
+
+                do
+                {
+                    yPlusLast = yp;
+
+                    // The non-dimensional roughness height
+                    scalar KsPlus = yp*dKsPlusdYPlus;
+
+                    // The extra term in the law-of-the-wall
+                    scalar G = 0.0;
+
+                    scalar yPlusGPrime = 0.0;
+
+                    if (KsPlus >= 90)
+                    {
+                        const scalar t_1 = 1 + roughnessConstant_*KsPlus;
+                        G = log(t_1);
+                        yPlusGPrime = roughnessConstant_*KsPlus/t_1;
+                    }
+                    else if (KsPlus > 2.25)
+                    {
+                        const scalar t_1 = c_1*KsPlus - c_2;
+                        const scalar t_2 = c_3*log(KsPlus) - c_4;
+                        const scalar sint_2 = sin(t_2);
+                        const scalar logt_1 = log(t_1);
+                        G = logt_1*sint_2;
+                        yPlusGPrime =
+                            (c_1*sint_2*KsPlus/t_1) + (c_3*logt_1*cos(t_2));
+                    }
+
+                    scalar denom = 1.0 + log(E_*yp) - G - yPlusGPrime;
+                    if (mag(denom) > VSMALL)
+                    {
+                        yp = (kappaRe + yp*(1 - yPlusGPrime))/denom;
+                    }
+                } while
+                (
+                    mag(ryPlusLam*(yp - yPlusLast)) > 0.0001
+                 && ++iter < 10
+                 && yp > VSMALL
+                );
+
+                yPlus[facei] = max(0.0, yp);
+            }
+        }
+    }
+    else
+    {
+        // Smooth Walls
+        forAll(yPlus, facei)
+        {
+            const scalar magUpara = magUp[facei];
+            const scalar Re = magUpara*y[facei]/nuw[facei];
+            const scalar kappaRe = kappa_*Re;
+
+            scalar yp = yPlusLam_;
+            const scalar ryPlusLam = 1.0/yp;
+
+            int iter = 0;
+            scalar yPlusLast = 0.0;
+
+            do
+            {
+                yPlusLast = yp;
+                yp = (kappaRe + yp)/(1.0 + log(E_*yp));
+
+            } while(mag(ryPlusLam*(yp - yPlusLast)) > 0.0001 && ++iter < 10);
+
+            yPlus[facei] = max(0.0, yp);
+        }
+    }
+
+    return tyPlus;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    nutWallFunctionFvPatchScalarField(p, iF),
+    roughnessHeight_(pTraits<scalar>::zero),
+    roughnessConstant_(pTraits<scalar>::zero),
+    roughnessFudgeFactor_(pTraits<scalar>::zero)
+{}
+
+
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+(
+    const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper),
+    roughnessHeight_(ptf.roughnessHeight_),
+    roughnessConstant_(ptf.roughnessConstant_),
+    roughnessFudgeFactor_(ptf.roughnessFudgeFactor_)
+{}
+
+
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    nutWallFunctionFvPatchScalarField(p, iF, dict),
+    roughnessHeight_(readScalar(dict.lookup("roughnessHeight"))),
+    roughnessConstant_(readScalar(dict.lookup("roughnessConstant"))),
+    roughnessFudgeFactor_(readScalar(dict.lookup("roughnessFudgeFactor")))
+{}
+
+
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+(
+    const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf
+)
+:
+    nutWallFunctionFvPatchScalarField(rwfpsf),
+    roughnessHeight_(rwfpsf.roughnessHeight_),
+    roughnessConstant_(rwfpsf.roughnessConstant_),
+    roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
+{}
+
+
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+(
+    const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField& rwfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    nutWallFunctionFvPatchScalarField(rwfpsf, iF),
+    roughnessHeight_(rwfpsf.roughnessHeight_),
+    roughnessConstant_(rwfpsf.roughnessConstant_),
+    roughnessFudgeFactor_(rwfpsf.roughnessFudgeFactor_)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+tmp<scalarField>
+nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::yPlus() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField magUp = mag(Uw.patchInternalField() - Uw);
+
+    return calcYPlus(magUp);
+}
+
+
+void nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    os.writeKeyword("roughnessHeight")
+        << roughnessHeight_ << token::END_STATEMENT << nl;
+    os.writeKeyword("roughnessConstant")
+        << roughnessConstant_ << token::END_STATEMENT << nl;
+    os.writeKeyword("roughnessFudgeFactor")
+        << roughnessFudgeFactor_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
similarity index 60%
rename from src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
index 3500de316..c6c953c31 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutStandardRoughWallFunction/nutStandardRoughWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardRoughWallFunction/nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField.H
@@ -23,20 +23,21 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RASModels::nutStandardRoughWallFunctionFvPatchScalarField
+    Foam::incompressible::RASModels::
+    nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 
 Description
     Wall function boundary condition for rough walls
 
 SourceFiles
-    nutStandardWallFunctionFvPatchScalarField.C
+    nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef nutStandardRoughWallFunctionFvPatchScalarField_H
-#define nutStandardRoughWallFunctionFvPatchScalarField_H
+#ifndef nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H
+#define nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField_H
 
-#include "fixedValueFvPatchFields.H"
+#include "nutWallFunctionFvPatchScalarField.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -48,40 +49,53 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class nutWallFunctionFvPatch Declaration
+Class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
-class nutStandardRoughWallFunctionFvPatchScalarField
+class nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
 :
-    public fixedValueFvPatchScalarField
+    public nutWallFunctionFvPatchScalarField
 {
     // Private data
 
-        //- Name of the velocity field
-        word UName_;
+        // Roughness model parameters
 
-        scalar roughnessHeight_;
-        scalar roughnessConstant_;
-        scalar roughnessFudgeFactor_;
+            //- Height
+            scalar roughnessHeight_;
+
+            //- Constant
+            scalar roughnessConstant_;
+
+            //- Scale factor
+            scalar roughnessFudgeFactor_;
+
+
+    // Protected member functions
+
+        //- Calculate yPLus
+        virtual tmp<scalarField> calcYPlus(const scalarField& magUp) const;
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcNut() const;
 
 
 public:
 
     //- Runtime type information
-    TypeName("nutStandardRoughWallFunction");
+    TypeName("nutSpalartAllmarasStandardRoughWallFunction");
 
 
     // Constructors
 
         //- Construct from patch and internal field
-        nutStandardRoughWallFunctionFvPatchScalarField
+        nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
-        nutStandardRoughWallFunctionFvPatchScalarField
+        nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         (
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
@@ -89,20 +103,20 @@ public:
         );
 
         //- Construct by mapping given
-        //  nutStandardRoughWallFunctionFvPatchScalarField
+        //  nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         //  onto a new patch
-        nutStandardRoughWallFunctionFvPatchScalarField
+        nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         (
-            const nutStandardRoughWallFunctionFvPatchScalarField&,
+            const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&,
             const fvPatch&,
             const DimensionedField<scalar, volMesh>&,
             const fvPatchFieldMapper&
         );
 
         //- Construct as copy
-        nutStandardRoughWallFunctionFvPatchScalarField
+        nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         (
-            const nutStandardRoughWallFunctionFvPatchScalarField&
+            const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&
         );
 
         //- Construct and return a clone
@@ -110,14 +124,17 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutStandardRoughWallFunctionFvPatchScalarField(*this)
+                new nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+                (
+                    *this
+                )
             );
         }
 
         //- Construct as copy setting internal field reference
-        nutStandardRoughWallFunctionFvPatchScalarField
+        nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
         (
-            const nutStandardRoughWallFunctionFvPatchScalarField&,
+            const nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField&,
             const DimensionedField<scalar, volMesh>&
         );
 
@@ -129,7 +146,11 @@ public:
         {
             return tmp<fvPatchScalarField>
             (
-                new nutStandardRoughWallFunctionFvPatchScalarField(*this, iF)
+                new nutSpalartAllmarasStandardRoughWallFunctionFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
             );
         }
 
@@ -138,62 +159,57 @@ public:
 
         // Access
 
-            //- Return the name of the velocity field
-            const word& UName() const
-            {
-                return UName_;
-            }
-
-
-            //- Return the fluctuation scale
+            //- Return the roughness height
             const scalar& roughnessHeight() const
             {
                 return roughnessHeight_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness height to allow adjustment
             scalar& roughnessHeight()
             {
                 return roughnessHeight_;
             }
 
 
-            //- Return the fluctuation scale
+            //- Return the roughness constant scale
             const scalar& roughnessConstant() const
             {
                 return roughnessConstant_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness constant to allow adjustment
             scalar& roughnessConstant()
             {
                 return roughnessConstant_;
             }
 
-            //- Return the fluctuation scale
+            //- Return the roughness scale factor
             const scalar& roughnessFudgeFactor() const
             {
                 return roughnessFudgeFactor_;
             }
 
-            //- Return reference to the fluctuation scale to allow adjustment
+            //- Return reference to the roughness scale factor to allow
+            //  adjustment
             scalar& roughnessFudgeFactor()
             {
                 return roughnessFudgeFactor_;
             }
 
 
+    // I-O
+
         // Evaluation functions
 
-            //- Evaluate the patchField
-            virtual void evaluate
-            (
-                const Pstream::commsTypes commsType=Pstream::blocking
-            );
+            //- Calculate and return the yPlus at the boundary
+            virtual tmp<scalarField> yPlus() const;
 
 
-        //- Write
-        virtual void write(Ostream& os) const;
+        // I-O
+
+            //- Write
+            virtual void write(Ostream& os) const;
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..863b96ac7
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
@@ -0,0 +1,210 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<scalarField>
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcNut() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField magUp = mag(Uw.patchInternalField() - Uw);
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    tmp<scalarField> tyPlus = calcYPlus(magUp);
+    scalarField& yPlus = tyPlus();
+
+    tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
+    scalarField& nutw = tnutw();
+
+    forAll(yPlus, facei)
+    {
+        if (yPlus[facei] > yPlusLam_)
+        {
+            nutw[facei] =
+                nuw[facei]*(yPlus[facei]*kappa_/log(E_*yPlus[facei]) - 1.0);
+        }
+    }
+
+    return tnutw;
+}
+
+
+tmp<scalarField>
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::calcYPlus
+(
+    const scalarField& magUp
+) const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    tmp<scalarField> tyPlus(new scalarField(patch().size(), 0.0));
+    scalarField& yPlus = tyPlus();
+
+    forAll(yPlus, facei)
+    {
+        scalar kappaRe = kappa_*magUp[facei]*y[facei]/nuw[facei];
+
+        scalar yp = yPlusLam_;
+        scalar ryPlusLam = 1.0/yp;
+
+        int iter = 0;
+        scalar yPlusLast = 0.0;
+
+        do
+        {
+            yPlusLast = yp;
+            yp = (kappaRe + yp)/(1.0 + log(E_*yp));
+
+        } while(mag(ryPlusLam*(yp - yPlusLast)) > 0.01 && ++iter < 10 );
+
+        yPlus[facei] = max(0.0, yp);
+    }
+
+    return tyPlus;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    nutWallFunctionFvPatchScalarField(p, iF)
+{}
+
+
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+(
+    const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    nutWallFunctionFvPatchScalarField(p, iF, dict)
+{}
+
+
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+(
+    const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf
+)
+:
+    nutWallFunctionFvPatchScalarField(sawfpsf)
+{}
+
+
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+(
+    const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField& sawfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    nutWallFunctionFvPatchScalarField(sawfpsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+tmp<scalarField>
+nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::yPlus() const
+{
+    const label patchI = patch().index();
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField magUp = mag(Uw.patchInternalField() - Uw);
+
+    return calcYPlus(magUp);
+}
+
+
+void nutSpalartAllmarasStandardWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..1cc3fdb3a
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasStandardWallFunction/nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.H
@@ -0,0 +1,171 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible::RASModels::
+    nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+
+Description
+    Wall function boundary condition for walls
+
+SourceFiles
+    nutSpalartAllmarasStandardWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H
+#define nutSpalartAllmarasStandardWallFunctionFvPatchScalarField_H
+
+#include "nutWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+  Class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+:
+    public nutWallFunctionFvPatchScalarField
+{
+protected:
+
+    // Protected member functions
+
+        //- Calculate yPLus
+        virtual tmp<scalarField> calcYPlus(const scalarField& magUp) const;
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcNut() const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("nutSpalartAllmarasStandardWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        //  onto a new patch
+        nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        (
+            const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        (
+            const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+                (
+                    *this
+                )
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+        (
+            const nutSpalartAllmarasStandardWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new nutSpalartAllmarasStandardWallFunctionFvPatchScalarField
+                (
+                    *this,
+                    iF
+                )
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Calculate and return the yPlus at the boundary
+            virtual tmp<scalarField> yPlus() const;
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..cf76be3ae
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.C
@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "nutSpalartAllmarasWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+tmp<scalarField>
+nutSpalartAllmarasWallFunctionFvPatchScalarField::calcNut() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField magGradU = mag(Uw.snGrad());
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    return max
+    (
+        scalar(0),
+        sqr(calcUTau(magGradU))/(magGradU + ROOTVSMALL) - nuw
+    );
+}
+
+
+tmp<scalarField> nutSpalartAllmarasWallFunctionFvPatchScalarField::calcUTau
+(
+    const scalarField& magGradU
+) const
+{
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patch().index()];
+
+    const fvPatchVectorField& Uw =
+        rasModel.U().boundaryField()[patch().index()];
+    const scalarField magUp = mag(Uw.patchInternalField() - Uw);
+
+    const scalarField& nuw = rasModel.nu().boundaryField()[patch().index()];
+    const scalarField& nutw = *this;
+
+    tmp<scalarField> tuTau(new scalarField(patch().size(), 0.0));
+    scalarField& uTau = tuTau();
+
+    forAll(uTau, facei)
+    {
+        scalar magUpara = magUp[facei];
+
+        scalar ut = sqrt((nutw[facei] + nuw[facei])*magGradU[facei]);
+
+        if (ut > VSMALL)
+        {
+            int iter = 0;
+            scalar err = GREAT;
+
+            do
+            {
+                scalar kUu = min(kappa_*magUpara/ut, 50);
+                scalar fkUu = exp(kUu) - 1 - kUu*(1 + 0.5*kUu);
+
+                scalar f =
+                    - ut*y[facei]/nuw[facei]
+                    + magUpara/ut
+                    + 1/E_*(fkUu - 1.0/6.0*kUu*sqr(kUu));
+
+                scalar df =
+                    y[facei]/nuw[facei]
+                  + magUpara/sqr(ut)
+                  + 1/E_*kUu*fkUu/ut;
+
+                scalar uTauNew = ut + f/df;
+                err = mag((ut - uTauNew)/ut);
+                ut = uTauNew;
+
+            } while (ut > VSMALL && err > 0.01 && ++iter < 10);
+            uTau[facei] = max(0.0, ut);
+        }
+    }
+
+    return tuTau;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+nutSpalartAllmarasWallFunctionFvPatchScalarField::
+nutSpalartAllmarasWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    nutWallFunctionFvPatchScalarField(p, iF)
+{}
+
+
+nutSpalartAllmarasWallFunctionFvPatchScalarField::
+nutSpalartAllmarasWallFunctionFvPatchScalarField
+(
+    const nutSpalartAllmarasWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    nutWallFunctionFvPatchScalarField(ptf, p, iF, mapper)
+{}
+
+
+nutSpalartAllmarasWallFunctionFvPatchScalarField::
+nutSpalartAllmarasWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    nutWallFunctionFvPatchScalarField(p, iF, dict)
+{}
+
+
+nutSpalartAllmarasWallFunctionFvPatchScalarField::
+nutSpalartAllmarasWallFunctionFvPatchScalarField
+(
+    const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf
+)
+:
+    nutWallFunctionFvPatchScalarField(wfpsf)
+{}
+
+
+nutSpalartAllmarasWallFunctionFvPatchScalarField::
+nutSpalartAllmarasWallFunctionFvPatchScalarField
+(
+    const nutSpalartAllmarasWallFunctionFvPatchScalarField& wfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    nutWallFunctionFvPatchScalarField(wfpsf, iF)
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+tmp<scalarField>
+nutSpalartAllmarasWallFunctionFvPatchScalarField::yPlus() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const fvPatchVectorField& Uw = rasModel.U().boundaryField()[patchI];
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    return y*calcUTau(mag(Uw.snGrad()))/nuw;
+}
+
+
+void nutSpalartAllmarasWallFunctionFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    nutSpalartAllmarasWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..28e23b9a9
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutSpalartAllmarasWallFunction/nutSpalartAllmarasWallFunctionFvPatchScalarField.H
@@ -0,0 +1,164 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible::RASModels::
+    nutSpalartAllmarasWallFunctionFvPatchScalarField
+
+Description
+    Wall function boundary condition for walls
+
+SourceFiles
+    nutSpalartAllmarasWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nutSpalartAllmarasWallFunctionFvPatchScalarField_H
+#define nutSpalartAllmarasWallFunctionFvPatchScalarField_H
+
+#include "nutWallFunctionFvPatchScalarField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+           Class nutSpalartAllmarasWallFunctionFvPatch Declaration
+\*---------------------------------------------------------------------------*/
+
+class nutSpalartAllmarasWallFunctionFvPatchScalarField
+:
+    public nutWallFunctionFvPatchScalarField
+{
+protected:
+
+    // Protected member functions
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcNut() const;
+
+        //- Calculate the friction velocity
+        virtual tmp<scalarField> calcUTau(const scalarField& magGradU) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("nutSpalartAllmarasWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        nutSpalartAllmarasWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        nutSpalartAllmarasWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  nutSpalartAllmarasWallFunctionFvPatchScalarField
+        //  onto a new patch
+        nutSpalartAllmarasWallFunctionFvPatchScalarField
+        (
+            const nutSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        nutSpalartAllmarasWallFunctionFvPatchScalarField
+        (
+            const nutSpalartAllmarasWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new nutSpalartAllmarasWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        nutSpalartAllmarasWallFunctionFvPatchScalarField
+        (
+            const nutSpalartAllmarasWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new nutSpalartAllmarasWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Calculate and return the yPlus at the boundary
+            virtual tmp<scalarField> yPlus() const;
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream& os) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..9cfc4936e
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.C
@@ -0,0 +1,243 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "nutWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "wallFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void nutWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn("nutWallFunctionFvPatchScalarField::checkType()")
+            << "Invalid wall function specification" << nl
+            << "    Patch type for patch " << patch().name()
+            << " must be wall" << nl
+            << "    Current patch type is " << patch().type() << nl << endl
+            << abort(FatalError);
+    }
+}
+
+
+scalar nutWallFunctionFvPatchScalarField::calcYPlusLam
+(
+    const scalar kappa,
+    const scalar E
+) const
+{
+    scalar ypl = 11.0;
+
+    for (int i=0; i<10; i++)
+    {
+        ypl = log(E*ypl)/kappa;
+    }
+
+    return ypl;
+}
+
+
+tmp<scalarField> nutWallFunctionFvPatchScalarField::calcNut() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    const scalar Cmu25 = pow(Cmu_, 0.25);
+
+    tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
+    scalarField& nutw = tnutw();
+
+    forAll(nutw, faceI)
+    {
+        label faceCellI = patch().faceCells()[faceI];
+
+        scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
+
+        if (yPlus > yPlusLam_)
+        {
+            nutw[faceI] = nuw[faceI]*(yPlus*kappa_/log(E_*yPlus) - 1.0);
+        }
+    }
+
+    return tnutw;
+}
+
+
+void nutWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+{
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    Cmu_(0.09),
+    kappa_(0.41),
+    E_(9.8),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+{
+    checkType();
+}
+
+
+nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
+(
+    const nutWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    Cmu_(ptf.Cmu_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_),
+    yPlusLam_(ptf.yPlusLam_)
+{
+    checkType();
+}
+
+
+nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+{
+    checkType();
+}
+
+
+nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
+(
+    const nutWallFunctionFvPatchScalarField& wfpsf
+)
+:
+    fixedValueFvPatchScalarField(wfpsf),
+    Cmu_(wfpsf.Cmu_),
+    kappa_(wfpsf.kappa_),
+    E_(wfpsf.E_),
+    yPlusLam_(wfpsf.yPlusLam_)
+{
+    checkType();
+}
+
+
+nutWallFunctionFvPatchScalarField::nutWallFunctionFvPatchScalarField
+(
+    const nutWallFunctionFvPatchScalarField& wfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(wfpsf, iF),
+    Cmu_(wfpsf.Cmu_),
+    kappa_(wfpsf.kappa_),
+    E_(wfpsf.E_),
+    yPlusLam_(wfpsf.yPlusLam_)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void nutWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    operator==(calcNut());
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+tmp<scalarField> nutWallFunctionFvPatchScalarField::yPlus() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
+    const scalarField kwc = k.boundaryField()[patchI].patchInternalField();
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    return pow(Cmu_, 0.25)*y*sqrt(kwc)/nuw;
+}
+
+
+void nutWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, nutWallFunctionFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
similarity index 75%
rename from src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
rename to src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
index 627e5c7c9..32b652c25 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutWallFunction/nutWallFunctionFvPatchScalarField.H
@@ -26,7 +26,9 @@ Class
     Foam::incompressible::RASModels::nutWallFunctionFvPatchScalarField
 
 Description
-    Wall function boundary condition for walls
+    Boundary condition for turbulent (kinematic) viscosity when using wall
+    functions
+    - replicates OpenFOAM v1.5 (and earlier) behaviour
 
 SourceFiles
     nutWallFunctionFvPatchScalarField.C
@@ -48,17 +50,43 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                    Class nutWallFunctionFvPatch Declaration
+             Class nutWallFunctionFvPatchScalarField Declaration
 \*---------------------------------------------------------------------------*/
 
 class nutWallFunctionFvPatchScalarField
 :
     public fixedValueFvPatchScalarField
 {
-    // Private data
+protected:
 
-        //- Name of the velocity field
-        word UName_;
+    // Protected data
+
+        //- Cmu coefficient
+        scalar Cmu_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+        //- Y+ at the edge of the laminar sublayer
+        scalar yPlusLam_;
+
+
+    // Protected member functions
+
+        //- Check the type of the patch
+        virtual void checkType();
+
+        //- Calculate the Y+ at the edge of the laminar sublayer
+        virtual scalar calcYPlusLam(const scalar kappa, const scalar E) const;
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcNut() const;
+
+        //- Write local wall function variables
+        virtual void writeLocalEntries(Ostream&) const;
 
 
 public:
@@ -84,7 +112,8 @@ public:
             const dictionary&
         );
 
-        //- Construct by mapping given nutWallFunctionFvPatchScalarField
+        //- Construct by mapping given
+        //  nutWallFunctionFvPatchScalarField
         //  onto a new patch
         nutWallFunctionFvPatchScalarField
         (
@@ -131,26 +160,19 @@ public:
 
     // Member functions
 
-        // Access
-
-            //- Return the name of the velocity field
-            const word& UName() const
-            {
-                return UName_;
-            }
-
-
         // Evaluation functions
 
-            //- Evaluate the patchField
-            virtual void evaluate
-            (
-                const Pstream::commsTypes commsType=Pstream::blocking
-            );
+            //- Calculate and return the yPlus at the boundary
+            virtual tmp<scalarField> yPlus() const;
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
 
 
-        //- Write
-        virtual void write(Ostream& os) const;
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..b32823a51
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.C
@@ -0,0 +1,248 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "nutkWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "wallFvPatch.H"
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+void nutkWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn("nutkWallFunctionFvPatchScalarField::checkType()")
+            << "Invalid wall function specification" << nl
+            << "    Patch type for patch " << patch().name()
+            << " must be wall" << nl
+            << "    Current patch type is " << patch().type() << nl << endl
+            << abort(FatalError);
+    }
+}
+
+
+scalar nutkWallFunctionFvPatchScalarField::calcYPlusLam
+(
+    const scalar kappa,
+    const scalar E
+) const
+{
+    scalar ypl = 11.0;
+
+    for (int i=0; i<10; i++)
+    {
+        ypl = log(E*ypl)/kappa;
+    }
+
+    return ypl;
+}
+
+
+tmp<scalarField> nutkWallFunctionFvPatchScalarField::calcNut() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    const scalar Cmu25 = pow(Cmu_, 0.25);
+
+    tmp<scalarField> tnutw(new scalarField(patch().size(), 0.0));
+    scalarField& nutw = tnutw();
+
+    forAll(nutw, faceI)
+    {
+        label faceCellI = patch().faceCells()[faceI];
+
+        scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
+
+        if (yPlus > yPlusLam_)
+        {
+            nutw[faceI] = nuw[faceI]*(yPlus*kappa_/log(E_*yPlus) - 1.0);
+        }
+    }
+
+    return tnutw;
+}
+
+
+void nutkWallFunctionFvPatchScalarField::writeLocalEntries(Ostream& os) const
+{
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(p, iF),
+    Cmu_(0.09),
+    kappa_(0.41),
+    E_(9.8),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+{
+    checkType();
+}
+
+
+nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
+(
+    const nutkWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedValueFvPatchScalarField(ptf, p, iF, mapper),
+    Cmu_(ptf.Cmu_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_),
+    yPlusLam_(ptf.yPlusLam_)
+{
+    checkType();
+}
+
+
+nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedValueFvPatchScalarField(p, iF, dict),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    yPlusLam_(calcYPlusLam(kappa_, E_))
+{
+    checkType();
+}
+
+
+nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
+(
+    const nutkWallFunctionFvPatchScalarField& wfpsf
+)
+:
+    fixedValueFvPatchScalarField(wfpsf),
+    Cmu_(wfpsf.Cmu_),
+    kappa_(wfpsf.kappa_),
+    E_(wfpsf.E_),
+    yPlusLam_(wfpsf.yPlusLam_)
+{
+    checkType();
+}
+
+
+nutkWallFunctionFvPatchScalarField::nutkWallFunctionFvPatchScalarField
+(
+    const nutkWallFunctionFvPatchScalarField& wfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedValueFvPatchScalarField(wfpsf, iF),
+    Cmu_(wfpsf.Cmu_),
+    kappa_(wfpsf.kappa_),
+    E_(wfpsf.E_),
+    yPlusLam_(wfpsf.yPlusLam_)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void nutkWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    operator==(calcNut());
+
+    fixedValueFvPatchScalarField::updateCoeffs();
+}
+
+
+tmp<scalarField> nutkWallFunctionFvPatchScalarField::yPlus() const
+{
+    const label patchI = patch().index();
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalarField& y = rasModel.y()[patchI];
+
+    const tmp<volScalarField> tk = rasModel.k();
+    const volScalarField& k = tk();
+    const scalarField kwc = k.boundaryField()[patchI].patchInternalField();
+    const scalarField& nuw = rasModel.nu().boundaryField()[patchI];
+
+    return pow(Cmu_, 0.25)*y*sqrt(kwc)/nuw;
+}
+
+
+void nutkWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fvPatchField<scalar>::write(os);
+    writeLocalEntries(os);
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField(fvPatchScalarField, nutkWallFunctionFvPatchScalarField);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..33d4bbdd5
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/nutWallFunctions/nutkWallFunction/nutkWallFunctionFvPatchScalarField.H
@@ -0,0 +1,189 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible::RASModels::nutkWallFunctionFvPatchScalarField
+
+Description
+    Boundary condition for turbulent (kinematic) viscosity when using wall
+    functions, based on turbulence kinetic energy.
+    - replicates OpenFOAM v1.5 (and earlier) behaviour
+
+SourceFiles
+    nutkWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef nutkWallFunctionFvPatchScalarField_H
+#define nutkWallFunctionFvPatchScalarField_H
+
+#include "fixedValueFvPatchFields.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+             Class nutkWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class nutkWallFunctionFvPatchScalarField
+:
+    public fixedValueFvPatchScalarField
+{
+protected:
+
+    // Protected data
+
+        //- Cmu coefficient
+        scalar Cmu_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+        //- Y+ at the edge of the laminar sublayer
+        scalar yPlusLam_;
+
+
+    // Protected member functions
+
+        //- Check the type of the patch
+        virtual void checkType();
+
+        //- Calculate the Y+ at the edge of the laminar sublayer
+        virtual scalar calcYPlusLam(const scalar kappa, const scalar E) const;
+
+        //- Calculate the turbulence viscosity
+        virtual tmp<scalarField> calcNut() const;
+
+        //- Write local wall function variables
+        virtual void writeLocalEntries(Ostream&) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("nutkWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        nutkWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        nutkWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        //  nutkWallFunctionFvPatchScalarField
+        //  onto a new patch
+        nutkWallFunctionFvPatchScalarField
+        (
+            const nutkWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        nutkWallFunctionFvPatchScalarField
+        (
+            const nutkWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new nutkWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        nutkWallFunctionFvPatchScalarField
+        (
+            const nutkWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new nutkWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Calculate and return the yPlus at the boundary
+            virtual tmp<scalarField> yPlus() const;
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            virtual void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
new file mode 100644
index 000000000..c07f7b835
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.C
@@ -0,0 +1,267 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "omegaWallFunctionFvPatchScalarField.H"
+#include "RASModel.H"
+#include "fvPatchFieldMapper.H"
+#include "volFields.H"
+#include "addToRunTimeSelectionTable.H"
+#include "wallFvPatch.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+void omegaWallFunctionFvPatchScalarField::checkType()
+{
+    if (!isA<wallFvPatch>(patch()))
+    {
+        FatalErrorIn("omegaWallFunctionFvPatchScalarField::checkType()")
+            << "Invalid wall function specification" << nl
+            << "    Patch type for patch " << patch().name()
+            << " must be wall" << nl
+            << "    Current patch type is " << patch().type() << nl << endl
+            << abort(FatalError);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedInternalValueFvPatchField<scalar>(p, iF),
+    UName_("U"),
+    kName_("k"),
+    GName_("RASModel::G"),
+    nuName_("nu"),
+    nutName_("nut"),
+    Cmu_(0.09),
+    kappa_(0.41),
+    E_(9.8),
+    beta1_(0.075)
+{
+    checkType();
+}
+
+
+omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
+(
+    const omegaWallFunctionFvPatchScalarField& ptf,
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const fvPatchFieldMapper& mapper
+)
+:
+    fixedInternalValueFvPatchField<scalar>(ptf, p, iF, mapper),
+    UName_(ptf.UName_),
+    kName_(ptf.kName_),
+    GName_(ptf.GName_),
+    nuName_(ptf.nuName_),
+    nutName_(ptf.nutName_),
+    Cmu_(ptf.Cmu_),
+    kappa_(ptf.kappa_),
+    E_(ptf.E_),
+    beta1_(ptf.beta1_)
+{
+    checkType();
+}
+
+
+omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
+(
+    const fvPatch& p,
+    const DimensionedField<scalar, volMesh>& iF,
+    const dictionary& dict
+)
+:
+    fixedInternalValueFvPatchField<scalar>(p, iF, dict),
+    UName_(dict.lookupOrDefault<word>("U", "U")),
+    kName_(dict.lookupOrDefault<word>("k", "k")),
+    GName_(dict.lookupOrDefault<word>("G", "RASModel::G")),
+    nuName_(dict.lookupOrDefault<word>("nu", "nu")),
+    nutName_(dict.lookupOrDefault<word>("nut", "nut")),
+    Cmu_(dict.lookupOrDefault<scalar>("Cmu", 0.09)),
+    kappa_(dict.lookupOrDefault<scalar>("kappa", 0.41)),
+    E_(dict.lookupOrDefault<scalar>("E", 9.8)),
+    beta1_(dict.lookupOrDefault<scalar>("beta1", 0.075))
+{
+    checkType();
+}
+
+
+omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
+(
+    const omegaWallFunctionFvPatchScalarField& owfpsf
+)
+:
+    fixedInternalValueFvPatchField<scalar>(owfpsf),
+    UName_(owfpsf.UName_),
+    kName_(owfpsf.kName_),
+    GName_(owfpsf.GName_),
+    nuName_(owfpsf.nuName_),
+    nutName_(owfpsf.nutName_),
+    Cmu_(owfpsf.Cmu_),
+    kappa_(owfpsf.kappa_),
+    E_(owfpsf.E_),
+    beta1_(owfpsf.beta1_)
+{
+    checkType();
+}
+
+
+omegaWallFunctionFvPatchScalarField::omegaWallFunctionFvPatchScalarField
+(
+    const omegaWallFunctionFvPatchScalarField& owfpsf,
+    const DimensionedField<scalar, volMesh>& iF
+)
+:
+    fixedInternalValueFvPatchField<scalar>(owfpsf, iF),
+    UName_(owfpsf.UName_),
+    kName_(owfpsf.kName_),
+    GName_(owfpsf.GName_),
+    nuName_(owfpsf.nuName_),
+    nutName_(owfpsf.nutName_),
+    Cmu_(owfpsf.Cmu_),
+    kappa_(owfpsf.kappa_),
+    E_(owfpsf.E_),
+    beta1_(owfpsf.beta1_)
+{
+    checkType();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void omegaWallFunctionFvPatchScalarField::updateCoeffs()
+{
+    if (updated())
+    {
+        return;
+    }
+
+    const RASModel& rasModel = db().lookupObject<RASModel>("RASProperties");
+    const scalar yPlusLam = rasModel.yPlusLam(kappa_, E_);
+    const scalarField& y = rasModel.y()[patch().index()];
+
+    const scalar Cmu25 = pow(Cmu_, 0.25);
+
+    volScalarField& G = const_cast<volScalarField&>
+        (db().lookupObject<volScalarField>(GName_));
+
+    volScalarField& omega = const_cast<volScalarField&>
+        (db().lookupObject<volScalarField>(dimensionedInternalField().name()));
+
+    const scalarField& k = db().lookupObject<volScalarField>(kName_);
+
+    const scalarField& nuw =
+        patch().lookupPatchField<volScalarField, scalar>(nuName_);
+
+    const scalarField& nutw =
+        patch().lookupPatchField<volScalarField, scalar>(nutName_);
+
+    const fvPatchVectorField& Uw =
+        patch().lookupPatchField<volVectorField, vector>(UName_);
+
+    vectorField n = patch().nf();
+
+    const scalarField magGradUw = mag(Uw.snGrad());
+
+    // Set omega and G
+    forAll(nutw, faceI)
+    {
+        label faceCellI = patch().faceCells()[faceI];
+
+        scalar yPlus = Cmu25*y[faceI]*sqrt(k[faceCellI])/nuw[faceI];
+
+        scalar omegaVis = 6.0*nuw[faceI]/(beta1_*sqr(y[faceI]));
+
+        scalar omegaLog = sqrt(k[faceCellI])/(Cmu25*kappa_*y[faceI]);
+
+        omega[faceCellI] = sqrt(sqr(omegaVis) + sqr(omegaLog));
+
+        if (yPlus > yPlusLam)
+        {
+            G[faceCellI] =
+                (nutw[faceI] + nuw[faceI])
+               *magGradUw[faceI]
+               *Cmu25*sqrt(k[faceCellI])
+               /(kappa_*y[faceI]);
+        }
+        else
+        {
+            G[faceCellI] = 0.0;
+        }
+    }
+
+    // TODO: perform averaging for cells sharing more than one boundary face
+
+    fixedInternalValueFvPatchField<scalar>::updateCoeffs();
+}
+
+
+void omegaWallFunctionFvPatchScalarField::write(Ostream& os) const
+{
+    fixedInternalValueFvPatchField<scalar>::write(os);
+    writeEntryIfDifferent<word>(os, "U", "U", UName_);
+    writeEntryIfDifferent<word>(os, "k", "k", kName_);
+    writeEntryIfDifferent<word>(os, "G", "RASModel::G", GName_);
+    writeEntryIfDifferent<word>(os, "nu", "nu", nuName_);
+    writeEntryIfDifferent<word>(os, "nut", "nut", nutName_);
+    os.writeKeyword("Cmu") << Cmu_ << token::END_STATEMENT << nl;
+    os.writeKeyword("kappa") << kappa_ << token::END_STATEMENT << nl;
+    os.writeKeyword("E") << E_ << token::END_STATEMENT << nl;
+    os.writeKeyword("beta1") << beta1_ << token::END_STATEMENT << nl;
+    writeEntry("value", os);
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makePatchTypeField
+(
+    fvPatchScalarField,
+    omegaWallFunctionFvPatchScalarField
+);
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
new file mode 100644
index 000000000..c35de695a
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/wallFunctions/omegaWallFunctions/omegaWallFunction/omegaWallFunctionFvPatchScalarField.H
@@ -0,0 +1,204 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible::RASModels::omegaWallFunctionFvPatchScalarField
+
+Description
+    Provides a wall function boundary condition/constraint on omega
+
+    Computed value is:
+
+        omega = sqrt(omega_vis^2 + omega_log^2)
+
+    where
+        omega_vis = omega in viscous region
+        omega_log = omega in logarithmic region
+
+    Model described by Eq.(15) of:
+    @verbatim
+        Menter, F., Esch, T.
+        "Elements of Industrial Heat Transfer Prediction"
+        16th Brazilian Congress of Mechanical Engineering (COBEM),
+        Nov. 2001
+    @endverbatim
+
+SourceFiles
+    omegaWallFunctionFvPatchScalarField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef omegaWallFunctionFvPatchScalarField_H
+#define omegaWallFunctionFvPatchScalarField_H
+
+#include "fixedInternalValueFvPatchField.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+           Class omegaWallFunctionFvPatchScalarField Declaration
+\*---------------------------------------------------------------------------*/
+
+class omegaWallFunctionFvPatchScalarField
+:
+    public fixedInternalValueFvPatchField<scalar>
+{
+    // Private data
+
+        //- Name of velocity field
+        word UName_;
+
+        //- Name of turbulence kinetic energy field
+        word kName_;
+
+        //- Name of turbulence generation field
+        word GName_;
+
+        //- Name of laminar viscosity field
+        word nuName_;
+
+        //- Name of turbulent viscosity field
+        word nutName_;
+
+        //- Cmu coefficient
+        scalar Cmu_;
+
+        //- Von Karman constant
+        scalar kappa_;
+
+        //- E coefficient
+        scalar E_;
+
+        //- beta1 coefficient
+        scalar beta1_;
+
+
+    // Private member functions
+
+        //- Check the type of the patch
+        void checkType();
+
+
+public:
+
+    //- Runtime type information
+    TypeName("omegaWallFunction");
+
+
+    // Constructors
+
+        //- Construct from patch and internal field
+        omegaWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct from patch, internal field and dictionary
+        omegaWallFunctionFvPatchScalarField
+        (
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const dictionary&
+        );
+
+        //- Construct by mapping given
+        // omegaWallFunctionFvPatchScalarField
+        //  onto a new patch
+        omegaWallFunctionFvPatchScalarField
+        (
+            const omegaWallFunctionFvPatchScalarField&,
+            const fvPatch&,
+            const DimensionedField<scalar, volMesh>&,
+            const fvPatchFieldMapper&
+        );
+
+        //- Construct as copy
+        omegaWallFunctionFvPatchScalarField
+        (
+            const omegaWallFunctionFvPatchScalarField&
+        );
+
+        //- Construct and return a clone
+        virtual tmp<fvPatchScalarField> clone() const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new omegaWallFunctionFvPatchScalarField(*this)
+            );
+        }
+
+        //- Construct as copy setting internal field reference
+        omegaWallFunctionFvPatchScalarField
+        (
+            const omegaWallFunctionFvPatchScalarField&,
+            const DimensionedField<scalar, volMesh>&
+        );
+
+        //- Construct and return a clone setting internal field reference
+        virtual tmp<fvPatchScalarField> clone
+        (
+            const DimensionedField<scalar, volMesh>& iF
+        ) const
+        {
+            return tmp<fvPatchScalarField>
+            (
+                new omegaWallFunctionFvPatchScalarField(*this, iF)
+            );
+        }
+
+
+    // Member functions
+
+        // Evaluation functions
+
+            //- Update the coefficients associated with the patch field
+            virtual void updateCoeffs();
+
+
+        // I-O
+
+            //- Write
+            void write(Ostream&) const;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/nonLinearWallFunctionsI.H b/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
similarity index 93%
rename from src/turbulenceModels/RAS/incompressible/wallFunctions/nonLinearWallFunctionsI.H
rename to src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
index 85e1c4db1..c5d7427b4 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/nonLinearWallFunctionsI.H
+++ b/src/turbulenceModels/incompressible/RAS/include/nonLinearWallFunctionsI.H
@@ -34,6 +34,8 @@ Description
 {
     labelList cellBoundaryFaceCount(epsilon_.size(), 0);
 
+    scalar yPlusLam = this->yPlusLam(kappa_.value(), E_.value());
+
     const fvPatchList& patches = mesh_.boundary();
 
     //- Initialise the near-wall G and epsilon fields to zero
@@ -41,7 +43,7 @@ Description
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
@@ -59,9 +61,9 @@ Description
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
-#           include "checkPatchFieldTypes.H"
+            #include "checkPatchFieldTypes.H"
 
             const scalarField& nuw = nu().boundaryField()[patchi];
             const scalarField& nutw = nut_.boundaryField()[patchi];
@@ -91,7 +93,7 @@ Description
                      Cmu75*pow(k_[faceCelli], 1.5)
                     /(kappa_.value()*y_[patchi][facei]);
 
-                if (yPlus > yPlusLam_)
+                if (yPlus > yPlusLam)
                 {
                     G[faceCelli] +=
                         (nutw[facei] + nuw[facei])
@@ -110,7 +112,7 @@ Description
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             forAll(curPatch, facei)
             {
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallDissipationI.H b/src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H
similarity index 97%
rename from src/turbulenceModels/RAS/incompressible/wallFunctions/wallDissipationI.H
rename to src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H
index 36bdda81d..edd2e6519 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallDissipationI.H
+++ b/src/turbulenceModels/incompressible/RAS/include/wallDissipationI.H
@@ -37,7 +37,7 @@ Description
     {
         const fvPatch& p = patches[patchi];
 
-        if (isType<wallFvPatch>(p))
+        if (isA<wallFvPatch>(p))
         {
             epsEqn().setValues
             (
diff --git a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallNonlinearViscosityI.H b/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
similarity index 88%
rename from src/turbulenceModels/RAS/incompressible/wallFunctions/wallNonlinearViscosityI.H
rename to src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
index a7f9f9313..7e8534650 100644
--- a/src/turbulenceModels/RAS/incompressible/wallFunctions/wallNonlinearViscosityI.H
+++ b/src/turbulenceModels/incompressible/RAS/include/wallNonlinearViscosityI.H
@@ -33,11 +33,13 @@ Description
 {
     const fvPatchList& patches = mesh_.boundary();
 
+    const scalar yPlusLam = this->yPlusLam(kappa_.value(), E_.value());
+
     forAll(patches, patchi)
     {
         const fvPatch& curPatch = patches[patchi];
 
-        if (isType<wallFvPatch>(curPatch))
+        if (isA<wallFvPatch>(curPatch))
         {
             const scalarField& nuw = nu().boundaryField()[patchi];
             scalarField& nutw = nut_.boundaryField()[patchi];
@@ -52,10 +54,11 @@ Description
                 scalar yPlus =
                     Cmu25*y_[patchi][facei]*sqrt(k_[faceCelli])/nuw[facei];
 
-                if (yPlus > yPlusLam_)
+                if (yPlus > yPlusLam)
                 {
-                    nutw[facei] = nuw[facei]
-                        *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
+                    nutw[facei] =
+                        nuw[facei]
+                       *(yPlus*kappa_.value()/log(E_.value()*yPlus) - 1);
                 }
                 else
                 {
diff --git a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
similarity index 83%
rename from src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C
rename to src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
index f824d76cd..8e4b1210b 100644
--- a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.C
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.C
@@ -26,7 +26,8 @@ License
 
 #include "kEpsilon.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -44,7 +45,6 @@ addToRunTimeSelectionTable(RASModel, kEpsilon, dictionary);
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct from components
 kEpsilon::kEpsilon
 (
     const volVectorField& U,
@@ -81,13 +81,13 @@ kEpsilon::kEpsilon
             1.92
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
 
@@ -98,12 +98,11 @@ kEpsilon::kEpsilon
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -111,15 +110,26 @@ kEpsilon::kEpsilon
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
-
-    nut_(Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    )
 {
-#   include "wallViscosityI.H"
+    nut_ = Cmu_*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_.correctBoundaryConditions();
 
     printCoeffs();
 }
@@ -182,10 +192,10 @@ bool kEpsilon::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -198,18 +208,17 @@ bool kEpsilon::read()
 
 void kEpsilon::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
+    volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_))));
 
-    volScalarField G = nut_*2*magSqr(symm(fvc::grad(U_)));
-
-#   include "wallFunctionsI.H"
+    // Update espsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
     // Dissipation equation
     tmp<fvScalarMatrix> epsEqn
@@ -225,7 +234,7 @@ void kEpsilon::correct()
 
     epsEqn().relax();
 
-#   include "wallDissipationI.H"
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
@@ -250,9 +259,7 @@ void kEpsilon::correct()
 
     // Re-calculate viscosity
     nut_ = Cmu_*sqr(k_)/epsilon_;
-
-#   include "wallViscosityI.H"
-
+    nut_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
similarity index 84%
rename from src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
rename to src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
index 52d8357b7..52c3e3c9e 100644
--- a/src/turbulenceModels/RAS/incompressible/kEpsilon/kEpsilon.H
+++ b/src/turbulenceModels/incompressible/RAS/kEpsilon/kEpsilon.H
@@ -35,10 +35,7 @@ Description
             Cmu         0.09;
             C1          1.44;
             C2          1.92;
-            C3          -0.33;  // only for compressible
-            alphak      1.0;    // only for compressible
-            alphaEps    0.76923;
-            alphah      1.0;    // only for compressible
+            sigmaEps    1.3;
         }
     @endverbatim
 
@@ -76,7 +73,7 @@ class kEpsilon
             dimensionedScalar Cmu_;
             dimensionedScalar C1_;
             dimensionedScalar C2_;
-            dimensionedScalar alphaEps_;
+            dimensionedScalar sigmaEps_;
 
 
         // Fields
@@ -102,16 +99,15 @@ public:
         );
 
 
-    // Destructor
-
-        ~kEpsilon()
-        {}
+    //- Destructor
+    virtual ~kEpsilon()
+    {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -130,36 +126,36 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
new file mode 100644
index 000000000..0c982491f
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.C
@@ -0,0 +1,281 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "kOmega.H"
+#include "addToRunTimeSelectionTable.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(kOmega, 0);
+addToRunTimeSelectionTable(RASModel, kOmega, dictionary);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+kOmega::kOmega
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    transportModel& lamTransportModel
+)
+:
+    RASModel(typeName, U, phi, lamTransportModel),
+
+    Cmu_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "betaStar",
+            coeffDict_,
+            0.09
+        )
+    ),
+    beta_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "beta",
+            coeffDict_,
+            0.072
+        )
+    ),
+    alpha_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alpha",
+            coeffDict_,
+            0.52
+        )
+    ),
+    alphaK_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaK",
+            coeffDict_,
+            0.5
+        )
+    ),
+    alphaOmega_
+    (
+        dimensioned<scalar>::lookupOrAddToDict
+        (
+            "alphaOmega",
+            coeffDict_,
+            0.5
+        )
+    ),
+
+    k_
+    (
+        IOobject
+        (
+            "k",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateK("k", mesh_)
+    ),
+    omega_
+    (
+        IOobject
+        (
+            "omega",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateOmega("omega", mesh_)
+    ),
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    )
+{
+    nut_ = k_/(omega_ + omegaSmall_);
+    nut_.correctBoundaryConditions();
+
+    printCoeffs();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+tmp<volSymmTensorField> kOmega::R() const
+{
+    return tmp<volSymmTensorField>
+    (
+        new volSymmTensorField
+        (
+            IOobject
+            (
+                "R",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            ((2.0/3.0)*I)*k_ - nut_*twoSymm(fvc::grad(U_)),
+            k_.boundaryField().types()
+        )
+    );
+}
+
+
+tmp<volSymmTensorField> kOmega::devReff() const
+{
+    return tmp<volSymmTensorField>
+    (
+        new volSymmTensorField
+        (
+            IOobject
+            (
+                "devRhoReff",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+           -nuEff()*dev(twoSymm(fvc::grad(U_)))
+        )
+    );
+}
+
+
+tmp<fvVectorMatrix> kOmega::divDevReff(volVectorField& U) const
+{
+    return
+    (
+      - fvm::laplacian(nuEff(), U)
+      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+    );
+}
+
+
+bool kOmega::read()
+{
+    if (RASModel::read())
+    {
+        Cmu_.readIfPresent(coeffDict());
+        beta_.readIfPresent(coeffDict());
+        alphaK_.readIfPresent(coeffDict());
+        alphaOmega_.readIfPresent(coeffDict());
+
+        return true;
+    }
+    else
+    {
+        return false;
+    }
+}
+
+
+void kOmega::correct()
+{
+    RASModel::correct();
+
+    if (!turbulence_)
+    {
+        return;
+    }
+
+    volScalarField G("RASModel::G", nut_*2*magSqr(symm(fvc::grad(U_))));
+
+    // Update omega and G at the wall
+    omega_.boundaryField().updateCoeffs();
+
+    // Turbulence specific dissipation rate equation
+    tmp<fvScalarMatrix> omegaEqn
+    (
+        fvm::ddt(omega_)
+      + fvm::div(phi_, omega_)
+      - fvm::Sp(fvc::div(phi_), omega_)
+      - fvm::laplacian(DomegaEff(), omega_)
+     ==
+        alpha_*G*omega_/k_
+      - fvm::Sp(beta_*omega_, omega_)
+    );
+
+    omegaEqn().relax();
+
+    omegaEqn().boundaryManipulate(omega_.boundaryField());
+
+    solve(omegaEqn);
+    bound(omega_, omega0_);
+
+
+    // Turbulent kinetic energy equation
+    tmp<fvScalarMatrix> kEqn
+    (
+        fvm::ddt(k_)
+      + fvm::div(phi_, k_)
+      - fvm::Sp(fvc::div(phi_), k_)
+      - fvm::laplacian(DkEff(), k_)
+     ==
+        G
+      - fvm::Sp(Cmu_*omega_, k_)
+    );
+
+    kEqn().relax();
+    solve(kEqn);
+    bound(k_, k0_);
+
+
+    // Re-calculate viscosity
+    nut_ = k_/(omega_ + omegaSmall_);
+    nut_.correctBoundaryConditions();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
new file mode 100644
index 000000000..5eb5cccd9
--- /dev/null
+++ b/src/turbulenceModels/incompressible/RAS/kOmega/kOmega.H
@@ -0,0 +1,205 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible::RASModels::kOmega
+
+Description
+    Standard high Reynolds-number k-omega turbulence model for
+    incompressible flows.
+
+    References:
+    @verbatim
+        "Turbulence Modeling for CFD"
+        D. C. Wilcox,
+        DCW Industries, Inc., La Canada,
+        California, 1988.
+
+        See also:
+        http://www.cfd-online.com/Wiki/Wilcox's_k-omega_model
+    @endverbatim
+
+    The default model coefficients correspond to the following:
+    @verbatim
+        kOmegaCoeffs
+        {
+            Cmu         0.09;  // Equivalent to betaStar
+            alpha       0.52;
+            beta        0.072;
+            alphak      0.5;
+            alphaOmega  0.5;
+        }
+    @endverbatim
+
+SourceFiles
+    kOmega.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef kOmega_H
+#define kOmega_H
+
+#include "RASModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+namespace RASModels
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class kOmega Declaration
+\*---------------------------------------------------------------------------*/
+
+class kOmega
+:
+    public RASModel
+{
+    // Private data
+
+        // Model coefficients
+
+            dimensionedScalar Cmu_;
+            dimensionedScalar beta_;
+            dimensionedScalar alpha_;
+            dimensionedScalar alphaK_;
+            dimensionedScalar alphaOmega_;
+
+
+        // Fields
+
+            volScalarField k_;
+            volScalarField omega_;
+            volScalarField nut_;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("kOmega");
+
+    // Constructors
+
+        //- Construct from components
+        kOmega
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            transportModel& transport
+        );
+
+
+    // Destructor
+    virtual ~kOmega()
+    {}
+
+
+    // Member Functions
+
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> nut() const
+        {
+            return nut_;
+        }
+
+        //- Return the effective diffusivity for k
+        tmp<volScalarField> DkEff() const
+        {
+            return tmp<volScalarField>
+            (
+                new volScalarField("DkEff", alphaK_*nut_ + nu())
+            );
+        }
+
+        //- Return the effective diffusivity for omega
+        tmp<volScalarField> DomegaEff() const
+        {
+            return tmp<volScalarField>
+            (
+                new volScalarField("DomegaEff", alphaOmega_*nut_ + nu())
+            );
+        }
+
+        //- Return the turbulence kinetic energy
+        virtual tmp<volScalarField> k() const
+        {
+            return k_;
+        }
+
+        //- Return the turbulence specific dissipation rate
+        virtual tmp<volScalarField> omega() const
+        {
+            return omega_;
+        }
+
+        //- Return the turbulence kinetic energy dissipation rate
+        virtual tmp<volScalarField> epsilon() const
+        {
+            return tmp<volScalarField>
+            (
+                new volScalarField
+                (
+                    IOobject
+                    (
+                        "epsilon",
+                        mesh_.time().timeName(),
+                        mesh_
+                    ),
+                    Cmu_*k_*omega_,
+                    omega_.boundaryField().types()
+                )
+            );
+        }
+
+        //- Return the Reynolds stress tensor
+        virtual tmp<volSymmTensorField> R() const;
+
+        //- Return the effective stress tensor including the laminar stress
+        virtual tmp<volSymmTensorField> devReff() const;
+
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+
+        //- Solve the turbulence equations and correct the turbulence viscosity
+        virtual void correct();
+
+        //- Read RASProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace RASModels
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
similarity index 86%
rename from src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C
rename to src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
index ca1cf4b06..dd42502da 100644
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.C
@@ -26,7 +26,8 @@ License
 
 #include "kOmegaSST.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -196,19 +197,6 @@ kOmegaSST::kOmegaSST
         )
     ),
 
-    omega0_("omega0", dimless/dimTime, SMALL),
-    omegaSmall_("omegaSmall", dimless/dimTime, SMALL),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-
     y_(mesh_),
 
     k_
@@ -218,12 +206,11 @@ kOmegaSST::kOmegaSST
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     omega_
     (
         IOobject
@@ -231,15 +218,28 @@ kOmegaSST::kOmegaSST
             "omega",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateOmega("omega", mesh_)
     ),
-
-    nut_(a1_*k_/max(a1_*(omega_ + omegaSmall_), F2()*mag(symm(fvc::grad(U_)))))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    )
 {
-#   include "kOmegaWallViscosityI.H"
+    bound(omega_, omega0_);
+
+    nut_ = a1_*k_/max(a1_*omega_, F2()*mag(symm(fvc::grad(U_))));
+    nut_.correctBoundaryConditions();
 
     printCoeffs();
 }
@@ -302,18 +302,17 @@ bool kOmegaSST::read()
 {
     if (RASModel::read())
     {
-        alphaK1_.readIfPresent(coeffDict_);
-        alphaK2_.readIfPresent(coeffDict_);
-        alphaOmega1_.readIfPresent(coeffDict_);
-        alphaOmega2_.readIfPresent(coeffDict_);
-        gamma1_.readIfPresent(coeffDict_);
-        gamma2_.readIfPresent(coeffDict_);
-        beta1_.readIfPresent(coeffDict_);
-        beta2_.readIfPresent(coeffDict_);
-        betaStar_.readIfPresent(coeffDict_);
-        a1_.readIfPresent(coeffDict_);
-        c1_.readIfPresent(coeffDict_);
-        Cmu_.readIfPresent(coeffDict_);
+        alphaK1_.readIfPresent(coeffDict());
+        alphaK2_.readIfPresent(coeffDict());
+        alphaOmega1_.readIfPresent(coeffDict());
+        alphaOmega2_.readIfPresent(coeffDict());
+        gamma1_.readIfPresent(coeffDict());
+        gamma2_.readIfPresent(coeffDict());
+        beta1_.readIfPresent(coeffDict());
+        beta2_.readIfPresent(coeffDict());
+        betaStar_.readIfPresent(coeffDict());
+        a1_.readIfPresent(coeffDict());
+        c1_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -326,24 +325,23 @@ bool kOmegaSST::read()
 
 void kOmegaSST::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     if (mesh_.changing())
     {
         y_.correct();
     }
 
     volScalarField S2 = magSqr(symm(fvc::grad(U_)));
-    volScalarField G = nut_*2*S2;
+    volScalarField G("RASModel::G", nut_*2*S2);
 
-#   include "kOmegaWallFunctionsI.H"
+    // Update omega and G at the wall
+    omega_.boundaryField().updateCoeffs();
 
     volScalarField CDkOmega =
         (2*alphaOmega2_)*(fvc::grad(k_) & fvc::grad(omega_))/omega_;
@@ -369,7 +367,7 @@ void kOmegaSST::correct()
 
     omegaEqn().relax();
 
-#   include "wallOmegaI.H"
+    omegaEqn().boundaryManipulate(omega_.boundaryField());
 
     solve(omegaEqn);
     bound(omega_, omega0_);
@@ -393,9 +391,7 @@ void kOmegaSST::correct()
 
     // Re-calculate viscosity
     nut_ = a1_*k_/max(a1_*omega_, F2()*sqrt(S2));
-
-#   include "kOmegaWallViscosityI.H"
-
+    nut_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
similarity index 84%
rename from src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
rename to src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
index df6aa5a81..7ab5fb614 100644
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST/kOmegaSST.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST/kOmegaSST.H
@@ -55,14 +55,12 @@ Description
 
     The default model coefficients correspond to the following:
     @verbatim
-        kOmegaSST
+        kOmegaSSTCoeffs
         {
-            Cmu         0.09;
             alphaK1     0.85034;
             alphaK2     1.0;
             alphaOmega1 0.5;
             alphaOmega2 0.85616;
-            alphah      1.0;    // only for compressible
             beta1       0.075;
             beta2       0.0828;
             betaStar    0.09;
@@ -75,9 +73,6 @@ Description
 
 SourceFiles
     kOmegaSST.C
-    kOmegaWallFunctionsI.H
-    kOmegaWallViscosityI.H
-    wallOmegaI.H
 
 \*---------------------------------------------------------------------------*/
 
@@ -106,33 +101,33 @@ class kOmegaSST
 {
     // Private data
 
-        dimensionedScalar alphaK1_;
-        dimensionedScalar alphaK2_;
+        // Model coefficients
+            dimensionedScalar alphaK1_;
+            dimensionedScalar alphaK2_;
 
-        dimensionedScalar alphaOmega1_;
-        dimensionedScalar alphaOmega2_;
+            dimensionedScalar alphaOmega1_;
+            dimensionedScalar alphaOmega2_;
 
-        dimensionedScalar gamma1_;
-        dimensionedScalar gamma2_;
+            dimensionedScalar gamma1_;
+            dimensionedScalar gamma2_;
 
-        dimensionedScalar beta1_;
-        dimensionedScalar beta2_;
+            dimensionedScalar beta1_;
+            dimensionedScalar beta2_;
 
-        dimensionedScalar betaStar_;
+            dimensionedScalar betaStar_;
 
-        dimensionedScalar a1_;
-        dimensionedScalar c1_;
-
-        dimensionedScalar omega0_;
-        dimensionedScalar omegaSmall_;
-
-        dimensionedScalar Cmu_;
+            dimensionedScalar a1_;
+            dimensionedScalar c1_;
 
+        //- Wall distance field
+        //  Note: different to wall distance in parent RASModel
         wallDist y_;
 
-        volScalarField k_;
-        volScalarField omega_;
-        volScalarField nut_;
+        // Fields
+
+            volScalarField k_;
+            volScalarField omega_;
+            volScalarField nut_;
 
 
     // Private member functions
@@ -200,16 +195,16 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~kOmegaSST()
+        virtual ~kOmegaSST()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -233,18 +228,19 @@ public:
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
-        tmp<volScalarField> omega() const
+        //- Return the turbulence specific dissipation rate
+        virtual tmp<volScalarField> omega() const
         {
             return omega_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return tmp<volScalarField>
             (
@@ -263,19 +259,19 @@ public:
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/checkkOmega_LowRePatchFieldTypes.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/checkkOmega_LowRePatchFieldTypes.H
similarity index 100%
rename from src/turbulenceModels/RAS/compressible/kOmegaSST_LowRe/checkkOmega_LowRePatchFieldTypes.H
rename to src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/checkkOmega_LowRePatchFieldTypes.H
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/kOmegaSST_LowRe.C b/src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.C
similarity index 88%
rename from src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/kOmegaSST_LowRe.C
rename to src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.C
index bb0e6b2f5..7a414899a 100644
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/kOmegaSST_LowRe.C
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.C
@@ -26,7 +26,8 @@ License
 
 #include "kOmegaSST_LowRe.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -197,19 +198,6 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
         )
     ),
 
-    omega0_("omega0", dimless/dimTime, SMALL),
-    omegaSmall_("omegaSmall", dimless/dimTime, SMALL),
-
-    Cmu_
-    (
-        dimensioned<scalar>::lookupOrAddToDict
-        (
-            "Cmu",
-            coeffDict_,
-            0.09
-        )
-    ),
-
     y_(mesh_),
 
     k_
@@ -235,11 +223,26 @@ kOmegaSST_LowRe::kOmegaSST_LowRe
             IOobject::MUST_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        mesh
     ),
-
-    nut_(a1_*k_/max(a1_*(omega_ + omegaSmall_), F2()*mag(symm(fvc::grad(U_)))))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        a1_*k_/max(a1_*(omega_ + omegaSmall_), F2()*mag(symm(fvc::grad(U_))))
+    )
 {
+    bound(omega_, omega0_);
+
+    nut_ = a1_*k_/max(a1_*omega_, F2()*mag(symm(fvc::grad(U_))));
+    nut_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
@@ -301,18 +304,17 @@ bool kOmegaSST_LowRe::read()
 {
     if (RASModel::read())
     {
-        alphaK1_.readIfPresent(coeffDict_);
-        alphaK2_.readIfPresent(coeffDict_);
-        alphaOmega1_.readIfPresent(coeffDict_);
-        alphaOmega2_.readIfPresent(coeffDict_);
-        gamma1_.readIfPresent(coeffDict_);
-        gamma2_.readIfPresent(coeffDict_);
-        beta1_.readIfPresent(coeffDict_);
-        beta2_.readIfPresent(coeffDict_);
-        betaStar_.readIfPresent(coeffDict_);
-        a1_.readIfPresent(coeffDict_);
-        c1_.readIfPresent(coeffDict_);
-        Cmu_.readIfPresent(coeffDict_);
+        alphaK1_.readIfPresent(coeffDict());
+        alphaK2_.readIfPresent(coeffDict());
+        alphaOmega1_.readIfPresent(coeffDict());
+        alphaOmega2_.readIfPresent(coeffDict());
+        gamma1_.readIfPresent(coeffDict());
+        gamma2_.readIfPresent(coeffDict());
+        beta1_.readIfPresent(coeffDict());
+        beta2_.readIfPresent(coeffDict());
+        betaStar_.readIfPresent(coeffDict());
+        a1_.readIfPresent(coeffDict());
+        c1_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -325,22 +327,20 @@ bool kOmegaSST_LowRe::read()
 
 void kOmegaSST_LowRe::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     if (mesh_.changing())
     {
         y_.correct();
     }
 
     volScalarField S2 = magSqr(symm(fvc::grad(U_)));
-    volScalarField G = nut_*2*S2;
+    volScalarField G("RASModel::G", nut_*2*S2);
 
 #   include "kOmega_LowReI.H"
 
@@ -389,6 +389,7 @@ void kOmegaSST_LowRe::correct()
     solve(kEqn);
     bound(k_, k0_);
 
+
     // Re-calculate viscosity
     nut_ = a1_*k_/max(a1_*omega_, F2()*sqrt(S2));
 }
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/kOmegaSST_LowRe.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.H
similarity index 84%
rename from src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/kOmegaSST_LowRe.H
rename to src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.H
index 75c322c02..67f97385b 100644
--- a/src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/kOmegaSST_LowRe.H
+++ b/src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/kOmegaSST_LowRe.H
@@ -57,12 +57,10 @@ Description
     @verbatim
         kOmegaSST_LowRe
         {
-            Cmu         0.09;
             alphaK1     0.85034;
             alphaK2     1.0;
             alphaOmega1 0.5;
             alphaOmega2 0.85616;
-            alphah      1.0;    // only for compressible
             beta1       0.075;
             beta2       0.0828;
             betaStar    0.09;
@@ -106,33 +104,33 @@ class kOmegaSST_LowRe
 {
     // Private data
 
-        dimensionedScalar alphaK1_;
-        dimensionedScalar alphaK2_;
+        // Model coefficients
+            dimensionedScalar alphaK1_;
+            dimensionedScalar alphaK2_;
 
-        dimensionedScalar alphaOmega1_;
-        dimensionedScalar alphaOmega2_;
+            dimensionedScalar alphaOmega1_;
+            dimensionedScalar alphaOmega2_;
 
-        dimensionedScalar gamma1_;
-        dimensionedScalar gamma2_;
+            dimensionedScalar gamma1_;
+            dimensionedScalar gamma2_;
 
-        dimensionedScalar beta1_;
-        dimensionedScalar beta2_;
+            dimensionedScalar beta1_;
+            dimensionedScalar beta2_;
 
-        dimensionedScalar betaStar_;
+            dimensionedScalar betaStar_;
 
-        dimensionedScalar a1_;
-        dimensionedScalar c1_;
-
-        dimensionedScalar omega0_;
-        dimensionedScalar omegaSmall_;
-
-        dimensionedScalar Cmu_;
+            dimensionedScalar a1_;
+            dimensionedScalar c1_;
 
+        //- Wall distance field
+        //  Note: different to wall distance in parent RASModel
         wallDist y_;
 
-        volScalarField k_;
-        volScalarField omega_;
-        volScalarField nut_;
+        // Fields
+
+            volScalarField k_;
+            volScalarField omega_;
+            volScalarField nut_;
 
 
     // Private member functions
@@ -200,16 +198,16 @@ public:
         );
 
 
-    // Destructor
+    //- Destructor
 
-        ~kOmegaSST_LowRe()
+        virtual ~kOmegaSST_LowRe()
         {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -233,18 +231,19 @@ public:
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
-        tmp<volScalarField> omega() const
+        //- Return the turbulence specific dissipation rate
+        virtual tmp<volScalarField> omega() const
         {
             return omega_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return tmp<volScalarField>
             (
@@ -263,19 +262,19 @@ public:
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/kOmega_LowReI.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/kOmega_LowReI.H
similarity index 100%
rename from src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/kOmega_LowReI.H
rename to src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/kOmega_LowReI.H
diff --git a/src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/wallOmega_LowReI.H b/src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/wallOmega_LowReI.H
similarity index 100%
rename from src/turbulenceModels/RAS/incompressible/kOmegaSST_LowRe/wallOmega_LowReI.H
rename to src/turbulenceModels/incompressible/RAS/kOmegaSST_LowRe/wallOmega_LowReI.H
diff --git a/src/turbulenceModels/RAS/incompressible/laminar/laminar.C b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
similarity index 96%
rename from src/turbulenceModels/RAS/incompressible/laminar/laminar.C
rename to src/turbulenceModels/incompressible/RAS/laminar/laminar.C
index 1604cbce8..94ec0cba7 100644
--- a/src/turbulenceModels/RAS/incompressible/laminar/laminar.C
+++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.C
@@ -77,12 +77,6 @@ tmp<volScalarField> laminar::nut() const
 }
 
 
-tmp<volScalarField> laminar::nuEff() const
-{
-    return tmp<volScalarField>(new volScalarField("nuEff", nu()));
-}
-
-
 tmp<volScalarField> laminar::k() const
 {
     return tmp<volScalarField>
@@ -190,7 +184,7 @@ bool laminar::read()
 
 void laminar::correct()
 {
-    transportModel_.correct();
+    turbulenceModel::correct();
 }
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/laminar/laminar.H b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
similarity index 78%
rename from src/turbulenceModels/RAS/incompressible/laminar/laminar.H
rename to src/turbulenceModels/incompressible/RAS/laminar/laminar.H
index 2838aac78..6e7752c2e 100644
--- a/src/turbulenceModels/RAS/incompressible/laminar/laminar.H
+++ b/src/turbulenceModels/incompressible/RAS/laminar/laminar.H
@@ -33,8 +33,8 @@ SourceFiles
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef laminar_H
-#define laminar_H
+#ifndef rasLaminar_H
+#define rasLaminar_H
 
 #include "RASModel.H"
 
@@ -63,7 +63,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         laminar
         (
             const volVectorField& U,
@@ -72,41 +72,43 @@ public:
         );
 
 
-    // Destructor
-
-        ~laminar()
-        {}
+    //- Destructor
+    virtual ~laminar()
+    {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity, i.e. 0 for laminar flow
-        tmp<volScalarField> nut() const;
+        virtual tmp<volScalarField> nut() const;
 
         //- Return the effective viscosity, i.e. the laminar viscosity
-        tmp<volScalarField> nuEff() const;
+        virtual tmp<volScalarField> nuEff() const
+        {
+            return tmp<volScalarField>(new volScalarField("nuEff", nu()));
+        }
 
         //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
-        tmp<volScalarField> k() const;
+        virtual tmp<volScalarField> k() const;
 
         //- Return the turbulence kinetic energy dissipation rate,
         //  i.e. 0 for laminar flow
-        tmp<volScalarField> epsilon() const;
+        virtual tmp<volScalarField> epsilon() const;
 
         //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
-        //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        //- Return the effective stress tensor, i.e. the laminar stress
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Correct the laminar viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
similarity index 84%
rename from src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C
rename to src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
index 5dd8b94df..584c562d9 100644
--- a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.C
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.C
@@ -24,9 +24,11 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "QZeta.H"
+#include "qZeta.H"
 #include "addToRunTimeSelectionTable.H"
 
+#include "backwardsCompatibilityWallFunctions.H"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -38,12 +40,12 @@ namespace RASModels
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-defineTypeNameAndDebug(QZeta, 0);
-addToRunTimeSelectionTable(RASModel, QZeta, dictionary);
+defineTypeNameAndDebug(qZeta, 0);
+addToRunTimeSelectionTable(RASModel, qZeta, dictionary);
 
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
-tmp<volScalarField> QZeta::fMu() const
+tmp<volScalarField> qZeta::fMu() const
 {
     volScalarField Rt = q_*k_/(2.0*nu()*zeta_);
 
@@ -60,7 +62,7 @@ tmp<volScalarField> QZeta::fMu() const
 }
 
 
-tmp<volScalarField> QZeta::f2() const
+tmp<volScalarField> qZeta::f2() const
 {
     volScalarField Rt = q_*k_/(2.0*nu()*zeta_);
     return scalar(1) - 0.3*exp(-sqr(Rt));
@@ -69,8 +71,7 @@ tmp<volScalarField> QZeta::f2() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// from components
-QZeta::QZeta
+qZeta::qZeta
 (
     const volVectorField& U,
     const surfaceScalarField& phi,
@@ -106,13 +107,13 @@ QZeta::QZeta
             1.92
         )
     ),
-    alphaZeta_
+    sigmaZeta_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaZeta",
+            "sigmaZeta",
             coeffDict_,
-            0.76923
+            1.3
         )
     ),
     anisotropic_
@@ -179,15 +180,29 @@ QZeta::QZeta
         epsilon_.boundaryField().types()
     ),
 
-    nut_(Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    )
 {
+    nut_ = Cmu_*fMu()*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_.correctBoundaryConditions();
+
     printCoeffs();
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-tmp<volSymmTensorField> QZeta::R() const
+tmp<volSymmTensorField> qZeta::R() const
 {
     return tmp<volSymmTensorField>
     (
@@ -208,7 +223,7 @@ tmp<volSymmTensorField> QZeta::R() const
 }
 
 
-tmp<volSymmTensorField> QZeta::devReff() const
+tmp<volSymmTensorField> qZeta::devReff() const
 {
     return tmp<volSymmTensorField>
     (
@@ -228,7 +243,7 @@ tmp<volSymmTensorField> QZeta::devReff() const
 }
 
 
-tmp<fvVectorMatrix> QZeta::divDevReff(volVectorField& U) const
+tmp<fvVectorMatrix> qZeta::divDevReff(volVectorField& U) const
 {
     return
     (
@@ -238,15 +253,15 @@ tmp<fvVectorMatrix> QZeta::divDevReff(volVectorField& U) const
 }
 
 
-bool QZeta::read()
+bool qZeta::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        C1_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphaZeta_.readIfPresent(coeffDict_);
-        anisotropic_.readIfPresent("anisotropic", coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        C1_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmaZeta_.readIfPresent(coeffDict());
+        anisotropic_.readIfPresent("anisotropic", coeffDict());
 
         return true;
     }
@@ -257,20 +272,18 @@ bool QZeta::read()
 }
 
 
-void QZeta::correct()
+void qZeta::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     volScalarField S2 = 2*magSqr(symm(fvc::grad(U_)));
 
-    volScalarField G = nut_/(2.0*q_)*S2;
+    volScalarField G("RASModel::G", nut_/(2.0*q_)*S2);
     volScalarField E = nu()*nut_/q_*fvc::magSqrGradGrad(U_);
 
 
@@ -280,7 +293,6 @@ void QZeta::correct()
     (
         fvm::ddt(zeta_)
       + fvm::div(phi_, zeta_)
-      + fvm::SuSp(-fvc::div(phi_), zeta_)
       - fvm::laplacian(DzetaEff(), zeta_)
      ==
         (2.0*C1_ - 1)*G*zeta_/q_
@@ -299,7 +311,6 @@ void QZeta::correct()
     (
         fvm::ddt(q_)
       + fvm::div(phi_, q_)
-      + fvm::SuSp(-fvc::div(phi_), q_)
       - fvm::laplacian(DqEff(), q_)
      ==
         G - fvm::Sp(zeta_/q_, q_)
@@ -320,6 +331,7 @@ void QZeta::correct()
 
     // Re-calculate viscosity
     nut_ = Cmu_*fMu()*sqr(k_)/epsilon_;
+    nut_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
similarity index 73%
rename from src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
rename to src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
index 2da4d289d..f76f87636 100644
--- a/src/turbulenceModels/RAS/incompressible/QZeta/QZeta.H
+++ b/src/turbulenceModels/incompressible/RAS/qZeta/qZeta.H
@@ -23,19 +23,19 @@ License
     Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 
 Class
-    Foam::incompressible::RASModels::QZeta
+    Foam::incompressible::RASModels::qZeta
 
 Description
     Gibson and Dafa'Alla's q-zeta two-equation low-Re turbulence model
     for incompressible flows
 
 SourceFiles
-    QZeta.C
+    qZeta.C
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef QZeta_H
-#define QZeta_H
+#ifndef qZeta_H
+#define qZeta_H
 
 #include "RASModel.H"
 
@@ -49,28 +49,33 @@ namespace RASModels
 {
 
 /*---------------------------------------------------------------------------*\
-                           Class QZeta Declaration
+                           Class qZeta Declaration
 \*---------------------------------------------------------------------------*/
 
-class QZeta
+class qZeta
 :
     public RASModel
 {
     // Private data
 
-        dimensionedScalar Cmu_;
-        dimensionedScalar C1_;
-        dimensionedScalar C2_;
-        dimensionedScalar alphaZeta_;
-        Switch anisotropic_;
+        // Model coefficients
 
-        volScalarField k_;
-        volScalarField epsilon_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar C1_;
+            dimensionedScalar C2_;
+            dimensionedScalar sigmaZeta_;
+            Switch anisotropic_;
 
-        volScalarField q_;
-        volScalarField zeta_;
 
-        volScalarField nut_;
+        // Fields
+
+            volScalarField k_;
+            volScalarField epsilon_;
+
+            volScalarField q_;
+            volScalarField zeta_;
+
+            volScalarField nut_;
 
 
     // Private member functions
@@ -82,12 +87,12 @@ class QZeta
 public:
 
     //- Runtime type information
-    TypeName("QZeta");
+    TypeName("qZeta");
 
     // Constructors
 
-        //- from components
-        QZeta
+        //- Construct from components
+        qZeta
         (
             const volVectorField& U,
             const surfaceScalarField& phi,
@@ -95,16 +100,15 @@ public:
         );
 
 
-    // Destructor
-
-        ~QZeta()
-        {}
+    //- Destructor
+    virtual ~qZeta()
+    {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -123,46 +127,46 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DzetaEff", alphaZeta_*nut_ + nu())
+                new volScalarField("DzetaEff", nut_/sigmaZeta_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
-        const volScalarField& q() const
+        virtual const volScalarField& q() const
         {
             return q_;
         }
 
-        const volScalarField& zeta() const
+        virtual const volScalarField& zeta() const
         {
             return zeta_;
         }
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
similarity index 86%
rename from src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C
rename to src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
index cbb69ac2f..238af0651 100644
--- a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.C
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.C
@@ -26,7 +26,8 @@ License
 
 #include "realizableKE.H"
 #include "addToRunTimeSelectionTable.H"
-#include "wallFvPatch.H"
+
+#include "backwardsCompatibilityWallFunctions.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -121,22 +122,22 @@ realizableKE::realizableKE
             1.9
         )
     ),
-    alphak_
+    sigmak_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphak",
+            "sigmak",
             coeffDict_,
             1.0
         )
     ),
-    alphaEps_
+    sigmaEps_
     (
         dimensioned<scalar>::lookupOrAddToDict
         (
-            "alphaEps",
+            "sigmaEps",
             coeffDict_,
-            0.833333
+            1.2
         )
     ),
 
@@ -147,12 +148,11 @@ realizableKE::realizableKE
             "k",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateK("k", mesh_)
     ),
-
     epsilon_
     (
         IOobject
@@ -160,17 +160,29 @@ realizableKE::realizableKE
             "epsilon",
             runTime_.timeName(),
             mesh_,
-            IOobject::MUST_READ,
+            IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        mesh_
+        autoCreateEpsilon("epsilon", mesh_)
     ),
-
-    nut_(rCmu(fvc::grad(U_))*sqr(k_)/(epsilon_ + epsilonSmall_))
+    nut_
+    (
+        IOobject
+        (
+            "nut",
+            runTime_.timeName(),
+            mesh_,
+            IOobject::NO_READ,
+            IOobject::AUTO_WRITE
+        ),
+        autoCreateNut("nut", mesh_)
+    )
 {
     bound(k_, k0_);
     bound(epsilon_, epsilon0_);
-#   include "wallViscosityI.H"
+
+    nut_ = rCmu(fvc::grad(U_))*sqr(k_)/(epsilon_ + epsilonSmall_);
+    nut_.correctBoundaryConditions();
 
     printCoeffs();
 }
@@ -233,11 +245,11 @@ bool realizableKE::read()
 {
     if (RASModel::read())
     {
-        Cmu_.readIfPresent(coeffDict_);
-        A0_.readIfPresent(coeffDict_);
-        C2_.readIfPresent(coeffDict_);
-        alphak_.readIfPresent(coeffDict_);
-        alphaEps_.readIfPresent(coeffDict_);
+        Cmu_.readIfPresent(coeffDict());
+        A0_.readIfPresent(coeffDict());
+        C2_.readIfPresent(coeffDict());
+        sigmak_.readIfPresent(coeffDict());
+        sigmaEps_.readIfPresent(coeffDict());
 
         return true;
     }
@@ -250,15 +262,13 @@ bool realizableKE::read()
 
 void realizableKE::correct()
 {
-    transportModel_.correct();
+    RASModel::correct();
 
     if (!turbulence_)
     {
         return;
     }
 
-    RASModel::correct();
-
     volTensorField gradU = fvc::grad(U_);
     volScalarField S2 = 2*magSqr(dev(symm(gradU)));
     volScalarField magS = sqrt(S2);
@@ -266,9 +276,10 @@ void realizableKE::correct()
     volScalarField eta = magS*k_/epsilon_;
     volScalarField C1 = max(eta/(scalar(5) + eta), scalar(0.43));
 
-    volScalarField G = nut_*S2;
+    volScalarField G("RASModel::G", nut_*S2);
 
-#   include "wallFunctionsI.H"
+    // Update epsilon and G at the wall
+    epsilon_.boundaryField().updateCoeffs();
 
 
     // Dissipation equation
@@ -289,7 +300,7 @@ void realizableKE::correct()
 
     epsEqn().relax();
 
-#   include "wallDissipationI.H"
+    epsEqn().boundaryManipulate(epsilon_.boundaryField());
 
     solve(epsEqn);
     bound(epsilon_, epsilon0_);
@@ -313,9 +324,7 @@ void realizableKE::correct()
 
     // Re-calculate viscosity
     nut_ = rCmu(gradU, S2, magS)*sqr(k_)/epsilon_;
-
-#   include "wallViscosityI.H"
-
+    nut_.correctBoundaryConditions();
 }
 
 
diff --git a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
similarity index 78%
rename from src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
rename to src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
index 8bfebe4d0..ef866a2e9 100644
--- a/src/turbulenceModels/RAS/incompressible/realizableKE/realizableKE.H
+++ b/src/turbulenceModels/incompressible/RAS/realizableKE/realizableKE.H
@@ -41,14 +41,13 @@ Description
 
     The default model coefficients correspond to the following:
     @verbatim
-        realizableKE
+        realizableKECoeffs
         {
             Cmu         0.09;
             A0          4.0;
             C2          1.9;
-            alphak      1.0;
-            alphaEps    0.833333;
-            alphah      1.0;    // only for compressible
+            sigmak      1.0;
+            sigmaEps    1.2;
         }
     @endverbatim
 
@@ -81,15 +80,23 @@ class realizableKE
 {
     // Private data
 
-        dimensionedScalar Cmu_;
-        dimensionedScalar A0_;
-        dimensionedScalar C2_;
-        dimensionedScalar alphak_;
-        dimensionedScalar alphaEps_;
+        // Model coefficients
 
-        volScalarField k_;
-        volScalarField epsilon_;
-        volScalarField nut_;
+            dimensionedScalar Cmu_;
+            dimensionedScalar A0_;
+            dimensionedScalar C2_;
+            dimensionedScalar sigmak_;
+            dimensionedScalar sigmaEps_;
+
+
+        // Fields
+
+            volScalarField k_;
+            volScalarField epsilon_;
+            volScalarField nut_;
+
+
+    // Private member functions
 
         tmp<volScalarField> rCmu
         (
@@ -98,10 +105,8 @@ class realizableKE
             const volScalarField& magS
         );
 
-        tmp<volScalarField> rCmu
-        (
-            const volTensorField& gradU
-        );
+        tmp<volScalarField> rCmu(const volTensorField& gradU);
+
 
 public:
 
@@ -110,7 +115,7 @@ public:
 
     // Constructors
 
-        //- from components
+        //- Construct from components
         realizableKE
         (
             const volVectorField& U,
@@ -119,16 +124,15 @@ public:
         );
 
 
-    // Destructor
-
-        ~realizableKE()
-        {}
+    //- Destructor
+    virtual ~realizableKE()
+    {}
 
 
     // Member Functions
 
         //- Return the turbulence viscosity
-        tmp<volScalarField> nut() const
+        virtual tmp<volScalarField> nut() const
         {
             return nut_;
         }
@@ -138,7 +142,7 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DkEff", alphak_*nut_ + nu())
+                new volScalarField("DkEff", nut_/sigmak_ + nu())
             );
         }
 
@@ -147,36 +151,36 @@ public:
         {
             return tmp<volScalarField>
             (
-                new volScalarField("DepsilonEff", alphaEps_*nut_ + nu())
+                new volScalarField("DepsilonEff", nut_/sigmaEps_ + nu())
             );
         }
 
         //- Return the turbulence kinetic energy
-        tmp<volScalarField> k() const
+        virtual tmp<volScalarField> k() const
         {
             return k_;
         }
 
         //- Return the turbulence kinetic energy dissipation rate
-        tmp<volScalarField> epsilon() const
+        virtual tmp<volScalarField> epsilon() const
         {
             return epsilon_;
         }
 
         //- Return the Reynolds stress tensor
-        tmp<volSymmTensorField> R() const;
+        virtual tmp<volSymmTensorField> R() const;
 
         //- Return the effective stress tensor including the laminar stress
-        tmp<volSymmTensorField> devReff() const;
+        virtual tmp<volSymmTensorField> devReff() const;
 
         //- Return the source term for the momentum equation
-        tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
 
         //- Solve the turbulence equations and correct the turbulence viscosity
-        void correct();
+        virtual void correct();
 
-        //- Read turbulenceProperties dictionary
-        bool read();
+        //- Read RASProperties dictionary
+        virtual bool read();
 };
 
 
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/Make/files b/src/turbulenceModels/incompressible/turbulenceModel/Make/files
new file mode 100644
index 000000000..a77efed2a
--- /dev/null
+++ b/src/turbulenceModels/incompressible/turbulenceModel/Make/files
@@ -0,0 +1,4 @@
+turbulenceModel.C
+laminar/laminar.C
+
+LIB = $(FOAM_LIBBIN)/libincompressibleTurbulenceModel
diff --git a/src/turbulenceModels/RAS/incompressible/Make/options b/src/turbulenceModels/incompressible/turbulenceModel/Make/options
similarity index 57%
rename from src/turbulenceModels/RAS/incompressible/Make/options
rename to src/turbulenceModels/incompressible/turbulenceModel/Make/options
index a6f6e7f45..2af4fa4ba 100644
--- a/src/turbulenceModels/RAS/incompressible/Make/options
+++ b/src/turbulenceModels/incompressible/turbulenceModel/Make/options
@@ -1,8 +1,8 @@
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(LIB_SRC)/turbulenceModels \
     -I$(LIB_SRC)/transportModels
 
 LIB_LIBS = \
-    -lfiniteVolume \
-    -lmeshTools
+    -lfiniteVolume
+
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
new file mode 100644
index 000000000..915adbc7b
--- /dev/null
+++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.C
@@ -0,0 +1,219 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+\*---------------------------------------------------------------------------*/
+
+#include "laminar.H"
+#include "Time.H"
+#include "volFields.H"
+#include "fvcGrad.H"
+#include "fvcDiv.H"
+#include "fvmLaplacian.H"
+#include "addToRunTimeSelectionTable.H"
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+defineTypeNameAndDebug(laminar, 0);
+addToRunTimeSelectionTable(turbulenceModel, laminar, turbulenceModel);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+laminar::laminar
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    transportModel& lamTransportModel
+)
+:
+    turbulenceModel(U, phi, lamTransportModel)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+autoPtr<laminar> laminar::New
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    transportModel& lamTransportModel
+)
+{
+    return autoPtr<laminar>(new laminar(U, phi, lamTransportModel));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+tmp<volScalarField> laminar::nut() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "nut",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar("nut", nu().dimensions(), 0.0)
+        )
+    );
+}
+
+
+tmp<volScalarField> laminar::nuEff() const
+{
+    return tmp<volScalarField>(new volScalarField("nuEff", nu()));
+}
+
+
+tmp<volScalarField> laminar::k() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "k",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar("k", sqr(U_.dimensions()), 0.0)
+        )
+    );
+}
+
+
+tmp<volScalarField> laminar::epsilon() const
+{
+    return tmp<volScalarField>
+    (
+        new volScalarField
+        (
+            IOobject
+            (
+                "epsilon",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedScalar
+            (
+                "epsilon", sqr(U_.dimensions())/dimTime, 0.0
+            )
+        )
+    );
+}
+
+
+tmp<volSymmTensorField> laminar::R() const
+{
+    return tmp<volSymmTensorField>
+    (
+        new volSymmTensorField
+        (
+            IOobject
+            (
+                "R",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+            mesh_,
+            dimensionedSymmTensor
+            (
+                "R", sqr(U_.dimensions()), symmTensor::zero
+            )
+        )
+    );
+}
+
+
+tmp<volSymmTensorField> laminar::devReff() const
+{
+    return tmp<volSymmTensorField>
+    (
+        new volSymmTensorField
+        (
+            IOobject
+            (
+                "devRhoReff",
+                runTime_.timeName(),
+                mesh_,
+                IOobject::NO_READ,
+                IOobject::NO_WRITE
+            ),
+           -nu()*dev(twoSymm(fvc::grad(U_)))
+        )
+    );
+}
+
+
+tmp<fvVectorMatrix> laminar::divDevReff(volVectorField& U) const
+{
+    return
+    (
+      - fvm::laplacian(nuEff(), U)
+      - fvc::div(nuEff()*dev(fvc::grad(U)().T()))
+    );
+}
+
+
+bool laminar::read()
+{
+    return true;
+}
+
+
+void laminar::correct()
+{
+    turbulenceModel::correct();
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
new file mode 100644
index 000000000..a52f7bfbe
--- /dev/null
+++ b/src/turbulenceModels/incompressible/turbulenceModel/laminar/laminar.H
@@ -0,0 +1,130 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Class
+    Foam::incompressible::laminar
+
+Description
+    Turbulence model for laminar incompressible flow.
+
+SourceFiles
+    laminar.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef laminar_H
+#define laminar_H
+
+#include "turbulenceModel.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+namespace incompressible
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class laminar Declaration
+\*---------------------------------------------------------------------------*/
+
+class laminar
+:
+    public turbulenceModel
+{
+
+public:
+
+    //- Runtime type information
+    TypeName("laminar");
+
+    // Constructors
+
+        //- Construct from components
+        laminar
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            transportModel& transport
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected turbulence model
+        static autoPtr<laminar> New
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            transportModel& lamTransportModel
+        );
+
+
+    //- Destructor
+    virtual ~laminar()
+    {}
+
+
+    // Member Functions
+
+        //- Return the turbulence viscosity, i.e. 0 for laminar flow
+        virtual tmp<volScalarField> nut() const;
+
+        //- Return the effective viscosity, i.e. the laminar viscosity
+        virtual tmp<volScalarField> nuEff() const;
+
+        //- Return the turbulence kinetic energy, i.e. 0 for laminar flow
+        virtual tmp<volScalarField> k() const;
+
+        //- Return the turbulence kinetic energy dissipation rate,
+        //  i.e. 0 for laminar flow
+        virtual tmp<volScalarField> epsilon() const;
+
+        //- Return the Reynolds stress tensor, i.e. 0 for laminar flow
+        virtual tmp<volSymmTensorField> R() const;
+
+        //- Return the effective stress tensor, i.e. the laminar stress
+        virtual tmp<volSymmTensorField> devReff() const;
+
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const;
+
+        //- Correct the laminar viscosity
+        virtual void correct();
+
+        //- Read turbulenceProperties dictionary
+        virtual bool read();
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/turbulenceModels/RAS/incompressible/RASModel/newRASModel.C b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
similarity index 56%
rename from src/turbulenceModels/RAS/incompressible/RASModel/newRASModel.C
rename to src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
index 653671be4..95a6e2157 100644
--- a/src/turbulenceModels/RAS/incompressible/RASModel/newRASModel.C
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.C
@@ -24,9 +24,9 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "error.H"
-
-#include "RASModel.H"
+#include "turbulenceModel.H"
+#include "volFields.H"
+#include "surfaceFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -37,24 +37,47 @@ namespace incompressible
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-autoPtr<RASModel> RASModel::New
+defineTypeNameAndDebug(turbulenceModel, 0);
+defineRunTimeSelectionTable(turbulenceModel, turbulenceModel);
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+turbulenceModel::turbulenceModel
+(
+    const volVectorField& U,
+    const surfaceScalarField& phi,
+    transportModel& lamTransportModel
+)
+:
+    runTime_(U.time()),
+    mesh_(U.mesh()),
+
+    U_(U),
+    phi_(phi),
+    transportModel_(lamTransportModel)
+{}
+
+
+// * * * * * * * * * * * * * * * * * Selectors * * * * * * * * * * * * * * * //
+
+autoPtr<turbulenceModel> turbulenceModel::New
 (
     const volVectorField& U,
     const surfaceScalarField& phi,
     transportModel& transport
 )
 {
-    word RASModelTypeName;
+    word modelName;
 
-    // Enclose the creation of the turbulencePropertiesDict to ensure it is
-    // deleted before the RASModel is created otherwise the dictionary
-    // is entered in the database twice
+    // Enclose the creation of the dictionary to ensure it is deleted
+    // before the turbulenceModel is created otherwise the dictionary is
+    // entered in the database twice
     {
-        IOdictionary turbulencePropertiesDict
+        IOdictionary dict
         (
             IOobject
             (
-                "RASProperties",
+                "turbulenceProperties",
                 U.time().constant(),
                 U.db(),
                 IOobject::MUST_READ,
@@ -62,29 +85,36 @@ autoPtr<RASModel> RASModel::New
             )
         );
 
-        turbulencePropertiesDict.lookup("RASModel")
-            >> RASModelTypeName;
+        dict.lookup("simulationType") >> modelName;
     }
 
-    Info<< "Selecting RAS turbulence model " << RASModelTypeName << endl;
+    Info<< "Selecting turbulence model type " << modelName << endl;
 
-    dictionaryConstructorTable::iterator cstrIter =
-        dictionaryConstructorTablePtr_->find(RASModelTypeName);
+    turbulenceModelConstructorTable::iterator cstrIter =
+        turbulenceModelConstructorTablePtr_->find(modelName);
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if (cstrIter == turbulenceModelConstructorTablePtr_->end())
     {
         FatalErrorIn
         (
-            "RASModel::New(const volVectorField&, "
+            "turbulenceModel::New(const volVectorField&, "
             "const surfaceScalarField&, transportModel&)"
-        )   << "Unknown RASModel type " << RASModelTypeName
+        )   << "Unknown turbulenceModel type " << modelName
             << endl << endl
-            << "Valid RASModel types are :" << endl
-            << dictionaryConstructorTablePtr_->toc()
+            << "Valid turbulenceModel types are :" << endl
+            << turbulenceModelConstructorTablePtr_->toc()
             << exit(FatalError);
     }
 
-    return autoPtr<RASModel>(cstrIter()(U, phi, transport));
+    return autoPtr<turbulenceModel>(cstrIter()(U, phi, transport));
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void turbulenceModel::correct()
+{
+    transportModel_.correct();
 }
 
 
diff --git a/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
new file mode 100644
index 000000000..4d55ff1fd
--- /dev/null
+++ b/src/turbulenceModels/incompressible/turbulenceModel/turbulenceModel.H
@@ -0,0 +1,210 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright held by original author
+     \\/     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 2 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, write to the Free Software Foundation,
+    Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Namespace
+    Foam::incompressible::turbulenceModels
+
+Description
+    Namespace for incompressible turbulence turbulence models.
+
+Class
+    Foam::incompressible::turbulenceModel
+
+Description
+    Abstract base class for incompressible turbulence models
+    (RAS, LES and laminar).
+
+SourceFiles
+    turbulenceModel.C
+    newTurbulenceModel.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef turbulenceModel_H
+#define turbulenceModel_H
+
+#include "primitiveFieldsFwd.H"
+#include "volFieldsFwd.H"
+#include "surfaceFieldsFwd.H"
+#include "fvMatricesFwd.H"
+#include "incompressible/transportModel/transportModel.H"
+#include "autoPtr.H"
+#include "runTimeSelectionTables.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declarations
+class fvMesh;
+
+namespace incompressible
+{
+
+/*---------------------------------------------------------------------------*\
+                           Class turbulenceModel Declaration
+\*---------------------------------------------------------------------------*/
+
+class turbulenceModel
+{
+
+protected:
+
+    // Protected data
+
+        const Time& runTime_;
+        const fvMesh& mesh_;
+
+        const volVectorField& U_;
+        const surfaceScalarField& phi_;
+
+        transportModel& transportModel_;
+
+
+private:
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        turbulenceModel(const turbulenceModel&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const turbulenceModel&);
+
+
+public:
+
+    //- Runtime type information
+    TypeName("turbulenceModel");
+
+
+    // Declare run-time New selection table
+
+        declareRunTimeNewSelectionTable
+        (
+            autoPtr,
+            turbulenceModel,
+            turbulenceModel,
+            (
+                const volVectorField& U,
+                const surfaceScalarField& phi,
+                transportModel& lamTransportModel
+            ),
+            (U, phi, lamTransportModel)
+        );
+
+
+    // Constructors
+
+        //- Construct from components
+        turbulenceModel
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            transportModel& lamTransportModel
+        );
+
+
+    // Selectors
+
+        //- Return a reference to the selected turbulence model
+        static autoPtr<turbulenceModel> New
+        (
+            const volVectorField& U,
+            const surfaceScalarField& phi,
+            transportModel& lamTransportModel
+        );
+
+
+    //- Destructor
+    virtual ~turbulenceModel()
+    {}
+
+
+    // Member Functions
+
+        //- Access function to velocity field
+        inline const volVectorField& U() const
+        {
+            return U_;
+        }
+
+        //- Access function to flux field
+        inline const surfaceScalarField& phi() const
+        {
+            return phi_;
+        }
+
+        //- Access function to incompressible transport model
+        inline transportModel& transport() const
+        {
+            return transportModel_;
+        }
+
+        //- Return the laminar viscosity
+        const volScalarField& nu() const
+        {
+            return transportModel_.nu();
+        }
+
+        //- Return the turbulence viscosity
+        virtual tmp<volScalarField> nut() const = 0;
+
+        //- Return the effective viscosity
+        virtual tmp<volScalarField> nuEff() const = 0;
+
+        //- Return the turbulence kinetic energy
+        virtual tmp<volScalarField> k() const = 0;
+
+        //- Return the turbulence kinetic energy dissipation rate
+        virtual tmp<volScalarField> epsilon() const = 0;
+
+        //- Return the Reynolds stress tensor
+        virtual tmp<volSymmTensorField> R() const = 0;
+
+        //- Return the effective stress tensor including the laminar stress
+        virtual tmp<volSymmTensorField> devReff() const = 0;
+
+        //- Return the source term for the momentum equation
+        virtual tmp<fvVectorMatrix> divDevReff(volVectorField& U) const = 0;
+
+        //- Solve the turbulence equations and correct the turbulence viscosity
+        virtual void correct() = 0;
+
+        //- Read turbulenceProperties dictionary
+        virtual bool read() = 0;
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace incompressible
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //