diff --git a/.gitignore b/.gitignore
index 3ef3669242..db2777cdc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,6 +62,7 @@ doc/Doxygen/DTAGS
 /etc/prefs.sh
 /etc/config.csh/prefs.csh
 /etc/config.sh/prefs.sh
+/wmake/rules/General/mplibUSER*
 
 # Source packages - anywhere
 *.tar.bz2
diff --git a/Allwmake b/Allwmake
index de7a288ec8..b9cfa95a5e 100755
--- a/Allwmake
+++ b/Allwmake
@@ -5,8 +5,8 @@ cd ${0%/*} && wmakeCheckPwd "$WM_PROJECT_DIR" 2>/dev/null || {
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : FOAM_EXT_LIBBIN not set"
+[ -d "$WM_PROJECT_DIR" -a -f "$WM_PROJECT_DIR/etc/bashrc" ] || {
+    echo "Error (${0##*/}) : WM_PROJECT_DIR appears to be incorrect"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
@@ -22,8 +22,8 @@ echo "  $WM_COMPILER $WM_COMPILER_TYPE compiler"
 echo "  ${WM_OPTIONS}, with ${WM_MPLIB} ${FOAM_MPI}"
 echo
 
-# Compile wmake support applications
-(cd wmake/src && make)
+# Compile wmake tools
+(cd "${WM_DIR:-wmake}/src" && make)
 
 # Compile ThirdParty libraries and applications
 if [ -d "$WM_THIRD_PARTY_DIR" ]
diff --git a/README.md b/README.md
index 3aa2503b54..aec529e09f 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # About OpenFOAM
-OpenFOAM is a free, open source CFD software [released and developed primarily by OpenCFD Ltd](http://www.openfoam.com) since 2004released and developed primarily by. It has a large user base across most areas of engineering and science, from both commercial and academic organisations. OpenFOAM has an extensive range of features to solve anything from complex fluid flows involving chemical reactions, turbulence and heat transfer, to acoustics, solid mechanics and electromagnetics.  [More...](http://www.openfoam.com/documentation)
+OpenFOAM is a free, open source CFD software [released and developed primarily by OpenCFD Ltd](http://www.openfoam.com) since 2004. It has a large user base across most areas of engineering and science, from both commercial and academic organisations. OpenFOAM has an extensive range of features to solve anything from complex fluid flows involving chemical reactions, turbulence and heat transfer, to acoustics, solid mechanics and electromagnetics.  [More...](http://www.openfoam.com/documentation)
 
 OpenFOAM+ is professionally released every six months to include customer sponsored developments and contributions from the community, including the OpenFOAM Foundation. Releases designated OpenFOAM+ contain several man years of client-sponsored developments of which much has been transferred to, but not released in the OpenFOAM Foundation branch.
 
@@ -23,4 +23,4 @@ Violations of the Trademark are continuously monitored, and will be duly prosecu
 - [OpenFOAM Community](http://www.openfoam.com/community/)
 - [Contacting OpenCFD](http://www.openfoam.com/contact/)
 
-Copyright 2016 OpenCFD Ltd
+Copyright 2016-2017 OpenCFD Ltd
diff --git a/applications/Allwmake b/applications/Allwmake
index e78e590f9c..88211f1306 100755
--- a/applications/Allwmake
+++ b/applications/Allwmake
@@ -5,8 +5,8 @@ cd ${0%/*} && wmakeCheckPwd "$WM_PROJECT_DIR/applications" 2>/dev/null || {
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : FOAM_EXT_LIBBIN not set"
+[ -d "$WM_PROJECT_DIR" -a -f "$WM_PROJECT_DIR/etc/bashrc" ] || {
+    echo "Error (${0##*/}) : WM_PROJECT_DIR appears to be incorrect"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H
index d720aa97f6..3f75765dd7 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/alphaEqn.H
@@ -108,6 +108,11 @@
             );
         }
 
+        alphaPhi1 = alphaPhi1BD + lambda*alphaPhi1;
+
+        // Reset allLambda to 1.0
+        allLambda = 1.0;
+
         // Create the complete flux for alpha2
         surfaceScalarField alphaPhi2
         (
@@ -172,7 +177,6 @@
         }
 
         // Construct the limited fluxes
-        alphaPhi1 = alphaPhi1BD + lambda*alphaPhi1;
         alphaPhi2 = alphaPhi2BD + lambda*alphaPhi2;
 
         // Solve for alpha1
diff --git a/applications/test/BinSum/Test-BinSum.C b/applications/test/BinSum/Test-BinSum.C
index 873e7eb893..6d0abfff28 100644
--- a/applications/test/BinSum/Test-BinSum.C
+++ b/applications/test/BinSum/Test-BinSum.C
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
     scalarField samples(10000000);
     forAll(samples, i)
     {
-        samples[i] = rndGen.scalar01();
+        samples[i] = rndGen.sample01<scalar>();
     }
 
     const scalar min = 0;
diff --git a/applications/test/DLList/Test-DLList.C b/applications/test/DLList/Test-DLList.C
index d370348982..268c8b3ed1 100644
--- a/applications/test/DLList/Test-DLList.C
+++ b/applications/test/DLList/Test-DLList.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -41,6 +41,8 @@ int main(int argc, char *argv[])
 {
     DLList<scalar> myList;
 
+    Info<< "DLList<scalar>" << nl;
+
     for (int i = 0; i<10; i++)
     {
         myList.append(1.3*i);
@@ -49,17 +51,14 @@ int main(int argc, char *argv[])
     myList.append(100.3);
     myList.append(500.3);
 
-    Info<< nl << "And again using STL iterator: " << nl << endl;
-
-    forAllIter(DLList<scalar>, myList, iter)
+    forAllConstIters(myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
 
-
     Info<< nl << "And again using the same STL iterator: " << nl << endl;
 
-    forAllIter(DLList<scalar>, myList, iter)
+    forAllIters(myList, iter)
     {
         Info<< "Removing " << myList.remove(iter) << endl;
     }
@@ -68,13 +67,10 @@ int main(int argc, char *argv[])
     myList.append(200.3);
     myList.append(100.3);
 
-
-    Info<< nl << "And again using STL const_iterator: " << nl << endl;
-
-
-    forAllConstIter(DLList<scalar>, myList, iter)
+    Info<< nl << "Using range-based for: " << nl << endl;
+    for (auto val : myList)
     {
-        Info<< "element:" << *iter << endl;
+        Info<< "element:" << val << endl;
     }
 
     Info<< nl << "Testing swapUp and swapDown: " << endl;
@@ -84,9 +80,9 @@ int main(int argc, char *argv[])
     myList.swapUp(myList.DLListBase::first());
     myList.swapUp(myList.DLListBase::last());
 
-    forAllIter(DLList<scalar>, myList, iter)
+    for (auto val : myList)
     {
-        Info<< "element:" << *iter << endl;
+        Info<< "element:" << val << endl;
     }
 
     Info<< nl << "swapDown" << endl;
@@ -94,12 +90,11 @@ int main(int argc, char *argv[])
     myList.swapDown(myList.DLListBase::first());
     myList.swapDown(myList.DLListBase::last());
 
-    forAllIter(DLList<scalar>, myList, iter)
+    for (auto val : myList)
     {
-        Info<< "element:" << *iter << endl;
+        Info<< "element:" << val << endl;
     }
 
-
     Info<< nl << "Testing transfer: " << nl << nl
         << "original: " << myList << endl;
 
diff --git a/applications/test/Dictionary/Test-Dictionary.C b/applications/test/Dictionary/Test-Dictionary.C
index f48845a36f..251cb2f841 100644
--- a/applications/test/Dictionary/Test-Dictionary.C
+++ b/applications/test/Dictionary/Test-Dictionary.C
@@ -168,9 +168,24 @@ int main(int argc, char *argv[])
     Info<< nl << "scalarDict2: " << endl;
     forAllConstIter(PtrDictionary<Scalar>, scalarDict2, iter)
     {
+        std::cout<< "iter: " << typeid(*iter).name() << '\n';
+
         Info<< "elem = " << *iter << endl;
     }
 
+    // FIXME: the deduction seems to be different here.
+    // - returns pointer (as perhaps actually expected) not the
+    //  underlying value.
+    forAllConstIters(scalarDict2, iter)
+    {
+        std::cout<< "iter: " << typeid(*iter).name() << '\n';
+
+        Info<< "elem = " << *(*iter) << endl;
+    }
+
+    std::cout<< "iter type: "
+        << typeid(stdFoam::begin(scalarDict2)).name() << '\n';
+
     scalarDict.transfer(scalarDict2);
 
 
diff --git a/applications/test/Distribution/Test-Distribution.C b/applications/test/Distribution/Test-Distribution.C
index f893e1e4bc..647c7a7d42 100644
--- a/applications/test/Distribution/Test-Distribution.C
+++ b/applications/test/Distribution/Test-Distribution.C
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
 
         for (label i = 0; i < randomDistributionTestSize; i++)
         {
-            dS.add(2.5*R.GaussNormal() + 8.5);
+            dS.add(2.5*R.GaussNormal<scalar>() + 8.5);
         }
 
         Info<< "Mean " << dS.mean() << nl
@@ -90,7 +90,7 @@ int main(int argc, char *argv[])
 
         for (label i = 0; i < randomDistributionTestSize; i++)
         {
-            dS2.add(1.5*R.GaussNormal() -6.0);
+            dS2.add(1.5*R.GaussNormal<scalar>() -6.0);
         }
 
         Info<< "Mean " << dS2.mean() << nl
@@ -121,7 +121,7 @@ int main(int argc, char *argv[])
 
         for (label i = 0; i < randomDistributionTestSize; i++)
         {
-            dS.add(R.scalar01() + 10*Pstream::myProcNo());
+            dS.add(R.sample01<scalar>() + 10*Pstream::myProcNo());
         }
 
         Pout<< "Mean " << dS.mean() << nl
@@ -155,7 +155,7 @@ int main(int argc, char *argv[])
 
         for (label i = 0; i < randomDistributionTestSize; i++)
         {
-            dV.add(R.vector01());
+            dV.add(R.sample01<vector>());
 
             // Adding separate GaussNormal components with component
             // weights
@@ -164,9 +164,9 @@ int main(int argc, char *argv[])
             (
                 vector
                 (
-                    R.GaussNormal()*3.0 + 1.5,
-                    R.GaussNormal()*0.25 + 4.0,
-                    R.GaussNormal()*3.0 - 1.5
+                    R.GaussNormal<scalar>()*3.0 + 1.5,
+                    R.GaussNormal<scalar>()*0.25 + 4.0,
+                    R.GaussNormal<scalar>()*3.0 - 1.5
                 ),
                 vector(1.0, 2.0, 5.0)
             );
@@ -225,7 +225,7 @@ int main(int argc, char *argv[])
 
         for (label i = 0; i < randomDistributionTestSize; i++)
         {
-            dT.add(R.tensor01());
+            dT.add(R.sample01<tensor>());
         }
 
         Info<< "Mean " << dT.mean() << nl
@@ -249,7 +249,7 @@ int main(int argc, char *argv[])
 
         for (label i = 0; i < randomDistributionTestSize; i++)
         {
-            dSyT.add(R.symmTensor01());
+            dSyT.add(R.sample01<symmTensor>());
         }
 
         Info<< "Mean " << dSyT.mean() << nl
@@ -273,7 +273,7 @@ int main(int argc, char *argv[])
 
         for (label i = 0; i < randomDistributionTestSize; i++)
         {
-            dSpT.add(R.sphericalTensor01());
+            dSpT.add(R.sample01<sphericalTensor>());
         }
 
         Info<< "Mean " << dSpT.mean() << nl
diff --git a/applications/test/FixedList/Test-FixedList.C b/applications/test/FixedList/Test-FixedList.C
index ec496e1e03..9fd0fde37a 100644
--- a/applications/test/FixedList/Test-FixedList.C
+++ b/applications/test/FixedList/Test-FixedList.C
@@ -33,7 +33,6 @@ See also
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "IOstreams.H"
 #include "FixedList.H"
 #include "IFstream.H"
 #include "OFstream.H"
@@ -64,6 +63,15 @@ int main(int argc, char *argv[])
     Info<< "list2:" << list2
         << " hash:" << FixedList<label, 4>::Hash<>()(list2) << endl;
 
+    // Using FixedList for content too
+    {
+        List<FixedList<label, 4>> twolists{list, list2};
+        Info<<"List of FixedList: " << flatOutput(twolists) << endl;
+        sort(twolists);
+        // outer-sort only
+        Info<<"sorted FixedList : " << flatOutput(twolists) << endl;
+    }
+
     Info<< "list: " << list << nl
         << "list2: " << list2 << endl;
     list.swap(list2);
diff --git a/applications/test/HashPtrTable/Test-hashPtrTable.C b/applications/test/HashPtrTable/Test-hashPtrTable.C
index 5133d784b1..e62d596869 100644
--- a/applications/test/HashPtrTable/Test-hashPtrTable.C
+++ b/applications/test/HashPtrTable/Test-hashPtrTable.C
@@ -36,14 +36,9 @@ void printTable(const HashPtrTable<T>& table)
 {
     Info<< table.size() << nl << "(" << nl;
 
-    for
-    (
-        typename HashPtrTable<T>::const_iterator iter = table.cbegin();
-        iter != table.cend();
-        ++iter
-    )
+    forAllConstIters(table, iter)
     {
-        const T* ptr = *iter;
+        const T* ptr = iter.object();
         Info<< iter.key() << " = ";
         if (ptr)
         {
@@ -57,6 +52,22 @@ void printTable(const HashPtrTable<T>& table)
     }
 
     Info<< ")" << endl;
+
+    // Values only, with for-range
+    Info<< "values (";
+    for (auto val : table)
+    {
+        Info<< ' ';
+        if (val)
+        {
+            Info<< *val;
+        }
+        else
+        {
+            Info<< "nullptr";
+        }
+    }
+    Info<< " )" << nl;
 }
 
 
@@ -68,7 +79,9 @@ int main()
     HashPtrTable<double> myTable;
     myTable.insert("abc", new double(42.1));
     myTable.insert("def", nullptr);
-    myTable.insert("ghi", new double(3.14159));
+    myTable.insert("pi", new double(3.14159));
+    myTable.insert("natlog", new double(2.718282));
+    myTable.insert("sqrt2", new double(1.414214));
 
     // Info<< myTable << endl;
     printTable(myTable);
@@ -79,8 +92,20 @@ int main()
     printTable(copy);
     Info<< copy << endl;
 
+    Info<<"\nerase some existing and non-existing entries" << nl;
+
+    auto iter = myTable.find("pi");
+    myTable.erase(iter);
+
+    iter = myTable.find("unknownKey");
+    myTable.erase(iter);
+
+    myTable.erase("abc");
+    myTable.erase("unknownKey");
+
+    printTable(myTable);
+
     return 0;
 }
 
-
 // ************************************************************************* //
diff --git a/applications/test/HashSet/Test-hashSet.C b/applications/test/HashSet/Test-hashSet.C
index dcfa0aec7a..55640829fb 100644
--- a/applications/test/HashSet/Test-hashSet.C
+++ b/applications/test/HashSet/Test-hashSet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +28,8 @@ Description
 #include "hashedWordList.H"
 #include "HashSet.H"
 #include "Map.H"
+#include "labelPairHashes.H"
+#include "FlatOutput.H"
 
 using namespace Foam;
 
@@ -65,6 +67,14 @@ int main(int argc, char *argv[])
     tableB.insert("value5", nil());
     tableB.insert("value6", nil());
 
+    Info<< "tableA keys: "; tableA.writeKeys(Info) << endl;
+
+    auto keyIterPair = tableA.keys();
+    for (const auto& i : keyIterPair)
+    {
+        Info<<" keys: " << i << endl;
+    }
+
     Map<label> mapA
     {
         { 1, 1 },
@@ -122,14 +132,23 @@ int main(int argc, char *argv[])
         << (wordHashSet(setA) | wordHashSet(tableA) | wordHashSet(tableB))
         << nl;
 
-
     labelHashSet setB
     {
         1, 11, 42
     };
 
+    setB = FixedList<label, 4>({1, 2, 3, 4});
+    setB = {1, 2, 4};
+    setB = List<label>({1, 2, 4});
     Info<< "setB : " << setB << endl;
 
+    labelPair pair(12, 15);
+    setB.set(pair);
+
+    Info<< "setB : " << setB << endl;
+    setB.unset(pair);
+
+
     labelHashSet setC(1);
     setC.insert(2008);
     setC.insert(1984);
@@ -139,7 +158,7 @@ int main(int argc, char *argv[])
     labelHashSet setD(1);
     setD.insert({11, 100, 49, 36, 2008});
 
-    Info<< "setD : " << setD << endl;
+    Info<< "setD : " << flatOutput(setD) << endl;
 
     Info<< "setB == setC: " << (setB == setC) << endl;
     Info<< "setC != setD: " << (setC != setD) << endl;
@@ -178,9 +197,13 @@ int main(int argc, char *argv[])
         Info<< "setD has no 11" << endl;
     }
 
-    Info<< "setD : " << setD << endl;
+    Info<< "setB : " << flatOutput(setB) << endl;
+    Info<< "setD : " << flatOutput(setD) << endl;
 
-    // this doesn't work (yet?)
+    setD -= setB;
+    Info<< "setD -= setB : " << flatOutput(setD) << endl;
+
+    // This should not work (yet?)
     // setD[12] = true;
 
     List<label> someLst(10);
@@ -191,8 +214,14 @@ int main(int argc, char *argv[])
 
     label added = setD.set(someLst);
     Info<< "added " << added << " from " << someLst.size() << endl;
-    Info<< "setD : " << setD << endl;
+    Info<< "setD : " << flatOutput(setD) << endl;
 
+    Info<< "setD for-range()" << nl;
+
+    for (auto i : setD)
+    {
+        Info << i << endl;
+    }
 
     return 0;
 }
diff --git a/applications/test/HashTable/Test-hashTable.C b/applications/test/HashTable/Test-hashTable.C
index dc2f70658e..8352a88ae0 100644
--- a/applications/test/HashTable/Test-hashTable.C
+++ b/applications/test/HashTable/Test-hashTable.C
@@ -24,6 +24,10 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "HashTable.H"
+#include "List.H"
+#include "SortableList.H"
+#include "DynamicList.H"
+#include "FlatOutput.H"
 #include "IOstreams.H"
 #include "IStringStream.H"
 #include "OStringStream.H"
@@ -62,7 +66,7 @@ int main()
     Info<< "\ntable1 sortedToc: " << table1.sortedToc() << endl;
     table1.printInfo(Info)
         << "table1 [" << table1.size() << "] " << endl;
-    forAllConstIter(HashTable<scalar>, table1, iter)
+    forAllConstIters(table1, iter)
     {
         Info<< iter.key() << " => " << iter() << nl;
     }
@@ -106,7 +110,7 @@ int main()
         << "\ntable3" << table3 << nl;
 
     Info<< "\nerase table2 by iterator" << nl;
-    forAllIter(HashTable<scalar>, table2, iter)
+    forAllIters(table2, iter)
     {
         Info<< "erasing " << iter.key() << " => " << iter.object() << " ... ";
         table2.erase(iter);
@@ -162,21 +166,74 @@ int main()
         << "\ntable2" << table2 << nl;
 
 
-    Info<< "\ntable3" << table3
-        << "\nclearStorage table3 ... ";
-    table3.clearStorage();
-    Info<< table3 << nl;
+    Info<< "\ntable3" << table2
+        << "\nclearStorage table2 ... ";
+    table2.clearStorage();
+    Info<< table2 << nl;
 
     table1 =
     {
-        {"aca", 3.0},
-        {"aaw", 6.0},
+        {"abc", 3.0},
+        {"def", 6.0},
         {"acr", 8.0},
         {"aec", 10.0}
     };
 
     Info<< "\ntable1" << table1 << nl;
 
+    Info<< "\nrange-for(table1) - returns values" << nl;
+    for (const auto& it : table1)
+    {
+        Info<< "val:" << it << nl;
+    }
+
+    Info<< "\nrange-for(table1.keys()) - returns keys" << nl;
+    for (const auto& k : table1.keys())
+    {
+        Info<< "key:" << k << nl;
+    }
+
+    // These do not yet work. Issues resolving the distance.
+    //
+    //  List<scalar> table1vals(table1.begin(), table1.end());
+
+    {
+        Info<<"distance/size: "
+            << std::distance(table1.begin(), table1.end())
+            << "/" << table1.size()
+            << " and "
+            << std::distance(table1.keys().begin(), table1.keys().end())
+            << "/" << table1.keys().size()
+            << nl;
+
+        SortableList<word> sortKeys
+        // DynamicList<word> sortKeys
+        (
+            table1.keys().begin(),
+            table1.keys().end()
+        );
+        Info<<"sortKeys: " << flatOutput(sortKeys) << nl;
+    }
+
+    Info<< "\nFrom table1: " << flatOutput(table1.sortedToc()) << nl
+        << "retain keys: " << flatOutput(table3.sortedToc()) << nl;
+
+    table1.retain(table3);
+    Info<< "-> " << flatOutput(table1.sortedToc()) << nl;
+
+    Info<< "Lookup non-existent" << nl;
+
+    Info<< table1.lookup("missing-const", 1.2345e+6)
+        << "  // const-access" << nl;
+
+    Info<< table1("missing-inadvertent", 3.14159)
+        << "  // (inadvertent?) non-const access"  << nl;
+
+    Info<< table1("missing-autovivify")
+        << "  // Known auto-vivification (non-const access)" << nl;
+
+    Info<<"\ntable1: " << table1 << endl;
+
     Info<< "\nDone\n";
 
     return 0;
diff --git a/applications/test/ISLList/Test-ISLList.C b/applications/test/ISLList/Test-ISLList.C
index ef4fd6614d..38ba2a1424 100644
--- a/applications/test/ISLList/Test-ISLList.C
+++ b/applications/test/ISLList/Test-ISLList.C
@@ -78,7 +78,7 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using STL iterator: " << nl << endl;
 
-    forAllIter(SLList<scalar>, myList, iter)
+    forAllIters(myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
@@ -87,7 +87,7 @@ int main(int argc, char *argv[])
 
     const ISLList<Scalar>& const_myList = myList;
 
-    forAllConstIter(SLList<scalar>, const_myList, iter)
+    forAllConstIters(const_myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
diff --git a/applications/test/List/Test-List.C b/applications/test/List/Test-List.C
index bbba8219b3..d68bc4d7ba 100644
--- a/applications/test/List/Test-List.C
+++ b/applications/test/List/Test-List.C
@@ -42,6 +42,7 @@ See also
 #include "vector.H"
 
 #include "labelRange.H"
+#include "scalarList.H"
 #include "ListOps.H"
 #include "SubList.H"
 
@@ -76,7 +77,6 @@ int main(int argc, char *argv[])
         Info<<"is >>: " << intlist << endl;
     }
 
-
     List<vector> list1(IStringStream("1 ((0 1 2))")());
     Info<< "list1: " << list1 << endl;
 
@@ -145,12 +145,23 @@ int main(int argc, char *argv[])
 
         labelList longLabelList = identity(15);
 
+        // This does not work:
+        // scalarList slist = identity(15);
+        //
+        // More writing, but does work:
+        scalarList slist
+        (
+            labelRange::null.begin(),
+            labelRange::identity(15).end()
+        );
+
+        Info<<"scalar identity:" << flatOutput(slist) << endl;
+
         Info<< "labels (contiguous=" << contiguous<label>() << ")" << nl;
 
         Info<< "normal: " << longLabelList << nl;
         Info<< "flatOutput: " << flatOutput(longLabelList) << nl;
         // Info<< "flatOutput(14): " << flatOutput(longLabelList, 14) << nl;
-        // Info<< "flatOutput(15): " << flatOutput(longLabelList, 15) << nl;
 
         stringList longStringList(12);
         forAll(longStringList, i)
@@ -165,6 +176,91 @@ int main(int argc, char *argv[])
         // contiguous longStringList[i].resize(3, 'a' + i);
     }
 
+    // test SubList and labelRange
+    {
+        Info<< nl;
+        labelList longLabelList = identity(25);
+        reverse(longLabelList);
+
+        FixedList<label, 6> fixedLabelList{0,1,2,3,4,5};
+        const labelList constLabelList = identity(25);
+
+        Info<< "full-list: " << flatOutput(longLabelList) << nl;
+
+        labelRange range1(-15, 25);
+        Info<<"sub range:" << range1 << "=";
+        Info<< SubList<label>(longLabelList, range1) << nl;
+
+        labelRange range2(7, 8);
+        Info<<"sub range:" << range2 << "=";
+        Info<< SubList<label>(longLabelList, range2) << nl;
+
+        // labelRange range2(7, 8);
+        Info<<"use range " << range2 << " to set value";
+        SubList<label>(longLabelList, range2) = -15;
+        Info<< "=> " << flatOutput(longLabelList) << nl;
+
+        // This syntax looks even nicer:
+
+        // GOOD: does not compile
+        // > constLabelList[labelRange(23,5)] = 5;
+
+        // Check correct overlaps
+        longLabelList[labelRange(-10, 12)] = 200;
+        longLabelList[{18,3}] = 100;
+        longLabelList[{23,3}] = 400;
+        // and complete misses
+        longLabelList[{500,50}] = 100;
+
+        // labelRange automatically suppresses -ve size -> nop
+        longLabelList[{5,-5}] = 42;
+        longLabelList[{21,100}] = 42;
+
+        //Good: does not compile
+        //> longLabelList[labelRange(20,50)] = constLabelList;
+
+        //Good: does not compile
+        // longLabelList[labelRange(20,50)] = fixedLabelList;
+
+        Info<< "updated: " << constLabelList[labelRange(23,5)] << nl;
+        Info<< "updated: " << flatOutput(longLabelList) << nl;
+
+        //Nope: sort(longLabelList[labelRange(18,5)]);
+        {
+            // Instead
+            UList<label> sub = longLabelList[labelRange(0, 8)];
+            sort(sub);
+        }
+        Info<< "sub-sorted: " << flatOutput(longLabelList) << nl;
+
+        // construct from a label-range
+        labelRange range(25,15);
+
+        labelList ident(range.begin(), range.end());
+        Info<<"range-list (label)=" << ident << nl;
+
+        List<scalar> sident(range.begin(), range.end());
+        Info<<"range-list (scalar)=" << sident << nl;
+
+        // Sub-ranges also work
+        List<scalar> sident2(range(3), range(10));
+        Info<<"range-list (scalar)=" << sident2 << nl;
+
+        // VERY BAD IDEA: List<scalar> sident3(range(10), range(3));
+
+        // This doesn't work, and don't know what it should do anyhow
+        // List<vector> vident(range.begin(), range.end());
+        // Info<<"range-list (vector)=" << vident << nl;
+
+        // Even weird things like this
+        List<scalar> sident4
+        (
+            labelRange().begin(),
+            labelRange::identity(8).end()
+        );
+        Info<<"range-list (scalar)=" << sident4 << nl;
+    }
+
     wordReList reLst;
     wordList wLst;
     stringList sLst;
diff --git a/applications/test/Map/Test-Map.C b/applications/test/Map/Test-Map.C
index ea46cfcb12..5ced3b569d 100644
--- a/applications/test/Map/Test-Map.C
+++ b/applications/test/Map/Test-Map.C
@@ -22,10 +22,9 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Application
-    testMapIterators
+    Test-Map
 
 Description
-    For each time calculate the magnitude of velocity.
 
 \*---------------------------------------------------------------------------*/
 
@@ -39,9 +38,7 @@ using namespace Foam;
 
 int main(int argc, char *argv[])
 {
-    Map<bool> banana;
-
-    banana.insert(5, true);
+    Map<bool> banana{{5, true}};
 
     // Taking a const iterator from find does not work!
     // Also, fails later on op==
@@ -50,7 +47,7 @@ int main(int argc, char *argv[])
     // This works but now I can change the value.
     //Map<bool>::iterator bananaIter = banana.find(5);
 
-    if (bananaIter == banana.end())
+    if (!bananaIter.found()) // same as  (bananaIter == banana.end())
     {
         Info<< "not found" << endl;
     }
@@ -62,8 +59,7 @@ int main(int argc, char *argv[])
     // Same with STL
     Info<< "Same with STL" << endl;
 
-    std::map<label, bool> STLbanana;
-    STLbanana[5] = true;
+    std::map<label, bool> STLbanana{{5, true}};
     std::map<label, bool>::const_iterator STLbananaIter = STLbanana.find(5);
 
     if (STLbananaIter == STLbanana.end())
diff --git a/applications/test/NamedEnum/Test-NamedEnum.C b/applications/test/NamedEnum/Test-NamedEnum.C
index 63386ed79e..08d1f74972 100644
--- a/applications/test/NamedEnum/Test-NamedEnum.C
+++ b/applications/test/NamedEnum/Test-NamedEnum.C
@@ -77,24 +77,12 @@ int main(int argc, char *argv[])
             << "] = '" << namedEnumTest::namedEnum[opt] << "'" << nl;
     }
 
-#if __cplusplus > 201100L
-    // C++11
     Info<< "loop over enums (C++11 for range):" << nl;
-    for (auto const& opt : options)
+    for (const auto& opt : options)
     {
         Info<< "option[" << opt
             << "] = '" << namedEnumTest::namedEnum[opt] << "'" << nl;
     }
-#else
-    Info<< "loop over enums (via iterator):" << nl;
-    forAllConstIter(List<namedEnumTest::option>, options, iter)
-    {
-        const namedEnumTest::option& opt = *iter;
-
-        Info<< "option[" << opt
-            << "] = '" << namedEnumTest::namedEnum[opt] << "'" << nl;
-    }
-#endif
 
     Info<< nl
         << namedEnumTest::namedEnum["a"] << nl
diff --git a/applications/test/Polynomial/Test-Polynomial.C b/applications/test/Polynomial/Test-Polynomial.C
index 352d15f96d..6a6fb8bb45 100644
--- a/applications/test/Polynomial/Test-Polynomial.C
+++ b/applications/test/Polynomial/Test-Polynomial.C
@@ -152,7 +152,7 @@ int main(int argc, char *argv[])
     Random rnd(123456);
     for (int i=0; i<10; i++)
     {
-        scalar x = rnd.scalar01()*100;
+        scalar x = rnd.sample01<scalar>()*100;
 
         scalar px = polyValue(x);
         scalar ipx = intPolyValue(x);
diff --git a/applications/test/SLList/Test-SLList.C b/applications/test/SLList/Test-SLList.C
index 30baaa18e3..2a6ef7a245 100644
--- a/applications/test/SLList/Test-SLList.C
+++ b/applications/test/SLList/Test-SLList.C
@@ -52,29 +52,29 @@ int main(int argc, char *argv[])
 
     Info<< nl << "And again using STL iterator: " << nl << endl;
 
-    forAllIter(SLList<scalar>, myList, iter)
+    for (const auto& val : myList)
     {
-        Info<< "element:" << *iter << endl;
+        Info<< "element:" << val << endl;
     }
 
     Info<< nl << "And again using STL const_iterator: " << nl << endl;
 
     const SLList<scalar>& const_myList = myList;
 
-    forAllConstIter(SLList<scalar>, const_myList, iter)
+    forAllConstIters(const_myList, iter)
     {
         Info<< "element:" << *iter << endl;
     }
 
-    forAllIter(SLList<scalar>, myList, iter)
+    forAllIters(myList, iter)
     {
         Info<< "Removing element:" << *iter << endl;
         myList.remove(iter);
     }
 
-    forAllConstIter(SLList<scalar>, const_myList, iter)
+    for (const auto& val : const_myList)
     {
-        Info<< "element:" << *iter << endl;
+        Info<< "element:" << val << endl;
     }
 
 
diff --git a/applications/test/Tuple2/Test-Tuple2.C b/applications/test/Tuple2/Test-Tuple2.C
index 64a2d5bd7b..f505554c79 100644
--- a/applications/test/Tuple2/Test-Tuple2.C
+++ b/applications/test/Tuple2/Test-Tuple2.C
@@ -31,6 +31,7 @@ Description
 #include "Tuple2.H"
 #include "label.H"
 #include "scalar.H"
+#include "List.H"
 
 using namespace Foam;
 
@@ -39,9 +40,25 @@ using namespace Foam;
 
 int main()
 {
-    Tuple2<label, scalar> t2(1, 3.2);
+    typedef Tuple2<label, scalar> indexedScalar;
 
-    Info<< t2 << " " << t2.first() << " " << t2.second() << endl;
+    indexedScalar t2(1, 3.2);
+
+    Info<< "tuple: "
+        << t2 << " "
+        << t2.first() << " " << t2.second() << endl;
+
+    List<indexedScalar> list1(10);
+    forAll(list1, i)
+    {
+        list1[i] = indexedScalar(-i, i*i);
+    }
+
+    sort(list1);
+
+    Info<< "tuples:" << nl
+        << list1
+        << endl;
 
     Info<< "End\n" << endl;
 
diff --git a/applications/test/cplusplus1/Make/files b/applications/test/cplusplus1/Make/files
new file mode 100644
index 0000000000..8beb3b204c
--- /dev/null
+++ b/applications/test/cplusplus1/Make/files
@@ -0,0 +1,3 @@
+Test-cpluplus1.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-cpluplus1
diff --git a/applications/test/cplusplus1/Make/options b/applications/test/cplusplus1/Make/options
new file mode 100644
index 0000000000..6a9e9810b3
--- /dev/null
+++ b/applications/test/cplusplus1/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
+/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/cplusplus1/Test-cpluplus1.C b/applications/test/cplusplus1/Test-cpluplus1.C
new file mode 100644
index 0000000000..b288e9286c
--- /dev/null
+++ b/applications/test/cplusplus1/Test-cpluplus1.C
@@ -0,0 +1,88 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Description
+    Test miscellaneous C++ templates/functionality.
+
+\*---------------------------------------------------------------------------*/
+
+#include "string.H"
+#include "IOstreams.H"
+#include "UList.H"
+#include "HashSet.H"
+
+#include <typeinfo>
+#include <type_traits>
+#include <utility>
+
+using namespace Foam;
+
+// Macros to stringify macro contents.
+#define STRINGIFY(content)      #content
+#define STRING_QUOTE(input)     STRINGIFY(input)
+
+#define PRINT_TYPEID(arg)       \
+    Info<< typeid(arg).name() << " <= typeid of " << STRING_QUOTE(arg) << nl
+
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    Info<< "various declaration types" << nl << nl;
+
+    PRINT_TYPEID(label);
+    PRINT_TYPEID(decltype(UList<label>::value_type()));
+    PRINT_TYPEID(decltype(std::declval<UList<label>>().cbegin()));
+    PRINT_TYPEID(decltype(*(std::declval<UList<label>>().cbegin())));
+    Info<< nl;
+
+    PRINT_TYPEID(decltype(HashTable<label>::key_type()));
+    PRINT_TYPEID(decltype(HashTable<label>::value_type()));
+    // Not yet: PRINT_TYPEID(decltype(HashTable<label>::mapped_type()));
+    PRINT_TYPEID(decltype(std::declval<HashTable<label>>().begin()));
+    PRINT_TYPEID(decltype(std::declval<const HashTable<label>>().begin()));
+    PRINT_TYPEID(decltype(*(std::declval<HashTable<label>>().begin())));
+    PRINT_TYPEID(decltype(*(std::declval<const HashTable<label>>().begin())));
+
+    PRINT_TYPEID(decltype(std::declval<const HashTable<label>>().keys()));
+    Info<< nl;
+
+    PRINT_TYPEID(decltype(HashSet<label>::key_type()));
+    PRINT_TYPEID(decltype(HashSet<label>::value_type()));
+    // Not yet: PRINT_TYPEID(decltype(HashSet<label>::mapped_type()));
+    PRINT_TYPEID(decltype(std::declval<HashSet<label>>().begin()));
+    PRINT_TYPEID(decltype(std::declval<const HashSet<label>>().begin()));
+    PRINT_TYPEID(decltype(*(std::declval<HashSet<label>>().begin())));
+    PRINT_TYPEID(decltype(*(std::declval<const HashSet<label>>().begin())));
+    Info<< nl;
+
+    Info << "\nEnd\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/dictionary/testSubkeyword b/applications/test/dictionary/testSubkeyword
new file mode 100644
index 0000000000..f8ee148501
--- /dev/null
+++ b/applications/test/dictionary/testSubkeyword
@@ -0,0 +1,53 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  plus                                  |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      testDict;
+    note        "test with foamDictionary -expand";
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// #inputMode  overwrite
+
+key1 val1;
+
+subdict
+{
+    key1 a;
+    key2 b;
+}
+
+update
+{
+    key1 val1b;
+    key2 val2;
+
+    subdict
+    {
+        key2 $key1;
+        key3 val3;
+        key2b ${..key2};
+        key3b $^key1;
+    }
+}
+
+
+$update
+
+// Can a leading '^' or  ':' as anchor for scoping
+key3 $^subdict.key1;
+key3 ${^update.subdict.key3};
+key4 ${:update.subdict...subdict.key1};
+
+// This is currently not working
+#remove update.key1
+// #remove update
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/applications/test/dynamicIndexedOctree/Make/options b/applications/test/dynamicIndexedOctree/Make/options
index e2c7c2d103..a1d2c044e1 100644
--- a/applications/test/dynamicIndexedOctree/Make/options
+++ b/applications/test/dynamicIndexedOctree/Make/options
@@ -1,3 +1,3 @@
-EXE_INC = -I$(FOAM_SRC)/meshTools/lnInclude
+EXE_INC = -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = -lmeshTools
diff --git a/applications/test/edges/Make/files b/applications/test/edges/Make/files
new file mode 100644
index 0000000000..8903c60b8c
--- /dev/null
+++ b/applications/test/edges/Make/files
@@ -0,0 +1,3 @@
+Test-edges.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-edges
diff --git a/applications/test/edges/Make/options b/applications/test/edges/Make/options
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/applications/test/edges/Test-edges.C b/applications/test/edges/Test-edges.C
new file mode 100644
index 0000000000..51da417de3
--- /dev/null
+++ b/applications/test/edges/Test-edges.C
@@ -0,0 +1,148 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    Test-edges
+
+Description
+    Simple tests for edges
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "edgeList.H"
+#include "edgeHashes.H"
+
+using namespace Foam;
+
+void printInfo(const edge& e)
+{
+    Info<< "edge: " << e << " count:" << e.count() << nl;
+}
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+//  Main program:
+
+int main(int argc, char *argv[])
+{
+    edge e1;
+    printInfo(e1);
+    Info<<"has '2'? " << e1.found(2) << endl;
+
+    edge e2(1, 2);
+    printInfo(e2);
+    Info<<"has '2'? " << e2.found(2) << endl;
+
+    edge e3{2, 3};
+    printInfo(e3);
+    Info<<"has '2'? " << e3.found(2) << endl;
+
+    edge e4(4, 4);
+    printInfo(e4);
+    Info<<"has '2'? " << e4.found(2) << endl;
+
+    Info<<"collapse? -> " << e4.collapse() << endl;
+    printInfo(e4);
+
+    Info<< e3 << " connects " << e2 << " => " << e2.connects(e3) << endl;
+
+    labelPair labels(e3);
+
+    Info<< "as labelPair: " << labels << endl;
+
+    edge e5;
+    // Good: this fails (explicit constructor):   printInfo(labels);
+    // Good: this also fails (no assignment operator): e5 = labels;
+
+    // OK: explicit
+    edge e6(labels);
+
+    Info<< nl << "hash-like functionality" << nl;
+
+    // doesn't work e4 = -1;
+    e4.start() = e4.end() = -1;
+
+    printInfo(e4);
+    for (label i : {2, -1, 2, 1, 4, 1, 2, 3})
+    {
+        bool ok = e4.insert(i);
+        Info<< "insert(" << i << ") = " << ok << " resulting ";
+        printInfo(e4);
+    }
+
+    e4.start() = e4.end() = -1;
+    Info<< "insert from list\n";
+    labelHashSet newIndices({2, -1, 2, 1, 4, 1, 2, 3});
+    e4.insert(newIndices.toc());
+    printInfo(e4);
+
+    e4.start() = e4.end() = -1;
+    Info<< "insert from list\n";
+    e4.insert({0, 5, 2, -1, 2, 1, 4, 1, 2, 3});
+    printInfo(e4);
+
+    FixedList<label, 8> otherIndices{12, 2, -1, 1, 4, 1, 2, 3};
+    e4.start() = e4.end() = -1;
+    Info<< "insert from list: " << otherIndices << nl;
+    e4.insert(otherIndices);
+    printInfo(e4);
+
+    e4.start() = e4.end();
+    Info<< "erase from list: " << otherIndices << nl;
+    Info<< "removed " << e4.erase(otherIndices) << " values" << nl;
+    printInfo(e4);
+
+    for (label i : {-1, 0, 1, 3})
+    {
+        bool ok = e4.erase(i);
+        Info<< "erase(" << i << ") = " << ok << " resulting ";
+        printInfo(e4);
+    }
+
+    for (label i : {-1, 0, 1, 3})
+    {
+        bool ok = e4.insert(i);
+        Info<< "insert(" << i << ") = " << ok << " resulting ";
+        printInfo(e4);
+    }
+    e4.flip();
+    Info<< "flipped ";
+    printInfo(e4);
+
+    for (label i : {-1, 0, 1, 3})
+    {
+        bool ok = e4.erase(i);
+        Info<< "erase(" << i << ") = " << ok << " resulting ";
+        printInfo(e4);
+    }
+
+    e4.sort();
+    Info<< "sorted ";
+    printInfo(e4);
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/etcFiles/Make/files b/applications/test/etcFiles/Make/files
new file mode 100644
index 0000000000..8db90803ac
--- /dev/null
+++ b/applications/test/etcFiles/Make/files
@@ -0,0 +1,3 @@
+Test-etcFiles.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-etcFiles
diff --git a/applications/test/etcFiles/Make/options b/applications/test/etcFiles/Make/options
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/applications/test/etcFiles/Test-etcFiles.C b/applications/test/etcFiles/Test-etcFiles.C
new file mode 100644
index 0000000000..6bb741bdf2
--- /dev/null
+++ b/applications/test/etcFiles/Test-etcFiles.C
@@ -0,0 +1,122 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    Test-etcFiles
+
+Description
+    Test etcFiles functionality.
+    Similar to foamEtcFile script, but automatically prunes nonexistent
+    directories from the list.
+
+\*---------------------------------------------------------------------------*/
+
+#include "argList.H"
+#include "etcFiles.H"
+
+using namespace Foam;
+
+void printList(const fileNameList& list)
+{
+    forAll(list, i)
+    {
+        Info<< list[i].c_str() << nl;
+    }
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Main program:
+
+int main(int argc, char *argv[])
+{
+    argList::noBanner();
+    argList::noParallel();
+    argList::noFunctionObjects();
+    argList::removeOption("case");
+
+    argList::addBoolOption
+    (
+        "all",
+        "Return all files (otherwise stop after the first match)"
+    );
+    argList::addBoolOption
+    (
+        "list",
+        "List directories or files to be checked"
+    );
+    argList::validArgs.insert("file...");
+
+    argList::addNote
+    (
+        "Locate user/group/other file with semantics similar to the "
+        "~OpenFOAM/fileName expansion."
+    );
+
+    argList args(argc, argv, false, true);
+
+    // First handle no parameters
+    if (args.size() == 1)
+    {
+        if (args.optionFound("list"))
+        {
+            fileNameList results = findEtcDirs();
+            printList(results);
+            return 0;
+        }
+        else
+        {
+            Info<<"Error: Missing filename" << endl;
+            args.printUsage();
+            return 1;
+        }
+    }
+
+    const bool listAll = (args.optionFound("all") || args.optionFound("list"));
+
+    int error = 0;
+
+    for (int argi = 1; argi < args.size(); ++argi)
+    {
+        const std::string file = args[argi];
+        fileNameList results = findEtcFiles(file);
+
+        if (results.empty())
+        {
+            Info<<"Not found: " << file << nl;
+            error = 2;
+        }
+        else if (listAll)
+        {
+            printList(results);
+        }
+        else
+        {
+            Info<<results[0].c_str() << nl;
+        }
+    }
+
+    return error;
+}
+
+
+// ************************************************************************* //
diff --git a/applications/test/labelRanges/Test-labelRanges.C b/applications/test/labelRanges/Test-labelRanges.C
index dec03a06f0..5acb0d296c 100644
--- a/applications/test/labelRanges/Test-labelRanges.C
+++ b/applications/test/labelRanges/Test-labelRanges.C
@@ -28,10 +28,6 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
-#include "IOobject.H"
-#include "IOstreams.H"
-#include "IFstream.H"
-#include "IStringStream.H"
 #include "labelRanges.H"
 
 using namespace Foam;
@@ -42,6 +38,7 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     argList::noParallel();
+    argList::noFunctionObjects();
     argList::validArgs.insert("start size .. startN sizeN");
     argList::addOption("verbose");
     argList::addNote
@@ -57,6 +54,34 @@ int main(int argc, char *argv[])
         labelRange::debug = 1;
     }
 
+    {
+        Info<<"test sorting" << endl;
+        DynamicList<labelRange> list1(10);
+        list1.append(labelRange(25, 8));
+        list1.append(labelRange::identity(8));
+        list1.append(labelRange(15, 5));
+        list1.append(labelRange(50, -10));
+
+        sort(list1);
+        Info<<"sorted" << list1 << endl;
+    }
+
+    {
+        Info<<"test intersections" << endl;
+        labelRange range1(-15, 25);
+        labelRange range2(7, 8);
+        labelRange range3(-20, 8);
+        labelRange range4(50, 8);
+
+        Info<<range1 << " & " << range2
+            << " = " << range1.subset(range2) << nl;
+
+        Info<< range1 << " & " << range3
+            << " = " << range1.subset(range3) << nl;
+
+        Info<< range2 << " & " << range4
+            << " = " << range2.subset(range4) << nl;
+    }
 
     labelRange range;
     labelRanges ranges;
@@ -76,12 +101,9 @@ int main(int argc, char *argv[])
         }
 
         {
-            label start = 0;
-            label size  = 0;
-
-            IStringStream(args[argI])() >> start;
+            label start = args.argRead<label>(argI);
+            label size  = args.argRead<label>(argI+1);
             ++argI;
-            IStringStream(args[argI])() >> size;
 
             range.reset(start, size);
         }
@@ -90,9 +112,9 @@ int main(int argc, char *argv[])
         if (removeMode)
         {
             Info<< "del " << range << " :";
-            forAllConstIter(labelRange, range, iter)
+            for (auto i : range)
             {
-                Info<< " " << iter();
+                Info<< " " << i;
             }
             Info<< nl;
 
@@ -101,9 +123,9 @@ int main(int argc, char *argv[])
         else
         {
             Info<< "add " << range  << " :";
-            forAllConstIter(labelRange, range, iter)
+            for (auto i : range)
             {
-                Info<< " " << iter();
+                Info<< " " << i;
             }
             Info<< nl;
 
diff --git a/applications/test/nullObject/Make/files b/applications/test/nullObject/Make/files
index 596014a446..dffa06d747 100644
--- a/applications/test/nullObject/Make/files
+++ b/applications/test/nullObject/Make/files
@@ -1,3 +1,3 @@
 Test-nullObject.C
 
-EXE = $(FOAM_USER_APPBIN)/nullObject
+EXE = $(FOAM_USER_APPBIN)/Test-nullObject
diff --git a/applications/test/nullObject/Test-nullObject.C b/applications/test/nullObject/Test-nullObject.C
index 9b43405f45..18524006dc 100644
--- a/applications/test/nullObject/Test-nullObject.C
+++ b/applications/test/nullObject/Test-nullObject.C
@@ -21,6 +21,17 @@ int main()
     SimpleClass* ptrToClass = new SimpleClass;
     SimpleClass& refToClass(*ptrToClass);
 
+    typedef unsigned long ptrval;
+
+    Info<<"nullObject address=" << ptrval(&(nullObjectPtr)) << endl;
+    Info<<"sizeof(nullObject)" << " == "
+        << sizeof(NullObject::nullObject)
+        << " vs. sizeof(void*)" << " == " << sizeof(void*)
+        << endl;
+
+    Info<<"nullObject pointer:" << ptrval(nullObjectPtr->pointer()) << endl;
+    Info<<"nullObject value:"   << nullObjectPtr->value() << endl;
+
     if (notNull(ptrToClass))
     {
         Info<< "Pass: ptrToClass is not null" << endl;
diff --git a/applications/test/pTraits/Test-pTraits.C b/applications/test/pTraits/Test-pTraits.C
index 548661573d..d300ddc87a 100644
--- a/applications/test/pTraits/Test-pTraits.C
+++ b/applications/test/pTraits/Test-pTraits.C
@@ -29,6 +29,9 @@ Description
 #include "pTraits.H"
 #include "vector.H"
 #include "tensor.H"
+#include "uLabel.H"
+
+#include <type_traits>
 
 using namespace Foam;
 
@@ -40,7 +43,10 @@ void printTraits()
 {
     Info<< pTraits<T>::typeName
         << ": zero=" << pTraits<T>::zero
-        << " one=" << pTraits<T>::one << endl;
+        << " one=" << pTraits<T>::one
+        << " integral=" << std::is_integral<T>::value
+        << " floating=" << std::is_floating_point<T>::value
+        << endl;
 }
 
 
@@ -51,6 +57,9 @@ void printTraits(const pTraits<T>& p)
 }
 
 
+#pragma GCC diagnostic warning "-Wmaybe-uninitialized"
+#pragma GCC diagnostic warning "-Wuninitialized"
+
 int main()
 {
     printTraits<bool>();
@@ -71,6 +80,27 @@ int main()
 
     printTraits(pTraits<scalar>(3.14159));
 
+    label abc;
+    Info<< "unintialized primitive:"<< abc << endl;
+
+    label def = label();
+    Info<< "intialized primitive:"<< def << endl;
+
+    Info<< nl << "some interesting label limits:" << nl;
+    std::cout<< "sizeof = " << sizeof(label) << nl;
+    std::cout<< "min = " << pTraits<label>::min << nl;
+    std::cout<< "max = " << pTraits<label>::max << nl;
+    std::cout<< "umax = " << pTraits<uLabel>::max << nl;
+
+    std::cout<< "max_2 = " << pTraits<label>::max/2 << " == "
+        << (1 << (sizeof(label)*8-2)) << nl;
+
+    std::cout<< "max_4 = " << pTraits<label>::max/4 << " == "
+        << (1 << (sizeof(label)*8-3)) << nl;
+
+    std::cout<< "max_8 = " << pTraits<label>::max/8 << " == "
+        << (1 << (sizeof(label)*8-4)) << nl;
+
     Info<< "End\n" << endl;
 
     return 0;
diff --git a/applications/test/vectorTools/Make/options b/applications/test/vectorTools/Make/options
index f695987c04..32442d589d 100644
--- a/applications/test/vectorTools/Make/options
+++ b/applications/test/vectorTools/Make/options
@@ -1 +1 @@
-EXE_INC = -I$(FOAM_APP)/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools
+EXE_INC = -I$(FOAM_UTILITIES)/mesh/generation/foamyMesh/conformalVoronoiMesh/vectorTools
diff --git a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
index e8d84ab180..867be587cc 100644
--- a/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
+++ b/applications/utilities/mesh/advanced/refineWallLayer/refineWallLayer.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,7 +62,6 @@ using namespace Foam;
 int main(int argc, char *argv[])
 {
     #include "addOverwriteOption.H"
-    argList::noParallel();
     argList::validArgs.append("patches");
     argList::validArgs.append("edgeFraction");
 
diff --git a/applications/utilities/mesh/conversion/Optional/Allwmake b/applications/utilities/mesh/conversion/Optional/Allwmake
index 428e8712a6..3fcc6f474b 100755
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@@ -22,8 +22,11 @@ fi
 # Build libccmio (.a|.so) - use static linkage for fewer issues
 $WM_THIRD_PARTY_DIR/makeCCMIO lib
 
+: ${FOAM_EXT_LIBBIN:=/usr/lib$WM_COMPILER_LIB_ARCH}  # Extra safety
+export FOAM_EXT_LIBBIN
+
 if [ -e $CCMIO_ARCH_PATH/include/libccmio/ccmio.h \
-  -a \( -e $CCMIO_ARCH_PATH/lib/libccmio.a -o $FOAM_EXT_LIBBIN/libccmio.so \) ]
+  -a \( -e $CCMIO_ARCH_PATH/lib/libccmio.a -o -e $FOAM_EXT_LIBBIN/libccmio.so \) ]
 then
     wmake $targetType ccm26ToFoam
 else
diff --git a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
index add9bf0392..3a854be88c 100644
--- a/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
+++ b/applications/utilities/mesh/conversion/gmshToFoam/gmshToFoam.C
@@ -512,7 +512,7 @@ void readCells
         {
             label meshPti;
             lineStr >> meshPti >> meshPti;
-	    }
+        }
         else if (elmType == MSHTRI)
         {
             lineStr >> triPoints[0] >> triPoints[1] >> triPoints[2];
diff --git a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
index 62cd1230df..8583c9fac5 100644
--- a/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
+++ b/applications/utilities/mesh/conversion/ideasUnvToFoam/ideasUnvToFoam.C
@@ -925,8 +925,8 @@ int main(int argc, char *argv[])
         }
     }
 
-    HashTable<labelList,word> cellZones;
-    HashTable<labelList,word> faceZones;
+    HashTable<labelList> cellZones;
+    HashTable<labelList> faceZones;
     List<bool> isAPatch(patchNames.size(),true);
 
     if (dofVertIndices.size())
diff --git a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
index a9026a5156..8f57ee2bbf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
+++ b/applications/utilities/mesh/generation/foamyMesh/cellSizeAndAlignmentGrid/cellSizeAndAlignmentGrid.C
@@ -62,7 +62,7 @@ Foam::tmp<Foam::Field<Type>> filterFarPoints
 )
 {
     tmp<Field<Type>> tNewField(new Field<Type>(field.size()));
-    Field<Type>& newField = tNewField();
+    Field<Type>& newField = tNewField.ref();
 
     label added = 0;
     label count = 0;
@@ -160,7 +160,7 @@ Foam::tmp<Foam::triadField> buildAlignmentField(const T& mesh)
     (
         new triadField(mesh.vertexCount(), triad::unset)
     );
-    triadField& alignments = tAlignments();
+    triadField& alignments = tAlignments.ref();
 
     for
     (
@@ -188,7 +188,7 @@ Foam::tmp<Foam::pointField> buildPointField(const T& mesh)
     (
         new pointField(mesh.vertexCount(), point(GREAT, GREAT, GREAT))
     );
-    pointField& points = tPoints();
+    pointField& points = tPoints.ref();
 
     for
     (
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
index 4831560f5d..5af8ac6d4c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.C
@@ -24,7 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "DelaunayMesh.H"
-#include "labelPair.H"
+#include "polyMesh.H"
+#include "labelPairHashes.H"
 #include "PrintTable.H"
 #include "pointIOField.H"
 #include "scalarIOField.H"
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
index 865b3108fe..7c92f8acff 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMesh.H
@@ -37,9 +37,7 @@ SourceFiles
 #ifndef DelaunayMesh_H
 #define DelaunayMesh_H
 
-#include "Pair.H"
-#include "HashSet.H"
-#include "FixedList.H"
+#include "labelPairHashes.H"
 #include "boundBox.H"
 #include "indexedVertex.H"
 #include "CGALTriangulation3Ddefs.H"
@@ -77,20 +75,6 @@ public:
         typedef typename Triangulation::Finite_facets_iterator
             Finite_facets_iterator;
 
-        typedef HashSet
-        <
-           Pair<label>,
-           FixedList<label, 2>::Hash<>
-        > labelPairHashSet;
-
-        typedef HashTable
-        <
-            label,
-            labelPair,
-            FixedList<label, 2>::Hash<>
-        > labelTolabelPairHashTable;
-
-
 private:
 
     // Private data
@@ -263,7 +247,7 @@ public:
             autoPtr<polyMesh> createMesh
             (
                 const fileName& name,
-                labelTolabelPairHashTable& vertexMap,
+                labelPairLookup& vertexMap,
                 labelList& cellMap,
                 const bool writeDelaunayData = true
             ) const;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
index 42ff66646b..5d6232510b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DelaunayMeshIO.C
@@ -337,7 +337,7 @@ Foam::autoPtr<Foam::polyMesh>
 Foam::DelaunayMesh<Triangulation>::createMesh
 (
     const fileName& name,
-    labelTolabelPairHashTable& vertexMap,
+    labelPairLookup& vertexMap,
     labelList& cellMap,
     const bool writeDelaunayData
 ) const
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
index c620bea282..97311eef3c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.C
@@ -31,9 +31,6 @@ License
 #include "indexedVertexEnum.H"
 #include "IOmanip.H"
 
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
-
 // * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * * //
 
 template<class Triangulation>
@@ -539,13 +536,7 @@ Foam::label Foam::DistributedDelaunayMesh<Triangulation>::referVertices
 
     if (!pointsNotInserted.empty())
     {
-        for
-        (
-            typename labelPairHashSet::const_iterator iter
-                = pointsNotInserted.begin();
-            iter != pointsNotInserted.end();
-            ++iter
-        )
+        forAllConstIters(pointsNotInserted, iter)
         {
             if (receivedVertices.found(iter.key()))
             {
@@ -863,7 +854,7 @@ void Foam::DistributedDelaunayMesh<Triangulation>::sync(const boundBox& bb)
 
 template<class Triangulation>
 template<class PointIterator>
-typename Foam::DistributedDelaunayMesh<Triangulation>::labelPairHashSet
+Foam::labelPairHashSet
 Foam::DistributedDelaunayMesh<Triangulation>::rangeInsertReferredWithInfo
 (
     PointIterator begin,
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
index 2c59cf6fde..35b0859b53 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/DelaunayMesh/DistributedDelaunayMesh.H
@@ -71,10 +71,6 @@ public:
         typedef typename Triangulation::All_cells_iterator
             All_cells_iterator;
 
-        typedef typename DelaunayMesh<Triangulation>::labelPairHashSet
-            labelPairHashSet;
-
-
 private:
 
         autoPtr<List<boundBox>> allBackgroundMeshBounds_;
@@ -193,12 +189,6 @@ public:
             bool printErrors = true
         );
 
-//        distributeField();
-
-
-    // Queries
-
-
 };
 
 
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
index 965a89996e..a36e0370cf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/cellShapeControlMesh/cellShapeControlMesh.C
@@ -635,7 +635,7 @@ void Foam::cellShapeControlMesh::write() const
         }
     }
 
-    DelaunayMesh<CellSizeDelaunay>::labelTolabelPairHashTable vertexMap;
+    labelPairLookup vertexMap;
     labelList cellMap;
 
     autoPtr<polyMesh> meshPtr = DelaunayMesh<CellSizeDelaunay>::createMesh
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
index e975f6d4f2..33abcb622c 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/cellShapeControl/smoothAlignmentSolver/smoothAlignmentSolver.C
@@ -35,7 +35,7 @@ Foam::tmp<Foam::Field<Type>> Foam::smoothAlignmentSolver::filterFarPoints
 )
 {
     tmp<Field<Type>> tNewField(new Field<Type>(field.size()));
-    Field<Type>& newField = tNewField();
+    Field<Type>& newField = tNewField.ref();
 
     label added = 0;
     label count = 0;
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 099e3281eb..d204911c8f 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -105,7 +105,7 @@ public:
     typedef Delaunay::Facet            Facet;
     typedef Delaunay::Point            Point;
 
-    typedef List<DynamicList<Pair<labelPair>>> labelPairPairDynListList;
+    typedef List<DynamicList<labelPairPair>>     labelPairPairDynListList;
 
     typedef Tuple2<pointIndexHit, label>         pointIndexHitAndFeature;
     typedef List<pointIndexHitAndFeature>        pointIndexHitAndFeatureList;
@@ -706,7 +706,7 @@ private:
         (
             labelList& owner,
             labelList& neighbour,
-            const HashSet<labelPair, labelPair::Hash<>>& deferredCollapseFaces
+            const labelPairHashSet& deferredCollapseFaces
         ) const;
 
         //- Check whether the cell sizes are fine enough. Creates a polyMesh.
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 88cb25e6ac..eb3ab47806 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -673,7 +673,7 @@ void Foam::conformalVoronoiMesh::deferredCollapseFaceSet
 (
     labelList& owner,
     labelList& neighbour,
-    const HashSet<labelPair, labelPair::Hash<>>& deferredCollapseFaces
+    const labelPairHashSet& deferredCollapseFaces
 ) const
 {
     DynamicList<label> faceLabels;
@@ -2131,14 +2131,14 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                             // Use this processor's vertex index as the master
                             // for sorting
 
-                            DynamicList<Pair<labelPair>>& sortingIndex =
+                            DynamicList<labelPairPair>& sortingIndex =
                                 procPatchSortingIndex[patchIndex];
 
                             if (vB->internalOrBoundaryPoint() && vB->referred())
                             {
                                 sortingIndex.append
                                 (
-                                    Pair<labelPair>
+                                    labelPairPair
                                     (
                                         labelPair(vA->index(), vA->procIndex()),
                                         labelPair(vB->index(), vB->procIndex())
@@ -2149,7 +2149,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                             {
                                 sortingIndex.append
                                 (
-                                    Pair<labelPair>
+                                    labelPairPair
                                     (
                                         labelPair(vB->index(), vB->procIndex()),
                                         labelPair(vA->index(), vA->procIndex())
@@ -2162,14 +2162,14 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                             // Use the other processor's vertex index as the
                             // master for sorting
 
-                            DynamicList<Pair<labelPair>>& sortingIndex =
+                            DynamicList<labelPairPair>& sortingIndex =
                                 procPatchSortingIndex[patchIndex];
 
                             if (vA->internalOrBoundaryPoint() && vA->referred())
                             {
                                 sortingIndex.append
                                 (
-                                    Pair<labelPair>
+                                    labelPairPair
                                     (
                                         labelPair(vA->index(), vA->procIndex()),
                                         labelPair(vB->index(), vB->procIndex())
@@ -2180,7 +2180,7 @@ void Foam::conformalVoronoiMesh::createFacesOwnerNeighbourAndPatches
                             {
                                 sortingIndex.append
                                 (
-                                    Pair<labelPair>
+                                    labelPairPair
                                     (
                                         labelPair(vB->index(), vB->procIndex()),
                                         labelPair(vA->index(), vA->procIndex())
@@ -2463,7 +2463,7 @@ void Foam::conformalVoronoiMesh::sortProcPatches
         faceList& faces = patchFaces[patchi];
         labelList& owner = patchOwners[patchi];
         DynamicList<label>& slaves = patchPointPairSlaves[patchi];
-        DynamicList<Pair<labelPair>>& sortingIndices
+        DynamicList<labelPairPair>& sortingIndices
             = patchSortingIndices[patchi];
 
         if (!sortingIndices.empty())
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index 190e493322..929eeb306b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -293,9 +293,9 @@ inline Foam::point Foam::conformalVoronoiMesh::perturbPoint
 
     scalar pert = 1e-12*defaultCellSize();
 
-    perturbedPt.x() += pert*(rndGen_.scalar01() - 0.5);
-    perturbedPt.y() += pert*(rndGen_.scalar01() - 0.5);
-    perturbedPt.z() += pert*(rndGen_.scalar01() - 0.5);
+    perturbedPt.x() += pert*(rndGen_.sample01<scalar>() - 0.5);
+    perturbedPt.y() += pert*(rndGen_.sample01<scalar>() - 0.5);
+    perturbedPt.z() += pert*(rndGen_.sample01<scalar>() - 0.5);
 
     return perturbedPt;
 }
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index ac85d25323..6b6d10d182 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -199,7 +199,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
 
         Info<< nl << "Writing " << "tetDualMesh" << endl;
 
-        DistributedDelaunayMesh<Delaunay>::labelTolabelPairHashTable vertexMap;
+        labelPairLookup vertexMap;
         labelList cellMap;
         autoPtr<polyMesh> tetMesh =
             createMesh("tetDualMesh", vertexMap, cellMap);
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index e2d1001504..1acd01d9bf 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -553,11 +553,11 @@ bool Foam::autoDensity::fillBox
                       + vector
                         (
                             delta.x()
-                           *(i + 0.5 + 0.1*(rndGen().scalar01() - 0.5)),
+                           *(i + 0.5 + 0.1*(rndGen().sample01<scalar>() - 0.5)),
                             delta.y()
-                           *(j + 0.5 + 0.1*(rndGen().scalar01() - 0.5)),
+                           *(j + 0.5 + 0.1*(rndGen().sample01<scalar>() - 0.5)),
                             delta.z()
-                           *(k + 0.5 + 0.1*(rndGen().scalar01() - 0.5))
+                           *(k + 0.5 + 0.1*(rndGen().sample01<scalar>() - 0.5))
                         );
                 }
             }
@@ -662,7 +662,7 @@ bool Foam::autoDensity::fillBox
                 // TODO - is there a lot of cost in the 1/density calc?  Could
                 // assess on
                 //    (1/maxDensity)/(1/localDensity) = minVolume/localVolume
-                if (localDensity/maxDensity > rndGen().scalar01())
+                if (localDensity/maxDensity > rndGen().sample01<scalar>())
                 {
                     scalar localVolume = 1/localDensity;
 
@@ -675,7 +675,7 @@ bool Foam::autoDensity::fillBox
                         scalar addProbability =
                            (totalVolume - volumeAdded)/localVolume;
 
-                        scalar r = rndGen().scalar01();
+                        scalar r = rndGen().sample01<scalar>();
 
                         if (debug)
                         {
@@ -729,7 +729,7 @@ bool Foam::autoDensity::fillBox
         {
             trialPoints++;
 
-            point p = min + cmptMultiply(span, rndGen().vector01());
+            point p = min + cmptMultiply(span, rndGen().sample01<vector>());
 
             scalar localSize = cellShapeControls().cellSize(p);
 
@@ -785,7 +785,7 @@ bool Foam::autoDensity::fillBox
 
                 // Accept possible placements proportional to the relative local
                 // density
-                if (localDensity/maxDensity > rndGen().scalar01())
+                if (localDensity/maxDensity > rndGen().sample01<scalar>())
                 {
                     scalar localVolume = 1/localDensity;
 
@@ -798,7 +798,7 @@ bool Foam::autoDensity::fillBox
                         scalar addProbability =
                             (totalVolume - volumeAdded)/localVolume;
 
-                        scalar r = rndGen().scalar01();
+                        scalar r = rndGen().sample01<scalar>();
 
                         if (debug)
                         {
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
index 17a4285d86..8991e7ae9d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
@@ -129,9 +129,9 @@ List<Vb::Point> bodyCentredCubic::initialPoints() const
 
                 if (randomiseInitialGrid_)
                 {
-                    pA.x() += pert*(rndGen().scalar01() - 0.5);
-                    pA.y() += pert*(rndGen().scalar01() - 0.5);
-                    pA.z() += pert*(rndGen().scalar01() - 0.5);
+                    pA.x() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    pA.y() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    pA.z() += pert*(rndGen().sample01<scalar>() - 0.5);
                 }
 
                 if (Pstream::parRun())
@@ -150,9 +150,9 @@ List<Vb::Point> bodyCentredCubic::initialPoints() const
 
                 if (randomiseInitialGrid_)
                 {
-                    pB.x() += pert*(rndGen().scalar01() - 0.5);
-                    pB.y() += pert*(rndGen().scalar01() - 0.5);
-                    pB.z() += pert*(rndGen().scalar01() - 0.5);
+                    pB.x() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    pB.y() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    pB.z() += pert*(rndGen().sample01<scalar>() - 0.5);
                 }
 
                 if (Pstream::parRun())
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
index 9fd36aee3a..36052a3bbb 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
@@ -127,9 +127,9 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
 
                 if (randomiseInitialGrid_)
                 {
-                    p.x() += pert*(rndGen().scalar01() - 0.5);
-                    p.y() += pert*(rndGen().scalar01() - 0.5);
-                    p.z() += pert*(rndGen().scalar01() - 0.5);
+                    p.x() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    p.y() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    p.z() += pert*(rndGen().sample01<scalar>() - 0.5);
                 }
 
                 if (Pstream::parRun())
@@ -155,9 +155,9 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
 
                 if (randomiseInitialGrid_)
                 {
-                    p.x() += pert*(rndGen().scalar01() - 0.5);
-                    p.y() += pert*(rndGen().scalar01() - 0.5);
-                    p.z() += pert*(rndGen().scalar01() - 0.5);
+                    p.x() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    p.y() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    p.z() += pert*(rndGen().sample01<scalar>() - 0.5);
                 }
 
                 if (Pstream::parRun())
@@ -183,9 +183,9 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
 
                 if (randomiseInitialGrid_)
                 {
-                    p.x() += pert*(rndGen().scalar01() - 0.5);
-                    p.y() += pert*(rndGen().scalar01() - 0.5);
-                    p.z() += pert*(rndGen().scalar01() - 0.5);
+                    p.x() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    p.y() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    p.z() += pert*(rndGen().sample01<scalar>() - 0.5);
                 }
 
                 if (Pstream::parRun())
@@ -211,9 +211,9 @@ List<Vb::Point> faceCentredCubic::initialPoints() const
 
                 if (randomiseInitialGrid_)
                 {
-                    p.x() += pert*(rndGen().scalar01() - 0.5);
-                    p.y() += pert*(rndGen().scalar01() - 0.5);
-                    p.z() += pert*(rndGen().scalar01() - 0.5);
+                    p.x() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    p.y() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    p.z() += pert*(rndGen().sample01<scalar>() - 0.5);
                 }
 
                 if (Pstream::parRun())
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
index 38742a6203..a09153cf20 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
@@ -198,9 +198,15 @@ List<Vb::Point> pointFile::initialPoints() const
 
             if (randomiseInitialGrid_)
             {
-                p.x() += randomPerturbationCoeff_*(rndGen().scalar01() - 0.5);
-                p.y() += randomPerturbationCoeff_*(rndGen().scalar01() - 0.5);
-                p.z() += randomPerturbationCoeff_*(rndGen().scalar01() - 0.5);
+                p.x() +=
+                    randomPerturbationCoeff_
+                   *(rndGen().sample01<scalar>() - 0.5);
+                p.y() +=
+                    randomPerturbationCoeff_
+                   *(rndGen().sample01<scalar>() - 0.5);
+                p.z() +=
+                    randomPerturbationCoeff_
+                   *(rndGen().sample01<scalar>() - 0.5);
             }
 
             initialPoints.append(Vb::Point(p.x(), p.y(), p.z()));
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
index 103a09c23a..7727153e5b 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/rayShooting/rayShooting.C
@@ -86,9 +86,9 @@ void rayShooting::splitLine
         {
             Foam::point newPt
             (
-                midPoint.x() + pert*(rndGen().scalar01() - 0.5),
-                midPoint.y() + pert*(rndGen().scalar01() - 0.5),
-                midPoint.z() + pert*(rndGen().scalar01() - 0.5)
+                midPoint.x() + pert*(rndGen().sample01<scalar>() - 0.5),
+                midPoint.y() + pert*(rndGen().sample01<scalar>() - 0.5),
+                midPoint.z() + pert*(rndGen().sample01<scalar>() - 0.5)
             );
 
             if
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
index 319db49293..e7d8d8dcf1 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
@@ -128,9 +128,9 @@ List<Vb::Point> uniformGrid::initialPoints() const
 
                 if (randomiseInitialGrid_)
                 {
-                    p.x() += pert*(rndGen().scalar01() - 0.5);
-                    p.y() += pert*(rndGen().scalar01() - 0.5);
-                    p.z() += pert*(rndGen().scalar01() - 0.5);
+                    p.x() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    p.y() += pert*(rndGen().sample01<scalar>() - 0.5);
+                    p.z() += pert*(rndGen().sample01<scalar>() - 0.5);
                 }
 
                 if
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
index 685999a167..ecbcd3f104 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.C
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
 template<class Triangulation>
-inline Foam::Pair<Foam::labelPair>
+inline Foam::labelPairPair
 Foam::pointPairs<Triangulation>::orderPointPair
 (
     const labelPair& vA,
@@ -38,8 +38,8 @@ Foam::pointPairs<Triangulation>::orderPointPair
     return
     (
         (vA < vB)
-      ? Pair<labelPair>(vA, vB)
-      : Pair<labelPair>(vB, vA)
+      ? labelPairPair(vA, vB)
+      : labelPairPair(vB, vA)
     );
 }
 
@@ -85,7 +85,7 @@ inline bool Foam::pointPairs<Triangulation>::insertPointPair
 template<class Triangulation>
 Foam::pointPairs<Triangulation>::pointPairs(const Triangulation& triangulation)
 :
-    ptPairTable(),
+    StorageContainer(),
     triangulation_(triangulation)
 {}
 
@@ -181,7 +181,7 @@ void Foam::pointPairs<Triangulation>::reIndex(const Map<label>& oldToNewIndices)
 
     forAllConstIter(pointPairs, *this, iter)
     {
-        Pair<labelPair> e = iter.key();
+        labelPairPair e = iter.key();
 
         labelPair& start = e.first();
         labelPair& end = e.second();
diff --git a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H
index 44a6aa88c8..7fc956edc0 100644
--- a/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H
+++ b/applications/utilities/mesh/generation/foamyMesh/conformalVoronoiMesh/pointPairs/pointPairs.H
@@ -39,20 +39,13 @@ Description
 #ifndef pointPairs_H
 #define pointPairs_H
 
-#include "labelPair.H"
-#include "HashSet.H"
+#include "labelPairHashes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-typedef HashSet
-<
-    Pair<labelPair>,
-    FixedList<labelPair, 2>::Hash<>
-> ptPairTable;
-
 /*---------------------------------------------------------------------------*\
                          Class pointPairs Declaration
 \*---------------------------------------------------------------------------*/
@@ -60,11 +53,12 @@ typedef HashSet
 template<class Triangulation>
 class pointPairs
 :
-    public ptPairTable
+    public HashSet<labelPairPair, labelPairPair::Hash<>>
 {
     // Private typedefs
 
-        typedef typename Triangulation::Vertex_handle Vertex_handle;
+    typedef HashSet<labelPairPair, labelPairPair::Hash<>> StorageContainer;
+    typedef typename Triangulation::Vertex_handle Vertex_handle;
 
 
     // Private data
@@ -74,7 +68,7 @@ class pointPairs
 
     // Private Member Functions
 
-        inline Pair<labelPair> orderPointPair
+        inline labelPairPair orderPointPair
         (
             const labelPair& vA,
             const labelPair& vB
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
index 92d08f29d6..1a540eaf8d 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/CV2D.C
@@ -264,8 +264,8 @@ void Foam::CV2D::insertGrid()
 
             if (meshControls().randomiseInitialGrid())
             {
-                p.x() += pert*(rndGen.scalar01() - 0.5);
-                p.y() += pert*(rndGen.scalar01() - 0.5);
+                p.x() += pert*(rndGen.sample01<scalar>() - 0.5);
+                p.y() += pert*(rndGen.sample01<scalar>() - 0.5);
             }
 
             if (qSurf_.wellInside(p, 0.5*meshControls().minCellSize2()))
diff --git a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
index 37dda18569..30e411d669 100644
--- a/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
+++ b/applications/utilities/mesh/generation/foamyMesh/foamyQuadMesh/Make/options
@@ -8,7 +8,7 @@ EXE_INC = \
     ${EXE_NDEBUG} \
     ${CGAL_INC} \
     ${c++LESSWARN} \
-    -I$(FOAM_APP)/utilities/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
+    -I$(FOAM_UTILITIES)/mesh/generation/extrude2DMesh/extrude2DMesh/lnInclude \
     -I../conformalVoronoi2DMesh/lnInclude \
     -I../conformalVoronoiMesh/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
index ba4a1e9306..3e91747415 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -660,7 +660,7 @@ void writeMesh
     Info<< "Writing mesh to time " << meshRefiner.timeName() << endl;
 
     processorMeshes::removeFiles(mesh);
-    if (!debugLevel)
+    if (!debugLevel && !(writeLevel&meshRefinement::WRITELAYERSETS))
     {
         topoSet::removeFiles(mesh);
     }
diff --git a/applications/utilities/mesh/manipulation/checkMesh/Make/files b/applications/utilities/mesh/manipulation/checkMesh/Make/files
index 21febe2789..08cbcaf088 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/Make/files
+++ b/applications/utilities/mesh/manipulation/checkMesh/Make/files
@@ -1,3 +1,4 @@
+writeFields.C
 checkTools.C
 checkTopology.C
 checkGeometry.C
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index 246d559c54..8de78b1d6b 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -57,12 +57,18 @@ Usage
     Reconstruct all cellSets and faceSets geometry and write to postProcessing/
     directory according to surfaceFormat (e.g. vtk or ensight)
 
+    \param -writeAllFields \n
+    Writes all mesh quality measures as fields.
+
+    \param -writeFields '(\<fieldName\>)' \n
+    Writes selected mesh quality measures as fields.
+
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
 #include "timeSelector.H"
 #include "Time.H"
-#include "polyMesh.H"
+#include "fvMesh.H"
 #include "globalMeshData.H"
 #include "surfaceWriter.H"
 #include "vtkSetWriter.H"
@@ -71,6 +77,7 @@ Usage
 #include "checkTopology.H"
 #include "checkGeometry.H"
 #include "checkMeshQuality.H"
+#include "writeFields.H"
 
 using namespace Foam;
 
@@ -96,6 +103,17 @@ int main(int argc, char *argv[])
         "include extra topology checks"
     );
     argList::addBoolOption
+    (
+        "writeAllFields",
+        "write volFields with mesh quality parameters"
+    );
+    argList::addOption
+    (
+        "writeFields",
+        "wordList",
+        "write volFields with selected mesh quality parameters"
+    );
+    argList::addBoolOption
     (
         "meshQuality",
         "read user-defined mesh quality criterions from system/meshQualityDict"
@@ -110,7 +128,7 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
     instantList timeDirs = timeSelector::select0(runTime, args);
-    #include "createNamedPolyMesh.H"
+    #include "createNamedMesh.H"
 
     const bool noTopology  = args.optionFound("noTopology");
     const bool allGeometry = args.optionFound("allGeometry");
@@ -119,6 +137,24 @@ int main(int argc, char *argv[])
 
     word surfaceFormat;
     const bool writeSets = args.optionReadIfPresent("writeSets", surfaceFormat);
+    HashSet<word> selectedFields;
+    bool writeFields = args.optionReadIfPresent
+    (
+        "writeFields",
+        selectedFields
+    );
+    if (!writeFields && args.optionFound("writeAllFields"))
+    {
+        selectedFields.insert("nonOrthoAngle");
+        selectedFields.insert("faceWeight");
+        selectedFields.insert("skewness");
+        selectedFields.insert("cellDeterminant");
+        selectedFields.insert("aspectRatio");
+        selectedFields.insert("cellShapes");
+        selectedFields.insert("cellVolume");
+        selectedFields.insert("cellVolumeRatio");
+    }
+
 
     if (noTopology)
     {
@@ -143,6 +179,11 @@ int main(int argc, char *argv[])
             << " representation"
             << " of all faceSets and cellSets." << nl << endl;
     }
+    if (selectedFields.size())
+    {
+        Info<< "Writing mesh quality as fields " << selectedFields << nl
+            << endl;
+    }
 
 
     autoPtr<IOdictionary> qualDict;
@@ -234,6 +275,10 @@ int main(int argc, char *argv[])
                 Info<< "\nFailed " << nFailedChecks << " mesh checks.\n"
                     << endl;
             }
+
+
+            // Write selected fields
+            Foam::writeFields(mesh, selectedFields);
         }
         else if (state == polyMesh::POINTS_MOVED)
         {
@@ -262,6 +307,10 @@ int main(int argc, char *argv[])
             {
                 Info<< "\nMesh OK.\n" << endl;
             }
+
+
+            // Write selected fields
+            Foam::writeFields(mesh, selectedFields);
         }
     }
 
diff --git a/applications/utilities/mesh/manipulation/checkMesh/writeFields.C b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
new file mode 100644
index 0000000000..1cdc3dbe61
--- /dev/null
+++ b/applications/utilities/mesh/manipulation/checkMesh/writeFields.C
@@ -0,0 +1,360 @@
+#include "writeFields.H"
+#include "volFields.H"
+#include "polyMeshTools.H"
+#include "zeroGradientFvPatchFields.H"
+#include "syncTools.H"
+
+using namespace Foam;
+
+void maxFaceToCell
+(
+    const scalarField& faceData,
+    volScalarField& cellData
+)
+{
+    const cellList& cells = cellData.mesh().cells();
+
+    scalarField& cellFld = cellData.ref();
+
+    cellFld = -GREAT;
+    forAll(cells, cellI)
+    {
+        const cell& cFaces = cells[cellI];
+        forAll(cFaces, i)
+        {
+            cellFld[cellI] = max(cellFld[cellI], faceData[cFaces[i]]);
+        }
+    }
+
+    forAll(cellData.boundaryField(), patchI)
+    {
+        fvPatchScalarField& fvp = cellData.boundaryFieldRef()[patchI];
+
+        fvp = fvp.patch().patchSlice(faceData);
+    }
+    cellData.correctBoundaryConditions();
+}
+
+
+void minFaceToCell
+(
+    const scalarField& faceData,
+    volScalarField& cellData
+)
+{
+    const cellList& cells = cellData.mesh().cells();
+
+    scalarField& cellFld = cellData.ref();
+
+    cellFld = GREAT;
+    forAll(cells, cellI)
+    {
+        const cell& cFaces = cells[cellI];
+        forAll(cFaces, i)
+        {
+            cellFld[cellI] = min(cellFld[cellI], faceData[cFaces[i]]);
+        }
+    }
+
+    forAll(cellData.boundaryField(), patchI)
+    {
+        fvPatchScalarField& fvp = cellData.boundaryFieldRef()[patchI];
+
+        fvp = fvp.patch().patchSlice(faceData);
+    }
+    cellData.correctBoundaryConditions();
+}
+
+
+void Foam::writeFields
+(
+    const fvMesh& mesh,
+    const HashSet<word>& selectedFields
+)
+{
+    if (selectedFields.empty())
+    {
+        return;
+    }
+
+    Info<< "Writing fields with mesh quality parameters" << endl;
+
+    if (selectedFields.found("nonOrthoAngle"))
+    {
+        //- Face based orthogonality
+        const scalarField faceOrthogonality
+        (
+            polyMeshTools::faceOrthogonality
+            (
+                mesh,
+                mesh.faceAreas(),
+                mesh.cellCentres()
+            )
+        );
+
+        //- Face based angle
+        const scalarField nonOrthoAngle
+        (
+            radToDeg
+            (
+                Foam::acos(min(1.0, faceOrthogonality))
+            )
+        );
+
+        //- Cell field - max of either face
+        volScalarField cellNonOrthoAngle
+        (
+            IOobject
+            (
+                "nonOrthoAngle",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh,
+            dimensionedScalar("angle", dimless, 0),
+            calculatedFvPatchScalarField::typeName
+        );
+        //- Take max
+        maxFaceToCell(nonOrthoAngle, cellNonOrthoAngle);
+        Info<< "    Writing non-orthogonality (angle) to "
+            << cellNonOrthoAngle.name() << endl;
+        cellNonOrthoAngle.write();
+    }
+
+    if (selectedFields.found("faceWeight"))
+    {
+        const scalarField faceWeights
+        (
+            polyMeshTools::faceWeights
+            (
+                mesh,
+                mesh.faceCentres(),
+                mesh.faceAreas(),
+                mesh.cellCentres()
+            )
+        );
+
+        volScalarField cellWeights
+        (
+            IOobject
+            (
+                "faceWeight",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh,
+            dimensionedScalar("weight", dimless, 0),
+            calculatedFvPatchScalarField::typeName
+        );
+        //- Take min
+        minFaceToCell(faceWeights, cellWeights);
+        Info<< "    Writing face interpolation weights (0..0.5) to "
+            << cellWeights.name() << endl;
+        cellWeights.write();
+    }
+
+
+    // Skewness
+    // ~~~~~~~~
+
+    if (selectedFields.found("skewness"))
+    {
+        //- Face based skewness
+        const scalarField faceSkewness
+        (
+            polyMeshTools::faceSkewness
+            (
+                mesh,
+                mesh.points(),
+                mesh.faceCentres(),
+                mesh.faceAreas(),
+                mesh.cellCentres()
+            )
+        );
+
+        //- Cell field - max of either face
+        volScalarField cellSkewness
+        (
+            IOobject
+            (
+                "skewness",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh,
+            dimensionedScalar("skewness", dimless, 0),
+            calculatedFvPatchScalarField::typeName
+        );
+        //- Take max
+        maxFaceToCell(faceSkewness, cellSkewness);
+        Info<< "    Writing face skewness to " << cellSkewness.name() << endl;
+        cellSkewness.write();
+    }
+
+
+    // cellDeterminant
+    // ~~~~~~~~~~~~~~~
+
+    if (selectedFields.found("cellDeterminant"))
+    {
+        volScalarField cellDeterminant
+        (
+            IOobject
+            (
+                "cellDeterminant",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE,
+                false
+            ),
+            mesh,
+            dimensionedScalar("cellDeterminant", dimless, 0),
+            zeroGradientFvPatchScalarField::typeName
+        );
+        cellDeterminant.primitiveFieldRef() =
+            primitiveMeshTools::cellDeterminant
+            (
+                mesh,
+                mesh.geometricD(),
+                mesh.faceAreas(),
+                syncTools::getInternalOrCoupledFaces(mesh)
+            );
+        cellDeterminant.correctBoundaryConditions();
+        Info<< "    Writing cell determinant to "
+            << cellDeterminant.name() << endl;
+        cellDeterminant.write();
+    }
+
+
+    // Aspect ratio
+    // ~~~~~~~~~~~~
+    if (selectedFields.found("aspectRatio"))
+    {
+        volScalarField aspectRatio
+        (
+            IOobject
+            (
+                "aspectRatio",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE,
+                false
+            ),
+            mesh,
+            dimensionedScalar("aspectRatio", dimless, 0),
+            zeroGradientFvPatchScalarField::typeName
+        );
+
+
+        scalarField cellOpenness;
+        polyMeshTools::cellClosedness
+        (
+            mesh,
+            mesh.geometricD(),
+            mesh.faceAreas(),
+            mesh.cellVolumes(),
+            cellOpenness,
+            aspectRatio.ref()
+        );
+
+        aspectRatio.correctBoundaryConditions();
+        Info<< "    Writing aspect ratio to " << aspectRatio.name() << endl;
+        aspectRatio.write();
+    }
+
+
+    // cell type
+    // ~~~~~~~~~
+    if (selectedFields.found("cellShapes"))
+    {
+        volScalarField shape
+        (
+            IOobject
+            (
+                "cellShapes",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE,
+                false
+            ),
+            mesh,
+            dimensionedScalar("cellShapes", dimless, 0),
+            zeroGradientFvPatchScalarField::typeName
+        );
+        const cellShapeList& cellShapes = mesh.cellShapes();
+        forAll(cellShapes, cellI)
+        {
+            const cellModel& model = cellShapes[cellI].model();
+            shape[cellI] = model.index();
+        }
+        shape.correctBoundaryConditions();
+        Info<< "    Writing cell shape (hex, tet etc.) to " << shape.name()
+            << endl;
+        shape.write();
+    }
+
+    if (selectedFields.found("cellVolume"))
+    {
+        volScalarField V
+        (
+            IOobject
+            (
+                "cellVolume",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE,
+                false
+            ),
+            mesh,
+            dimensionedScalar("cellVolume", dimVolume, 0),
+            calculatedFvPatchScalarField::typeName
+        );
+        V.ref() = mesh.V();
+        Info<< "    Writing cell volume to " << V.name() << endl;
+        V.write();
+    }
+
+    if (selectedFields.found("cellVolumeRatio"))
+    {
+        const scalarField faceVolumeRatio
+        (
+            polyMeshTools::volRatio
+            (
+                mesh,
+                mesh.V()
+            )
+        );
+
+        volScalarField cellVolumeRatio
+        (
+            IOobject
+            (
+                "cellVolumeRatio",
+                mesh.time().timeName(),
+                mesh,
+                IOobject::NO_READ,
+                IOobject::AUTO_WRITE
+            ),
+            mesh,
+            dimensionedScalar("cellVolumeRatio", dimless, 0),
+            calculatedFvPatchScalarField::typeName
+        );
+        //- Take min
+        minFaceToCell(faceVolumeRatio, cellVolumeRatio);
+        Info<< "    Writing cell volume ratio to "
+            << cellVolumeRatio.name() << endl;
+        cellVolumeRatio.write();
+    }
+
+    Info<< endl;
+}
diff --git a/applications/utilities/mesh/manipulation/checkMesh/writeFields.H b/applications/utilities/mesh/manipulation/checkMesh/writeFields.H
new file mode 100644
index 0000000000..09c31b0e62
--- /dev/null
+++ b/applications/utilities/mesh/manipulation/checkMesh/writeFields.H
@@ -0,0 +1,10 @@
+#include "fvMesh.H"
+
+namespace Foam
+{
+    void writeFields
+    (
+        const fvMesh&,
+        const HashSet<word>& selectedFields
+    );
+}
diff --git a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
index 4115f79c23..59db39f970 100755
--- a/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
+++ b/applications/utilities/mesh/manipulation/renumberMesh/Allwmake
@@ -12,11 +12,27 @@ then
     export LINK_FLAGS="${LINK_FLAGS} -lSloanRenumber"
 fi
 
-if [ -f "${ZOLTAN_ARCH_PATH}/lib/libzoltan.a" -a -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ]
+if [ -f "${FOAM_LIBBIN}/libzoltanRenumber.so" ]
 then
-    echo "    found libzoltanRenumber  --  enabling sloan renumbering support."
-    export COMP_FLAGS="-DFOAM_USE_ZOLTAN"
-    export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L${ZOLTAN_ARCH_PATH}/lib -lzoltan"
+    if [ -z "$ZOLTAN_ARCH_PATH" ]
+    then
+        # Optional: get ZOLTAN_ARCH_PATH
+        if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan)
+        then
+            . $settings
+        fi
+    fi
+
+    for libdir in lib "lib${WM_COMPILER_LIB_ARCH}"
+    do
+        if [ -f "$ZOLTAN_ARCH_PATH/$libdir/libzoltan.a" ]
+        then
+            echo "    found libzoltanRenumber  --  enabling zoltan renumbering support."
+            export COMP_FLAGS="-DFOAM_USE_ZOLTAN"
+            export LINK_FLAGS="${LINK_FLAGS} -lzoltanRenumber -L$ZOLTAN_ARCH_PATH/$libdir -lzoltan"
+            break
+        fi
+    done
 fi
 
 wmake $targetType
diff --git a/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict b/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
index e627adf839..96a1f1e23a 100644
--- a/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
+++ b/applications/utilities/mesh/manipulation/stitchMesh/toleranceDict
@@ -15,7 +15,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 // For complete details on what this dictionary file should provide, see
-//   $FOAM_SRC/src/dynamicMesh/slidingInterface/slidingInterface.C
+//   src/dynamicMesh/slidingInterface/slidingInterface.C
 //   method: Foam::slidingInterface::setTolerances
 
 //- Point merge tolerance
diff --git a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
index eb13245ec3..751e70934d 100644
--- a/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
+++ b/applications/utilities/mesh/manipulation/transformPoints/transformPoints.C
@@ -53,9 +53,9 @@ Usage
     it will also read & transform vector & tensor fields.
 
     Note:
-    yaw (rotation about z)
-    pitch (rotation about y)
     roll (rotation about x)
+    pitch (rotation about y)
+    yaw (rotation about z)
 
 \*---------------------------------------------------------------------------*/
 
@@ -143,6 +143,12 @@ void rotateFields(const argList& args, const Time& runTime, const tensor& T)
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "Transform (translate/rotate/scale) mesh points.\n"
+        "Note: roll=rotation about x, pitch=rotation about y, "
+        "yaw=rotation about z"
+    );
     argList::addOption
     (
         "translate",
@@ -160,13 +166,13 @@ int main(int argc, char *argv[])
     (
         "rollPitchYaw",
         "vector",
-        "transform in terms of '(roll pitch yaw)' in degrees"
+        "rotate by '(roll pitch yaw)' in degrees"
     );
     argList::addOption
     (
         "yawPitchRoll",
         "vector",
-        "transform in terms of '(yaw pitch roll)' in degrees"
+        "rotate by '(yaw pitch roll)' in degrees"
     );
     argList::addBoolOption
     (
diff --git a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
index 75e48487c1..6d6dca2c76 100644
--- a/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
+++ b/applications/utilities/miscellaneous/foamDictionary/foamDictionary.C
@@ -112,6 +112,7 @@ Usage
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "profiling.H"
 #include "Time.H"
 #include "IFstream.H"
 #include "OFstream.H"
@@ -241,6 +242,7 @@ int main(int argc, char *argv[])
     argList::addNote("manipulates dictionaries");
 
     argList::noBanner();
+    argList::noJobInfo();
     argList::validArgs.append("dictionary");
     argList::addBoolOption("keywords", "list keywords");
     argList::addOption("entry", "name", "report/select the named entry");
@@ -288,6 +290,7 @@ int main(int argc, char *argv[])
         "disableFunctionEntries",
         "Disable expansion of dictionary directives - #include, #codeStream etc"
     );
+    profiling::disable(); // Disable profiling (and its output)
 
     argList args(argc, argv);
 
diff --git a/applications/utilities/miscellaneous/foamListTimes/foamListTimes.C b/applications/utilities/miscellaneous/foamListTimes/foamListTimes.C
index 48be875408..5aa7389d76 100644
--- a/applications/utilities/miscellaneous/foamListTimes/foamListTimes.C
+++ b/applications/utilities/miscellaneous/foamListTimes/foamListTimes.C
@@ -45,6 +45,7 @@ Usage
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "profiling.H"
 #include "timeSelector.H"
 #include "Time.H"
 
@@ -59,6 +60,7 @@ int main(int argc, char *argv[])
     timeSelector::addOptions(true, true);
     argList::noBanner();
     argList::noParallel();
+    argList::noJobInfo();
     argList::addBoolOption
     (
         "processor",
@@ -69,6 +71,8 @@ int main(int argc, char *argv[])
         "rm",
         "remove selected time directories"
     );
+    profiling::disable(); // Disable profiling (and its output)
+
     #include "setRootCase.H"
 
     label nProcs = 0;
diff --git a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/fluentUnitNumbers.txt b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/fluentUnitNumbers.txt
index f85462d171..83af2c41aa 100644
--- a/applications/utilities/postProcessing/dataConversion/foamDataToFluent/fluentUnitNumbers.txt
+++ b/applications/utilities/postProcessing/dataConversion/foamDataToFluent/fluentUnitNumbers.txt
@@ -103,7 +103,7 @@ enum {
   XF_RF_DATA_KTC=105,
   XF_RF_DATA_VGS_DTRM=106,
   XF_RF_DATA_VGF_DTRM=107,
-  XF_RF_DATA_RSTRESS=108,	/* V4 reynolds stress model */
+  XF_RF_DATA_RSTRESS=108,       /* V4 reynolds stress model */
   XF_RF_DATA_THREAD_RAD_FLUX=109,
 
   /* mass absorption term for absorbing porous media model */
@@ -133,12 +133,12 @@ enum {
   XF_RF_DATA_TKE_M2=126,
   XF_RF_DATA_TED_M2=127,
 
-  XF_RF_DATA_RUU=128,	/* V5 reynolds stress model */
-  XF_RF_DATA_RVV=129,	/* V5 reynolds stress model */
-  XF_RF_DATA_RWW=130,	/* V5 reynolds stress model */
-  XF_RF_DATA_RUV=131,	/* V5 reynolds stress model */
-  XF_RF_DATA_RVW=132,	/* V5 reynolds stress model */
-  XF_RF_DATA_RUW=133,	/* V5 reynolds stress model */
+  XF_RF_DATA_RUU=128,   /* V5 reynolds stress model */
+  XF_RF_DATA_RVV=129,   /* V5 reynolds stress model */
+  XF_RF_DATA_RWW=130,   /* V5 reynolds stress model */
+  XF_RF_DATA_RUV=131,   /* V5 reynolds stress model */
+  XF_RF_DATA_RVW=132,   /* V5 reynolds stress model */
+  XF_RF_DATA_RUW=133,   /* V5 reynolds stress model */
 
   XF_RF_DATA_DPMS_EROSION=134,
   XF_RF_DATA_DPMS_ACCRETION=135,
@@ -227,18 +227,18 @@ chunk.
   XF_RF_DATA_NUT_M1=501,
   XF_RF_DATA_NUT_M2=502,
 
-  XF_RF_DATA_RUU_M1=503,	
-  XF_RF_DATA_RVV_M1=504,	
-  XF_RF_DATA_RWW_M1=505,	
-  XF_RF_DATA_RUV_M1=506,	
-  XF_RF_DATA_RVW_M1=507,	
+  XF_RF_DATA_RUU_M1=503,
+  XF_RF_DATA_RVV_M1=504,
+  XF_RF_DATA_RWW_M1=505,
+  XF_RF_DATA_RUV_M1=506,
+  XF_RF_DATA_RVW_M1=507,
   XF_RF_DATA_RUW_M1=508,
 
-  XF_RF_DATA_RUU_M2=509,	
-  XF_RF_DATA_RVV_M2=510,	
-  XF_RF_DATA_RWW_M2=511,	
-  XF_RF_DATA_RUV_M2=512,	
-  XF_RF_DATA_RVW_M2=513,	
+  XF_RF_DATA_RUU_M2=509,
+  XF_RF_DATA_RVV_M2=510,
+  XF_RF_DATA_RWW_M2=511,
+  XF_RF_DATA_RUV_M2=512,
+  XF_RF_DATA_RVW_M2=513,
   XF_RF_DATA_RUW_M2=514,
 
   XF_RF_DATA_ENERGY_M1=515,
@@ -271,9 +271,9 @@ chunk.
 
   EXPAND_50_EQUAL(XF_RF_DATA_UDS_,700), /* user defined scalar */
   EXPAND_50(XF_RF_DATA_UDS_,_M1=, 750), /* user defined scalar
-				         * at fist time level */
+                                         * at fist time level */
   EXPAND_50(XF_RF_DATA_UDS_,_M2=, 800),  /* user defined scalar
-					 * at second time level */
+                                         * at second time level */
   XF_RF_DATA_GRANULAR_PRESSURE=910,
   XF_RF_DATA_GRANULAR_PRESSURE_M1=0,/* never stored but symbol is
 required */
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
index 819a476c3a..ce13bed97a 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/PVFoamReader/CMakeLists.txt
@@ -7,7 +7,6 @@ include(${PARAVIEW_USE_FILE})
 
 link_directories(
     $ENV{FOAM_LIBBIN}
-    $ENV{FOAM_EXT_LIBBIN}
 )
 
 include_directories(
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
index 2b7ab51888..c20a965578 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoam.C
@@ -288,6 +288,9 @@ Foam::vtkPVFoam::vtkPVFoam
         fullCasePath = cwd();
     }
 
+    // The name of the executable, unless already present in the environment
+    setEnv("FOAM_EXECUTABLE", "paraview", false);
+
     // Set the case as an environment variable - some BCs might use this
     if (fullCasePath.name().find("processor", 0) == 0)
     {
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
index 41855ddd7b..52030e9c81 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVFoamReader/vtkPVFoam/vtkPVFoamUpdateInfo.C
@@ -233,21 +233,16 @@ void Foam::vtkPVFoam::updateInfoPatches
     if (meshPtr_)
     {
         const polyBoundaryMesh& patches = meshPtr_->boundaryMesh();
-        const HashTable<labelList, word>& groups = patches.groupPatchIDs();
+        const HashTable<labelList>& groups = patches.groupPatchIDs();
         const wordList allPatchNames = patches.names();
 
         // Add patch groups
         // ~~~~~~~~~~~~~~~~
 
-        for
-        (
-            HashTable<labelList, word>::const_iterator iter = groups.begin();
-            iter != groups.end();
-            ++iter
-        )
+        forAllConstIters(groups, iter)
         {
             const word& groupName = iter.key();
-            const labelList& patchIDs = iter();
+            const labelList& patchIDs = iter.object();
 
             label nFaces = 0;
             forAll(patchIDs, i)
@@ -349,7 +344,7 @@ void Foam::vtkPVFoam::updateInfoPatches
             // Add (non-zero) patch groups to the list of mesh parts
             // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-            HashTable<labelList, word> groups(patchEntries.size());
+            HashTable<labelList> groups(patchEntries.size());
 
             forAll(patchEntries, patchi)
             {
@@ -360,7 +355,7 @@ void Foam::vtkPVFoam::updateInfoPatches
 
                 forAll(groupNames, groupI)
                 {
-                    HashTable<labelList, word>::iterator iter = groups.find
+                    HashTable<labelList>::iterator iter = groups.find
                     (
                         groupNames[groupI]
                     );
@@ -375,16 +370,10 @@ void Foam::vtkPVFoam::updateInfoPatches
                 }
             }
 
-            for
-            (
-                HashTable<labelList, word>::const_iterator iter =
-                    groups.begin();
-                iter != groups.end();
-                ++iter
-            )
+            forAllConstIters(groups, iter)
             {
                 const word& groupName = iter.key();
-                const labelList& patchIDs = iter();
+                const labelList& patchIDs = iter.object();
 
                 label nFaces = 0;
                 forAll(patchIDs, i)
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/CMakeLists.txt b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/CMakeLists.txt
index 267938563b..c3c889ffb5 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/CMakeLists.txt
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/PVblockMeshReader/CMakeLists.txt
@@ -7,7 +7,6 @@ include(${PARAVIEW_USE_FILE})
 
 link_directories(
     $ENV{FOAM_LIBBIN}
-    $ENV{FOAM_EXT_LIBBIN}
 )
 
 include_directories(
diff --git a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
index e64f031dec..39c60bb738 100644
--- a/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
+++ b/applications/utilities/postProcessing/graphics/PVReaders/PVblockMeshReader/vtkPVblockMesh/vtkPVblockMesh.C
@@ -206,6 +206,9 @@ Foam::vtkPVblockMesh::vtkPVblockMesh
         fullCasePath = cwd();
     }
 
+    // The name of the executable, unless already present in the environment
+    setEnv("FOAM_EXECUTABLE", "paraview", false);
+
     // Set the case as an environment variable - some BCs might use this
     if (fullCasePath.name().find("processor", 0) == 0)
     {
diff --git a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
index 1b288f3c8d..a36a86b0b0 100644
--- a/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
+++ b/applications/utilities/postProcessing/lagrangian/steadyParticleTracks/steadyParticleTracks.C
@@ -45,7 +45,7 @@ Description
 #include "timeSelector.H"
 #include "OFstream.H"
 #include "passiveParticleCloud.H"
-
+#include "labelPairHashes.H"
 #include "SortableList.H"
 #include "IOobjectList.H"
 #include "PtrList.H"
@@ -133,8 +133,6 @@ int main(int argc, char *argv[])
     fileName vtkPath(runTime.path()/"VTK");
     mkDir(vtkPath);
 
-    typedef HashTable<label, labelPair, labelPair::Hash<>> trackTableType;
-
     forAll(timeDirs, timeI)
     {
         runTime.setTime(timeDirs[timeI], timeI);
@@ -168,13 +166,14 @@ int main(int argc, char *argv[])
         label nTracks = 0;
 
         {
-            trackTableType trackTable;
+            labelPairLookup trackTable;
+
             forAll(particles, i)
             {
                 const label origProc = particles[i].origProc();
                 const label origId = particles[i].origId();
 
-                const trackTableType::const_iterator& iter =
+                labelPairLookup::const_iterator iter =
                     trackTable.find(labelPair(origProc, origId));
 
                 if (iter == trackTable.end())
diff --git a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
index 4fc525a3a9..860d7c2eb9 100644
--- a/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
+++ b/applications/utilities/postProcessing/miscellaneous/pdfPlot/createFields.H
@@ -20,7 +20,7 @@
     const fileName pdfPath = runTime.path()/"pdf";
     mkDir(pdfPath);
 
-    cachedRandom rndGen(label(0), -1);
+    Random rndGen;
 
     autoPtr<distributionModel> p
     (
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
index 367e9e2e3c..bea50bf0fe 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
+++ b/applications/utilities/surface/surfaceBooleanFeatures/PolyhedronReader/Make/options
@@ -13,8 +13,8 @@ EXE_INC = \
     ${CGAL_INC} \
     ${c++CGALWARN} \
     -I.. \
-    -I$(FOAM_SRC)/surfMesh/lnInclude \
-    -I$(FOAM_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/triSurface/lnInclude \
     -I$(LIB_SRC)/edgeMesh/lnInclude \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I/usr/include/Qt
diff --git a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
index abc3d321d2..02d0b0c8e6 100644
--- a/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
+++ b/applications/utilities/surface/surfaceBooleanFeatures/surfaceBooleanFeatures.C
@@ -783,7 +783,7 @@ labelPair edgeIntersectionsAndShuffleCGAL
                     const edge& e = edges[edgeI];
                     forAll(e, eI)
                     {
-                        vector d = rndGen.vector01()-p05;
+                        vector d = rndGen.sample01<vector>() - p05;
                         surf1Points[mp[e[eI]]] += surf1PointTol[e[eI]]*d;
                     }
                 }
diff --git a/applications/utilities/surface/surfaceCoarsen/bunnylod/README b/applications/utilities/surface/surfaceCoarsen/bunnylod/README
index f62b96bc25..96c8188b9b 100644
--- a/applications/utilities/surface/surfaceCoarsen/bunnylod/README
+++ b/applications/utilities/surface/surfaceCoarsen/bunnylod/README
@@ -1,12 +1,9 @@
-
-	Polygon Reduction Demo
-	By Stan Melax (c) 1998
-	mailto:melax@cs.ualberta.ca
-	http://www.cs.ualberta.ca/~melax
+Polygon Reduction Demo
+By Stan Melax (c) 1998
+mailto:melax@cs.ualberta.ca
+http://www.cs.ualberta.ca/~melax
 
 The PC executable bunnylod.exe should run
 on a standard PC.
 Just run it and enjoy.
 Mouse dragging spins the rabbit.
-
-
diff --git a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
index 86bfe9a22e..a91ed5140a 100644
--- a/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
+++ b/applications/utilities/surface/surfaceFeatureExtract/surfaceFeatureExtract.C
@@ -87,73 +87,6 @@ scalar calcVertexNormalWeight
 }
 
 
-point randomPointInPlane(const plane& p)
-{
-    // Perturb base point
-    const point& refPt = p.refPoint();
-
-    // ax + by + cz + d = 0
-    const FixedList<scalar, 4>& planeCoeffs = p.planeCoeffs();
-
-    const scalar perturbX = refPt.x() + 1e-3;
-    const scalar perturbY = refPt.y() + 1e-3;
-    const scalar perturbZ = refPt.z() + 1e-3;
-
-    if (mag(planeCoeffs[2]) < SMALL)
-    {
-        if (mag(planeCoeffs[1]) < SMALL)
-        {
-            const scalar x =
-                -1.0
-                *(
-                     planeCoeffs[3]
-                   + planeCoeffs[1]*perturbY
-                   + planeCoeffs[2]*perturbZ
-                 )/planeCoeffs[0];
-
-            return point
-            (
-                x,
-                perturbY,
-                perturbZ
-            );
-        }
-
-        const scalar y =
-            -1.0
-            *(
-                 planeCoeffs[3]
-               + planeCoeffs[0]*perturbX
-               + planeCoeffs[2]*perturbZ
-             )/planeCoeffs[1];
-
-        return point
-        (
-            perturbX,
-            y,
-            perturbZ
-        );
-    }
-    else
-    {
-        const scalar z =
-            -1.0
-            *(
-                 planeCoeffs[3]
-               + planeCoeffs[0]*perturbX
-               + planeCoeffs[1]*perturbY
-             )/planeCoeffs[2];
-
-        return point
-        (
-            perturbX,
-            perturbY,
-            z
-        );
-    }
-}
-
-
 triadField calcVertexCoordSys
 (
     const triSurface& surf,
@@ -178,8 +111,8 @@ triadField calcVertexCoordSys
 
         plane p(pt, normal);
 
-        // Pick random point in plane
-        vector dir1 = pt - randomPointInPlane(p);
+        // Pick arbitrary point in plane
+        vector dir1 = pt - p.somePointInPlane(1e-3);
         dir1 /= mag(dir1);
 
         vector dir2 = dir1 ^ normal;
diff --git a/applications/utilities/surface/surfaceInertia/surfaceInertia.C b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
index b0808d239d..fb45390688 100644
--- a/applications/utilities/surface/surfaceInertia/surfaceInertia.C
+++ b/applications/utilities/surface/surfaceInertia/surfaceInertia.C
@@ -125,9 +125,9 @@ int main(int argc, char *argv[])
             << "No eigenValues found, shape may have symmetry, "
             << "perturbing inertia tensor diagonal" << endl;
 
-        J.xx() *= 1.0 + SMALL*rand.scalar01();
-        J.yy() *= 1.0 + SMALL*rand.scalar01();
-        J.zz() *= 1.0 + SMALL*rand.scalar01();
+        J.xx() *= 1.0 + SMALL*rand.sample01<scalar>();
+        J.yy() *= 1.0 + SMALL*rand.sample01<scalar>();
+        J.zz() *= 1.0 + SMALL*rand.sample01<scalar>();
 
         eVal = eigenValues(J);
 
diff --git a/applications/utilities/surface/surfaceInflate/Make/options b/applications/utilities/surface/surfaceInflate/Make/options
index 6c6cd12287..dd995740b3 100644
--- a/applications/utilities/surface/surfaceInflate/Make/options
+++ b/applications/utilities/surface/surfaceInflate/Make/options
@@ -1,8 +1,7 @@
 EXE_INC = \
-    -I$(FOAM_SRC)/triSurface/lnInclude \
-    -I$(FOAM_SRC)/surfMesh/lnInclude \
-    -I$(FOAM_SRC)/meshTools/lnInclude
-
+    -I$(LIB_SRC)/triSurface/lnInclude \
+    -I$(LIB_SRC)/surfMesh/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude
 
 EXE_LIBS = \
     -ltriSurface \
diff --git a/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C b/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
index 54589cf973..bf965eee0d 100644
--- a/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
+++ b/applications/utilities/surface/surfaceMeshInfo/surfaceMeshInfo.C
@@ -62,6 +62,7 @@ Note
 \*---------------------------------------------------------------------------*/
 
 #include "argList.H"
+#include "profiling.H"
 #include "Time.H"
 
 #include "UnsortedMeshedSurfaces.H"
@@ -98,6 +99,7 @@ int main(int argc, char *argv[])
         "xml",
         "write output in XML format"
     );
+    profiling::disable(); // Disable profiling (and its output)
 
     argList args(argc, argv);
     Time runTime(args.rootPath(), args.caseName());
diff --git a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
index ee4544ee34..712ed6564e 100644
--- a/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
+++ b/applications/utilities/surface/surfaceMeshTriangulate/surfaceMeshTriangulate.C
@@ -51,6 +51,7 @@ Description
 #include "uindirectPrimitivePatch.H"
 #include "globalMeshData.H"
 #include "globalIndex.H"
+#include "timeSelector.H"
 
 using namespace Foam;
 
@@ -63,6 +64,8 @@ int main(int argc, char *argv[])
     (
         "extract surface from a polyMesh"
     );
+    timeSelector::addOptions();
+
     argList::validArgs.append("output file");
     #include "addRegionOption.H"
     argList::addBoolOption
@@ -86,7 +89,14 @@ int main(int argc, char *argv[])
     #include "setRootCase.H"
     #include "createTime.H"
 
-    const fileName outFileName(args[1]);
+    const fileName userOutFileName(args[1]);
+
+    if (!userOutFileName.hasExt())
+    {
+        FatalErrorInFunction
+            << "Missing extension on output name " << userOutFileName
+            << exit(FatalError);
+    }
 
     Info<< "Extracting surface from boundaryMesh ..."
         << endl << endl;
@@ -106,275 +116,321 @@ int main(int argc, char *argv[])
         Info<< "Excluding all processor patches." << nl << endl;
     }
 
+
     Info<< "Reading mesh from time " << runTime.value() << endl;
 
     #include "createNamedPolyMesh.H"
 
+    // User specified times
+    instantList timeDirs = timeSelector::select0(runTime, args);
 
-    // Create local surface from:
-    // - explicitly named patches only (-patches (at your option)
-    // - all patches (default in sequential mode)
-    // - all non-processor patches (default in parallel mode)
-    // - all non-processor patches (sequential mode, -excludeProcPatches
-    //   (at your option)
-
-    // Construct table of patches to include.
-    const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
-
-    labelHashSet includePatches(bMesh.size());
-
-    if (args.optionFound("patches"))
+    forAll(timeDirs, timeIndex)
     {
-        includePatches = bMesh.patchSet
-        (
-            wordReList(args.optionLookup("patches")())
-        );
-    }
-    else
-    {
-        forAll(bMesh, patchi)
-        {
-            const polyPatch& patch = bMesh[patchi];
+        runTime.setTime(timeDirs[timeIndex], timeIndex);
+        Info<< "Time [" << timeIndex << "] = " << runTime.timeName();
 
-            if (includeProcPatches || !isA<processorPolyPatch>(patch))
+        fileName outFileName;
+        if (timeDirs.size() == 1)
+        {
+            outFileName = userOutFileName;
+            Info<< nl;
+        }
+        else
+        {
+            polyMesh::readUpdateState meshState = mesh.readUpdate();
+            if (timeIndex && meshState == polyMesh::UNCHANGED)
             {
-                includePatches.insert(patchi);
-            }
-        }
-    }
-
-
-
-    const faceZoneMesh& fzm = mesh.faceZones();
-    labelHashSet includeFaceZones(fzm.size());
-
-    if (args.optionFound("faceZones"))
-    {
-        wordReList zoneNames(args.optionLookup("faceZones")());
-        const wordList allZoneNames(fzm.names());
-        forAll(zoneNames, i)
-        {
-            const wordRe& zoneName = zoneNames[i];
-
-            labelList zoneIDs = findStrings(zoneName, allZoneNames);
-
-            forAll(zoneIDs, j)
-            {
-                includeFaceZones.insert(zoneIDs[j]);
-            }
-
-            if (zoneIDs.empty())
-            {
-                WarningInFunction
-                    << "Cannot find any faceZone name matching "
-                    << zoneName << endl;
-            }
-
-        }
-        Info<< "Additionally triangulating faceZones "
-            << UIndirectList<word>(allZoneNames, includeFaceZones.sortedToc())
-            << endl;
-    }
-
-
-
-    // From (name of) patch to compact 'zone' index
-    HashTable<label> compactZoneID(1000);
-    // Mesh face and compact zone indx
-    DynamicList<label> faceLabels;
-    DynamicList<label> compactZones;
-
-    {
-        // Collect sizes. Hash on names to handle local-only patches (e.g.
-        //  processor patches)
-        HashTable<label> patchSize(1000);
-        label nFaces = 0;
-        forAllConstIter(labelHashSet, includePatches, iter)
-        {
-            const polyPatch& pp = bMesh[iter.key()];
-            patchSize.insert(pp.name(), pp.size());
-            nFaces += pp.size();
-        }
-
-        HashTable<label> zoneSize(1000);
-        forAllConstIter(labelHashSet, includeFaceZones, iter)
-        {
-            const faceZone& pp = fzm[iter.key()];
-            zoneSize.insert(pp.name(), pp.size());
-            nFaces += pp.size();
-        }
-
-
-        Pstream::mapCombineGather(patchSize, plusEqOp<label>());
-        Pstream::mapCombineGather(zoneSize, plusEqOp<label>());
-
-
-        // Allocate compact numbering for all patches/faceZones
-        forAllConstIter(HashTable<label>, patchSize, iter)
-        {
-            label sz = compactZoneID.size();
-            compactZoneID.insert(iter.key(), sz);
-        }
-
-        forAllConstIter(HashTable<label>, zoneSize, iter)
-        {
-            label sz = compactZoneID.size();
-            //Info<< "For faceZone " << iter.key() << " allocating zoneID "
-            //    << sz << endl;
-            compactZoneID.insert(iter.key(), sz);
-        }
-
-
-        Pstream::mapCombineScatter(compactZoneID);
-
-
-        // Rework HashTable into labelList just for speed of conversion
-        labelList patchToCompactZone(bMesh.size(), -1);
-        labelList faceZoneToCompactZone(bMesh.size(), -1);
-        forAllConstIter(HashTable<label>, compactZoneID, iter)
-        {
-            label patchi = bMesh.findPatchID(iter.key());
-            if (patchi != -1)
-            {
-                patchToCompactZone[patchi] = iter();
+                Info<<"  ... no mesh change." << nl;
+                continue;
             }
             else
             {
-                label zoneI = fzm.findZoneID(iter.key());
-                faceZoneToCompactZone[zoneI] = iter();
+                Info<< nl;
             }
+
+            // The filename based on the original, but with additional
+            // time information. The extension was previously checked that
+            // it exists
+            std::string::size_type dot = userOutFileName.rfind('.');
+
+            outFileName =
+                userOutFileName.substr(0, dot) + "_"
+              + Foam::name(runTime.value()) + "."
+              + userOutFileName.ext();
         }
 
+        // Create local surface from:
+        // - explicitly named patches only (-patches (at your option)
+        // - all patches (default in sequential mode)
+        // - all non-processor patches (default in parallel mode)
+        // - all non-processor patches (sequential mode, -excludeProcPatches
+        //   (at your option)
 
-        faceLabels.setCapacity(nFaces);
-        compactZones.setCapacity(nFaces);
+        // Construct table of patches to include.
+        const polyBoundaryMesh& bMesh = mesh.boundaryMesh();
 
-        // Collect faces on patches
-        forAllConstIter(labelHashSet, includePatches, iter)
+        labelHashSet includePatches(bMesh.size());
+
+        if (args.optionFound("patches"))
         {
-            const polyPatch& pp = bMesh[iter.key()];
-            forAll(pp, i)
+            includePatches = bMesh.patchSet
+            (
+                wordReList(args.optionLookup("patches")())
+            );
+        }
+        else
+        {
+            forAll(bMesh, patchi)
             {
-                faceLabels.append(pp.start()+i);
-                compactZones.append(patchToCompactZone[pp.index()]);
+                const polyPatch& patch = bMesh[patchi];
+
+                if (includeProcPatches || !isA<processorPolyPatch>(patch))
+                {
+                    includePatches.insert(patchi);
+                }
             }
         }
-        // Collect faces on faceZones
-        forAllConstIter(labelHashSet, includeFaceZones, iter)
+
+
+        const faceZoneMesh& fzm = mesh.faceZones();
+        labelHashSet includeFaceZones(fzm.size());
+
+        if (args.optionFound("faceZones"))
         {
-            const faceZone& pp = fzm[iter.key()];
-            forAll(pp, i)
+            wordReList zoneNames(args.optionLookup("faceZones")());
+            const wordList allZoneNames(fzm.names());
+            forAll(zoneNames, i)
             {
-                faceLabels.append(pp[i]);
-                compactZones.append(faceZoneToCompactZone[pp.index()]);
+                const wordRe& zoneName = zoneNames[i];
+
+                labelList zoneIDs = findStrings(zoneName, allZoneNames);
+
+                forAll(zoneIDs, j)
+                {
+                    includeFaceZones.insert(zoneIDs[j]);
+                }
+
+                if (zoneIDs.empty())
+                {
+                    WarningInFunction
+                        << "Cannot find any faceZone name matching "
+                        << zoneName << endl;
+                }
+
             }
-        }
-    }
-
-
-    // Addressing engine for all faces
-    uindirectPrimitivePatch allBoundary
-    (
-        UIndirectList<face>(mesh.faces(), faceLabels),
-        mesh.points()
-    );
-
-
-    // Find correspondence to master points
-    labelList pointToGlobal;
-    labelList uniqueMeshPoints;
-    autoPtr<globalIndex> globalNumbers = mesh.globalData().mergePoints
-    (
-        allBoundary.meshPoints(),
-        allBoundary.meshPointMap(),
-        pointToGlobal,
-        uniqueMeshPoints
-    );
-
-    // Gather all unique points on master
-    List<pointField> gatheredPoints(Pstream::nProcs());
-    gatheredPoints[Pstream::myProcNo()] = pointField
-    (
-        mesh.points(),
-        uniqueMeshPoints
-    );
-    Pstream::gatherList(gatheredPoints);
-
-    // Gather all faces
-    List<faceList> gatheredFaces(Pstream::nProcs());
-    gatheredFaces[Pstream::myProcNo()] = allBoundary.localFaces();
-    forAll(gatheredFaces[Pstream::myProcNo()], i)
-    {
-        inplaceRenumber(pointToGlobal, gatheredFaces[Pstream::myProcNo()][i]);
-    }
-    Pstream::gatherList(gatheredFaces);
-
-    // Gather all ZoneIDs
-    List<labelList> gatheredZones(Pstream::nProcs());
-    gatheredZones[Pstream::myProcNo()] = compactZones.xfer();
-    Pstream::gatherList(gatheredZones);
-
-    // On master combine all points, faces, zones
-    if (Pstream::master())
-    {
-        pointField allPoints = ListListOps::combine<pointField>
-        (
-            gatheredPoints,
-            accessOp<pointField>()
-        );
-        gatheredPoints.clear();
-
-        faceList allFaces = ListListOps::combine<faceList>
-        (
-            gatheredFaces,
-            accessOp<faceList>()
-        );
-        gatheredFaces.clear();
-
-        labelList allZones = ListListOps::combine<labelList>
-        (
-            gatheredZones,
-            accessOp<labelList>()
-        );
-        gatheredZones.clear();
-
-
-        // Zones
-        surfZoneIdentifierList surfZones(compactZoneID.size());
-        forAllConstIter(HashTable<label>, compactZoneID, iter)
-        {
-            surfZones[iter()] = surfZoneIdentifier(iter.key(), iter());
-            Info<< "surfZone " << iter()  <<  " : " << surfZones[iter()].name()
+            Info<< "Additionally triangulating faceZones "
+                << UIndirectList<word>
+                  (
+                      allZoneNames,
+                      includeFaceZones.sortedToc()
+                  )
                 << endl;
         }
 
-        UnsortedMeshedSurface<face> unsortedFace
+
+
+        // From (name of) patch to compact 'zone' index
+        HashTable<label> compactZoneID(1000);
+        // Mesh face and compact zone indx
+        DynamicList<label> faceLabels;
+        DynamicList<label> compactZones;
+
+        {
+            // Collect sizes. Hash on names to handle local-only patches (e.g.
+            //  processor patches)
+            HashTable<label> patchSize(1000);
+            label nFaces = 0;
+            forAllConstIter(labelHashSet, includePatches, iter)
+            {
+                const polyPatch& pp = bMesh[iter.key()];
+                patchSize.insert(pp.name(), pp.size());
+                nFaces += pp.size();
+            }
+
+            HashTable<label> zoneSize(1000);
+            forAllConstIter(labelHashSet, includeFaceZones, iter)
+            {
+                const faceZone& pp = fzm[iter.key()];
+                zoneSize.insert(pp.name(), pp.size());
+                nFaces += pp.size();
+            }
+
+
+            Pstream::mapCombineGather(patchSize, plusEqOp<label>());
+            Pstream::mapCombineGather(zoneSize, plusEqOp<label>());
+
+
+            // Allocate compact numbering for all patches/faceZones
+            forAllConstIter(HashTable<label>, patchSize, iter)
+            {
+                label sz = compactZoneID.size();
+                compactZoneID.insert(iter.key(), sz);
+            }
+
+            forAllConstIter(HashTable<label>, zoneSize, iter)
+            {
+                label sz = compactZoneID.size();
+                //Info<< "For faceZone " << iter.key() << " allocating zoneID "
+                //    << sz << endl;
+                compactZoneID.insert(iter.key(), sz);
+            }
+
+
+            Pstream::mapCombineScatter(compactZoneID);
+
+
+            // Rework HashTable into labelList just for speed of conversion
+            labelList patchToCompactZone(bMesh.size(), -1);
+            labelList faceZoneToCompactZone(bMesh.size(), -1);
+            forAllConstIter(HashTable<label>, compactZoneID, iter)
+            {
+                label patchi = bMesh.findPatchID(iter.key());
+                if (patchi != -1)
+                {
+                    patchToCompactZone[patchi] = iter();
+                }
+                else
+                {
+                    label zoneI = fzm.findZoneID(iter.key());
+                    faceZoneToCompactZone[zoneI] = iter();
+                }
+            }
+
+
+            faceLabels.setCapacity(nFaces);
+            compactZones.setCapacity(nFaces);
+
+            // Collect faces on patches
+            forAllConstIter(labelHashSet, includePatches, iter)
+            {
+                const polyPatch& pp = bMesh[iter.key()];
+                forAll(pp, i)
+                {
+                    faceLabels.append(pp.start()+i);
+                    compactZones.append(patchToCompactZone[pp.index()]);
+                }
+            }
+            // Collect faces on faceZones
+            forAllConstIter(labelHashSet, includeFaceZones, iter)
+            {
+                const faceZone& pp = fzm[iter.key()];
+                forAll(pp, i)
+                {
+                    faceLabels.append(pp[i]);
+                    compactZones.append(faceZoneToCompactZone[pp.index()]);
+                }
+            }
+        }
+
+
+        // Addressing engine for all faces
+        uindirectPrimitivePatch allBoundary
         (
-            xferMove(allPoints),
-            xferMove(allFaces),
-            xferMove(allZones),
-            xferMove(surfZones)
+            UIndirectList<face>(mesh.faces(), faceLabels),
+            mesh.points()
         );
 
 
-        MeshedSurface<face> sortedFace(unsortedFace);
-
-        fileName globalCasePath
+        // Find correspondence to master points
+        labelList pointToGlobal;
+        labelList uniqueMeshPoints;
+        autoPtr<globalIndex> globalNumbers = mesh.globalData().mergePoints
         (
-            outFileName.isAbsolute()
-          ? outFileName
-          : (
-                runTime.processorCase()
-              ? runTime.rootPath()/runTime.globalCaseName()/outFileName
-              : runTime.path()/outFileName
-            )
+            allBoundary.meshPoints(),
+            allBoundary.meshPointMap(),
+            pointToGlobal,
+            uniqueMeshPoints
         );
 
-        Info<< "Writing merged surface to " << globalCasePath << endl;
+        // Gather all unique points on master
+        List<pointField> gatheredPoints(Pstream::nProcs());
+        gatheredPoints[Pstream::myProcNo()] = pointField
+        (
+            mesh.points(),
+            uniqueMeshPoints
+        );
+        Pstream::gatherList(gatheredPoints);
 
-        sortedFace.write(globalCasePath);
+        // Gather all faces
+        List<faceList> gatheredFaces(Pstream::nProcs());
+        gatheredFaces[Pstream::myProcNo()] = allBoundary.localFaces();
+        forAll(gatheredFaces[Pstream::myProcNo()], i)
+        {
+            inplaceRenumber
+           (
+                pointToGlobal,
+                gatheredFaces[Pstream::myProcNo()][i]
+           );
+        }
+        Pstream::gatherList(gatheredFaces);
+
+        // Gather all ZoneIDs
+        List<labelList> gatheredZones(Pstream::nProcs());
+        gatheredZones[Pstream::myProcNo()] = compactZones.xfer();
+        Pstream::gatherList(gatheredZones);
+
+        // On master combine all points, faces, zones
+        if (Pstream::master())
+        {
+            pointField allPoints = ListListOps::combine<pointField>
+            (
+                gatheredPoints,
+                accessOp<pointField>()
+            );
+            gatheredPoints.clear();
+
+            faceList allFaces = ListListOps::combine<faceList>
+            (
+                gatheredFaces,
+                accessOp<faceList>()
+            );
+            gatheredFaces.clear();
+
+            labelList allZones = ListListOps::combine<labelList>
+            (
+                gatheredZones,
+                accessOp<labelList>()
+            );
+            gatheredZones.clear();
+
+
+            // Zones
+            surfZoneIdentifierList surfZones(compactZoneID.size());
+            forAllConstIter(HashTable<label>, compactZoneID, iter)
+            {
+                surfZones[iter()] = surfZoneIdentifier(iter.key(), iter());
+                Info<< "surfZone " << iter()
+                    <<  " : "      << surfZones[iter()].name()
+                    << endl;
+            }
+
+            UnsortedMeshedSurface<face> unsortedFace
+            (
+                xferMove(allPoints),
+                xferMove(allFaces),
+                xferMove(allZones),
+                xferMove(surfZones)
+            );
+
+
+            MeshedSurface<face> sortedFace(unsortedFace);
+
+            fileName globalCasePath
+            (
+                outFileName.isAbsolute()
+              ? outFileName
+              : (
+                    runTime.processorCase()
+                  ? runTime.rootPath()/runTime.globalCaseName()/outFileName
+                  : runTime.path()/outFileName
+                )
+            );
+
+            Info<< "Writing merged surface to " << globalCasePath << endl;
+
+            sortedFace.write(globalCasePath);
+        }
     }
-
     Info<< "End\n" << endl;
 
     return 0;
diff --git a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
index 2f1f7699ca..dcfb66f61b 100644
--- a/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
+++ b/applications/utilities/surface/surfaceTransformPoints/surfaceTransformPoints.C
@@ -61,8 +61,10 @@ int main(int argc, char *argv[])
 {
     argList::addNote
     (
-        "Transform (scale/rotate) a surface. "
-        "Like transformPoints but for surfaces."
+        "Transform (translate/rotate/scale) a surface. "
+        "Like transformPoints but for surfaces.\n"
+        "Note: roll=rotation about x, pitch=rotation about y, "
+        "yaw=rotation about z"
     );
     argList::noParallel();
     argList::validArgs.append("surfaceFile");
@@ -91,13 +93,13 @@ int main(int argc, char *argv[])
     (
         "rollPitchYaw",
         "vector",
-        "transform in terms of '( roll pitch yaw )' in degrees"
+        "rotate by '(roll pitch yaw)' in degrees"
     );
     argList::addOption
     (
         "yawPitchRoll",
         "vector",
-        "transform in terms of '( yaw pitch roll )' in degrees"
+        "rotate by '(yaw pitch roll)' in degrees"
     );
     argList args(argc, argv);
 
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log b/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
deleted file mode 100644
index 02555c3591..0000000000
--- a/applications/utilities/thermophysical/adiabaticFlameT/Hydrogen.log
+++ /dev/null
@@ -1,8726 +0,0 @@
-/*---------------------------------------------------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-Build  : dev-27a117d1f441
-Exec   : adiabaticFlameT controlDict
-Date   : Jan 16 2013
-Time   : 15:39:43
-Host   : "dm"
-PID    : 4485
-Case   : /home/dm2/henry/OpenFOAM/OpenFOAM-dev/applications/utilities/thermophysical/adiabaticFlameT
-nProcs : 1
-sigFpe : Enabling floating point exception trapping (FOAM_SIGFPE).
-SetNaN : Initialising allocated memory to NaN (FOAM_SETNAN).
-fileModificationChecking : Monitoring run-time modified files using timeStampMaster
-allowSystemOperations : Allowing user-supplied system call operations
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Reading thermodynamic data dictionary
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 34.0741;
-phi = 0.01
-ft = 0.000293392
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       28.7381
-    200 6000    1000
-    3.10064 0.00123965 -4.17681e-07 6.62032e-11 -3.8993e-15 -984.555 5.32933
-    3.57863 -0.000690587 1.58211e-06 -2.44153e-11 -4.60821e-13 -1049.99 3.10225
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.7983
-    200 6000    1000
-    3.09839 0.00124987 -4.2089e-07 6.663e-11 -3.91975e-15 -1105.92 5.36648
-    3.58598 -0.000727737 1.67376e-06 -1.11662e-10 -4.30243e-13 -1173.08 3.09467
-;
-Tad = 334.675
-
-phi = 0.02
-ft = 0.000586612
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       28.6268
-    200 6000    1000
-    3.09994 0.00123793 -4.16552e-07 6.59917e-11 -3.88593e-15 -983.841 5.30287
-    3.57349 -0.000654472 1.49439e-06 5.96414e-11 -4.89623e-13 -1049.44 3.09218
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.7465
-    200 6000    1000
-    3.09545 0.00125832 -4.22951e-07 6.68426e-11 -3.92669e-15 -1226.06 5.3769
-    3.58813 -0.000728465 1.67693e-06 -1.14136e-10 -4.28715e-13 -1295.1 3.077
-;
-Tad = 369.064
-
-phi = 0.03
-ft = 0.000879661
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       28.5164
-    200 6000    1000
-    3.09924 0.00123623 -4.15431e-07 6.57819e-11 -3.87267e-15 -983.133 5.27663
-    3.56839 -0.000618656 1.40741e-06 1.43001e-10 -5.18187e-13 -1048.89 3.08218
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.695
-    200 6000    1000
-    3.09252 0.00126673 -4.25004e-07 6.70543e-11 -3.9336e-15 -1345.7 5.38728
-    3.59027 -0.000729191 1.6801e-06 -1.16599e-10 -4.27194e-13 -1416.61 3.0594
-;
-Tad = 403.142
-
-phi = 0.04
-ft = 0.00117254
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       28.407
-    200 6000    1000
-    3.09856 0.00123453 -4.1432e-07 6.55738e-11 -3.85951e-15 -982.43 5.2506
-    3.56334 -0.000583136 1.32113e-06 2.25672e-10 -5.46514e-13 -1048.35 3.07227
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.6436
-    200 6000    1000
-    3.08961 0.00127511 -4.27047e-07 6.72651e-11 -3.94049e-15 -1464.84 5.39762
-    3.5924 -0.000729913 1.68325e-06 -1.19052e-10 -4.25679e-13 -1537.62 3.04187
-;
-Tad = 436.888
-
-phi = 0.05
-ft = 0.00146524
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       28.2984
-    200 6000    1000
-    3.09787 0.00123286 -4.13218e-07 6.53674e-11 -3.84647e-15 -981.733 5.22479
-    3.55832 -0.000547908 1.23557e-06 3.07662e-10 -5.74608e-13 -1047.81 3.06245
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.5924
-    200 6000    1000
-    3.08671 0.00128346 -4.29082e-07 6.74751e-11 -3.94734e-15 -1583.49 5.40791
-    3.59453 -0.000730633 1.68639e-06 -1.21495e-10 -4.24171e-13 -1658.13 3.02442
-;
-Tad = 470.284
-
-phi = 0.06
-ft = 0.00175777
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       28.1907
-    200 6000    1000
-    3.0972 0.00123119 -4.12125e-07 6.51628e-11 -3.83353e-15 -981.043 5.19919
-    3.55335 -0.00051297 1.15072e-06 3.88981e-10 -6.02473e-13 -1047.28 3.0527
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.5415
-    200 6000    1000
-    3.08382 0.00129177 -4.31109e-07 6.76841e-11 -3.95417e-15 -1701.64 5.41816
-    3.59664 -0.000731349 1.68951e-06 -1.23928e-10 -4.22668e-13 -1778.13 3.00704
-;
-Tad = 503.317
-
-phi = 0.07
-ft = 0.00205014
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       28.0839
-    200 6000    1000
-    3.09653 0.00122954 -4.1104e-07 6.49598e-11 -3.8207e-15 -980.357 5.17379
-    3.54841 -0.000478316 1.06655e-06 4.69636e-10 -6.30109e-13 -1046.75 3.04303
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.4908
-    200 6000    1000
-    3.08094 0.00130004 -4.33128e-07 6.78924e-11 -3.96097e-15 -1819.3 5.42836
-    3.59875 -0.000732062 1.69262e-06 -1.26351e-10 -4.21172e-13 -1897.64 2.98974
-;
-Tad = 535.974
-
-phi = 0.08
-ft = 0.00234233
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       27.978
-    200 6000    1000
-    3.09586 0.0012279 -4.09965e-07 6.47584e-11 -3.80798e-15 -979.677 5.14861
-    3.54352 -0.000443944 9.83065e-07 5.49636e-10 -6.57522e-13 -1046.23 3.03344
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.4403
-    200 6000    1000
-    3.07807 0.00130828 -4.35138e-07 6.80997e-11 -3.96774e-15 -1936.48 5.43853
-    3.60085 -0.000732773 1.69572e-06 -1.28763e-10 -4.19682e-13 -2016.66 2.9725
-;
-Tad = 568.248
-
-phi = 0.09
-ft = 0.00263435
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       27.8729
-    200 6000    1000
-    3.0952 0.00122628 -4.08898e-07 6.45587e-11 -3.79535e-15 -979.003 5.12363
-    3.53867 -0.00040985 9.00258e-07 6.28988e-10 -6.84712e-13 -1045.71 3.02393
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.39
-    200 6000    1000
-    3.07522 0.00131649 -4.3714e-07 6.83062e-11 -3.97448e-15 -2053.18 5.44865
-    3.60294 -0.00073348 1.69881e-06 -1.31166e-10 -4.18199e-13 -2135.18 2.95534
-;
-Tad = 600.133
-
-phi = 0.1
-ft = 0.0029262
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       27.7687
-    200 6000    1000
-    3.09455 0.00122467 -4.0784e-07 6.43606e-11 -3.78283e-15 -978.334 5.09885
-    3.53385 -0.00037603 8.18118e-07 7.07701e-10 -7.11683e-13 -1045.2 3.01449
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.3399
-    200 6000    1000
-    3.07238 0.00132466 -4.39133e-07 6.85118e-11 -3.98119e-15 -2169.39 5.45873
-    3.60502 -0.000734185 1.70189e-06 -1.33559e-10 -4.16721e-13 -2253.22 2.93824
-;
-Tad = 631.628
-
-phi = 0.11
-ft = 0.00321787
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       27.6653
-    200 6000    1000
-    3.0939 0.00122307 -4.06791e-07 6.41641e-11 -3.77041e-15 -977.671 5.07426
-    3.52908 -0.000342483 7.36638e-07 7.85781e-10 -7.38438e-13 -1044.69 3.00513
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.29
-    200 6000    1000
-    3.06954 0.0013328 -4.41119e-07 6.87166e-11 -3.98788e-15 -2285.13 5.46877
-    3.60709 -0.000734887 1.70495e-06 -1.35942e-10 -4.15249e-13 -2370.77 2.92122
-;
-Tad = 662.732
-
-phi = 0.12
-ft = 0.00350938
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       27.5628
-    200 6000    1000
-    3.09326 0.00122149 -4.0575e-07 6.39692e-11 -3.75809e-15 -977.013 5.04988
-    3.52434 -0.000309203 6.5581e-07 8.63238e-10 -7.64978e-13 -1044.18 2.99585
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.2403
-    200 6000    1000
-    3.06672 0.0013409 -4.43096e-07 6.89206e-11 -3.99454e-15 -2400.39 5.47877
-    3.60916 -0.000735586 1.708e-06 -1.38315e-10 -4.13784e-13 -2487.84 2.90426
-;
-Tad = 693.449
-
-phi = 0.13
-ft = 0.00380072
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       27.461
-    200 6000    1000
-    3.09262 0.00121991 -4.04717e-07 6.37758e-11 -3.74587e-15 -976.36 5.02569
-    3.51964 -0.000276189 5.75625e-07 9.40077e-10 -7.91307e-13 -1043.68 2.98664
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.1908
-    200 6000    1000
-    3.06392 0.00134898 -4.45065e-07 6.91237e-11 -4.00117e-15 -2515.18 5.48872
-    3.61121 -0.000736282 1.71103e-06 -1.40679e-10 -4.12324e-13 -2604.43 2.88738
-;
-Tad = 723.78
-
-phi = 0.14
-ft = 0.00409188
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       27.3601
-    200 6000    1000
-    3.09198 0.00121835 -4.03692e-07 6.35839e-11 -3.73374e-15 -975.712 5.00169
-    3.51498 -0.000243437 4.96076e-07 1.01631e-09 -8.17428e-13 -1043.18 2.9775
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.1415
-    200 6000    1000
-    3.06112 0.00135702 -4.47026e-07 6.9326e-11 -4.00778e-15 -2629.51 5.49864
-    3.61326 -0.000736975 1.71406e-06 -1.43033e-10 -4.10871e-13 -2720.55 2.87056
-;
-Tad = 753.734
-
-phi = 0.15
-ft = 0.00438288
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       27.26
-    200 6000    1000
-    3.09136 0.00121681 -4.02676e-07 6.33936e-11 -3.72171e-15 -975.069 4.97788
-    3.51035 -0.000210943 4.17156e-07 1.09193e-09 -8.43342e-13 -1042.68 2.96843
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.0924
-    200 6000    1000
-    3.05834 0.00136502 -4.48979e-07 6.95275e-11 -4.01435e-15 -2743.37 5.50852
-    3.6153 -0.000737665 1.71707e-06 -1.45377e-10 -4.09423e-13 -2836.19 2.85381
-;
-Tad = 783.317
-
-phi = 0.16
-ft = 0.00467371
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       27.1606
-    200 6000    1000
-    3.09073 0.00121527 -4.01667e-07 6.32047e-11 -3.70977e-15 -974.432 4.95426
-    3.50577 -0.000178706 3.38858e-07 1.16697e-09 -8.69052e-13 -1042.19 2.95944
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       28.0435
-    200 6000    1000
-    3.05556 0.001373 -4.50924e-07 6.97281e-11 -4.02091e-15 -2856.76 5.51835
-    3.61733 -0.000738353 1.72007e-06 -1.47712e-10 -4.07981e-13 -2951.36 2.83713
-;
-Tad = 812.538
-
-phi = 0.17
-ft = 0.00496436
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       27.062
-    200 6000    1000
-    3.09011 0.00121375 -4.00666e-07 6.30174e-11 -3.69793e-15 -973.799 4.93082
-    3.50121 -0.000146721 2.61173e-07 1.24141e-09 -8.9456e-13 -1041.7 2.95051
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.9949
-    200 6000    1000
-    3.0528 0.00138094 -4.52862e-07 6.9928e-11 -4.02743e-15 -2969.7 5.52815
-    3.61935 -0.000739038 1.72305e-06 -1.50038e-10 -4.06545e-13 -3066.07 2.82052
-;
-Tad = 841.406
-
-phi = 0.18
-ft = 0.00525485
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.9642
-    200 6000    1000
-    3.0895 0.00121223 -3.99673e-07 6.28315e-11 -3.68618e-15 -973.172 4.90757
-    3.4967 -0.000114985 1.84094e-07 1.31527e-09 -9.19869e-13 -1041.22 2.94166
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.9464
-    200 6000    1000
-    3.05005 0.00138885 -4.54791e-07 7.0127e-11 -4.03393e-15 -3082.18 5.53791
-    3.62137 -0.00073972 1.72603e-06 -1.52354e-10 -4.05115e-13 -3180.31 2.80398
-;
-Tad = 869.932
-
-phi = 0.19
-ft = 0.00554517
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.8672
-    200 6000    1000
-    3.08889 0.00121073 -3.98688e-07 6.2647e-11 -3.67452e-15 -972.549 4.88449
-    3.49221 -8.34969e-05 1.07616e-07 1.38856e-09 -9.44981e-13 -1040.74 2.93287
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.8981
-    200 6000    1000
-    3.04731 0.00139673 -4.56713e-07 7.03252e-11 -4.0404e-15 -3194.2 5.54762
-    3.62337 -0.000740399 1.72899e-06 -1.5466e-10 -4.03691e-13 -3294.09 2.7875
-;
-Tad = 898.128
-
-phi = 0.2
-ft = 0.00583532
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.7709
-    200 6000    1000
-    3.08828 0.00120925 -3.97711e-07 6.2464e-11 -3.66295e-15 -971.931 4.8616
-    3.48777 -5.22526e-05 3.17297e-08 1.46128e-09 -9.69899e-13 -1040.27 2.92416
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.85
-    200 6000    1000
-    3.04458 0.00140458 -4.58627e-07 7.05227e-11 -4.04685e-15 -3305.78 5.5573
-    3.62537 -0.000741075 1.73194e-06 -1.56957e-10 -4.02272e-13 -3407.42 2.77109
-;
-Tad = 926.006
-
-phi = 0.21
-ft = 0.00612529
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.6754
-    200 6000    1000
-    3.08769 0.00120777 -3.96741e-07 6.22824e-11 -3.65147e-15 -971.318 4.83888
-    3.48335 -2.12494e-05 -4.35705e-08 1.53344e-09 -9.94625e-13 -1039.79 2.91551
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.8021
-    200 6000    1000
-    3.04186 0.00141239 -4.60533e-07 7.07193e-11 -4.05327e-15 -3416.9 5.56694
-    3.62736 -0.000741749 1.73488e-06 -1.59245e-10 -4.00859e-13 -3520.28 2.75474
-;
-Tad = 953.578
-
-phi = 0.22
-ft = 0.0064151
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.5806
-    200 6000    1000
-    3.08709 0.0012063 -3.95778e-07 6.21022e-11 -3.64008e-15 -970.709 4.81634
-    3.47897 9.51534e-06 -1.18292e-07 1.60504e-09 -1.01916e-12 -1039.33 2.90692
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.7544
-    200 6000    1000
-    3.03915 0.00142017 -4.62432e-07 7.09151e-11 -4.05966e-15 -3527.58 5.57654
-    3.62934 -0.00074242 1.73781e-06 -1.61524e-10 -3.99452e-13 -3632.69 2.73846
-;
-Tad = 980.858
-
-phi = 0.23
-ft = 0.00670474
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.4865
-    200 6000    1000
-    3.0865 0.00120485 -3.94823e-07 6.19234e-11 -3.62878e-15 -970.105 4.79397
-    3.47463 4.00444e-05 -1.92441e-07 1.6761e-09 -1.04351e-12 -1038.86 2.89841
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.7068
-    200 6000    1000
-    3.03646 0.00142793 -4.64323e-07 7.11102e-11 -4.06603e-15 -3637.82 5.5861
-    3.63132 -0.000743088 1.74073e-06 -1.63794e-10 -3.98051e-13 -3744.66 2.72225
-;
-Tad = 1007.86
-
-phi = 0.24
-ft = 0.00699422
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.3931
-    200 6000    1000
-    3.08591 0.00120341 -3.93875e-07 6.17459e-11 -3.61756e-15 -969.506 4.77177
-    3.47032 7.03406e-05 -2.66024e-07 1.74661e-09 -1.06767e-12 -1038.4 2.88995
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.6595
-    200 6000    1000
-    3.03377 0.00143565 -4.66206e-07 7.13045e-11 -4.07237e-15 -3747.61 5.59563
-    3.63328 -0.000743754 1.74363e-06 -1.66055e-10 -3.96655e-13 -3856.17 2.7061
-;
-Tad = 1034.59
-
-phi = 0.25
-ft = 0.00728352
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.3005
-    200 6000    1000
-    3.08533 0.00120197 -3.92935e-07 6.15698e-11 -3.60643e-15 -968.912 4.74974
-    3.46604 0.000100406 -3.39047e-07 1.81659e-09 -1.09165e-12 -1037.94 2.88157
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.6124
-    200 6000    1000
-    3.0311 0.00144334 -4.68082e-07 7.1498e-11 -4.07869e-15 -3856.97 5.60511
-    3.63524 -0.000744417 1.74652e-06 -1.68306e-10 -3.95264e-13 -3967.24 2.69001
-;
-Tad = 1061.05
-
-phi = 0.26
-ft = 0.00757265
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.2085
-    200 6000    1000
-    3.08475 0.00120055 -3.92001e-07 6.1395e-11 -3.59538e-15 -968.322 4.72788
-    3.46179 0.000130245 -4.11518e-07 1.88603e-09 -1.11544e-12 -1037.49 2.87324
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.5654
-    200 6000    1000
-    3.02843 0.001451 -4.6995e-07 7.16907e-11 -4.08498e-15 -3965.89 5.61456
-    3.63719 -0.000745078 1.7494e-06 -1.70549e-10 -3.93879e-13 -4077.87 2.67399
-;
-Tad = 1087.24
-
-phi = 0.27
-ft = 0.00786162
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.1172
-    200 6000    1000
-    3.08418 0.00119914 -3.91075e-07 6.12215e-11 -3.58442e-15 -967.736 4.70618
-    3.45757 0.000159858 -4.83442e-07 1.95496e-09 -1.13906e-12 -1037.04 2.86498
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.5186
-    200 6000    1000
-    3.02578 0.00145863 -4.71811e-07 7.18827e-11 -4.09125e-15 -4074.37 5.62397
-    3.63914 -0.000745735 1.75227e-06 -1.72783e-10 -3.925e-13 -4188.06 2.65804
-;
-Tad = 1113.17
-
-phi = 0.28
-ft = 0.00815042
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       26.0267
-    200 6000    1000
-    3.08361 0.00119774 -3.90155e-07 6.10494e-11 -3.57354e-15 -967.155 4.68464
-    3.45339 0.000189248 -5.54825e-07 2.02336e-09 -1.1625e-12 -1036.59 2.85678
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.472
-    200 6000    1000
-    3.02313 0.00146623 -4.73665e-07 7.20739e-11 -4.09749e-15 -4182.43 5.63334
-    3.64107 -0.000746391 1.75513e-06 -1.75008e-10 -3.91126e-13 -4297.81 2.64214
-;
-Tad = 1138.85
-
-phi = 0.29
-ft = 0.00843905
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.9368
-    200 6000    1000
-    3.08305 0.00119635 -3.89243e-07 6.08785e-11 -3.56274e-15 -966.578 4.66327
-    3.44924 0.000218418 -6.25674e-07 2.09125e-09 -1.18576e-12 -1036.14 2.84864
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.4256
-    200 6000    1000
-    3.0205 0.00147379 -4.75511e-07 7.22643e-11 -4.10371e-15 -4290.06 5.64268
-    3.643 -0.000747043 1.75798e-06 -1.77224e-10 -3.89758e-13 -4407.13 2.62631
-;
-Tad = 1164.29
-
-phi = 0.3
-ft = 0.00872751
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.8476
-    200 6000    1000
-    3.08249 0.00119497 -3.88337e-07 6.07089e-11 -3.55202e-15 -966.005 4.64205
-    3.44512 0.000247371 -6.95994e-07 2.15864e-09 -1.20885e-12 -1035.7 2.84056
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.3794
-    200 6000    1000
-    3.01788 0.00148133 -4.7735e-07 7.2454e-11 -4.10991e-15 -4397.26 5.65198
-    3.64492 -0.000747693 1.76082e-06 -1.79431e-10 -3.88395e-13 -4516.01 2.61054
-;
-Tad = 1189.47
-
-phi = 0.31
-ft = 0.0090158
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.759
-    200 6000    1000
-    3.08193 0.0011936 -3.87438e-07 6.05406e-11 -3.54138e-15 -965.437 4.621
-    3.44102 0.000276109 -7.65792e-07 2.22553e-09 -1.23177e-12 -1035.27 2.83254
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.3334
-    200 6000    1000
-    3.01527 0.00148884 -4.79182e-07 7.2643e-11 -4.11608e-15 -4504.05 5.66124
-    3.64683 -0.000748341 1.76364e-06 -1.8163e-10 -3.87037e-13 -4624.47 2.59483
-;
-Tad = 1214.42
-
-phi = 0.32
-ft = 0.00930393
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.6711
-    200 6000    1000
-    3.08138 0.00119225 -3.86545e-07 6.03735e-11 -3.53082e-15 -964.873 4.6001
-    3.43696 0.000304634 -8.35073e-07 2.29192e-09 -1.25452e-12 -1034.83 2.82459
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.2875
-    200 6000    1000
-    3.01267 0.00149632 -4.81006e-07 7.28312e-11 -4.12222e-15 -4610.41 5.67047
-    3.64874 -0.000748986 1.76645e-06 -1.8382e-10 -3.85684e-13 -4732.49 2.57919
-;
-Tad = 1239.13
-
-phi = 0.33
-ft = 0.00959189
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.5838
-    200 6000    1000
-    3.08083 0.0011909 -3.8566e-07 6.02076e-11 -3.52033e-15 -964.313 4.57935
-    3.43293 0.000332948 -9.03842e-07 2.35782e-09 -1.2771e-12 -1034.4 2.81669
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.2419
-    200 6000    1000
-    3.01007 0.00150377 -4.82824e-07 7.30187e-11 -4.12834e-15 -4716.35 5.67966
-    3.65063 -0.000749628 1.76926e-06 -1.86001e-10 -3.84337e-13 -4840.1 2.56361
-;
-Tad = 1263.61
-
-phi = 0.34
-ft = 0.00987968
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.4972
-    200 6000    1000
-    3.08029 0.00118956 -3.8478e-07 6.0043e-11 -3.50993e-15 -963.757 4.55875
-    3.42893 0.000361054 -9.72106e-07 2.42323e-09 -1.29952e-12 -1033.97 2.80884
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.1964
-    200 6000    1000
-    3.00749 0.00151119 -4.84634e-07 7.32054e-11 -4.13444e-15 -4821.88 5.68881
-    3.65252 -0.000750268 1.77205e-06 -1.88174e-10 -3.82996e-13 -4947.28 2.54808
-;
-Tad = 1287.86
-
-phi = 0.35
-ft = 0.0101673
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.4112
-    200 6000    1000
-    3.07975 0.00118823 -3.83907e-07 5.98795e-11 -3.4996e-15 -963.205 4.53831
-    3.42496 0.000388955 -1.03987e-06 2.48817e-09 -1.32177e-12 -1033.55 2.80106
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.1511
-    200 6000    1000
-    3.00492 0.00151859 -4.86437e-07 7.33914e-11 -4.14051e-15 -4926.99 5.69793
-    3.65441 -0.000750905 1.77483e-06 -1.90338e-10 -3.81659e-13 -5054.04 2.53262
-;
-Tad = 1311.88
-
-phi = 0.36
-ft = 0.0104548
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.3259
-    200 6000    1000
-    3.07921 0.00118691 -3.83041e-07 5.97173e-11 -3.48934e-15 -962.657 4.51802
-    3.42102 0.000416651 -1.10714e-06 2.55263e-09 -1.34386e-12 -1033.12 2.79333
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.1059
-    200 6000    1000
-    3.00236 0.00152595 -4.88233e-07 7.35767e-11 -4.14656e-15 -5031.7 5.70701
-    3.65628 -0.00075154 1.7776e-06 -1.92494e-10 -3.80328e-13 -5160.39 2.51722
-;
-Tad = 1335.69
-
-phi = 0.37
-ft = 0.0107421
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.2411
-    200 6000    1000
-    3.07868 0.0011856 -3.82181e-07 5.95562e-11 -3.47916e-15 -962.114 4.49787
-    3.41711 0.000444147 -1.17392e-06 2.61663e-09 -1.36578e-12 -1032.71 2.78566
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.061
-    200 6000    1000
-    2.99981 0.00153328 -4.90022e-07 7.37612e-11 -4.15259e-15 -5136 5.71606
-    3.65815 -0.000752172 1.78036e-06 -1.94642e-10 -3.79002e-13 -5266.32 2.50188
-;
-Tad = 1359.28
-
-phi = 0.38
-ft = 0.0110292
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.157
-    200 6000    1000
-    3.07815 0.0011843 -3.81327e-07 5.93963e-11 -3.46905e-15 -961.574 4.47787
-    3.41322 0.000471443 -1.24022e-06 2.68016e-09 -1.38755e-12 -1032.29 2.77805
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       27.0162
-    200 6000    1000
-    2.99727 0.00154059 -4.91805e-07 7.39451e-11 -4.15859e-15 -5239.89 5.72507
-    3.66001 -0.000752802 1.7831e-06 -1.96781e-10 -3.77681e-13 -5371.84 2.4866
-;
-Tad = 1382.66
-
-phi = 0.39
-ft = 0.0113161
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       25.0735
-    200 6000    1000
-    3.07763 0.00118301 -3.80479e-07 5.92376e-11 -3.45902e-15 -961.038 4.45801
-    3.40936 0.000498542 -1.30604e-06 2.74323e-09 -1.40916e-12 -1031.88 2.77049
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.9716
-    200 6000    1000
-    2.99474 0.00154787 -4.9358e-07 7.41282e-11 -4.16457e-15 -5343.37 5.73404
-    3.66186 -0.00075343 1.78584e-06 -1.98912e-10 -3.76365e-13 -5476.95 2.47138
-;
-Tad = 1405.83
-
-phi = 0.4
-ft = 0.0116029
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.9906
-    200 6000    1000
-    3.07711 0.00118173 -3.79637e-07 5.908e-11 -3.44906e-15 -960.506 4.4383
-    3.40553 0.000525447 -1.37138e-06 2.80585e-09 -1.43062e-12 -1031.47 2.76298
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.9271
-    200 6000    1000
-    2.99222 0.00155512 -4.95348e-07 7.43106e-11 -4.17052e-15 -5446.46 5.74299
-    3.66371 -0.000754055 1.78857e-06 -2.01034e-10 -3.75054e-13 -5581.65 2.45621
-;
-Tad = 1428.79
-
-phi = 0.41
-ft = 0.0118895
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.9083
-    200 6000    1000
-    3.07659 0.00118046 -3.78802e-07 5.89235e-11 -3.43917e-15 -959.977 4.41872
-    3.40173 0.000552158 -1.43626e-06 2.86802e-09 -1.45192e-12 -1031.06 2.75553
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.8829
-    200 6000    1000
-    2.9897 0.00156234 -4.9711e-07 7.44923e-11 -4.17646e-15 -5549.15 5.75189
-    3.66555 -0.000754677 1.79128e-06 -2.03149e-10 -3.73749e-13 -5685.95 2.44111
-;
-Tad = 1451.55
-
-phi = 0.42
-ft = 0.012176
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.8265
-    200 6000    1000
-    3.07608 0.00117919 -3.77972e-07 5.87682e-11 -3.42935e-15 -959.453 4.39929
-    3.39796 0.000578679 -1.50067e-06 2.92974e-09 -1.47307e-12 -1030.66 2.74813
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.8388
-    200 6000    1000
-    2.9872 0.00156953 -4.98864e-07 7.46733e-11 -4.18237e-15 -5651.44 5.76077
-    3.66738 -0.000755298 1.79399e-06 -2.05255e-10 -3.72448e-13 -5789.85 2.42606
-;
-Tad = 1474.11
-
-phi = 0.43
-ft = 0.0124623
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.7454
-    200 6000    1000
-    3.07557 0.00117794 -3.77148e-07 5.86139e-11 -3.4196e-15 -958.932 4.38
-    3.39421 0.000605011 -1.56463e-06 2.99103e-09 -1.49407e-12 -1030.26 2.74078
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.7948
-    200 6000    1000
-    2.98471 0.0015767 -5.00612e-07 7.48536e-11 -4.18825e-15 -5753.34 5.7696
-    3.6692 -0.000755915 1.79669e-06 -2.07353e-10 -3.71153e-13 -5893.34 2.41107
-;
-Tad = 1496.48
-
-phi = 0.44
-ft = 0.0127484
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.6648
-    200 6000    1000
-    3.07506 0.00117669 -3.7633e-07 5.84608e-11 -3.40992e-15 -958.415 4.36084
-    3.39049 0.000631157 -1.62813e-06 3.05188e-09 -1.51493e-12 -1029.86 2.73349
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.7511
-    200 6000    1000
-    2.98223 0.00158384 -5.02354e-07 7.50332e-11 -4.19412e-15 -5854.85 5.77841
-    3.67102 -0.000756531 1.79937e-06 -2.09443e-10 -3.69862e-13 -5996.44 2.39614
-;
-Tad = 1518.65
-
-phi = 0.45
-ft = 0.0130344
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.5848
-    200 6000    1000
-    3.07456 0.00117546 -3.75518e-07 5.83087e-11 -3.40031e-15 -957.902 4.34182
-    3.38679 0.000657118 -1.69118e-06 3.11231e-09 -1.53563e-12 -1029.46 2.72624
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.7075
-    200 6000    1000
-    2.97975 0.00159095 -5.04088e-07 7.52121e-11 -4.19996e-15 -5955.96 5.78718
-    3.67283 -0.000757144 1.80204e-06 -2.11525e-10 -3.68576e-13 -6099.14 2.38127
-;
-Tad = 1540.63
-
-phi = 0.46
-ft = 0.0133202
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.5054
-    200 6000    1000
-    3.07406 0.00117423 -3.74711e-07 5.81577e-11 -3.39076e-15 -957.392 4.32293
-    3.38312 0.000682896 -1.75379e-06 3.1723e-09 -1.55619e-12 -1029.07 2.71905
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.6641
-    200 6000    1000
-    2.97729 0.00159803 -5.05816e-07 7.53904e-11 -4.20578e-15 -6056.69 5.79592
-    3.67464 -0.000757755 1.80471e-06 -2.13599e-10 -3.67296e-13 -6201.45 2.36645
-;
-Tad = 1562.43
-
-phi = 0.47
-ft = 0.0136058
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.4265
-    200 6000    1000
-    3.07357 0.00117301 -3.73911e-07 5.80078e-11 -3.38129e-15 -956.886 4.30417
-    3.37948 0.000708493 -1.81596e-06 3.23188e-09 -1.5766e-12 -1028.68 2.71191
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.6208
-    200 6000    1000
-    2.97483 0.00160509 -5.07537e-07 7.55679e-11 -4.21158e-15 -6157.04 5.80462
-    3.67643 -0.000758363 1.80736e-06 -2.15665e-10 -3.6602e-13 -6303.36 2.35169
-;
-Tad = 1584.04
-
-phi = 0.48
-ft = 0.0138913
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.3482
-    200 6000    1000
-    3.07307 0.0011718 -3.73115e-07 5.78589e-11 -3.37187e-15 -956.383 4.28555
-    3.37586 0.000733911 -1.8777e-06 3.29104e-09 -1.59687e-12 -1028.29 2.70482
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.5777
-    200 6000    1000
-    2.97239 0.00161212 -5.09252e-07 7.57448e-11 -4.21735e-15 -6257 5.81329
-    3.67822 -0.000758969 1.81001e-06 -2.17723e-10 -3.64749e-13 -6404.89 2.33699
-;
-Tad = 1605.47
-
-phi = 0.49
-ft = 0.0141766
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.2704
-    200 6000    1000
-    3.07259 0.0011706 -3.72326e-07 5.7711e-11 -3.36253e-15 -955.884 4.26705
-    3.37227 0.000759152 -1.939e-06 3.34979e-09 -1.617e-12 -1027.91 2.69778
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.5348
-    200 6000    1000
-    2.96995 0.00161912 -5.1096e-07 7.5921e-11 -4.2231e-15 -6356.58 5.82193
-    3.68001 -0.000759573 1.81264e-06 -2.19774e-10 -3.63483e-13 -6506.03 2.32234
-;
-Tad = 1626.72
-
-phi = 0.5
-ft = 0.0144617
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.1931
-    200 6000    1000
-    3.0721 0.0011694 -3.71541e-07 5.75642e-11 -3.35325e-15 -955.388 4.24869
-    3.3687 0.000784218 -1.99988e-06 3.40813e-09 -1.63699e-12 -1027.53 2.69078
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.492
-    200 6000    1000
-    2.96753 0.0016261 -5.12662e-07 7.60966e-11 -4.22884e-15 -6455.78 5.83054
-    3.68178 -0.000760175 1.81527e-06 -2.21816e-10 -3.62221e-13 -6606.79 2.30775
-;
-Tad = 1647.79
-
-phi = 0.51
-ft = 0.0147467
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.1164
-    200 6000    1000
-    3.07162 0.00116822 -3.70763e-07 5.74184e-11 -3.34403e-15 -954.896 4.23045
-    3.36515 0.00080911 -2.06034e-06 3.46606e-09 -1.65685e-12 -1027.15 2.68384
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.4494
-    200 6000    1000
-    2.96511 0.00163305 -5.14357e-07 7.62714e-11 -4.23455e-15 -6554.61 5.83911
-    3.68355 -0.000760774 1.81788e-06 -2.23851e-10 -3.60965e-13 -6707.17 2.29322
-;
-Tad = 1668.69
-
-phi = 0.52
-ft = 0.0150315
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       24.0402
-    200 6000    1000
-    3.07114 0.00116704 -3.69989e-07 5.72735e-11 -3.33488e-15 -954.407 4.21233
-    3.36164 0.000833831 -2.12038e-06 3.5236e-09 -1.67656e-12 -1026.77 2.67694
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.407
-    200 6000    1000
-    2.9627 0.00163997 -5.16046e-07 7.64456e-11 -4.24023e-15 -6653.06 5.84765
-    3.68532 -0.000761371 1.82048e-06 -2.25878e-10 -3.59713e-13 -6807.16 2.27873
-;
-Tad = 1689.42
-
-phi = 0.53
-ft = 0.0153161
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.9646
-    200 6000    1000
-    3.07067 0.00116587 -3.69221e-07 5.71297e-11 -3.32579e-15 -953.921 4.19434
-    3.35814 0.000858382 -2.18001e-06 3.58074e-09 -1.69614e-12 -1026.4 2.67009
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.3647
-    200 6000    1000
-    2.9603 0.00164687 -5.17729e-07 7.66192e-11 -4.2459e-15 -6751.14 5.85615
-    3.68707 -0.000761965 1.82308e-06 -2.27898e-10 -3.58466e-13 -6906.78 2.26431
-;
-Tad = 1709.98
-
-phi = 0.54
-ft = 0.0156006
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.8894
-    200 6000    1000
-    3.07019 0.00116471 -3.68458e-07 5.69869e-11 -3.31676e-15 -953.439 4.17648
-    3.35467 0.000882765 -2.23923e-06 3.63749e-09 -1.71559e-12 -1026.03 2.66329
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.3226
-    200 6000    1000
-    2.95791 0.00165374 -5.19405e-07 7.67921e-11 -4.25154e-15 -6848.85 5.86463
-    3.68882 -0.000762558 1.82566e-06 -2.29909e-10 -3.57224e-13 -7006.02 2.24994
-;
-Tad = 1730.37
-
-phi = 0.55
-ft = 0.0158849
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.8148
-    200 6000    1000
-    3.06973 0.00116355 -3.67701e-07 5.68451e-11 -3.3078e-15 -952.96 4.15873
-    3.35122 0.000906982 -2.29805e-06 3.69385e-09 -1.7349e-12 -1025.66 2.65653
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.2806
-    200 6000    1000
-    2.95553 0.00166058 -5.21074e-07 7.69643e-11 -4.25717e-15 -6946.19 5.87307
-    3.69057 -0.000763148 1.82824e-06 -2.31914e-10 -3.55986e-13 -7104.89 2.23562
-;
-Tad = 1750.6
-
-phi = 0.56
-ft = 0.0161691
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.7407
-    200 6000    1000
-    3.06926 0.00116241 -3.66948e-07 5.67042e-11 -3.29889e-15 -952.484 4.14111
-    3.3478 0.000931034 -2.35647e-06 3.74983e-09 -1.75408e-12 -1025.29 2.64982
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.2388
-    200 6000    1000
-    2.95316 0.0016674 -5.22738e-07 7.71359e-11 -4.26277e-15 -7043.16 5.88149
-    3.6923 -0.000763736 1.8308e-06 -2.3391e-10 -3.54753e-13 -7203.38 2.22135
-;
-Tad = 1770.67
-
-phi = 0.57
-ft = 0.016453
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.6671
-    200 6000    1000
-    3.0688 0.00116127 -3.66201e-07 5.65642e-11 -3.29004e-15 -952.012 4.1236
-    3.3444 0.000954923 -2.41449e-06 3.80543e-09 -1.77313e-12 -1024.93 2.64316
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.1971
-    200 6000    1000
-    2.9508 0.0016742 -5.24395e-07 7.73069e-11 -4.26835e-15 -7139.78 5.88987
-    3.69403 -0.000764322 1.83336e-06 -2.359e-10 -3.53525e-13 -7301.51 2.20714
-;
-Tad = 1790.57
-
-phi = 0.58
-ft = 0.0167369
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.5939
-    200 6000    1000
-    3.06834 0.00116014 -3.65459e-07 5.64252e-11 -3.28126e-15 -951.543 4.10622
-    3.34102 0.00097865 -2.47212e-06 3.86066e-09 -1.79205e-12 -1024.57 2.63654
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.1556
-    200 6000    1000
-    2.94844 0.00168097 -5.26046e-07 7.74772e-11 -4.27391e-15 -7236.03 5.89821
-    3.69576 -0.000764905 1.8359e-06 -2.37882e-10 -3.52301e-13 -7399.27 2.19298
-;
-Tad = 1810.32
-
-phi = 0.59
-ft = 0.0170205
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.5213
-    200 6000    1000
-    3.06788 0.00115902 -3.64721e-07 5.62872e-11 -3.27253e-15 -951.077 4.08895
-    3.33767 0.00100222 -2.52936e-06 3.91551e-09 -1.81085e-12 -1024.21 2.62996
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.1143
-    200 6000    1000
-    2.9461 0.00168771 -5.27691e-07 7.76469e-11 -4.27945e-15 -7331.92 5.90653
-    3.69747 -0.000765487 1.83844e-06 -2.39856e-10 -3.51082e-13 -7496.66 2.17888
-;
-Tad = 1829.92
-
-phi = 0.6
-ft = 0.017304
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.4492
-    200 6000    1000
-    3.06743 0.0011579 -3.63989e-07 5.61501e-11 -3.26387e-15 -950.614 4.0718
-    3.33433 0.00102563 -2.58622e-06 3.97e-09 -1.82952e-12 -1023.85 2.62343
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.0731
-    200 6000    1000
-    2.94376 0.00169443 -5.2933e-07 7.78159e-11 -4.28497e-15 -7427.45 5.91482
-    3.69918 -0.000766066 1.84097e-06 -2.41823e-10 -3.49867e-13 -7593.69 2.16483
-;
-Tad = 1849.36
-
-phi = 0.61
-ft = 0.0175873
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.3775
-    200 6000    1000
-    3.06698 0.00115679 -3.63261e-07 5.60138e-11 -3.25526e-15 -950.154 4.05476
-    3.33102 0.00104888 -2.64269e-06 4.02412e-09 -1.84806e-12 -1023.5 2.61694
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       26.0321
-    200 6000    1000
-    2.94143 0.00170112 -5.30963e-07 7.79843e-11 -4.29047e-15 -7522.63 5.92307
-    3.70089 -0.000766643 1.84349e-06 -2.43783e-10 -3.48657e-13 -7690.36 2.15083
-;
-Tad = 1868.65
-
-phi = 0.62
-ft = 0.0178705
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.3063
-    200 6000    1000
-    3.06653 0.00115569 -3.62539e-07 5.58785e-11 -3.2467e-15 -949.697 4.03783
-    3.32774 0.00107198 -2.69879e-06 4.07788e-09 -1.86649e-12 -1023.14 2.6105
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.9912
-    200 6000    1000
-    2.93911 0.00170779 -5.32589e-07 7.81521e-11 -4.29595e-15 -7617.45 5.9313
-    3.70259 -0.000767218 1.84599e-06 -2.45735e-10 -3.47451e-13 -7786.67 2.13688
-;
-Tad = 1887.79
-
-phi = 0.63
-ft = 0.0181535
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.2356
-    200 6000    1000
-    3.06609 0.0011546 -3.61821e-07 5.57441e-11 -3.23821e-15 -949.243 4.02102
-    3.32447 0.00109492 -2.75452e-06 4.13128e-09 -1.88478e-12 -1022.8 2.6041
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.9505
-    200 6000    1000
-    2.9368 0.00171443 -5.3421e-07 7.83193e-11 -4.30141e-15 -7711.92 5.93949
-    3.70428 -0.000767791 1.84849e-06 -2.4768e-10 -3.4625e-13 -7882.62 2.12298
-;
-Tad = 1906.78
-
-phi = 0.64
-ft = 0.0184363
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.1654
-    200 6000    1000
-    3.06565 0.00115352 -3.61108e-07 5.56106e-11 -3.22977e-15 -948.792 4.00432
-    3.32123 0.00111772 -2.80988e-06 4.18433e-09 -1.90296e-12 -1022.45 2.59774
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.9099
-    200 6000    1000
-    2.9345 0.00172105 -5.35825e-07 7.84858e-11 -4.30685e-15 -7806.05 5.94766
-    3.70596 -0.000768362 1.85098e-06 -2.49618e-10 -3.45053e-13 -7978.22 2.10914
-;
-Tad = 1925.63
-
-phi = 0.65
-ft = 0.018719
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.0956
-    200 6000    1000
-    3.06521 0.00115244 -3.60399e-07 5.5478e-11 -3.22139e-15 -948.344 3.98773
-    3.318 0.00114036 -2.86487e-06 4.23703e-09 -1.92102e-12 -1022.1 2.59142
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.8695
-    200 6000    1000
-    2.9322 0.00172765 -5.37433e-07 7.86518e-11 -4.31226e-15 -7899.82 5.95579
-    3.70764 -0.00076893 1.85346e-06 -2.51549e-10 -3.43861e-13 -8073.47 2.09535
-;
-Tad = 1944.33
-
-phi = 0.66
-ft = 0.0190015
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       23.0263
-    200 6000    1000
-    3.06478 0.00115137 -3.59696e-07 5.53462e-11 -3.21306e-15 -947.9 3.97125
-    3.3148 0.00116285 -2.91951e-06 4.28938e-09 -1.93896e-12 -1021.76 2.58514
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.8292
-    200 6000    1000
-    2.92992 0.00173422 -5.39036e-07 7.88171e-11 -4.31766e-15 -7993.25 5.9639
-    3.70932 -0.000769497 1.85593e-06 -2.53473e-10 -3.42673e-13 -8168.36 2.0816
-;
-Tad = 1962.9
-
-phi = 0.67
-ft = 0.0192839
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.9574
-    200 6000    1000
-    3.06434 0.0011503 -3.58997e-07 5.52153e-11 -3.20479e-15 -947.458 3.95487
-    3.31162 0.0011852 -2.97378e-06 4.34139e-09 -1.95678e-12 -1021.42 2.57891
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.7891
-    200 6000    1000
-    2.92764 0.00174076 -5.40633e-07 7.89818e-11 -4.32304e-15 -8086.33 5.97197
-    3.71098 -0.000770061 1.8584e-06 -2.55389e-10 -3.41489e-13 -8262.9 2.06791
-;
-Tad = 1981.32
-
-phi = 0.68
-ft = 0.0195661
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.889
-    200 6000    1000
-    3.06391 0.00114924 -3.58302e-07 5.50853e-11 -3.19657e-15 -947.019 3.9386
-    3.30846 0.0012074 -3.0277e-06 4.39306e-09 -1.97448e-12 -1021.08 2.57271
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.7491
-    200 6000    1000
-    2.92537 0.00174729 -5.42223e-07 7.91459e-11 -4.3284e-15 -8179.07 5.98002
-    3.71265 -0.000770623 1.86085e-06 -2.57299e-10 -3.4031e-13 -8357.1 2.05427
-;
-Tad = 1999.6
-
-phi = 0.69
-ft = 0.0198481
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.821
-    200 6000    1000
-    3.06349 0.00114819 -3.57612e-07 5.49561e-11 -3.1884e-15 -946.582 3.92244
-    3.30532 0.00122945 -3.08127e-06 4.44439e-09 -1.99207e-12 -1020.75 2.56656
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.7093
-    200 6000    1000
-    2.92311 0.00175378 -5.43809e-07 7.93094e-11 -4.33374e-15 -8271.48 5.98803
-    3.7143 -0.000771184 1.86329e-06 -2.59202e-10 -3.39135e-13 -8450.95 2.04068
-;
-Tad = 2017.75
-
-phi = 0.7
-ft = 0.0201299
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.7535
-    200 6000    1000
-    3.06306 0.00114715 -3.56927e-07 5.48277e-11 -3.18029e-15 -946.149 3.90639
-    3.3022 0.00125137 -3.13449e-06 4.49539e-09 -2.00955e-12 -1020.41 2.56045
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.6696
-    200 6000    1000
-    2.92086 0.00176026 -5.45388e-07 7.94723e-11 -4.33905e-15 -8363.54 5.99602
-    3.71595 -0.000771742 1.86573e-06 -2.61097e-10 -3.37965e-13 -8544.46 2.02714
-;
-Tad = 2035.76
-
-phi = 0.71
-ft = 0.0204116
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.6864
-    200 6000    1000
-    3.06264 0.00114611 -3.56245e-07 5.47002e-11 -3.17223e-15 -945.719 3.89044
-    3.2991 0.00127314 -3.18736e-06 4.54606e-09 -2.02691e-12 -1020.08 2.55437
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.63
-    200 6000    1000
-    2.91862 0.00176671 -5.46961e-07 7.96346e-11 -4.34435e-15 -8455.27 6.00397
-    3.71759 -0.000772298 1.86815e-06 -2.62986e-10 -3.36799e-13 -8637.62 2.01365
-;
-Tad = 2053.64
-
-phi = 0.72
-ft = 0.0206932
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.6197
-    200 6000    1000
-    3.06222 0.00114508 -3.55569e-07 5.45735e-11 -3.16422e-15 -945.291 3.87459
-    3.29602 0.00129477 -3.2399e-06 4.59641e-09 -2.04416e-12 -1019.75 2.54834
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.5906
-    200 6000    1000
-    2.91638 0.00177314 -5.48529e-07 7.97964e-11 -4.34963e-15 -8546.66 6.0119
-    3.71923 -0.000772852 1.87057e-06 -2.64868e-10 -3.35637e-13 -8730.45 2.0002
-;
-Tad = 2071.39
-
-phi = 0.73
-ft = 0.0209746
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.5535
-    200 6000    1000
-    3.06181 0.00114406 -3.54896e-07 5.44476e-11 -3.15626e-15 -944.866 3.85884
-    3.29296 0.00131626 -3.2921e-06 4.64643e-09 -2.0613e-12 -1019.42 2.54234
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.5514
-    200 6000    1000
-    2.91416 0.00177954 -5.50091e-07 7.99575e-11 -4.3549e-15 -8637.72 6.0198
-    3.72086 -0.000773404 1.87298e-06 -2.66743e-10 -3.34479e-13 -8822.93 1.98681
-;
-Tad = 2089.01
-
-phi = 0.74
-ft = 0.0212558
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.4877
-    200 6000    1000
-    3.06139 0.00114304 -3.54228e-07 5.43225e-11 -3.14835e-15 -944.443 3.84319
-    3.28992 0.00133761 -3.34396e-06 4.69612e-09 -2.07833e-12 -1019.1 2.53639
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.5123
-    200 6000    1000
-    2.91194 0.00178592 -5.51647e-07 8.0118e-11 -4.36014e-15 -8728.45 6.02767
-    3.72248 -0.000773954 1.87538e-06 -2.68611e-10 -3.33325e-13 -8915.08 1.97346
-;
-Tad = 2106.5
-
-phi = 0.75
-ft = 0.0215368
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.4223
-    200 6000    1000
-    3.06098 0.00114203 -3.53565e-07 5.41982e-11 -3.1405e-15 -944.024 3.82765
-    3.2869 0.00135883 -3.39549e-06 4.74551e-09 -2.09525e-12 -1018.78 2.53047
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.4733
-    200 6000    1000
-    2.90972 0.00179228 -5.53198e-07 8.0278e-11 -4.36536e-15 -8818.85 6.03551
-    3.7241 -0.000774502 1.87777e-06 -2.70472e-10 -3.32176e-13 -9006.9 1.96017
-;
-Tad = 2123.87
-
-phi = 0.76
-ft = 0.0218177
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.3574
-    200 6000    1000
-    3.06058 0.00114103 -3.52905e-07 5.40748e-11 -3.13269e-15 -943.607 3.8122
-    3.2839 0.00137991 -3.44669e-06 4.79457e-09 -2.11206e-12 -1018.46 2.52458
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.4345
-    200 6000    1000
-    2.90752 0.00179861 -5.54743e-07 8.04374e-11 -4.37056e-15 -8908.92 6.04332
-    3.72572 -0.000775049 1.88015e-06 -2.72327e-10 -3.31031e-13 -9098.38 1.94692
-;
-Tad = 2141.11
-
-phi = 0.77
-ft = 0.0220985
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.2928
-    200 6000    1000
-    3.06017 0.00114003 -3.5225e-07 5.3952e-11 -3.12494e-15 -943.193 3.79685
-    3.28092 0.00140086 -3.49757e-06 4.84333e-09 -2.12877e-12 -1018.14 2.51874
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.3958
-    200 6000    1000
-    2.90533 0.00180492 -5.56283e-07 8.05962e-11 -4.37575e-15 -8998.67 6.05111
-    3.72732 -0.000775593 1.88253e-06 -2.74174e-10 -3.2989e-13 -9189.54 1.93372
-;
-Tad = 2158.22
-
-phi = 0.78
-ft = 0.022379
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.2287
-    200 6000    1000
-    3.05977 0.00113904 -3.51598e-07 5.38301e-11 -3.11723e-15 -942.781 3.7816
-    3.27796 0.00142167 -3.54813e-06 4.89178e-09 -2.14537e-12 -1017.82 2.51293
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.3572
-    200 6000    1000
-    2.90314 0.00181121 -5.57817e-07 8.07544e-11 -4.38091e-15 -9088.09 6.05886
-    3.72892 -0.000776135 1.88489e-06 -2.76016e-10 -3.28753e-13 -9280.36 1.92056
-;
-Tad = 2175.21
-
-phi = 0.79
-ft = 0.0226594
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.1649
-    200 6000    1000
-    3.05937 0.00113805 -3.50951e-07 5.3709e-11 -3.10957e-15 -942.372 3.76644
-    3.27501 0.00144236 -3.59837e-06 4.93992e-09 -2.16187e-12 -1017.5 2.50716
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.3188
-    200 6000    1000
-    2.90096 0.00181748 -5.59345e-07 8.09121e-11 -4.38606e-15 -9177.19 6.06659
-    3.73052 -0.000776675 1.88725e-06 -2.7785e-10 -3.2762e-13 -9370.86 1.90746
-;
-Tad = 2192.09
-
-phi = 0.8
-ft = 0.0229397
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.1016
-    200 6000    1000
-    3.05897 0.00113707 -3.50308e-07 5.35886e-11 -3.10196e-15 -941.965 3.75138
-    3.27209 0.00146291 -3.64829e-06 4.98776e-09 -2.17826e-12 -1017.19 2.50143
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.2805
-    200 6000    1000
-    2.89879 0.00182372 -5.60868e-07 8.10692e-11 -4.39119e-15 -9265.97 6.07429
-    3.73211 -0.000777213 1.8896e-06 -2.79678e-10 -3.26491e-13 -9461.03 1.8944
-;
-Tad = 2208.84
-
-phi = 0.81
-ft = 0.0232198
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       22.0386
-    200 6000    1000
-    3.05857 0.0011361 -3.49669e-07 5.34689e-11 -3.0944e-15 -941.561 3.73641
-    3.26918 0.00148334 -3.6979e-06 5.03529e-09 -2.19455e-12 -1016.88 2.49573
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.2424
-    200 6000    1000
-    2.89662 0.00182994 -5.62386e-07 8.12257e-11 -4.3963e-15 -9354.43 6.08197
-    3.73369 -0.00077775 1.89194e-06 -2.815e-10 -3.25366e-13 -9550.88 1.88139
-;
-Tad = 2225.47
-
-phi = 0.82
-ft = 0.0234997
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.9761
-    200 6000    1000
-    3.05818 0.00113513 -3.49034e-07 5.335e-11 -3.08688e-15 -941.16 3.72154
-    3.26629 0.00150363 -3.74719e-06 5.08254e-09 -2.21074e-12 -1016.57 2.49006
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.2044
-    200 6000    1000
-    2.89447 0.00183614 -5.63898e-07 8.13817e-11 -4.40139e-15 -9442.58 6.08961
-    3.73527 -0.000778284 1.89427e-06 -2.83315e-10 -3.24245e-13 -9640.4 1.86842
-;
-Tad = 2241.99
-
-phi = 0.83
-ft = 0.0237795
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.9139
-    200 6000    1000
-    3.05779 0.00113417 -3.48403e-07 5.32319e-11 -3.07942e-15 -940.761 3.70676
-    3.26342 0.00152381 -3.79619e-06 5.12948e-09 -2.22682e-12 -1016.26 2.48444
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.1665
-    200 6000    1000
-    2.89232 0.00184232 -5.65404e-07 8.15371e-11 -4.40647e-15 -9530.41 6.09723
-    3.73685 -0.000778817 1.89659e-06 -2.85123e-10 -3.23129e-13 -9729.61 1.8555
-;
-Tad = 2258.4
-
-phi = 0.84
-ft = 0.0240591
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.8521
-    200 6000    1000
-    3.0574 0.00113322 -3.47776e-07 5.31144e-11 -3.07199e-15 -940.365 3.69207
-    3.26057 0.00154385 -3.84487e-06 5.17614e-09 -2.24281e-12 -1015.96 2.47884
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.1288
-    200 6000    1000
-    2.89018 0.00184847 -5.66905e-07 8.1692e-11 -4.41153e-15 -9617.92 6.10482
-    3.73841 -0.000779347 1.89891e-06 -2.86925e-10 -3.22016e-13 -9818.5 1.84263
-;
-Tad = 2274.68
-
-phi = 0.85
-ft = 0.0243385
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.7907
-    200 6000    1000
-    3.05702 0.00113227 -3.47153e-07 5.29977e-11 -3.06462e-15 -939.971 3.67747
-    3.25773 0.00156377 -3.89326e-06 5.22251e-09 -2.2587e-12 -1015.66 2.47329
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.0912
-    200 6000    1000
-    2.88805 0.0018546 -5.68401e-07 8.18463e-11 -4.41656e-15 -9705.12 6.11239
-    3.73997 -0.000779876 1.90122e-06 -2.8872e-10 -3.20907e-13 -9907.07 1.8298
-;
-Tad = 2290.86
-
-phi = 0.86
-ft = 0.0246178
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.7297
-    200 6000    1000
-    3.05664 0.00113132 -3.46533e-07 5.28818e-11 -3.05729e-15 -939.579 3.66297
-    3.25491 0.00158357 -3.94135e-06 5.26859e-09 -2.27449e-12 -1015.35 2.46776
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.0538
-    200 6000    1000
-    2.88592 0.00186072 -5.69892e-07 8.2e-11 -4.42158e-15 -9792.02 6.11992
-    3.74153 -0.000780403 1.90351e-06 -2.9051e-10 -3.19802e-13 -9995.32 1.81702
-;
-Tad = 2306.93
-
-phi = 0.87
-ft = 0.0248969
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.6691
-    200 6000    1000
-    3.05625 0.00113039 -3.45918e-07 5.27665e-11 -3.05e-15 -939.19 3.64855
-    3.25211 0.00160325 -3.98914e-06 5.31439e-09 -2.29018e-12 -1015.05 2.46227
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       25.0164
-    200 6000    1000
-    2.8838 0.0018668 -5.71377e-07 8.21532e-11 -4.42659e-15 -9878.6 6.12743
-    3.74308 -0.000780928 1.9058e-06 -2.92292e-10 -3.18701e-13 -10083.3 1.80429
-;
-Tad = 2322.88
-
-phi = 0.88
-ft = 0.0251759
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.6088
-    200 6000    1000
-    3.05588 0.00112946 -3.45306e-07 5.26519e-11 -3.04276e-15 -938.803 3.63422
-    3.24933 0.00162281 -4.03664e-06 5.3599e-09 -2.30578e-12 -1014.76 2.45682
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.9792
-    200 6000    1000
-    2.88169 0.00187287 -5.72857e-07 8.23059e-11 -4.43157e-15 -9964.88 6.13492
-    3.74463 -0.000781451 1.90809e-06 -2.94069e-10 -3.17604e-13 -10170.9 1.79159
-;
-Tad = 2338.73
-
-phi = 0.89
-ft = 0.0254547
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.5489
-    200 6000    1000
-    3.0555 0.00112853 -3.44698e-07 5.25381e-11 -3.03556e-15 -938.419 3.61998
-    3.24656 0.00164224 -4.08385e-06 5.40514e-09 -2.32128e-12 -1014.46 2.45139
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.9422
-    200 6000    1000
-    2.87959 0.00187892 -5.74332e-07 8.2458e-11 -4.43654e-15 -10050.9 6.14238
-    3.74617 -0.000781972 1.91036e-06 -2.95839e-10 -3.16511e-13 -10258.2 1.77895
-;
-Tad = 2354.46
-
-phi = 0.9
-ft = 0.0257334
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.4894
-    200 6000    1000
-    3.05513 0.00112761 -3.44093e-07 5.24249e-11 -3.02841e-15 -938.037 3.60582
-    3.24381 0.00166156 -4.13077e-06 5.4501e-09 -2.33668e-12 -1014.17 2.446
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.9053
-    200 6000    1000
-    2.87749 0.00188494 -5.75802e-07 8.26096e-11 -4.44149e-15 -10136.5 6.14981
-    3.7477 -0.000782492 1.91263e-06 -2.97603e-10 -3.15422e-13 -10345.2 1.76635
-;
-Tad = 2370.09
-
-phi = 0.91
-ft = 0.0260118
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.4302
-    200 6000    1000
-    3.05476 0.00112669 -3.43493e-07 5.23124e-11 -3.0213e-15 -937.657 3.59175
-    3.24108 0.00168076 -4.1774e-06 5.49479e-09 -2.352e-12 -1013.87 2.44065
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.8685
-    200 6000    1000
-    2.87541 0.00189095 -5.77266e-07 8.27607e-11 -4.44642e-15 -10221.9 6.15721
-    3.74923 -0.000783009 1.91488e-06 -2.99361e-10 -3.14337e-13 -10431.9 1.75379
-;
-Tad = 2385.62
-
-phi = 0.92
-ft = 0.0262902
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.3714
-    200 6000    1000
-    3.05439 0.00112579 -3.42896e-07 5.22006e-11 -3.01424e-15 -937.279 3.57777
-    3.23836 0.00169985 -4.22375e-06 5.53921e-09 -2.36722e-12 -1013.58 2.43532
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.8318
-    200 6000    1000
-    2.87332 0.00189693 -5.78725e-07 8.29112e-11 -4.45133e-15 -10307 6.16459
-    3.75075 -0.000783525 1.91713e-06 -3.01112e-10 -3.13255e-13 -10518.3 1.74128
-;
-Tad = 2401.04
-
-phi = 0.93
-ft = 0.0265683
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.3129
-    200 6000    1000
-    3.05402 0.00112488 -3.42302e-07 5.20895e-11 -3.00721e-15 -936.904 3.56387
-    3.23566 0.00171882 -4.26983e-06 5.58336e-09 -2.38235e-12 -1013.29 2.43003
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.7952
-    200 6000    1000
-    2.87125 0.00190289 -5.80179e-07 8.30612e-11 -4.45623e-15 -10391.7 6.17194
-    3.75227 -0.000784039 1.91938e-06 -3.02858e-10 -3.12177e-13 -10604.4 1.72881
-;
-Tad = 2416.36
-
-phi = 0.94
-ft = 0.0268464
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.2548
-    200 6000    1000
-    3.05365 0.00112398 -3.41712e-07 5.19791e-11 -3.00023e-15 -936.531 3.55005
-    3.23298 0.00173767 -4.31562e-06 5.62725e-09 -2.39738e-12 -1013.01 2.42477
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.7588
-    200 6000    1000
-    2.86918 0.00190883 -5.81628e-07 8.32107e-11 -4.46111e-15 -10476.2 6.17927
-    3.75378 -0.000784551 1.92161e-06 -3.04597e-10 -3.11103e-13 -10690.2 1.71638
-;
-Tad = 2431.58
-
-phi = 0.95
-ft = 0.0271242
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.1971
-    200 6000    1000
-    3.05329 0.00112309 -3.41126e-07 5.18693e-11 -2.99329e-15 -936.161 3.53632
-    3.23031 0.00175641 -4.36114e-06 5.67087e-09 -2.41233e-12 -1012.72 2.41954
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.7225
-    200 6000    1000
-    2.86713 0.00191475 -5.83072e-07 8.33596e-11 -4.46597e-15 -10560.4 6.18657
-    3.75529 -0.000785062 1.92384e-06 -3.0633e-10 -3.10033e-13 -10775.7 1.704
-;
-Tad = 2446.69
-
-phi = 0.96
-ft = 0.0274019
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.1397
-    200 6000    1000
-    3.05293 0.0011222 -3.40543e-07 5.17602e-11 -2.98639e-15 -935.792 3.52267
-    3.22766 0.00177504 -4.40639e-06 5.71423e-09 -2.42719e-12 -1012.44 2.41434
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.6864
-    200 6000    1000
-    2.86507 0.00192065 -5.84511e-07 8.3508e-11 -4.47082e-15 -10644.2 6.19385
-    3.75679 -0.00078557 1.92606e-06 -3.08057e-10 -3.08967e-13 -10860.9 1.69167
-;
-Tad = 2461.71
-
-phi = 0.97
-ft = 0.0276794
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.0826
-    200 6000    1000
-    3.05257 0.00112132 -3.39964e-07 5.16517e-11 -2.97954e-15 -935.426 3.5091
-    3.22502 0.00179356 -4.45137e-06 5.75733e-09 -2.44196e-12 -1012.16 2.40917
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.6503
-    200 6000    1000
-    2.86303 0.00192653 -5.85945e-07 8.36559e-11 -4.47565e-15 -10727.8 6.2011
-    3.75829 -0.000786077 1.92827e-06 -3.09778e-10 -3.07904e-13 -10945.8 1.67937
-;
-Tad = 2476.62
-
-phi = 0.98
-ft = 0.0279568
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       21.0259
-    200 6000    1000
-    3.05222 0.00112044 -3.39388e-07 5.15439e-11 -2.97272e-15 -935.062 3.49561
-    3.2224 0.00181197 -4.49608e-06 5.80017e-09 -2.45664e-12 -1011.88 2.40404
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.6144
-    200 6000    1000
-    2.86099 0.00193238 -5.87374e-07 8.38033e-11 -4.48046e-15 -10811.1 6.20832
-    3.75978 -0.000786582 1.93047e-06 -3.11493e-10 -3.06845e-13 -11030.4 1.66712
-;
-Tad = 2491.44
-
-phi = 0.99
-ft = 0.028234
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.9695
-    200 6000    1000
-    3.05186 0.00111957 -3.38815e-07 5.14367e-11 -2.96595e-15 -934.7 3.4822
-    3.2198 0.00183027 -4.54052e-06 5.84276e-09 -2.47123e-12 -1011.6 2.39893
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.5786
-    200 6000    1000
-    2.85896 0.00193822 -5.88798e-07 8.39502e-11 -4.48526e-15 -10894.1 6.21552
-    3.76127 -0.000787085 1.93267e-06 -3.13202e-10 -3.05789e-13 -11114.7 1.65491
-;
-Tad = 2506.16
-
-phi = 1
-ft = 0.0285111
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.9134
-    200 6000    1000
-    3.05151 0.00111871 -3.38246e-07 5.13301e-11 -2.95921e-15 -934.34 3.46887
-    3.21721 0.00184846 -4.5847e-06 5.8851e-09 -2.48574e-12 -1011.32 2.39386
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-Tad = 2520.79
-
-phi = 1.01
-ft = 0.028788
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.8577
-    200 6000    1000
-    3.05116 0.00111785 -3.3768e-07 5.12242e-11 -2.95252e-15 -933.983 3.45562
-    3.21463 0.00186654 -4.62863e-06 5.92719e-09 -2.50016e-12 -1011.04 2.38881
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.4651
-    200 6000    1000
-    2.8572 0.00194017 -5.88682e-07 8.3859e-11 -4.47689e-15 -10941.7 6.19763
-    3.75784 -0.000757257 1.86079e-06 -2.44091e-10 -3.29198e-13 -11163.2 1.63942
-;
-Tad = 2515.06
-
-phi = 1.02
-ft = 0.0290647
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.8023
-    200 6000    1000
-    3.05081 0.00111699 -3.37118e-07 5.11189e-11 -2.94586e-15 -933.627 3.44245
-    3.21207 0.00188452 -4.67229e-06 5.96903e-09 -2.5145e-12 -1010.77 2.3838
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.3877
-    200 6000    1000
-    2.85746 0.00193633 -5.87157e-07 8.3623e-11 -4.46383e-15 -10906.8 6.17273
-    3.75297 -0.000727137 1.78723e-06 -1.73765e-10 -3.5349e-13 -11127.9 1.63613
-;
-Tad = 2509.36
-
-phi = 1.03
-ft = 0.0293413
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.7472
-    200 6000    1000
-    3.05047 0.00111614 -3.36559e-07 5.10142e-11 -2.93924e-15 -933.274 3.42935
-    3.20953 0.00190239 -4.7157e-06 6.01063e-09 -2.52875e-12 -1010.5 2.37881
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.3108
-    200 6000    1000
-    2.85772 0.00193252 -5.85643e-07 8.33887e-11 -4.45086e-15 -10872.1 6.14801
-    3.74813 -0.000697224 1.71417e-06 -1.03922e-10 -3.77615e-13 -11092.8 1.63285
-;
-Tad = 2503.7
-
-phi = 1.04
-ft = 0.0296178
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.6924
-    200 6000    1000
-    3.05012 0.00111529 -3.36003e-07 5.09101e-11 -2.93266e-15 -932.922 3.41634
-    3.207 0.00192016 -4.75885e-06 6.05198e-09 -2.54292e-12 -1010.23 2.37385
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.2345
-    200 6000    1000
-    2.85798 0.00192874 -5.84139e-07 8.3156e-11 -4.43798e-15 -10837.7 6.12346
-    3.74333 -0.000667515 1.64162e-06 -3.45572e-11 -4.01574e-13 -11057.9 1.6296
-;
-Tad = 2498.06
-
-phi = 1.05
-ft = 0.029894
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.638
-    200 6000    1000
-    3.04978 0.00111445 -3.3545e-07 5.08066e-11 -2.92612e-15 -932.573 3.40339
-    3.20449 0.00193782 -4.80175e-06 6.09309e-09 -2.55701e-12 -1009.96 2.36893
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.1587
-    200 6000    1000
-    2.85823 0.00192498 -5.82646e-07 8.29248e-11 -4.42519e-15 -10803.5 6.09907
-    3.73855 -0.000638009 1.56956e-06 3.43343e-11 -4.2537e-13 -11023.4 1.62637
-;
-Tad = 2492.46
-
-phi = 1.06
-ft = 0.0301701
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.5839
-    200 6000    1000
-    3.04944 0.00111361 -3.34901e-07 5.07038e-11 -2.91962e-15 -932.226 3.39053
-    3.20199 0.00195538 -4.8444e-06 6.13397e-09 -2.57101e-12 -1009.69 2.36403
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.0834
-    200 6000    1000
-    2.85849 0.00192124 -5.81162e-07 8.26953e-11 -4.41249e-15 -10769.5 6.07485
-    3.73381 -0.000608704 1.49799e-06 1.02757e-10 -4.49005e-13 -10989 1.62316
-;
-Tad = 2486.88
-
-phi = 1.07
-ft = 0.0304461
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.5301
-    200 6000    1000
-    3.0491 0.00111278 -3.34355e-07 5.06015e-11 -2.91316e-15 -931.88 3.37773
-    3.1995 0.00197284 -4.88681e-06 6.1746e-09 -2.58494e-12 -1009.43 2.35915
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       24.0086
-    200 6000    1000
-    2.85874 0.00191753 -5.79689e-07 8.24673e-11 -4.39987e-15 -10735.8 6.05079
-    3.7291 -0.000579597 1.42691e-06 1.70716e-10 -4.72479e-13 -10954.9 1.61998
-;
-Tad = 2481.33
-
-phi = 1.08
-ft = 0.0307219
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.4766
-    200 6000    1000
-    3.04877 0.00111195 -3.33812e-07 5.04998e-11 -2.90673e-15 -931.537 3.36501
-    3.19703 0.0019902 -4.92897e-06 6.215e-09 -2.59878e-12 -1009.16 2.35431
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.9343
-    200 6000    1000
-    2.85899 0.00191385 -5.78226e-07 8.22408e-11 -4.38733e-15 -10702.2 6.02689
-    3.72443 -0.000550687 1.35631e-06 2.38217e-10 -4.95795e-13 -10921 1.61681
-;
-Tad = 2475.82
-
-phi = 1.09
-ft = 0.0309976
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.4234
-    200 6000    1000
-    3.04843 0.00111113 -3.33272e-07 5.03987e-11 -2.90034e-15 -931.196 3.35237
-    3.19457 0.00200746 -4.97089e-06 6.25517e-09 -2.61254e-12 -1008.9 2.3495
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.8606
-    200 6000    1000
-    2.85924 0.00191019 -5.76772e-07 8.20158e-11 -4.37488e-15 -10669 6.00316
-    3.71978 -0.000521972 1.28618e-06 3.05262e-10 -5.18953e-13 -10887.3 1.61367
-;
-Tad = 2470.33
-
-phi = 1.1
-ft = 0.031273
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.3705
-    200 6000    1000
-    3.0481 0.00111032 -3.32735e-07 5.02982e-11 -2.89399e-15 -930.856 3.33979
-    3.19213 0.00202462 -5.01256e-06 6.29511e-09 -2.62623e-12 -1008.64 2.34471
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.7873
-    200 6000    1000
-    2.85949 0.00190655 -5.75328e-07 8.17924e-11 -4.36252e-15 -10635.9 5.97959
-    3.71517 -0.000493449 1.21652e-06 3.71858e-10 -5.41957e-13 -10853.9 1.61055
-;
-Tad = 2464.87
-
-phi = 1.11
-ft = 0.0315484
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.3179
-    200 6000    1000
-    3.04777 0.0011095 -3.32201e-07 5.01983e-11 -2.88767e-15 -930.519 3.32729
-    3.1897 0.00204168 -5.054e-06 6.33482e-09 -2.63983e-12 -1008.38 2.33995
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.7145
-    200 6000    1000
-    2.85973 0.00190294 -5.73894e-07 8.15705e-11 -4.35024e-15 -10603.1 5.95617
-    3.71058 -0.000465117 1.14733e-06 4.38009e-10 -5.64806e-13 -10820.6 1.60745
-;
-Tad = 2459.45
-
-phi = 1.12
-ft = 0.0318235
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.2657
-    200 6000    1000
-    3.04744 0.00110869 -3.3167e-07 5.00989e-11 -2.88139e-15 -930.183 3.31486
-    3.18729 0.00205864 -5.0952e-06 6.3743e-09 -2.65336e-12 -1008.12 2.33522
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.6422
-    200 6000    1000
-    2.85997 0.00189936 -5.7247e-07 8.135e-11 -4.33804e-15 -10570.4 5.93291
-    3.70603 -0.000436974 1.0786e-06 5.03719e-10 -5.87503e-13 -10787.6 1.60436
-;
-Tad = 2454.04
-
-phi = 1.13
-ft = 0.0320986
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.2137
-    200 6000    1000
-    3.04712 0.00110789 -3.31143e-07 5.00001e-11 -2.87514e-15 -929.85 3.3025
-    3.18489 0.00207551 -5.13617e-06 6.41356e-09 -2.66681e-12 -1007.86 2.33051
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.5704
-    200 6000    1000
-    2.86022 0.00189579 -5.71055e-07 8.1131e-11 -4.32592e-15 -10538 5.9098
-    3.70151 -0.000409018 1.01033e-06 5.68992e-10 -6.1005e-13 -10754.9 1.6013
-;
-Tad = 2448.67
-
-phi = 1.14
-ft = 0.0323734
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.162
-    200 6000    1000
-    3.04679 0.00110709 -3.30618e-07 4.99019e-11 -2.86894e-15 -929.518 3.29021
-    3.1825 0.00209228 -5.1769e-06 6.45259e-09 -2.68019e-12 -1007.61 2.32583
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.499
-    200 6000    1000
-    2.86046 0.00189225 -5.69649e-07 8.09134e-11 -4.31388e-15 -10505.8 5.88685
-    3.69702 -0.000381247 9.42509e-07 6.33833e-10 -6.32447e-13 -10722.3 1.59826
-;
-Tad = 2443.33
-
-phi = 1.15
-ft = 0.0326481
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.1106
-    200 6000    1000
-    3.04647 0.0011063 -3.30096e-07 4.98042e-11 -2.86276e-15 -929.188 3.278
-    3.18013 0.00210896 -5.2174e-06 6.4914e-09 -2.69349e-12 -1007.35 2.32118
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.4281
-    200 6000    1000
-    2.8607 0.00188874 -5.68253e-07 8.06973e-11 -4.30192e-15 -10473.9 5.86405
-    3.69255 -0.000353659 8.75135e-07 6.98247e-10 -6.54696e-13 -10689.9 1.59525
-;
-Tad = 2438.01
-
-phi = 1.16
-ft = 0.0329227
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.0595
-    200 6000    1000
-    3.04615 0.00110551 -3.29578e-07 4.9707e-11 -2.85662e-15 -928.86 3.26585
-    3.17776 0.00212554 -5.25768e-06 6.53e-09 -2.70671e-12 -1007.1 2.31655
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.3577
-    200 6000    1000
-    2.86093 0.00188524 -5.66865e-07 8.04826e-11 -4.29003e-15 -10442.1 5.84139
-    3.68812 -0.000326252 8.08204e-07 7.62236e-10 -6.76799e-13 -10657.8 1.59225
-;
-Tad = 2432.72
-
-phi = 1.17
-ft = 0.0331971
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       20.0087
-    200 6000    1000
-    3.04583 0.00110472 -3.29062e-07 4.96104e-11 -2.85052e-15 -928.534 3.25376
-    3.17542 0.00214203 -5.29772e-06 6.56837e-09 -2.71986e-12 -1006.85 2.31195
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.2878
-    200 6000    1000
-    2.86117 0.00188177 -5.65487e-07 8.02693e-11 -4.27823e-15 -10410.5 5.81889
-    3.68371 -0.000299025 7.41712e-07 8.25806e-10 -6.98757e-13 -10625.9 1.58927
-;
-Tad = 2427.46
-
-phi = 1.18
-ft = 0.0334713
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.9582
-    200 6000    1000
-    3.04551 0.00110394 -3.28549e-07 4.95144e-11 -2.84445e-15 -928.21 3.24175
-    3.17308 0.00215842 -5.33754e-06 6.60653e-09 -2.73294e-12 -1006.6 2.30738
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.2183
-    200 6000    1000
-    2.8614 0.00187833 -5.64118e-07 8.00574e-11 -4.2665e-15 -10379.2 5.79653
-    3.67934 -0.000271976 6.75655e-07 8.88961e-10 -7.20572e-13 -10594.2 1.5863
-;
-Tad = 2422.23
-
-phi = 1.19
-ft = 0.0337454
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.9079
-    200 6000    1000
-    3.0452 0.00110316 -3.28039e-07 4.94189e-11 -2.83841e-15 -927.888 3.2298
-    3.17076 0.00217473 -5.37714e-06 6.64448e-09 -2.74594e-12 -1006.35 2.30283
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.1492
-    200 6000    1000
-    2.86164 0.0018749 -5.62758e-07 7.98469e-11 -4.25485e-15 -10348 5.77432
-    3.67499 -0.000245104 6.10027e-07 9.51705e-10 -7.42244e-13 -10562.7 1.58336
-;
-Tad = 2417.02
-
-phi = 1.2
-ft = 0.0340193
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.858
-    200 6000    1000
-    3.04488 0.00110239 -3.27532e-07 4.93239e-11 -2.83241e-15 -927.567 3.21792
-    3.16846 0.00219094 -5.41652e-06 6.68221e-09 -2.75887e-12 -1006.1 2.29831
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.0806
-    200 6000    1000
-    2.86187 0.0018715 -5.61407e-07 7.96378e-11 -4.24328e-15 -10317.1 5.75226
-    3.67067 -0.000218405 5.44826e-07 1.01404e-09 -7.63776e-13 -10531.4 1.58044
-;
-Tad = 2411.84
-
-phi = 1.21
-ft = 0.0342931
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.8083
-    200 6000    1000
-    3.04457 0.00110162 -3.27027e-07 4.92295e-11 -2.82644e-15 -927.248 3.20611
-    3.16616 0.00220706 -5.45568e-06 6.71974e-09 -2.77173e-12 -1005.86 2.29381
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       23.0125
-    200 6000    1000
-    2.8621 0.00186812 -5.60064e-07 7.943e-11 -4.23178e-15 -10286.3 5.73033
-    3.66638 -0.00019188 4.80046e-07 1.07597e-09 -7.85169e-13 -10500.3 1.57754
-;
-Tad = 2406.69
-
-phi = 1.22
-ft = 0.0345667
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.7589
-    200 6000    1000
-    3.04426 0.00110086 -3.26525e-07 4.91356e-11 -2.8205e-15 -926.931 3.19436
-    3.16388 0.0022231 -5.49462e-06 6.75706e-09 -2.78452e-12 -1005.61 2.28933
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.9448
-    200 6000    1000
-    2.86233 0.00186476 -5.5873e-07 7.92235e-11 -4.22035e-15 -10255.8 5.70855
-    3.66212 -0.000165525 4.15685e-07 1.13751e-09 -8.06424e-13 -10469.4 1.57465
-;
-Tad = 2401.56
-
-phi = 1.23
-ft = 0.0348402
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.7097
-    200 6000    1000
-    3.04395 0.0011001 -3.26027e-07 4.90422e-11 -2.8146e-15 -926.616 3.18268
-    3.16161 0.00223904 -5.53335e-06 6.79417e-09 -2.79723e-12 -1005.37 2.28489
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.8775
-    200 6000    1000
-    2.86255 0.00186142 -5.57404e-07 7.90184e-11 -4.209e-15 -10225.4 5.68691
-    3.65788 -0.00013934 3.51737e-07 1.19865e-09 -8.27541e-13 -10438.7 1.57179
-;
-Tad = 2396.46
-
-phi = 1.24
-ft = 0.0351135
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.6609
-    200 6000    1000
-    3.04365 0.00109935 -3.25531e-07 4.89493e-11 -2.80873e-15 -926.302 3.17106
-    3.15935 0.0022549 -5.57186e-06 6.83107e-09 -2.80988e-12 -1005.13 2.28046
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.8107
-    200 6000    1000
-    2.86278 0.00185811 -5.56088e-07 7.88146e-11 -4.19772e-15 -10195.3 5.6654
-    3.65367 -0.000113323 2.88199e-07 1.25939e-09 -8.48524e-13 -10408.1 1.56894
-;
-Tad = 2391.38
-
-phi = 1.25
-ft = 0.0353866
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.6123
-    200 6000    1000
-    3.04334 0.00109859 -3.25037e-07 4.88569e-11 -2.80289e-15 -925.99 3.15951
-    3.15711 0.00227067 -5.61016e-06 6.86777e-09 -2.82245e-12 -1004.89 2.27606
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.7442
-    200 6000    1000
-    2.863 0.00185481 -5.54779e-07 7.86121e-11 -4.18652e-15 -10165.3 5.64404
-    3.64949 -8.74719e-05 2.25067e-07 1.31975e-09 -8.69373e-13 -10377.8 1.56611
-;
-Tad = 2386.33
-
-phi = 1.26
-ft = 0.0356596
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.5639
-    200 6000    1000
-    3.04304 0.00109785 -3.24547e-07 4.87651e-11 -2.79708e-15 -925.68 3.14801
-    3.15487 0.00228635 -5.64825e-06 6.90427e-09 -2.83496e-12 -1004.65 2.27169
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.6783
-    200 6000    1000
-    2.86322 0.00185154 -5.53479e-07 7.84109e-11 -4.17538e-15 -10135.5 5.62281
-    3.64534 -6.17855e-05 1.62336e-07 1.37972e-09 -8.90089e-13 -10347.7 1.5633
-;
-Tad = 2381.31
-
-phi = 1.27
-ft = 0.0359325
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.5159
-    200 6000    1000
-    3.04274 0.0010971 -3.24059e-07 4.86737e-11 -2.79131e-15 -925.372 3.13659
-    3.15265 0.00230195 -5.68613e-06 6.94057e-09 -2.8474e-12 -1004.41 2.26734
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.6127
-    200 6000    1000
-    2.86344 0.00184829 -5.52187e-07 7.82109e-11 -4.16432e-15 -10105.9 5.60171
-    3.64121 -3.62621e-05 1.00004e-07 1.43932e-09 -9.10673e-13 -10317.8 1.5605
-;
-Tad = 2376.31
-
-phi = 1.28
-ft = 0.0362052
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.4681
-    200 6000    1000
-    3.04244 0.00109637 -3.23573e-07 4.85828e-11 -2.78556e-15 -925.065 3.12522
-    3.15045 0.00231746 -5.7238e-06 6.97667e-09 -2.85977e-12 -1004.18 2.26301
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.5475
-    200 6000    1000
-    2.86366 0.00184506 -5.50903e-07 7.80123e-11 -4.15332e-15 -10076.5 5.58075
-    3.6371 -1.09001e-05 3.80666e-08 1.49853e-09 -9.31127e-13 -10288.1 1.55773
-;
-Tad = 2371.34
-
-phi = 1.29
-ft = 0.0364777
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.4205
-    200 6000    1000
-    3.04214 0.00109563 -3.23091e-07 4.84925e-11 -2.77985e-15 -924.76 3.11392
-    3.14825 0.00233288 -5.76127e-06 7.01258e-09 -2.87207e-12 -1003.94 2.2587
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.4828
-    200 6000    1000
-    2.86388 0.00184184 -5.49628e-07 7.78148e-11 -4.14239e-15 -10047.3 5.55992
-    3.63303 1.43018e-05 -2.34804e-08 1.55737e-09 -9.51452e-13 -10258.5 1.55497
-;
-Tad = 2366.39
-
-phi = 1.3
-ft = 0.0367501
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.3732
-    200 6000    1000
-    3.04184 0.0010949 -3.22611e-07 4.84026e-11 -2.77417e-15 -924.456 3.10267
-    3.14607 0.00234823 -5.79853e-06 7.04829e-09 -2.88431e-12 -1003.71 2.25442
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.4184
-    200 6000    1000
-    2.8641 0.00183865 -5.4836e-07 7.76187e-11 -4.13154e-15 -10018.3 5.53922
-    3.62898 3.93453e-05 -8.46404e-08 1.61585e-09 -9.71649e-13 -10229.1 1.55223
-;
-Tad = 2361.46
-
-phi = 1.31
-ft = 0.0370223
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.3262
-    200 6000    1000
-    3.04155 0.00109417 -3.22133e-07 4.83132e-11 -2.76852e-15 -924.155 3.09149
-    3.14389 0.00236349 -5.8356e-06 7.0838e-09 -2.89648e-12 -1003.48 2.25017
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.3545
-    200 6000    1000
-    2.86431 0.00183548 -5.471e-07 7.74237e-11 -4.12075e-15 -9989.45 5.51865
-    3.62495 6.42318e-05 -1.45417e-07 1.67395e-09 -9.9172e-13 -10200 1.5495
-;
-Tad = 2356.56
-
-phi = 1.32
-ft = 0.0372944
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.2794
-    200 6000    1000
-    3.04125 0.00109345 -3.21659e-07 4.82243e-11 -2.7629e-15 -923.854 3.08037
-    3.14173 0.00237866 -5.87246e-06 7.11913e-09 -2.90858e-12 -1003.25 2.24593
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.291
-    200 6000    1000
-    2.86453 0.00183233 -5.45848e-07 7.723e-11 -4.11003e-15 -9960.78 5.49821
-    3.62095 8.89629e-05 -2.05814e-07 1.7317e-09 -1.01167e-12 -10171 1.5468
-;
-Tad = 2351.69
-
-phi = 1.33
-ft = 0.0375663
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.2329
-    200 6000    1000
-    3.04096 0.00109273 -3.21186e-07 4.81359e-11 -2.75731e-15 -923.556 3.06931
-    3.13959 0.00239376 -5.90912e-06 7.15426e-09 -2.92062e-12 -1003.02 2.24172
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.2278
-    200 6000    1000
-    2.86474 0.0018292 -5.44604e-07 7.70374e-11 -4.09937e-15 -9932.29 5.4779
-    3.61697 0.00011354 -2.65835e-07 1.78908e-09 -1.03149e-12 -10142.1 1.54411
-;
-Tad = 2346.83
-
-phi = 1.34
-ft = 0.0378381
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.1867
-    200 6000    1000
-    3.04067 0.00109202 -3.20717e-07 4.80479e-11 -2.75175e-15 -923.259 3.05831
-    3.13745 0.00240877 -5.94559e-06 7.18921e-09 -2.93259e-12 -1002.79 2.23753
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.1651
-    200 6000    1000
-    2.86495 0.00182608 -5.43368e-07 7.68461e-11 -4.08878e-15 -9903.98 5.45771
-    3.61302 0.000137964 -3.25483e-07 1.84611e-09 -1.05118e-12 -10113.5 1.54143
-;
-Tad = 2342.01
-
-phi = 1.35
-ft = 0.0381097
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.1406
-    200 6000    1000
-    3.04038 0.0010913 -3.20249e-07 4.79604e-11 -2.74622e-15 -922.964 3.04737
-    3.13532 0.00242371 -5.98186e-06 7.22397e-09 -2.9445e-12 -1002.56 2.23336
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.1027
-    200 6000    1000
-    2.86516 0.00182299 -5.4214e-07 7.6656e-11 -4.07826e-15 -9875.84 5.43765
-    3.6091 0.000162237 -3.84762e-07 1.90278e-09 -1.07076e-12 -10085 1.53878
-;
-Tad = 2337.2
-
-phi = 1.36
-ft = 0.0383811
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.0949
-    200 6000    1000
-    3.04009 0.0010906 -3.19785e-07 4.78734e-11 -2.74073e-15 -922.67 3.03648
-    3.13321 0.00243856 -6.01794e-06 7.25854e-09 -2.95635e-12 -1002.33 2.22922
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       22.0407
-    200 6000    1000
-    2.86537 0.00181992 -5.40918e-07 7.6467e-11 -4.0678e-15 -9847.88 5.41771
-    3.60519 0.000186361 -4.43675e-07 1.9591e-09 -1.09022e-12 -10056.8 1.53614
-;
-Tad = 2332.42
-
-phi = 1.37
-ft = 0.0386525
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.0493
-    200 6000    1000
-    3.03981 0.00108989 -3.19322e-07 4.77869e-11 -2.73525e-15 -922.378 3.02566
-    3.1311 0.00245334 -6.05382e-06 7.29293e-09 -2.96813e-12 -1002.11 2.2251
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.9791
-    200 6000    1000
-    2.86558 0.00181686 -5.39705e-07 7.62792e-11 -4.05741e-15 -9820.09 5.39789
-    3.60132 0.000210336 -5.02225e-07 2.01508e-09 -1.10955e-12 -10028.6 1.53351
-;
-Tad = 2327.66
-
-phi = 1.38
-ft = 0.0389236
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       19.004
-    200 6000    1000
-    3.03952 0.00108919 -3.18863e-07 4.77008e-11 -2.72981e-15 -922.087 3.01489
-    3.12901 0.00246803 -6.08952e-06 7.32713e-09 -2.97985e-12 -1001.88 2.221
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.9179
-    200 6000    1000
-    2.86579 0.00181382 -5.38499e-07 7.60925e-11 -4.04708e-15 -9792.47 5.3782
-    3.59746 0.000234164 -5.60417e-07 2.07072e-09 -1.12877e-12 -10000.7 1.5309
-;
-Tad = 2322.93
-
-phi = 1.39
-ft = 0.0391946
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.959
-    200 6000    1000
-    3.03924 0.0010885 -3.18405e-07 4.76152e-11 -2.7244e-15 -921.798 3.00418
-    3.12693 0.00248265 -6.12502e-06 7.36115e-09 -2.99151e-12 -1001.66 2.21692
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.8571
-    200 6000    1000
-    2.86599 0.00181081 -5.373e-07 7.5907e-11 -4.03681e-15 -9765.02 5.35862
-    3.59363 0.000257846 -6.18253e-07 2.12601e-09 -1.14787e-12 -9972.94 1.52831
-;
-Tad = 2318.22
-
-phi = 1.4
-ft = 0.0394655
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.9142
-    200 6000    1000
-    3.03896 0.0010878 -3.1795e-07 4.753e-11 -2.71902e-15 -921.51 2.99352
-    3.12486 0.00249719 -6.16034e-06 7.395e-09 -3.00311e-12 -1001.44 2.21286
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.7966
-    200 6000    1000
-    2.8662 0.00180781 -5.36109e-07 7.57226e-11 -4.02661e-15 -9737.73 5.33917
-    3.58982 0.000281384 -6.75736e-07 2.18097e-09 -1.16685e-12 -9945.34 1.52574
-;
-Tad = 2313.53
-
-phi = 1.41
-ft = 0.0397361
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.8696
-    200 6000    1000
-    3.03868 0.00108712 -3.17498e-07 4.74453e-11 -2.71366e-15 -921.224 2.98292
-    3.1228 0.00251166 -6.19547e-06 7.42866e-09 -3.01464e-12 -1001.22 2.20883
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.7365
-    200 6000    1000
-    2.8664 0.00180482 -5.34925e-07 7.55393e-11 -4.01646e-15 -9710.61 5.31983
-    3.58604 0.000304779 -7.3287e-07 2.23559e-09 -1.18572e-12 -9917.91 1.52317
-;
-Tad = 2308.86
-
-phi = 1.42
-ft = 0.0400067
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.8253
-    200 6000    1000
-    3.0384 0.00108643 -3.17048e-07 4.7361e-11 -2.70833e-15 -920.94 2.97238
-    3.12075 0.00252604 -6.23042e-06 7.46215e-09 -3.02612e-12 -1001 2.20481
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.6767
-    200 6000    1000
-    2.8666 0.00180186 -5.33748e-07 7.53572e-11 -4.00638e-15 -9683.66 5.30061
-    3.58228 0.000328032 -7.89657e-07 2.28988e-09 -1.20447e-12 -9890.65 1.52063
-;
-Tad = 2304.22
-
-phi = 1.43
-ft = 0.0402771
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.7811
-    200 6000    1000
-    3.03812 0.00108575 -3.166e-07 4.72771e-11 -2.70304e-15 -920.657 2.96189
-    3.11872 0.00254036 -6.26518e-06 7.49546e-09 -3.03753e-12 -1000.78 2.20082
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.6174
-    200 6000    1000
-    2.8668 0.00179892 -5.32578e-07 7.51761e-11 -3.99636e-15 -9656.87 5.28151
-    3.57854 0.000351145 -8.46102e-07 2.34385e-09 -1.22311e-12 -9863.55 1.5181
-;
-Tad = 2299.6
-
-phi = 1.44
-ft = 0.0405473
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.7373
-    200 6000    1000
-    3.03785 0.00108507 -3.16154e-07 4.71937e-11 -2.69776e-15 -920.375 2.95146
-    3.11669 0.00255459 -6.29976e-06 7.5286e-09 -3.04889e-12 -1000.57 2.19685
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.5583
-    200 6000    1000
-    2.867 0.00179599 -5.31415e-07 7.49961e-11 -3.9864e-15 -9630.24 5.26252
-    3.57482 0.000374118 -9.02207e-07 2.39749e-09 -1.24164e-12 -9836.61 1.51558
-;
-Tad = 2295
-
-phi = 1.45
-ft = 0.0408174
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.6936
-    200 6000    1000
-    3.03757 0.0010844 -3.15711e-07 4.71108e-11 -2.69252e-15 -920.095 2.94108
-    3.11467 0.00256876 -6.33416e-06 7.56156e-09 -3.06018e-12 -1000.35 2.19289
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.4997
-    200 6000    1000
-    2.8672 0.00179308 -5.30259e-07 7.48173e-11 -3.9765e-15 -9603.76 5.24365
-    3.57113 0.000396954 -9.57974e-07 2.4508e-09 -1.26006e-12 -9809.83 1.51309
-;
-Tad = 2290.42
-
-phi = 1.46
-ft = 0.0410873
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.6502
-    200 6000    1000
-    3.0373 0.00108372 -3.15271e-07 4.70282e-11 -2.6873e-15 -919.816 2.93076
-    3.11267 0.00258285 -6.36838e-06 7.59436e-09 -3.07142e-12 -1000.14 2.18896
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.4413
-    200 6000    1000
-    2.86739 0.00179018 -5.2911e-07 7.46394e-11 -3.96666e-15 -9577.45 5.22489
-    3.56745 0.000419652 -1.01341e-06 2.5038e-09 -1.27836e-12 -9783.22 1.5106
-;
-Tad = 2285.87
-
-phi = 1.47
-ft = 0.0413571
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.607
-    200 6000    1000
-    3.03703 0.00108306 -3.14832e-07 4.69461e-11 -2.68211e-15 -919.539 2.92049
-    3.11067 0.00259686 -6.40242e-06 7.62698e-09 -3.0826e-12 -999.923 2.18505
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.3834
-    200 6000    1000
-    2.86759 0.00178731 -5.27968e-07 7.44627e-11 -3.95688e-15 -9551.3 5.20624
-    3.5638 0.000442216 -1.06851e-06 2.55648e-09 -1.29656e-12 -9756.76 1.50813
-;
-Tad = 2281.33
-
-phi = 1.48
-ft = 0.0416267
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.564
-    200 6000    1000
-    3.03676 0.00108239 -3.14396e-07 4.68645e-11 -2.67695e-15 -919.263 2.91027
-    3.10869 0.00261081 -6.43629e-06 7.65943e-09 -3.09372e-12 -999.71 2.18116
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.3257
-    200 6000    1000
-    2.86778 0.00178445 -5.26833e-07 7.4287e-11 -3.94716e-15 -9525.3 5.1877
-    3.56018 0.000464645 -1.12329e-06 2.60885e-09 -1.31465e-12 -9730.46 1.50568
-;
-Tad = 2276.82
-
-phi = 1.49
-ft = 0.0418962
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.5213
-    200 6000    1000
-    3.03649 0.00108173 -3.13962e-07 4.67832e-11 -2.67181e-15 -918.989 2.90011
-    3.10671 0.00262468 -6.46998e-06 7.69172e-09 -3.10478e-12 -999.499 2.17729
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.2685
-    200 6000    1000
-    2.86798 0.00178161 -5.25704e-07 7.41123e-11 -3.93749e-15 -9499.45 5.16927
-    3.55657 0.000486941 -1.17774e-06 2.66091e-09 -1.33263e-12 -9704.32 1.50324
-;
-Tad = 2272.33
-
-phi = 1.5
-ft = 0.0421655
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.4788
-    200 6000    1000
-    3.03623 0.00108107 -3.1353e-07 4.67024e-11 -2.6667e-15 -918.716 2.88999
-    3.10475 0.00263848 -6.5035e-06 7.72384e-09 -3.11579e-12 -999.289 2.17344
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.2115
-    200 6000    1000
-    2.86817 0.00177878 -5.24582e-07 7.39387e-11 -3.92788e-15 -9473.76 5.15095
-    3.55298 0.000509105 -1.23187e-06 2.71266e-09 -1.35051e-12 -9678.33 1.50081
-;
-Tad = 2267.86
-
-phi = 1.51
-ft = 0.0424347
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.4364
-    200 6000    1000
-    3.03596 0.00108042 -3.13101e-07 4.66219e-11 -2.66162e-15 -918.444 2.87993
-    3.1028 0.00265221 -6.53684e-06 7.75579e-09 -3.12674e-12 -999.08 2.16961
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.1549
-    200 6000    1000
-    2.86836 0.00177598 -5.23467e-07 7.37661e-11 -3.91833e-15 -9448.22 5.13274
-    3.54942 0.000531138 -1.28567e-06 2.7641e-09 -1.36828e-12 -9652.5 1.4984
-;
-Tad = 2263.41
-
-phi = 1.52
-ft = 0.0427037
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.3944
-    200 6000    1000
-    3.0357 0.00107977 -3.12673e-07 4.65419e-11 -2.65656e-15 -918.174 2.86993
-    3.10085 0.00266587 -6.57002e-06 7.78758e-09 -3.13763e-12 -998.872 2.1658
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.0986
-    200 6000    1000
-    2.86855 0.00177319 -5.22358e-07 7.35945e-11 -3.90883e-15 -9422.83 5.11464
-    3.54588 0.000553042 -1.33917e-06 2.81525e-09 -1.38594e-12 -9626.82 1.496
-;
-Tad = 2258.99
-
-phi = 1.53
-ft = 0.0429726
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.3525
-    200 6000    1000
-    3.03543 0.00107912 -3.12248e-07 4.64623e-11 -2.65153e-15 -917.906 2.85997
-    3.09892 0.00267946 -6.60302e-06 7.81921e-09 -3.14847e-12 -998.665 2.16201
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       21.0427
-    200 6000    1000
-    2.86874 0.00177041 -5.21256e-07 7.34239e-11 -3.89939e-15 -9397.59 5.09664
-    3.54235 0.000574818 -1.39235e-06 2.86609e-09 -1.4035e-12 -9601.28 1.49362
-;
-Tad = 2254.58
-
-phi = 1.54
-ft = 0.0432413
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.3108
-    200 6000    1000
-    3.03517 0.00107848 -3.11825e-07 4.63831e-11 -2.64653e-15 -917.638 2.85006
-    3.09699 0.00269298 -6.63586e-06 7.85068e-09 -3.15925e-12 -998.459 2.15824
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.9871
-    200 6000    1000
-    2.86892 0.00176765 -5.2016e-07 7.32543e-11 -3.89001e-15 -9372.5 5.07875
-    3.53885 0.000596466 -1.44521e-06 2.91663e-09 -1.42096e-12 -9575.9 1.49125
-;
-Tad = 2250.19
-
-phi = 1.55
-ft = 0.0435099
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.2694
-    200 6000    1000
-    3.03491 0.00107784 -3.11404e-07 4.63043e-11 -2.64155e-15 -917.372 2.84021
-    3.09508 0.00270643 -6.66853e-06 7.88199e-09 -3.16998e-12 -998.254 2.15448
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.9318
-    200 6000    1000
-    2.86911 0.00176491 -5.19071e-07 7.30858e-11 -3.88068e-15 -9347.55 5.06096
-    3.53537 0.000617987 -1.49777e-06 2.96688e-09 -1.43832e-12 -9550.67 1.48889
-;
-Tad = 2245.82
-
-phi = 1.56
-ft = 0.0437783
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.2281
-    200 6000    1000
-    3.03465 0.0010772 -3.10986e-07 4.62259e-11 -2.63659e-15 -917.108 2.8304
-    3.09317 0.00271981 -6.70103e-06 7.91313e-09 -3.18065e-12 -998.05 2.15075
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.8768
-    200 6000    1000
-    2.8693 0.00176218 -5.17988e-07 7.29181e-11 -3.8714e-15 -9322.74 5.04328
-    3.53191 0.000639384 -1.55003e-06 3.01684e-09 -1.45557e-12 -9525.58 1.48655
-;
-Tad = 2241.48
-
-phi = 1.57
-ft = 0.0440466
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.1871
-    200 6000    1000
-    3.03439 0.00107657 -3.10569e-07 4.61479e-11 -2.63166e-15 -916.844 2.82064
-    3.09128 0.00273313 -6.73337e-06 7.94412e-09 -3.19127e-12 -997.847 2.14704
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.8222
-    200 6000    1000
-    2.86948 0.00175947 -5.16911e-07 7.27515e-11 -3.86218e-15 -9298.09 5.02569
-    3.52847 0.000660657 -1.60198e-06 3.06651e-09 -1.47273e-12 -9500.64 1.48422
-;
-Tad = 2237.15
-
-phi = 1.58
-ft = 0.0443147
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.1463
-    200 6000    1000
-    3.03414 0.00107593 -3.10155e-07 4.60703e-11 -2.62676e-15 -916.582 2.81094
-    3.08939 0.00274637 -6.76555e-06 7.97496e-09 -3.20183e-12 -997.646 2.14334
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.7678
-    200 6000    1000
-    2.86966 0.00175678 -5.15841e-07 7.25858e-11 -3.85301e-15 -9273.57 5.00821
-    3.52505 0.000681807 -1.65363e-06 3.11589e-09 -1.48979e-12 -9475.84 1.48191
-;
-Tad = 2232.85
-
-phi = 1.59
-ft = 0.0445827
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.1056
-    200 6000    1000
-    3.03388 0.00107531 -3.09742e-07 4.59931e-11 -2.62188e-15 -916.321 2.80128
-    3.08752 0.00275955 -6.79756e-06 8.00564e-09 -3.21235e-12 -997.445 2.13966
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.7138
-    200 6000    1000
-    2.86985 0.0017541 -5.14776e-07 7.24211e-11 -3.8439e-15 -9249.19 4.99083
-    3.52164 0.000702835 -1.70498e-06 3.16499e-09 -1.50675e-12 -9451.18 1.4796
-;
-Tad = 2228.56
-
-phi = 1.6
-ft = 0.0448505
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.0652
-    200 6000    1000
-    3.03363 0.00107468 -3.09332e-07 4.59163e-11 -2.61702e-15 -916.062 2.79167
-    3.08565 0.00277267 -6.82942e-06 8.03616e-09 -3.2228e-12 -997.245 2.136
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.6601
-    200 6000    1000
-    2.87003 0.00175143 -5.13718e-07 7.22573e-11 -3.83483e-15 -9224.96 4.97355
-    3.51826 0.000723742 -1.75604e-06 3.2138e-09 -1.52361e-12 -9426.67 1.47732
-;
-Tad = 2224.29
-
-phi = 1.61
-ft = 0.0451182
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       18.025
-    200 6000    1000
-    3.03338 0.00107406 -3.08924e-07 4.58399e-11 -2.61219e-15 -915.804 2.78211
-    3.08379 0.00278572 -6.86111e-06 8.06653e-09 -3.23321e-12 -997.046 2.13236
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.6067
-    200 6000    1000
-    2.87021 0.00174878 -5.12666e-07 7.20945e-11 -3.82582e-15 -9200.86 4.95637
-    3.5149 0.000744529 -1.80681e-06 3.26234e-09 -1.54037e-12 -9402.29 1.47504
-;
-Tad = 2220.05
-
-phi = 1.62
-ft = 0.0453857
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.985
-    200 6000    1000
-    3.03313 0.00107344 -3.08517e-07 4.57638e-11 -2.60738e-15 -915.547 2.77259
-    3.08194 0.0027987 -6.89265e-06 8.09675e-09 -3.24357e-12 -996.849 2.12874
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.5536
-    200 6000    1000
-    2.87039 0.00174615 -5.1162e-07 7.19326e-11 -3.81686e-15 -9176.9 4.93929
-    3.51155 0.000765198 -1.85728e-06 3.3106e-09 -1.55704e-12 -9378.06 1.47278
-;
-Tad = 2215.82
-
-phi = 1.63
-ft = 0.0456531
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.9452
-    200 6000    1000
-    3.03288 0.00107283 -3.08113e-07 4.56881e-11 -2.6026e-15 -915.292 2.76313
-    3.0801 0.00281162 -6.92402e-06 8.12682e-09 -3.25387e-12 -996.652 2.12514
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.5008
-    200 6000    1000
-    2.87056 0.00174353 -5.10579e-07 7.17716e-11 -3.80795e-15 -9153.08 4.9223
-    3.50823 0.000785749 -1.90747e-06 3.35858e-09 -1.57362e-12 -9353.96 1.47053
-;
-Tad = 2211.61
-
-phi = 1.64
-ft = 0.0459203
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.9056
-    200 6000    1000
-    3.03263 0.00107221 -3.07711e-07 4.56128e-11 -2.59784e-15 -915.038 2.75371
-    3.07827 0.00282448 -6.95525e-06 8.15674e-09 -3.26412e-12 -996.456 2.12155
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.4483
-    200 6000    1000
-    2.87074 0.00174092 -5.09545e-07 7.16115e-11 -3.79909e-15 -9129.4 4.90541
-    3.50492 0.000806183 -1.95738e-06 3.40629e-09 -1.5901e-12 -9330 1.46829
-;
-Tad = 2207.42
-
-phi = 1.65
-ft = 0.0461874
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.8661
-    200 6000    1000
-    3.03238 0.0010716 -3.07311e-07 4.55379e-11 -2.5931e-15 -914.785 2.74433
-    3.07645 0.00283727 -6.98631e-06 8.18651e-09 -3.27432e-12 -996.261 2.11798
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.3961
-    200 6000    1000
-    2.87092 0.00173833 -5.08517e-07 7.14523e-11 -3.79028e-15 -9105.84 4.88862
-    3.50164 0.000826502 -2.007e-06 3.45373e-09 -1.60648e-12 -9306.18 1.46607
-;
-Tad = 2203.25
-
-phi = 1.66
-ft = 0.0464543
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.8269
-    200 6000    1000
-    3.03213 0.001071 -3.06913e-07 4.54634e-11 -2.58839e-15 -914.533 2.73501
-    3.07464 0.00285 -7.01723e-06 8.21613e-09 -3.28447e-12 -996.068 2.11443
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.3442
-    200 6000    1000
-    2.87109 0.00173576 -5.07494e-07 7.12941e-11 -3.78152e-15 -9082.42 4.87192
-    3.49837 0.000846705 -2.05634e-06 3.5009e-09 -1.62278e-12 -9282.49 1.46386
-;
-Tad = 2199.1
-
-phi = 1.67
-ft = 0.046721
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.7879
-    200 6000    1000
-    3.03189 0.0010704 -3.06516e-07 4.53892e-11 -2.5837e-15 -914.282 2.72573
-    3.07284 0.00286266 -7.04799e-06 8.24561e-09 -3.29457e-12 -995.875 2.1109
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.2925
-    200 6000    1000
-    2.87126 0.0017332 -5.06477e-07 7.11367e-11 -3.77281e-15 -9059.14 4.85532
-    3.49512 0.000866795 -2.1054e-06 3.54781e-09 -1.63898e-12 -9258.93 1.46166
-;
-Tad = 2194.96
-
-phi = 1.68
-ft = 0.0469877
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.7491
-    200 6000    1000
-    3.03164 0.0010698 -3.06122e-07 4.53153e-11 -2.57904e-15 -914.033 2.71649
-    3.07104 0.00287526 -7.0786e-06 8.27494e-09 -3.30462e-12 -995.683 2.10738
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.2412
-    200 6000    1000
-    2.87144 0.00173065 -5.05466e-07 7.09802e-11 -3.76415e-15 -9035.98 4.8388
-    3.49189 0.000886772 -2.15419e-06 3.59445e-09 -1.65509e-12 -9235.51 1.45947
-;
-Tad = 2190.85
-
-phi = 1.69
-ft = 0.0472541
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.7104
-    200 6000    1000
-    3.0314 0.0010692 -3.0573e-07 4.52419e-11 -2.57439e-15 -913.785 2.7073
-    3.06926 0.0028878 -7.10906e-06 8.30413e-09 -3.31463e-12 -995.492 2.10388
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.1902
-    200 6000    1000
-    2.87161 0.00172812 -5.0446e-07 7.08246e-11 -3.75554e-15 -9012.95 4.82239
-    3.48867 0.000906637 -2.2027e-06 3.64083e-09 -1.67111e-12 -9212.22 1.4573
-;
-Tad = 2186.75
-
-phi = 1.7
-ft = 0.0475205
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.6719
-    200 6000    1000
-    3.03116 0.0010686 -3.05339e-07 4.51688e-11 -2.56977e-15 -913.538 2.69816
-    3.06748 0.00290028 -7.13936e-06 8.33318e-09 -3.32458e-12 -995.302 2.1004
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.1394
-    200 6000    1000
-    2.87178 0.0017256 -5.0346e-07 7.06698e-11 -3.74698e-15 -8990.05 4.80606
-    3.48548 0.000926391 -2.25094e-06 3.68696e-09 -1.68704e-12 -9189.06 1.45513
-;
-Tad = 2182.68
-
-phi = 1.71
-ft = 0.0477866
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.6337
-    200 6000    1000
-    3.03092 0.00106801 -3.04951e-07 4.5096e-11 -2.56517e-15 -913.293 2.68906
-    3.06572 0.0029127 -7.16953e-06 8.36208e-09 -3.33448e-12 -995.113 2.09693
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.089
-    200 6000    1000
-    2.87195 0.0017231 -5.02466e-07 7.05159e-11 -3.73846e-15 -8967.28 4.78982
-    3.4823 0.000946036 -2.29892e-06 3.73282e-09 -1.70289e-12 -9166.02 1.45298
-;
-Tad = 2178.62
-
-phi = 1.72
-ft = 0.0480527
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.5956
-    200 6000    1000
-    3.03068 0.00106742 -3.04564e-07 4.50236e-11 -2.5606e-15 -913.048 2.68001
-    3.06396 0.00292506 -7.19954e-06 8.39084e-09 -3.34434e-12 -994.924 2.09349
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       20.0388
-    200 6000    1000
-    2.87212 0.00172061 -5.01477e-07 7.03629e-11 -3.72999e-15 -8944.64 4.77368
-    3.47914 0.000965571 -2.34662e-06 3.77843e-09 -1.71864e-12 -9143.12 1.45085
-;
-Tad = 2174.57
-
-phi = 1.73
-ft = 0.0483185
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.5577
-    200 6000    1000
-    3.03044 0.00106684 -3.0418e-07 4.49516e-11 -2.55605e-15 -912.805 2.671
-    3.06221 0.00293736 -7.22941e-06 8.41946e-09 -3.35414e-12 -994.737 2.09006
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.9889
-    200 6000    1000
-    2.87229 0.00171814 -5.00494e-07 7.02107e-11 -3.72157e-15 -8922.12 4.75762
-    3.476 0.000984998 -2.39407e-06 3.82379e-09 -1.73431e-12 -9120.34 1.44872
-;
-Tad = 2170.55
-
-phi = 1.74
-ft = 0.0485843
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.52
-    200 6000    1000
-    3.03021 0.00106625 -3.03797e-07 4.48799e-11 -2.55151e-15 -912.563 2.66203
-    3.06046 0.00294959 -7.25913e-06 8.44795e-09 -3.3639e-12 -994.551 2.08664
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.9392
-    200 6000    1000
-    2.87246 0.00171567 -4.99516e-07 7.00594e-11 -3.71319e-15 -8899.72 4.74165
-    3.47287 0.00100432 -2.44125e-06 3.8689e-09 -1.74989e-12 -9097.69 1.44661
-;
-Tad = 2166.54
-
-phi = 1.75
-ft = 0.0488498
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.4824
-    200 6000    1000
-    3.02997 0.00106567 -3.03416e-07 4.48086e-11 -2.547e-15 -912.322 2.6531
-    3.05873 0.00296177 -7.28871e-06 8.47629e-09 -3.37362e-12 -994.365 2.08324
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.8899
-    200 6000    1000
-    2.87262 0.00171322 -4.98544e-07 6.99089e-11 -3.70486e-15 -8877.45 4.72577
-    3.46976 0.00102353 -2.48817e-06 3.91376e-09 -1.76538e-12 -9075.16 1.4445
-;
-Tad = 2162.56
-
-phi = 1.76
-ft = 0.0491153
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.4451
-    200 6000    1000
-    3.02974 0.0010651 -3.03037e-07 4.47376e-11 -2.54252e-15 -912.083 2.64422
-    3.05701 0.00297389 -7.31815e-06 8.5045e-09 -3.38328e-12 -994.181 2.07986
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.8408
-    200 6000    1000
-    2.87279 0.00171079 -4.97576e-07 6.97592e-11 -3.69658e-15 -8855.3 4.70998
-    3.46667 0.00104264 -2.53483e-06 3.95837e-09 -1.78079e-12 -9052.76 1.44241
-;
-Tad = 2158.58
-
-phi = 1.77
-ft = 0.0493806
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.4079
-    200 6000    1000
-    3.0295 0.00106452 -3.02659e-07 4.46669e-11 -2.53805e-15 -911.844 2.63539
-    3.05529 0.00298595 -7.34744e-06 8.53257e-09 -3.3929e-12 -993.997 2.0765
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.7919
-    200 6000    1000
-    2.87295 0.00170837 -4.96614e-07 6.96103e-11 -3.68834e-15 -8833.27 4.69427
-    3.4636 0.00106164 -2.58124e-06 4.00274e-09 -1.79612e-12 -9030.47 1.44033
-;
-Tad = 2154.63
-
-phi = 1.78
-ft = 0.0496457
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.3709
-    200 6000    1000
-    3.02927 0.00106395 -3.02284e-07 4.45966e-11 -2.53361e-15 -911.607 2.62659
-    3.05358 0.00299796 -7.3766e-06 8.56051e-09 -3.40247e-12 -993.814 2.07315
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.7434
-    200 6000    1000
-    2.87312 0.00170596 -4.95658e-07 6.94623e-11 -3.68015e-15 -8811.37 4.67865
-    3.46054 0.00108054 -2.6274e-06 4.04687e-09 -1.81136e-12 -9008.31 1.43826
-;
-Tad = 2150.69
-
-phi = 1.79
-ft = 0.0499107
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.3341
-    200 6000    1000
-    3.02904 0.00106338 -3.0191e-07 4.45267e-11 -2.52918e-15 -911.37 2.61784
-    3.05188 0.0030099 -7.40561e-06 8.58831e-09 -3.412e-12 -993.632 2.06981
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.6951
-    200 6000    1000
-    2.87328 0.00170356 -4.94706e-07 6.9315e-11 -3.672e-15 -8789.58 4.66312
-    3.4575 0.00109934 -2.6733e-06 4.09075e-09 -1.82652e-12 -8986.28 1.4362
-;
-Tad = 2146.78
-
-phi = 1.8
-ft = 0.0501755
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.2975
-    200 6000    1000
-    3.02881 0.00106282 -3.01538e-07 4.4457e-11 -2.52478e-15 -911.135 2.60913
-    3.05019 0.00302179 -7.43448e-06 8.61598e-09 -3.42148e-12 -993.451 2.0665
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.6471
-    200 6000    1000
-    2.87344 0.00170118 -4.9376e-07 6.91686e-11 -3.6639e-15 -8767.91 4.64766
-    3.45448 0.00111803 -2.71895e-06 4.1344e-09 -1.8416e-12 -8964.36 1.43416
-;
-Tad = 2142.87
-
-phi = 1.81
-ft = 0.0504402
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.261
-    200 6000    1000
-    3.02858 0.00106225 -3.01168e-07 4.43877e-11 -2.5204e-15 -910.901 2.60046
-    3.0485 0.00303362 -7.46322e-06 8.64352e-09 -3.43092e-12 -993.271 2.0632
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.5993
-    200 6000    1000
-    2.8736 0.00169881 -4.92819e-07 6.90229e-11 -3.65584e-15 -8746.36 4.6323
-    3.45147 0.00113662 -2.76436e-06 4.17781e-09 -1.85659e-12 -8942.56 1.43212
-;
-Tad = 2138.99
-
-phi = 1.82
-ft = 0.0507048
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.2247
-    200 6000    1000
-    3.02835 0.00106169 -3.00799e-07 4.43187e-11 -2.51604e-15 -910.668 2.59183
-    3.04683 0.0030454 -7.49182e-06 8.67093e-09 -3.44031e-12 -993.092 2.05991
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.5518
-    200 6000    1000
-    2.87376 0.00169646 -4.91883e-07 6.88781e-11 -3.64782e-15 -8724.92 4.61701
-    3.44848 0.00115512 -2.80952e-06 4.22099e-09 -1.87151e-12 -8920.87 1.4301
-;
-Tad = 2135.12
-
-phi = 1.83
-ft = 0.0509692
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.1886
-    200 6000    1000
-    3.02813 0.00106113 -3.00433e-07 4.42501e-11 -2.5117e-15 -910.437 2.58324
-    3.04516 0.00305712 -7.52029e-06 8.69821e-09 -3.44966e-12 -992.913 2.05664
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.5045
-    200 6000    1000
-    2.87392 0.00169411 -4.90952e-07 6.8734e-11 -3.63984e-15 -8703.6 4.60181
-    3.4455 0.00117351 -2.85444e-06 4.26393e-09 -1.88634e-12 -8899.31 1.42809
-;
-Tad = 2131.27
-
-phi = 1.84
-ft = 0.0512334
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.1527
-    200 6000    1000
-    3.0279 0.00106058 -3.00068e-07 4.41817e-11 -2.50738e-15 -910.206 2.57469
-    3.0435 0.00306878 -7.54862e-06 8.72535e-09 -3.45896e-12 -992.736 2.05339
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.4575
-    200 6000    1000
-    2.87408 0.00169178 -4.90026e-07 6.85907e-11 -3.63191e-15 -8682.4 4.58669
-    3.44254 0.0011918 -2.89911e-06 4.30664e-09 -1.90109e-12 -8877.86 1.42608
-;
-Tad = 2127.43
-
-phi = 1.85
-ft = 0.0514975
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.1169
-    200 6000    1000
-    3.02768 0.00106002 -2.99705e-07 4.41137e-11 -2.50309e-15 -909.976 2.56619
-    3.04185 0.00308039 -7.57681e-06 8.75237e-09 -3.46822e-12 -992.559 2.05015
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.4108
-    200 6000    1000
-    2.87424 0.00168946 -4.89105e-07 6.84481e-11 -3.62403e-15 -8661.3 4.57165
-    3.4396 0.00121 -2.94355e-06 4.34913e-09 -1.91577e-12 -8856.52 1.42409
-;
-Tad = 2123.62
-
-phi = 1.86
-ft = 0.0517615
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.0813
-    200 6000    1000
-    3.02745 0.00105947 -2.99343e-07 4.40461e-11 -2.49881e-15 -909.748 2.55772
-    3.0402 0.00309195 -7.60488e-06 8.77926e-09 -3.47743e-12 -992.383 2.04692
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.3643
-    200 6000    1000
-    2.87439 0.00168715 -4.88189e-07 6.83064e-11 -3.61618e-15 -8640.32 4.55669
-    3.43667 0.0012281 -2.98775e-06 4.39139e-09 -1.93036e-12 -8835.3 1.42211
-;
-Tad = 2119.81
-
-phi = 1.87
-ft = 0.0520253
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.0458
-    200 6000    1000
-    3.02723 0.00105893 -2.98983e-07 4.39787e-11 -2.49455e-15 -909.52 2.54929
-    3.03856 0.00310345 -7.63281e-06 8.80603e-09 -3.4866e-12 -992.208 2.04372
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.318
-    200 6000    1000
-    2.87455 0.00168486 -4.87278e-07 6.81653e-11 -3.60837e-15 -8619.46 4.54181
-    3.43376 0.0012461 -3.03171e-06 4.43342e-09 -1.94488e-12 -8814.19 1.42014
-;
-Tad = 2116.03
-
-phi = 1.88
-ft = 0.0522889
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       17.0106
-    200 6000    1000
-    3.02701 0.00105838 -2.98625e-07 4.39116e-11 -2.49031e-15 -909.294 2.54091
-    3.03693 0.00311489 -7.66061e-06 8.83267e-09 -3.49573e-12 -992.033 2.04052
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.272
-    200 6000    1000
-    2.8747 0.00168258 -4.86372e-07 6.80251e-11 -3.60061e-15 -8598.7 4.52701
-    3.43086 0.001264 -3.07544e-06 4.47523e-09 -1.95932e-12 -8793.2 1.41818
-;
-Tad = 2112.26
-
-phi = 1.89
-ft = 0.0525525
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.9755
-    200 6000    1000
-    3.02679 0.00105784 -2.98269e-07 4.38449e-11 -2.48609e-15 -909.069 2.53256
-    3.03531 0.00312629 -7.68828e-06 8.85919e-09 -3.50482e-12 -991.86 2.03734
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.2263
-    200 6000    1000
-    2.87486 0.00168031 -4.8547e-07 6.78855e-11 -3.59289e-15 -8578.05 4.51229
-    3.42798 0.00128181 -3.11894e-06 4.51681e-09 -1.97369e-12 -8772.31 1.41623
-;
-Tad = 2108.5
-
-phi = 1.9
-ft = 0.0528158
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.9405
-    200 6000    1000
-    3.02657 0.0010573 -2.97914e-07 4.37785e-11 -2.4819e-15 -908.844 2.52425
-    3.0337 0.00313762 -7.71582e-06 8.88558e-09 -3.51386e-12 -991.687 2.03418
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.1808
-    200 6000    1000
-    2.87501 0.00167805 -4.84573e-07 6.77468e-11 -3.58521e-15 -8557.52 4.49765
-    3.42512 0.00129953 -3.16221e-06 4.55818e-09 -1.98798e-12 -8751.54 1.41429
-;
-Tad = 2104.77
-
-phi = 1.91
-ft = 0.053079
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.9057
-    200 6000    1000
-    3.02635 0.00105676 -2.97561e-07 4.37124e-11 -2.47772e-15 -908.621 2.51598
-    3.03209 0.00314891 -7.74323e-06 8.91185e-09 -3.52286e-12 -991.515 2.03103
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.1355
-    200 6000    1000
-    2.87517 0.0016758 -4.83681e-07 6.76087e-11 -3.57757e-15 -8537.09 4.48308
-    3.42226 0.00131716 -3.20525e-06 4.59933e-09 -2.00219e-12 -8730.88 1.41236
-;
-Tad = 2101.04
-
-phi = 1.92
-ft = 0.0533421
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.8711
-    200 6000    1000
-    3.02613 0.00105622 -2.9721e-07 4.36466e-11 -2.47356e-15 -908.399 2.50775
-    3.03049 0.00316014 -7.77051e-06 8.93799e-09 -3.53182e-12 -991.344 2.0279
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.0904
-    200 6000    1000
-    2.87532 0.00167357 -4.82794e-07 6.74714e-11 -3.56997e-15 -8516.77 4.46859
-    3.41943 0.00133469 -3.24806e-06 4.64026e-09 -2.01633e-12 -8710.32 1.41044
-;
-Tad = 2097.34
-
-phi = 1.93
-ft = 0.0536051
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.8367
-    200 6000    1000
-    3.02592 0.00105569 -2.9686e-07 4.35811e-11 -2.46942e-15 -908.178 2.49956
-    3.0289 0.00317133 -7.79767e-06 8.96402e-09 -3.54074e-12 -991.174 2.02478
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.0456
-    200 6000    1000
-    2.87547 0.00167135 -4.81911e-07 6.73348e-11 -3.56241e-15 -8496.55 4.45418
-    3.41661 0.00135212 -3.29065e-06 4.68097e-09 -2.03039e-12 -8689.87 1.40854
-;
-Tad = 2093.65
-
-phi = 1.94
-ft = 0.0538678
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.8024
-    200 6000    1000
-    3.0257 0.00105516 -2.96512e-07 4.35159e-11 -2.4653e-15 -907.958 2.4914
-    3.02732 0.00318246 -7.8247e-06 8.98992e-09 -3.54961e-12 -991.005 2.02167
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       19.0011
-    200 6000    1000
-    2.87562 0.00166914 -4.81033e-07 6.71989e-11 -3.55489e-15 -8476.44 4.43984
-    3.4138 0.00136947 -3.33301e-06 4.72148e-09 -2.04438e-12 -8669.53 1.40664
-;
-Tad = 2089.97
-
-phi = 1.95
-ft = 0.0541305
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.7682
-    200 6000    1000
-    3.02549 0.00105463 -2.96165e-07 4.3451e-11 -2.46119e-15 -907.739 2.48328
-    3.02574 0.00319354 -7.85161e-06 9.01571e-09 -3.55845e-12 -990.836 2.01858
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.9567
-    200 6000    1000
-    2.87577 0.00166694 -4.8016e-07 6.70637e-11 -3.54741e-15 -8456.44 4.42558
-    3.41101 0.00138673 -3.37516e-06 4.76177e-09 -2.0583e-12 -8649.3 1.40475
-;
-Tad = 2086.31
-
-phi = 1.96
-ft = 0.054393
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.7342
-    200 6000    1000
-    3.02527 0.00105411 -2.9582e-07 4.33864e-11 -2.45711e-15 -907.521 2.4752
-    3.02417 0.00320456 -7.8784e-06 9.04137e-09 -3.56724e-12 -990.668 2.0155
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.9126
-    200 6000    1000
-    2.87592 0.00166475 -4.79291e-07 6.69292e-11 -3.53996e-15 -8436.54 4.41139
-    3.40823 0.0014039 -3.41708e-06 4.80185e-09 -2.07214e-12 -8629.17 1.40287
-;
-Tad = 2082.67
-
-phi = 1.97
-ft = 0.0546553
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.7004
-    200 6000    1000
-    3.02506 0.00105359 -2.95477e-07 4.33221e-11 -2.45305e-15 -907.303 2.46716
-    3.02261 0.00321554 -7.90506e-06 9.06692e-09 -3.576e-12 -990.501 2.01244
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.8687
-    200 6000    1000
-    2.87606 0.00166257 -4.78426e-07 6.67954e-11 -3.53256e-15 -8416.74 4.39727
-    3.40547 0.00142097 -3.45879e-06 4.84173e-09 -2.08592e-12 -8609.15 1.401
-;
-Tad = 2079.04
-
-phi = 1.98
-ft = 0.0549175
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.6667
-    200 6000    1000
-    3.02485 0.00105307 -2.95135e-07 4.32581e-11 -2.449e-15 -907.087 2.45915
-    3.02105 0.00322647 -7.93159e-06 9.09235e-09 -3.58471e-12 -990.334 2.00939
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.8251
-    200 6000    1000
-    2.87621 0.00166041 -4.77566e-07 6.66623e-11 -3.5252e-15 -8397.05 4.38323
-    3.40272 0.00143796 -3.50028e-06 4.88139e-09 -2.09962e-12 -8589.23 1.39914
-;
-Tad = 2075.43
-
-phi = 1.99
-ft = 0.0551796
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.6332
-    200 6000    1000
-    3.02464 0.00105255 -2.94794e-07 4.31944e-11 -2.44497e-15 -906.872 2.45118
-    3.0195 0.00323734 -7.95801e-06 9.11767e-09 -3.59339e-12 -990.169 2.00636
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.7817
-    200 6000    1000
-    2.87636 0.00165825 -4.76711e-07 6.65299e-11 -3.51787e-15 -8377.46 4.36926
-    3.39999 0.00145487 -3.54156e-06 4.92086e-09 -2.11325e-12 -8569.41 1.39729
-;
-Tad = 2071.83
-
-phi = 2
-ft = 0.0554415
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.5998
-    200 6000    1000
-    3.02443 0.00105203 -2.94456e-07 4.31309e-11 -2.44097e-15 -906.658 2.44325
-    3.01796 0.00324817 -7.98431e-06 9.14286e-09 -3.60202e-12 -990.004 2.00334
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.7385
-    200 6000    1000
-    2.8765 0.00165611 -4.7586e-07 6.63982e-11 -3.51058e-15 -8357.97 4.35537
-    3.39727 0.00147168 -3.58262e-06 4.96012e-09 -2.12681e-12 -8549.69 1.39545
-;
-Tad = 2068.24
-
-phi = 2.01
-ft = 0.0557033
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.5666
-    200 6000    1000
-    3.02422 0.00105152 -2.94119e-07 4.30678e-11 -2.43698e-15 -906.445 2.43535
-    3.01643 0.00325895 -8.01048e-06 9.16795e-09 -3.61062e-12 -989.84 2.00033
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.6955
-    200 6000    1000
-    2.87665 0.00165398 -4.75013e-07 6.62672e-11 -3.50333e-15 -8338.58 4.34154
-    3.39456 0.00148841 -3.62347e-06 4.99917e-09 -2.1403e-12 -8530.08 1.39362
-;
-Tad = 2064.67
-
-phi = 2.02
-ft = 0.0559649
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.5336
-    200 6000    1000
-    3.02401 0.00105101 -2.93783e-07 4.3005e-11 -2.433e-15 -906.233 2.42749
-    3.0149 0.00326968 -8.03654e-06 9.19292e-09 -3.61917e-12 -989.676 1.99734
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.6527
-    200 6000    1000
-    2.87679 0.00165186 -4.7417e-07 6.61368e-11 -3.49611e-15 -8319.28 4.32778
-    3.39187 0.00150505 -3.66412e-06 5.03803e-09 -2.15372e-12 -8510.57 1.3918
-;
-Tad = 2061.12
-
-phi = 2.03
-ft = 0.0562264
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.5007
-    200 6000    1000
-    3.02381 0.0010505 -2.93449e-07 4.29424e-11 -2.42905e-15 -906.022 2.41967
-    3.01338 0.00328036 -8.06248e-06 9.21778e-09 -3.62769e-12 -989.514 1.99436
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.6102
-    200 6000    1000
-    2.87694 0.00164975 -4.73332e-07 6.60071e-11 -3.48893e-15 -8300.09 4.3141
-    3.38919 0.00152161 -3.70455e-06 5.07669e-09 -2.16708e-12 -8491.15 1.38998
-;
-Tad = 2057.58
-
-phi = 2.04
-ft = 0.0564877
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.4679
-    200 6000    1000
-    3.0236 0.00104999 -2.93116e-07 4.28801e-11 -2.42511e-15 -905.811 2.41188
-    3.01187 0.00329099 -8.0883e-06 9.24252e-09 -3.63617e-12 -989.352 1.99139
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.5679
-    200 6000    1000
-    2.87708 0.00164765 -4.72499e-07 6.5878e-11 -3.48179e-15 -8281 4.30048
-    3.38653 0.00153808 -3.74478e-06 5.11515e-09 -2.18036e-12 -8471.84 1.38818
-;
-Tad = 2054.05
-
-phi = 2.05
-ft = 0.0567489
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.4353
-    200 6000    1000
-    3.0234 0.00104949 -2.92785e-07 4.28181e-11 -2.42119e-15 -905.602 2.40412
-    3.01036 0.00330157 -8.11401e-06 9.26715e-09 -3.64461e-12 -989.191 1.98844
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.5258
-    200 6000    1000
-    2.87722 0.00164556 -4.71669e-07 6.57496e-11 -3.47469e-15 -8262 4.28694
-    3.38387 0.00155447 -3.7848e-06 5.15342e-09 -2.19358e-12 -8452.62 1.38639
-;
-Tad = 2050.54
-
-phi = 2.06
-ft = 0.0570099
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.4028
-    200 6000    1000
-    3.02319 0.00104899 -2.92455e-07 4.27564e-11 -2.41729e-15 -905.394 2.3964
-    3.00886 0.00331211 -8.1396e-06 9.29167e-09 -3.65301e-12 -989.03 1.9855
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.4839
-    200 6000    1000
-    2.87736 0.00164348 -4.70844e-07 6.56219e-11 -3.46762e-15 -8243.1 4.27346
-    3.38124 0.00157078 -3.82463e-06 5.19149e-09 -2.20673e-12 -8433.5 1.3846
-;
-Tad = 2047.05
-
-phi = 2.07
-ft = 0.0572708
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.3705
-    200 6000    1000
-    3.02299 0.00104849 -2.92127e-07 4.2695e-11 -2.41341e-15 -905.186 2.38872
-    3.00737 0.00332259 -8.16507e-06 9.31609e-09 -3.66138e-12 -988.87 1.98257
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.4422
-    200 6000    1000
-    2.8775 0.00164142 -4.70022e-07 6.54948e-11 -3.46058e-15 -8224.29 4.26005
-    3.37861 0.001587 -3.86425e-06 5.22937e-09 -2.21981e-12 -8414.48 1.38283
-;
-Tad = 2043.57
-
-phi = 2.08
-ft = 0.0575316
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.3383
-    200 6000    1000
-    3.02279 0.00104799 -2.91801e-07 4.26338e-11 -2.40954e-15 -904.98 2.38107
-    3.00588 0.00333304 -8.19043e-06 9.34039e-09 -3.6697e-12 -988.711 1.97966
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.4007
-    200 6000    1000
-    2.87764 0.00163936 -4.69205e-07 6.53684e-11 -3.45359e-15 -8205.58 4.24671
-    3.376 0.00160314 -3.90367e-06 5.26705e-09 -2.23283e-12 -8395.55 1.38106
-;
-Tad = 2040.1
-
-phi = 2.09
-ft = 0.0577922
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.3063
-    200 6000    1000
-    3.02259 0.00104749 -2.91475e-07 4.25729e-11 -2.4057e-15 -904.774 2.37345
-    3.0044 0.00334343 -8.21568e-06 9.36458e-09 -3.67799e-12 -988.553 1.97676
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.3595
-    200 6000    1000
-    2.87778 0.00163731 -4.68393e-07 6.52426e-11 -3.44662e-15 -8186.96 4.23344
-    3.3734 0.0016192 -3.94289e-06 5.30455e-09 -2.24579e-12 -8376.72 1.3793
-;
-Tad = 2036.64
-
-phi = 2.1
-ft = 0.0580526
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.2744
-    200 6000    1000
-    3.02239 0.001047 -2.91152e-07 4.25123e-11 -2.40186e-15 -904.569 2.36587
-    3.00293 0.00335378 -8.24081e-06 9.38867e-09 -3.68625e-12 -988.395 1.97387
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.3184
-    200 6000    1000
-    2.87792 0.00163527 -4.67584e-07 6.51174e-11 -3.4397e-15 -8168.44 4.22023
-    3.37082 0.00163518 -3.98191e-06 5.34186e-09 -2.25867e-12 -8357.99 1.37755
-;
-Tad = 2033.2
-
-phi = 2.11
-ft = 0.058313
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.2426
-    200 6000    1000
-    3.02219 0.00104651 -2.90829e-07 4.2452e-11 -2.39805e-15 -904.366 2.35832
-    3.00146 0.00336408 -8.26583e-06 9.41265e-09 -3.69446e-12 -988.239 1.971
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.2776
-    200 6000    1000
-    2.87806 0.00163325 -4.66779e-07 6.49928e-11 -3.4328e-15 -8150.01 4.20709
-    3.36825 0.00165108 -4.02074e-06 5.37898e-09 -2.27149e-12 -8339.34 1.37581
-;
-Tad = 2029.78
-
-phi = 2.12
-ft = 0.0585731
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.211
-    200 6000    1000
-    3.02199 0.00104602 -2.90508e-07 4.23919e-11 -2.39425e-15 -904.163 2.3508
-    3 0.00337434 -8.29075e-06 9.43652e-09 -3.70264e-12 -988.082 1.96814
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.2369
-    200 6000    1000
-    2.87819 0.00163123 -4.65978e-07 6.48689e-11 -3.42595e-15 -8131.67 4.19401
-    3.36569 0.0016669 -4.05937e-06 5.41592e-09 -2.28425e-12 -8320.8 1.37408
-;
-Tad = 2026.36
-
-phi = 2.13
-ft = 0.0588332
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.1796
-    200 6000    1000
-    3.02179 0.00104554 -2.90189e-07 4.23321e-11 -2.39047e-15 -903.961 2.34332
-    2.99855 0.00338455 -8.31555e-06 9.46028e-09 -3.71079e-12 -987.927 1.96529
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.1965
-    200 6000    1000
-    2.87833 0.00162923 -4.65181e-07 6.47456e-11 -3.41912e-15 -8113.43 4.181
-    3.36314 0.00168264 -4.09782e-06 5.45267e-09 -2.29695e-12 -8302.34 1.37236
-;
-Tad = 2022.97
-
-phi = 2.14
-ft = 0.0590931
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.1482
-    200 6000    1000
-    3.02159 0.00104505 -2.89871e-07 4.22725e-11 -2.38671e-15 -903.76 2.33587
-    2.9971 0.00339472 -8.34024e-06 9.48394e-09 -3.71889e-12 -987.772 1.96245
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.1562
-    200 6000    1000
-    2.87847 0.00162723 -4.64389e-07 6.46229e-11 -3.41233e-15 -8095.27 4.16806
-    3.36061 0.0016983 -4.13607e-06 5.48924e-09 -2.30958e-12 -8283.97 1.37064
-;
-Tad = 2019.58
-
-phi = 2.15
-ft = 0.0593528
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.117
-    200 6000    1000
-    3.0214 0.00104457 -2.89554e-07 4.22132e-11 -2.38296e-15 -903.56 2.32845
-    2.99566 0.00340484 -8.36482e-06 9.5075e-09 -3.72696e-12 -987.618 1.95963
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.1162
-    200 6000    1000
-    2.8786 0.00162524 -4.636e-07 6.45008e-11 -3.40557e-15 -8077.21 4.15518
-    3.35809 0.00171389 -4.17413e-06 5.52563e-09 -2.32215e-12 -8265.7 1.36894
-;
-Tad = 2016.21
-
-phi = 2.16
-ft = 0.0596124
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.086
-    200 6000    1000
-    3.0212 0.00104409 -2.89239e-07 4.21542e-11 -2.37923e-15 -903.36 2.32107
-    2.99423 0.00341491 -8.38929e-06 9.53095e-09 -3.735e-12 -987.464 1.95682
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.0763
-    200 6000    1000
-    2.87874 0.00162327 -4.62815e-07 6.43793e-11 -3.39885e-15 -8059.23 4.14236
-    3.35558 0.00172939 -4.212e-06 5.56184e-09 -2.33466e-12 -8247.52 1.36724
-;
-Tad = 2012.85
-
-phi = 2.17
-ft = 0.0598719
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.0551
-    200 6000    1000
-    3.02101 0.00104361 -2.88925e-07 4.20954e-11 -2.37551e-15 -903.162 2.31372
-    2.9928 0.00342495 -8.41366e-06 9.5543e-09 -3.743e-12 -987.312 1.95402
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       18.0367
-    200 6000    1000
-    2.87887 0.0016213 -4.62034e-07 6.42585e-11 -3.39216e-15 -8041.34 4.1296
-    3.35308 0.00174483 -4.24968e-06 5.59787e-09 -2.3471e-12 -8229.42 1.36555
-;
-Tad = 2009.51
-
-phi = 2.18
-ft = 0.0601312
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       16.0243
-    200 6000    1000
-    3.02082 0.00104314 -2.88613e-07 4.20369e-11 -2.37182e-15 -902.964 2.3064
-    2.99138 0.00343493 -8.43792e-06 9.57755e-09 -3.75097e-12 -987.16 1.95123
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.9973
-    200 6000    1000
-    2.879 0.00161934 -4.61257e-07 6.41382e-11 -3.3855e-15 -8023.54 4.11691
-    3.3506 0.00176018 -4.28718e-06 5.63372e-09 -2.35948e-12 -8211.42 1.36387
-;
-Tad = 2006.18
-
-phi = 2.19
-ft = 0.0603904
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.9936
-    200 6000    1000
-    3.02062 0.00104266 -2.88302e-07 4.19787e-11 -2.36813e-15 -902.768 2.29911
-    2.98996 0.00344488 -8.46207e-06 9.6007e-09 -3.7589e-12 -987.008 1.94846
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.958
-    200 6000    1000
-    2.87913 0.0016174 -4.60483e-07 6.40185e-11 -3.37888e-15 -8005.83 4.10428
-    3.34812 0.00177546 -4.3245e-06 5.6694e-09 -2.37181e-12 -8193.5 1.3622
-;
-Tad = 2002.86
-
-phi = 2.2
-ft = 0.0606494
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.9631
-    200 6000    1000
-    3.02043 0.00104219 -2.87992e-07 4.19207e-11 -2.36447e-15 -902.572 2.29186
-    2.98855 0.00345478 -8.48612e-06 9.62374e-09 -3.76679e-12 -986.857 1.94569
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.9189
-    200 6000    1000
-    2.87927 0.00161546 -4.59713e-07 6.38994e-11 -3.37229e-15 -7988.2 4.09172
-    3.34566 0.00179067 -4.36163e-06 5.7049e-09 -2.38407e-12 -8175.68 1.36053
-;
-Tad = 1999.55
-
-phi = 2.21
-ft = 0.0609083
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.9328
-    200 6000    1000
-    3.02024 0.00104172 -2.87683e-07 4.18629e-11 -2.36082e-15 -902.377 2.28464
-    2.98715 0.00346464 -8.51006e-06 9.64668e-09 -3.77466e-12 -986.707 1.94294
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.8801
-    200 6000    1000
-    2.8794 0.00161353 -4.58948e-07 6.37808e-11 -3.36573e-15 -7970.67 4.07921
-    3.34322 0.0018058 -4.39858e-06 5.74022e-09 -2.39627e-12 -8157.93 1.35888
-;
-Tad = 1996.26
-
-phi = 2.22
-ft = 0.061167
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.9025
-    200 6000    1000
-    3.02005 0.00104125 -2.87376e-07 4.18054e-11 -2.35718e-15 -902.183 2.27744
-    2.98575 0.00347445 -8.5339e-06 9.66953e-09 -3.78248e-12 -986.558 1.94021
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.8414
-    200 6000    1000
-    2.87953 0.00161161 -4.58185e-07 6.36629e-11 -3.3592e-15 -7953.21 4.06677
-    3.34078 0.00182085 -4.43536e-06 5.77538e-09 -2.40842e-12 -8140.28 1.35723
-;
-Tad = 1992.98
-
-phi = 2.23
-ft = 0.0614256
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.8724
-    200 6000    1000
-    3.01986 0.00104079 -2.87071e-07 4.17482e-11 -2.35357e-15 -901.99 2.27028
-    2.98436 0.00348422 -8.55764e-06 9.69227e-09 -3.79028e-12 -986.409 1.93748
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.8029
-    200 6000    1000
-    2.87966 0.0016097 -4.57427e-07 6.35455e-11 -3.35271e-15 -7935.84 4.05438
-    3.33836 0.00183584 -4.47195e-06 5.81036e-09 -2.4205e-12 -8122.71 1.35559
-;
-Tad = 1989.72
-
-phi = 2.24
-ft = 0.0616841
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.8424
-    200 6000    1000
-    3.01967 0.00104032 -2.86766e-07 4.16912e-11 -2.34996e-15 -901.797 2.26315
-    2.98298 0.00349395 -8.58127e-06 9.71492e-09 -3.79804e-12 -986.261 1.93476
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.7646
-    200 6000    1000
-    2.87979 0.0016078 -4.56672e-07 6.34287e-11 -3.34624e-15 -7918.56 4.04206
-    3.33595 0.00185075 -4.50836e-06 5.84518e-09 -2.43253e-12 -8105.23 1.35396
-;
-Tad = 1986.46
-
-phi = 2.25
-ft = 0.0619424
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.8125
-    200 6000    1000
-    3.01949 0.00103986 -2.86463e-07 4.16344e-11 -2.34638e-15 -901.606 2.25605
-    2.9816 0.00350364 -8.6048e-06 9.73747e-09 -3.80576e-12 -986.113 1.93206
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.7264
-    200 6000    1000
-    2.87991 0.00160591 -4.55921e-07 6.33125e-11 -3.33981e-15 -7901.36 4.02979
-    3.33354 0.00186559 -4.5446e-06 5.87982e-09 -2.44449e-12 -8087.83 1.35233
-;
-Tad = 1983.22
-
-phi = 2.26
-ft = 0.0622006
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.7828
-    200 6000    1000
-    3.0193 0.0010394 -2.86161e-07 4.15779e-11 -2.34281e-15 -901.415 2.24899
-    2.98022 0.00351329 -8.62823e-06 9.75992e-09 -3.81346e-12 -985.966 1.92937
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.6885
-    200 6000    1000
-    2.88004 0.00160403 -4.55174e-07 6.31968e-11 -3.33341e-15 -7884.24 4.01759
-    3.33116 0.00188035 -4.58066e-06 5.9143e-09 -2.4564e-12 -8070.51 1.35072
-;
-Tad = 1980
-
-phi = 2.27
-ft = 0.0624586
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.7532
-    200 6000    1000
-    3.01911 0.00103895 -2.85861e-07 4.15217e-11 -2.33925e-15 -901.225 2.24195
-    2.97886 0.00352289 -8.65156e-06 9.78228e-09 -3.82112e-12 -985.82 1.92669
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.6507
-    200 6000    1000
-    2.88017 0.00160216 -4.5443e-07 6.30817e-11 -3.32704e-15 -7867.21 4.00544
-    3.32878 0.00189505 -4.61655e-06 5.94861e-09 -2.46825e-12 -8053.28 1.34911
-;
-Tad = 1976.78
-
-phi = 2.28
-ft = 0.0627165
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.7237
-    200 6000    1000
-    3.01893 0.00103849 -2.85562e-07 4.14657e-11 -2.33571e-15 -901.036 2.23494
-    2.9775 0.00353246 -8.67479e-06 9.80453e-09 -3.82874e-12 -985.674 1.92402
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.6132
-    200 6000    1000
-    2.8803 0.00160029 -4.5369e-07 6.29671e-11 -3.32069e-15 -7850.25 3.99335
-    3.32641 0.00190967 -4.65227e-06 5.98276e-09 -2.48005e-12 -8036.14 1.34751
-;
-Tad = 1973.58
-
-phi = 2.29
-ft = 0.0629743
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.6944
-    200 6000    1000
-    3.01875 0.00103804 -2.85264e-07 4.14099e-11 -2.33218e-15 -900.847 2.22796
-    2.97614 0.00354198 -8.69791e-06 9.8267e-09 -3.83634e-12 -985.529 1.92136
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.5758
-    200 6000    1000
-    2.88042 0.00159844 -4.52953e-07 6.28531e-11 -3.31438e-15 -7833.38 3.98132
-    3.32406 0.00192423 -4.68782e-06 6.01675e-09 -2.49179e-12 -8019.07 1.34591
-;
-Tad = 1970.39
-
-phi = 2.3
-ft = 0.0632319
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.6652
-    200 6000    1000
-    3.01856 0.00103758 -2.84967e-07 4.13543e-11 -2.32867e-15 -900.66 2.22102
-    2.97479 0.00355146 -8.72094e-06 9.84877e-09 -3.8439e-12 -985.385 1.91872
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.5386
-    200 6000    1000
-    2.88055 0.00159659 -4.5222e-07 6.27396e-11 -3.3081e-15 -7816.59 3.96935
-    3.32171 0.00193872 -4.72319e-06 6.05057e-09 -2.50347e-12 -8002.08 1.34433
-;
-Tad = 1967.21
-
-phi = 2.31
-ft = 0.0634893
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.6361
-    200 6000    1000
-    3.01838 0.00103713 -2.84672e-07 4.1299e-11 -2.32518e-15 -900.473 2.2141
-    2.97345 0.0035609 -8.74388e-06 9.87074e-09 -3.85143e-12 -985.241 1.91608
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.5015
-    200 6000    1000
-    2.88067 0.00159475 -4.5149e-07 6.26267e-11 -3.30185e-15 -7799.88 3.95744
-    3.31938 0.00195313 -4.7584e-06 6.08423e-09 -2.5151e-12 -7985.18 1.34275
-;
-Tad = 1964.04
-
-phi = 2.32
-ft = 0.0637467
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.6071
-    200 6000    1000
-    3.0182 0.00103669 -2.84377e-07 4.12439e-11 -2.32169e-15 -900.287 2.20721
-    2.97211 0.00357031 -8.76671e-06 9.89262e-09 -3.85893e-12 -985.098 1.91346
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.4647
-    200 6000    1000
-    2.8808 0.00159293 -4.50764e-07 6.25143e-11 -3.29563e-15 -7783.25 3.94558
-    3.31706 0.00196748 -4.79344e-06 6.11773e-09 -2.52667e-12 -7968.36 1.34118
-;
-Tad = 1960.89
-
-phi = 2.33
-ft = 0.0640038
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.5783
-    200 6000    1000
-    3.01802 0.00103624 -2.84085e-07 4.11891e-11 -2.31823e-15 -900.102 2.20035
-    2.97078 0.00357967 -8.78945e-06 9.91441e-09 -3.86639e-12 -984.955 1.91085
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.428
-    200 6000    1000
-    2.88092 0.00159111 -4.50041e-07 6.24024e-11 -3.28944e-15 -7766.69 3.93377
-    3.31475 0.00198176 -4.82831e-06 6.15107e-09 -2.53818e-12 -7951.62 1.33962
-;
-Tad = 1957.75
-
-phi = 2.34
-ft = 0.0642609
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.5495
-    200 6000    1000
-    3.01784 0.0010358 -2.83793e-07 4.11345e-11 -2.31478e-15 -899.918 2.19352
-    2.96945 0.00358899 -8.81209e-06 9.93611e-09 -3.87383e-12 -984.813 1.90825
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.3915
-    200 6000    1000
-    2.88104 0.00158929 -4.49322e-07 6.22911e-11 -3.28328e-15 -7750.22 3.92203
-    3.31245 0.00199597 -4.86302e-06 6.18425e-09 -2.54965e-12 -7934.95 1.33806
-;
-Tad = 1954.62
-
-phi = 2.35
-ft = 0.0645178
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.5209
-    200 6000    1000
-    3.01766 0.00103535 -2.83503e-07 4.10801e-11 -2.31134e-15 -899.734 2.18672
-    2.96813 0.00359827 -8.83463e-06 9.95771e-09 -3.88123e-12 -984.672 1.90566
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.3551
-    200 6000    1000
-    2.88117 0.00158749 -4.48606e-07 6.21803e-11 -3.27715e-15 -7733.82 3.91034
-    3.31016 0.00201012 -4.89756e-06 6.21727e-09 -2.56105e-12 -7918.37 1.33651
-;
-Tad = 1951.5
-
-phi = 2.36
-ft = 0.0647745
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.4924
-    200 6000    1000
-    3.01748 0.00103491 -2.83213e-07 4.1026e-11 -2.30792e-15 -899.551 2.17994
-    2.96681 0.00360752 -8.85709e-06 9.97923e-09 -3.8886e-12 -984.531 1.90308
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.319
-    200 6000    1000
-    2.88129 0.0015857 -4.47893e-07 6.207e-11 -3.27105e-15 -7717.51 3.8987
-    3.30789 0.00202419 -4.93194e-06 6.25014e-09 -2.57241e-12 -7901.86 1.33497
-;
-Tad = 1948.4
-
-phi = 2.37
-ft = 0.0650312
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.4641
-    200 6000    1000
-    3.0173 0.00103448 -2.82925e-07 4.09721e-11 -2.30451e-15 -899.369 2.1732
-    2.9655 0.00361672 -8.87944e-06 1.00007e-08 -3.89594e-12 -984.391 1.90051
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.283
-    200 6000    1000
-    2.88141 0.00158391 -4.47184e-07 6.19602e-11 -3.26497e-15 -7701.26 3.88712
-    3.30562 0.0020382 -4.96616e-06 6.28286e-09 -2.58371e-12 -7885.43 1.33344
-;
-Tad = 1945.31
-
-phi = 2.38
-ft = 0.0652876
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.4358
-    200 6000    1000
-    3.01712 0.00103404 -2.82639e-07 4.09184e-11 -2.30112e-15 -899.188 2.16648
-    2.9642 0.00362589 -8.9017e-06 1.0022e-08 -3.90325e-12 -984.252 1.89796
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.2471
-    200 6000    1000
-    2.88153 0.00158213 -4.46478e-07 6.1851e-11 -3.25893e-15 -7685.1 3.87559
-    3.30336 0.00205215 -5.00022e-06 6.31542e-09 -2.59496e-12 -7869.08 1.33191
-;
-Tad = 1942.22
-
-phi = 2.39
-ft = 0.065544
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.4077
-    200 6000    1000
-    3.01695 0.0010336 -2.82353e-07 4.08649e-11 -2.29774e-15 -899.007 2.15979
-    2.9629 0.00363501 -8.92387e-06 1.00432e-08 -3.91053e-12 -984.113 1.89541
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.2115
-    200 6000    1000
-    2.88165 0.00158037 -4.45775e-07 6.17422e-11 -3.25291e-15 -7669.01 3.86412
-    3.30112 0.00206603 -5.03412e-06 6.34783e-09 -2.60615e-12 -7852.8 1.33039
-;
-Tad = 1939.15
-
-phi = 2.4
-ft = 0.0658002
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.3797
-    200 6000    1000
-    3.01677 0.00103317 -2.82069e-07 4.08117e-11 -2.29437e-15 -898.828 2.15313
-    2.9616 0.0036441 -8.94595e-06 1.00644e-08 -3.91778e-12 -983.974 1.89287
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.176
-    200 6000    1000
-    2.88177 0.00157861 -4.45076e-07 6.1634e-11 -3.24692e-15 -7652.99 3.8527
-    3.29888 0.00207985 -5.06786e-06 6.38009e-09 -2.61729e-12 -7836.6 1.32888
-;
-Tad = 1936.1
-
-phi = 2.41
-ft = 0.0660562
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.3518
-    200 6000    1000
-    3.01659 0.00103274 -2.81786e-07 4.07586e-11 -2.29102e-15 -898.649 2.1465
-    2.96031 0.00365315 -8.96793e-06 1.00854e-08 -3.925e-12 -983.836 1.89035
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.1406
-    200 6000    1000
-    2.88189 0.00157685 -4.4438e-07 6.15263e-11 -3.24096e-15 -7637.05 3.84134
-    3.29666 0.0020936 -5.10144e-06 6.4122e-09 -2.62838e-12 -7820.48 1.32738
-;
-Tad = 1933.05
-
-phi = 2.42
-ft = 0.0663122
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.324
-    200 6000    1000
-    3.01642 0.00103231 -2.81504e-07 4.07058e-11 -2.28768e-15 -898.47 2.1399
-    2.95903 0.00366217 -8.98982e-06 1.01064e-08 -3.93219e-12 -983.699 1.88783
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.1055
-    200 6000    1000
-    2.88201 0.00157511 -4.43687e-07 6.14191e-11 -3.23502e-15 -7621.19 3.83002
-    3.29444 0.00210729 -5.13487e-06 6.44415e-09 -2.63942e-12 -7804.43 1.32588
-;
-Tad = 1930.01
-
-phi = 2.43
-ft = 0.0665679
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.2963
-    200 6000    1000
-    3.01625 0.00103188 -2.81223e-07 4.06533e-11 -2.28436e-15 -898.293 2.13332
-    2.95775 0.00367114 -9.01162e-06 1.01273e-08 -3.93935e-12 -983.562 1.88533
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.0705
-    200 6000    1000
-    2.88213 0.00157337 -4.42998e-07 6.13123e-11 -3.22912e-15 -7605.39 3.81876
-    3.29224 0.00212091 -5.16814e-06 6.47596e-09 -2.65041e-12 -7788.46 1.32439
-;
-Tad = 1926.99
-
-phi = 2.44
-ft = 0.0668236
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.2688
-    200 6000    1000
-    3.01607 0.00103146 -2.80943e-07 4.06009e-11 -2.28105e-15 -898.116 2.12677
-    2.95648 0.00368008 -9.03333e-06 1.01481e-08 -3.94648e-12 -983.426 1.88283
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.0356
-    200 6000    1000
-    2.88224 0.00157164 -4.42311e-07 6.12061e-11 -3.22324e-15 -7589.67 3.80755
-    3.29005 0.00213447 -5.20126e-06 6.50763e-09 -2.66135e-12 -7772.56 1.3229
-;
-Tad = 1923.98
-
-phi = 2.45
-ft = 0.0670791
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.2414
-    200 6000    1000
-    3.0159 0.00103103 -2.80665e-07 4.05488e-11 -2.27775e-15 -897.94 2.12025
-    2.95521 0.00368898 -9.05496e-06 1.01688e-08 -3.95358e-12 -983.291 1.88035
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       17.0009
-    200 6000    1000
-    2.88236 0.00156992 -4.41628e-07 6.11004e-11 -3.21739e-15 -7574.03 3.7964
-    3.28786 0.00214797 -5.23422e-06 6.53914e-09 -2.67223e-12 -7756.73 1.32142
-;
-Tad = 1920.98
-
-phi = 2.46
-ft = 0.0673344
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.214
-    200 6000    1000
-    3.01573 0.00103061 -2.80387e-07 4.04968e-11 -2.27447e-15 -897.765 2.11375
-    2.95395 0.00369785 -9.07649e-06 1.01895e-08 -3.96065e-12 -983.156 1.87788
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.9664
-    200 6000    1000
-    2.88248 0.00156821 -4.40948e-07 6.09951e-11 -3.21156e-15 -7558.45 3.78529
-    3.28569 0.00216141 -5.26704e-06 6.57051e-09 -2.68307e-12 -7740.98 1.31995
-;
-Tad = 1917.99
-
-phi = 2.47
-ft = 0.0675896
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.1868
-    200 6000    1000
-    3.01556 0.00103019 -2.80111e-07 4.04451e-11 -2.2712e-15 -897.59 2.10728
-    2.9527 0.00370668 -9.09793e-06 1.021e-08 -3.96769e-12 -983.021 1.87541
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.9321
-    200 6000    1000
-    2.88259 0.00156651 -4.40271e-07 6.08903e-11 -3.20576e-15 -7542.95 3.77424
-    3.28353 0.00217478 -5.2997e-06 6.60174e-09 -2.69385e-12 -7725.29 1.31849
-;
-Tad = 1915.01
-
-phi = 2.48
-ft = 0.0678447
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.1597
-    200 6000    1000
-    3.01539 0.00102977 -2.79836e-07 4.03936e-11 -2.26795e-15 -897.416 2.10084
-    2.95144 0.00371547 -9.11928e-06 1.02305e-08 -3.9747e-12 -982.887 1.87296
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.8979
-    200 6000    1000
-    2.88271 0.00156481 -4.39597e-07 6.0786e-11 -3.19999e-15 -7527.52 3.76323
-    3.28137 0.00218809 -5.33221e-06 6.63282e-09 -2.70459e-12 -7709.68 1.31703
-;
-Tad = 1912.04
-
-phi = 2.49
-ft = 0.0680996
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.1328
-    200 6000    1000
-    3.01522 0.00102936 -2.79562e-07 4.03423e-11 -2.26471e-15 -897.243 2.09442
-    2.9502 0.00372423 -9.14055e-06 1.02509e-08 -3.98168e-12 -982.754 1.87052
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.8638
-    200 6000    1000
-    2.88282 0.00156312 -4.38926e-07 6.06822e-11 -3.19425e-15 -7512.16 3.75228
-    3.27923 0.00220135 -5.36457e-06 6.66377e-09 -2.71528e-12 -7694.15 1.31558
-;
-Tad = 1909.08
-
-phi = 2.5
-ft = 0.0683544
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.1059
-    200 6000    1000
-    3.01505 0.00102894 -2.79289e-07 4.02912e-11 -2.26148e-15 -897.071 2.08804
-    2.94896 0.00373295 -9.16173e-06 1.02712e-08 -3.98864e-12 -982.621 1.86809
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.8299
-    200 6000    1000
-    2.88294 0.00156144 -4.38258e-07 6.05789e-11 -3.18853e-15 -7496.86 3.74138
-    3.27709 0.00221454 -5.39679e-06 6.69457e-09 -2.72592e-12 -7678.68 1.31414
-;
-Tad = 1906.14
-
-phi = 2.51
-ft = 0.0686091
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.0791
-    200 6000    1000
-    3.01488 0.00102853 -2.79018e-07 4.02404e-11 -2.25826e-15 -896.899 2.08167
-    2.94772 0.00374163 -9.18282e-06 1.02914e-08 -3.99556e-12 -982.489 1.86566
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.7962
-    200 6000    1000
-    2.88305 0.00155977 -4.37594e-07 6.0476e-11 -3.18284e-15 -7481.64 3.73052
-    3.27497 0.00222767 -5.42886e-06 6.72523e-09 -2.73651e-12 -7663.28 1.3127
-;
-Tad = 1903.2
-
-phi = 2.52
-ft = 0.0688636
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.0525
-    200 6000    1000
-    3.01472 0.00102811 -2.78747e-07 4.01897e-11 -2.25506e-15 -896.728 2.07533
-    2.94649 0.00375028 -9.20383e-06 1.03115e-08 -4.00246e-12 -982.357 1.86325
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.7626
-    200 6000    1000
-    2.88316 0.0015581 -4.36932e-07 6.03736e-11 -3.17717e-15 -7466.49 3.71972
-    3.27286 0.00224074 -5.46078e-06 6.75575e-09 -2.74705e-12 -7647.95 1.31127
-;
-Tad = 1900.28
-
-phi = 2.53
-ft = 0.069118
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       15.0259
-    200 6000    1000
-    3.01455 0.0010277 -2.78477e-07 4.01392e-11 -2.25187e-15 -896.557 2.06902
-    2.94526 0.00375889 -9.22475e-06 1.03316e-08 -4.00933e-12 -982.226 1.86085
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.7292
-    200 6000    1000
-    2.88328 0.00155644 -4.36273e-07 6.02717e-11 -3.17153e-15 -7451.41 3.70897
-    3.27075 0.00225375 -5.49256e-06 6.78613e-09 -2.75754e-12 -7632.7 1.30985
-;
-Tad = 1897.37
-
-phi = 2.54
-ft = 0.0693722
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.9995
-    200 6000    1000
-    3.01438 0.00102729 -2.78209e-07 4.0089e-11 -2.24869e-15 -896.388 2.06274
-    2.94404 0.00376747 -9.24559e-06 1.03515e-08 -4.01617e-12 -982.095 1.85845
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.6959
-    200 6000    1000
-    2.88339 0.00155479 -4.35618e-07 6.01702e-11 -3.16591e-15 -7436.39 3.69826
-    3.26866 0.00226671 -5.5242e-06 6.81637e-09 -2.76799e-12 -7617.51 1.30843
-;
-Tad = 1894.47
-
-phi = 2.55
-ft = 0.0696264
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.9732
-    200 6000    1000
-    3.01422 0.00102689 -2.77942e-07 4.00389e-11 -2.24553e-15 -896.219 2.05648
-    2.94283 0.00377602 -9.26634e-06 1.03714e-08 -4.02298e-12 -981.965 1.85607
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.6628
-    200 6000    1000
-    2.8835 0.00155315 -4.34965e-07 6.00692e-11 -3.16032e-15 -7421.44 3.6876
-    3.26657 0.0022796 -5.55569e-06 6.84648e-09 -2.77839e-12 -7602.39 1.30702
-;
-Tad = 1891.57
-
-phi = 2.56
-ft = 0.0698803
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.9469
-    200 6000    1000
-    3.01405 0.00102648 -2.77676e-07 3.99891e-11 -2.24238e-15 -896.051 2.05024
-    2.94161 0.00378453 -9.28701e-06 1.03912e-08 -4.02977e-12 -981.836 1.85369
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.6298
-    200 6000    1000
-    2.88361 0.00155151 -4.34315e-07 5.99686e-11 -3.15476e-15 -7406.56 3.67699
-    3.26449 0.00229244 -5.58704e-06 6.87645e-09 -2.78874e-12 -7587.34 1.30561
-;
-Tad = 1888.69
-
-phi = 2.57
-ft = 0.0701341
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.9208
-    200 6000    1000
-    3.01389 0.00102608 -2.7741e-07 3.99395e-11 -2.23924e-15 -895.883 2.04403
-    2.94041 0.003793 -9.30759e-06 1.04109e-08 -4.03653e-12 -981.707 1.85133
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.5969
-    200 6000    1000
-    2.88372 0.00154988 -4.33668e-07 5.98685e-11 -3.14921e-15 -7391.75 3.66643
-    3.26243 0.00230522 -5.61825e-06 6.90629e-09 -2.79905e-12 -7572.35 1.30421
-;
-Tad = 1885.82
-
-phi = 2.58
-ft = 0.0703878
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.8948
-    200 6000    1000
-    3.01373 0.00102568 -2.77146e-07 3.989e-11 -2.23612e-15 -895.716 2.03785
-    2.93921 0.00380144 -9.32809e-06 1.04306e-08 -4.04326e-12 -981.578 1.84897
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.5643
-    200 6000    1000
-    2.88383 0.00154826 -4.33024e-07 5.97689e-11 -3.1437e-15 -7377 3.65591
-    3.26037 0.00231794 -5.64932e-06 6.936e-09 -2.80931e-12 -7557.43 1.30282
-;
-Tad = 1882.96
-
-phi = 2.59
-ft = 0.0706414
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.8689
-    200 6000    1000
-    3.01356 0.00102528 -2.76883e-07 3.98408e-11 -2.233e-15 -895.55 2.03169
-    2.93801 0.00380985 -9.34851e-06 1.04502e-08 -4.04997e-12 -981.45 1.84663
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.5317
-    200 6000    1000
-    2.88394 0.00154665 -4.32383e-07 5.96696e-11 -3.13821e-15 -7362.32 3.64544
-    3.25832 0.00233061 -5.68025e-06 6.96557e-09 -2.81953e-12 -7542.58 1.30143
-;
-Tad = 1880.11
-
-phi = 2.6
-ft = 0.0708948
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.8431
-    200 6000    1000
-    3.0134 0.00102488 -2.76621e-07 3.97917e-11 -2.2299e-15 -895.384 2.02555
-    2.93682 0.00381822 -9.36885e-06 1.04696e-08 -4.05664e-12 -981.322 1.84429
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.4993
-    200 6000    1000
-    2.88405 0.00154504 -4.31745e-07 5.95709e-11 -3.13274e-15 -7347.7 3.63502
-    3.25628 0.00234321 -5.71104e-06 6.99501e-09 -2.82969e-12 -7527.8 1.30005
-;
-Tad = 1877.27
-
-phi = 2.61
-ft = 0.0711481
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.8174
-    200 6000    1000
-    3.01324 0.00102448 -2.7636e-07 3.97429e-11 -2.22682e-15 -895.219 2.01944
-    2.93563 0.00382656 -9.3891e-06 1.0489e-08 -4.0633e-12 -981.195 1.84197
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.4671
-    200 6000    1000
-    2.88416 0.00154344 -4.3111e-07 5.94725e-11 -3.1273e-15 -7333.15 3.62465
-    3.25425 0.00235577 -5.7417e-06 7.02431e-09 -2.83982e-12 -7513.08 1.29868
-;
-Tad = 1874.44
-
-phi = 2.62
-ft = 0.0714012
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.7918
-    200 6000    1000
-    3.01308 0.00102408 -2.76101e-07 3.96942e-11 -2.22374e-15 -895.055 2.01335
-    2.93445 0.00383487 -9.40928e-06 1.05084e-08 -4.06992e-12 -981.069 1.83965
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.435
-    200 6000    1000
-    2.88427 0.00154185 -4.30477e-07 5.93746e-11 -3.12188e-15 -7318.67 3.61432
-    3.25223 0.00236826 -5.77221e-06 7.05349e-09 -2.8499e-12 -7498.43 1.29731
-;
-Tad = 1871.63
-
-phi = 2.63
-ft = 0.0716542
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.7663
-    200 6000    1000
-    3.01292 0.00102369 -2.75842e-07 3.96457e-11 -2.22068e-15 -894.891 2.00729
-    2.93327 0.00384314 -9.42937e-06 1.05276e-08 -4.07652e-12 -980.943 1.83734
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.403
-    200 6000    1000
-    2.88438 0.00154026 -4.29847e-07 5.92772e-11 -3.11649e-15 -7304.25 3.60404
-    3.25021 0.00238071 -5.8026e-06 7.08254e-09 -2.85993e-12 -7483.84 1.29595
-;
-Tad = 1868.82
-
-phi = 2.64
-ft = 0.071907
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.7409
-    200 6000    1000
-    3.01276 0.0010233 -2.75584e-07 3.95975e-11 -2.21763e-15 -894.728 2.00125
-    2.9321 0.00385138 -9.44939e-06 1.05468e-08 -4.08309e-12 -980.817 1.83504
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.3712
-    200 6000    1000
-    2.88448 0.00153868 -4.29221e-07 5.91801e-11 -3.11112e-15 -7289.89 3.5938
-    3.24821 0.00239309 -5.83285e-06 7.11146e-09 -2.86992e-12 -7469.32 1.29459
-;
-Tad = 1866.02
-
-phi = 2.65
-ft = 0.0721598
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.7156
-    200 6000    1000
-    3.0126 0.00102291 -2.75327e-07 3.95494e-11 -2.21459e-15 -894.566 1.99524
-    2.93093 0.00385959 -9.46932e-06 1.05659e-08 -4.08963e-12 -980.693 1.83275
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.3395
-    200 6000    1000
-    2.88459 0.00153711 -4.28596e-07 5.90835e-11 -3.10577e-15 -7275.59 3.58361
-    3.24622 0.00240542 -5.86296e-06 7.14025e-09 -2.87987e-12 -7454.86 1.29324
-;
-Tad = 1863.23
-
-phi = 2.66
-ft = 0.0724123
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.6904
-    200 6000    1000
-    3.01244 0.00102252 -2.75071e-07 3.95015e-11 -2.21156e-15 -894.404 1.98925
-    2.92977 0.00386776 -9.48917e-06 1.05849e-08 -4.09615e-12 -980.568 1.83047
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.308
-    200 6000    1000
-    2.8847 0.00153555 -4.27975e-07 5.89874e-11 -3.10045e-15 -7261.36 3.57346
-    3.24423 0.0024177 -5.89295e-06 7.16892e-09 -2.88977e-12 -7440.46 1.2919
-;
-Tad = 1860.45
-
-phi = 2.67
-ft = 0.0726648
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.6653
-    200 6000    1000
-    3.01228 0.00102213 -2.74817e-07 3.94538e-11 -2.20855e-15 -894.243 1.98328
-    2.92861 0.00387591 -9.50895e-06 1.06039e-08 -4.10265e-12 -980.444 1.8282
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.2765
-    200 6000    1000
-    2.8848 0.00153399 -4.27356e-07 5.88916e-11 -3.09515e-15 -7247.19 3.56336
-    3.24225 0.00242992 -5.9228e-06 7.19746e-09 -2.89962e-12 -7426.13 1.29056
-;
-Tad = 1857.68
-
-phi = 2.68
-ft = 0.0729171
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.6403
-    200 6000    1000
-    3.01213 0.00102174 -2.74563e-07 3.94063e-11 -2.20554e-15 -894.083 1.97734
-    2.92745 0.00388402 -9.52865e-06 1.06228e-08 -4.10912e-12 -980.32 1.82594
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.2453
-    200 6000    1000
-    2.88491 0.00153244 -4.2674e-07 5.87963e-11 -3.08988e-15 -7233.08 3.5533
-    3.24028 0.00244209 -5.95252e-06 7.22587e-09 -2.90944e-12 -7411.86 1.28923
-;
-Tad = 1854.93
-
-phi = 2.69
-ft = 0.0731693
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.6154
-    200 6000    1000
-    3.01197 0.00102136 -2.7431e-07 3.9359e-11 -2.20255e-15 -893.923 1.97142
-    2.9263 0.0038921 -9.54827e-06 1.06416e-08 -4.11556e-12 -980.197 1.82368
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.2142
-    200 6000    1000
-    2.88501 0.0015309 -4.26127e-07 5.87014e-11 -3.08462e-15 -7219.04 3.54328
-    3.23832 0.00245421 -5.98211e-06 7.25416e-09 -2.91921e-12 -7397.66 1.2879
-;
-Tad = 1852.18
-
-phi = 2.7
-ft = 0.0734213
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.5906
-    200 6000    1000
-    3.01182 0.00102098 -2.74058e-07 3.93119e-11 -2.19957e-15 -893.764 1.96552
-    2.92516 0.00390014 -9.56781e-06 1.06603e-08 -4.12198e-12 -980.075 1.82144
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.1832
-    200 6000    1000
-    2.88512 0.00152936 -4.25516e-07 5.86069e-11 -3.07939e-15 -7205.06 3.53331
-    3.23637 0.00246627 -6.01157e-06 7.28233e-09 -2.92894e-12 -7383.51 1.28658
-;
-Tad = 1849.44
-
-phi = 2.71
-ft = 0.0736732
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.5659
-    200 6000    1000
-    3.01166 0.00102059 -2.73808e-07 3.92649e-11 -2.1966e-15 -893.605 1.95965
-    2.92402 0.00390816 -9.58728e-06 1.0679e-08 -4.12837e-12 -979.953 1.8192
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.1523
-    200 6000    1000
-    2.88522 0.00152783 -4.24908e-07 5.85128e-11 -3.07419e-15 -7191.13 3.52338
-    3.23443 0.00247829 -6.0409e-06 7.31038e-09 -2.93863e-12 -7369.43 1.28527
-;
-Tad = 1846.71
-
-phi = 2.72
-ft = 0.073925
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.5413
-    200 6000    1000
-    3.01151 0.00102021 -2.73558e-07 3.92181e-11 -2.19365e-15 -893.448 1.9538
-    2.92288 0.00391614 -9.60667e-06 1.06975e-08 -4.13473e-12 -979.831 1.81697
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.1216
-    200 6000    1000
-    2.88532 0.0015263 -4.24303e-07 5.84191e-11 -3.069e-15 -7177.27 3.5135
-    3.23249 0.00249024 -6.07011e-06 7.3383e-09 -2.94827e-12 -7355.4 1.28396
-;
-Tad = 1843.99
-
-phi = 2.73
-ft = 0.0741766
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.5168
-    200 6000    1000
-    3.01135 0.00101983 -2.73309e-07 3.91716e-11 -2.1907e-15 -893.29 1.94797
-    2.92175 0.00392409 -9.62599e-06 1.0716e-08 -4.14108e-12 -979.71 1.81476
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.091
-    200 6000    1000
-    2.88543 0.00152479 -4.237e-07 5.83258e-11 -3.06384e-15 -7163.47 3.50366
-    3.23057 0.00250215 -6.09919e-06 7.3661e-09 -2.95788e-12 -7341.44 1.28266
-;
-Tad = 1841.28
-
-phi = 2.74
-ft = 0.0744281
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.4924
-    200 6000    1000
-    3.0112 0.00101946 -2.73061e-07 3.91252e-11 -2.18777e-15 -893.134 1.94217
-    2.92062 0.00393201 -9.64522e-06 1.07345e-08 -4.14739e-12 -979.59 1.81255
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.0605
-    200 6000    1000
-    2.88553 0.00152327 -4.231e-07 5.82329e-11 -3.0587e-15 -7149.73 3.49386
-    3.22865 0.00251401 -6.12814e-06 7.39378e-09 -2.96744e-12 -7327.54 1.28136
-;
-Tad = 1838.58
-
-phi = 2.75
-ft = 0.0746794
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.4681
-    200 6000    1000
-    3.01105 0.00101908 -2.72814e-07 3.90789e-11 -2.18485e-15 -892.978 1.93639
-    2.9195 0.0039399 -9.66439e-06 1.07528e-08 -4.15369e-12 -979.469 1.81034
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16.0302
-    200 6000    1000
-    2.88563 0.00152177 -4.22503e-07 5.81405e-11 -3.05358e-15 -7136.04 3.4841
-    3.22674 0.00252581 -6.15697e-06 7.42134e-09 -2.97696e-12 -7313.7 1.28007
-;
-Tad = 1835.89
-
-phi = 2.76
-ft = 0.0749306
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.4439
-    200 6000    1000
-    3.01089 0.00101871 -2.72569e-07 3.90329e-11 -2.18194e-15 -892.822 1.93063
-    2.91838 0.00394776 -9.68348e-06 1.07711e-08 -4.15996e-12 -979.35 1.80815
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       16
-    200 6000    1000
-    2.88573 0.00152027 -4.21908e-07 5.80484e-11 -3.04849e-15 -7122.42 3.47439
-    3.22484 0.00253756 -6.18567e-06 7.44878e-09 -2.98644e-12 -7299.92 1.27878
-;
-Tad = 1833.21
-
-phi = 2.77
-ft = 0.0751817
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.4197
-    200 6000    1000
-    3.01074 0.00101833 -2.72324e-07 3.8987e-11 -2.17904e-15 -892.667 1.92489
-    2.91726 0.00395559 -9.70249e-06 1.07894e-08 -4.1662e-12 -979.23 1.80597
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.9699
-    200 6000    1000
-    2.88584 0.00151878 -4.21315e-07 5.79567e-11 -3.04341e-15 -7108.85 3.46472
-    3.22295 0.00254927 -6.21425e-06 7.47611e-09 -2.99587e-12 -7286.2 1.2775
-;
-Tad = 1830.54
-
-phi = 2.78
-ft = 0.0754327
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.3957
-    200 6000    1000
-    3.01059 0.00101796 -2.7208e-07 3.89413e-11 -2.17615e-15 -892.513 1.91918
-    2.91615 0.00396339 -9.72144e-06 1.08075e-08 -4.17242e-12 -979.112 1.80379
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.94
-    200 6000    1000
-    2.88594 0.0015173 -4.20726e-07 5.78654e-11 -3.03836e-15 -7095.34 3.45509
-    3.22106 0.00256092 -6.24271e-06 7.50331e-09 -3.00527e-12 -7272.54 1.27622
-;
-Tad = 1827.88
-
-phi = 2.79
-ft = 0.0756835
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.3718
-    200 6000    1000
-    3.01044 0.00101759 -2.71837e-07 3.88958e-11 -2.17328e-15 -892.359 1.91349
-    2.91505 0.00397116 -9.7403e-06 1.08256e-08 -4.17861e-12 -978.993 1.80162
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.9102
-    200 6000    1000
-    2.88604 0.00151582 -4.20138e-07 5.77745e-11 -3.03333e-15 -7081.89 3.4455
-    3.21918 0.00257252 -6.27105e-06 7.5304e-09 -3.01463e-12 -7258.93 1.27495
-;
-Tad = 1825.22
-
-phi = 2.8
-ft = 0.0759341
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.3479
-    200 6000    1000
-    3.01029 0.00101722 -2.71594e-07 3.88505e-11 -2.17041e-15 -892.206 1.90782
-    2.91395 0.0039789 -9.7591e-06 1.08436e-08 -4.18479e-12 -978.876 1.79946
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.8805
-    200 6000    1000
-    2.88614 0.00151434 -4.19553e-07 5.7684e-11 -3.02832e-15 -7068.5 3.43595
-    3.21731 0.00258408 -6.29926e-06 7.55738e-09 -3.02395e-12 -7245.39 1.27369
-;
-Tad = 1822.58
-
-phi = 2.81
-ft = 0.0761847
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.3242
-    200 6000    1000
-    3.01014 0.00101686 -2.71353e-07 3.88054e-11 -2.16756e-15 -892.054 1.90217
-    2.91285 0.00398661 -9.77782e-06 1.08615e-08 -4.19093e-12 -978.758 1.79731
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.8509
-    200 6000    1000
-    2.88624 0.00151288 -4.18971e-07 5.75939e-11 -3.02333e-15 -7055.17 3.42644
-    3.21545 0.00259558 -6.32735e-06 7.58424e-09 -3.03322e-12 -7231.9 1.27243
-;
-Tad = 1819.95
-
-phi = 2.82
-ft = 0.0764351
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.3005
-    200 6000    1000
-    3.00999 0.00101649 -2.71113e-07 3.87604e-11 -2.16471e-15 -891.902 1.89654
-    2.91176 0.00399429 -9.79647e-06 1.08794e-08 -4.19706e-12 -978.641 1.79517
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.8215
-    200 6000    1000
-    2.88634 0.00151142 -4.18391e-07 5.75042e-11 -3.01837e-15 -7041.89 3.41697
-    3.2136 0.00260703 -6.35533e-06 7.61098e-09 -3.04246e-12 -7218.47 1.27118
-;
-Tad = 1817.32
-
-phi = 2.83
-ft = 0.0766853
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.2769
-    200 6000    1000
-    3.00985 0.00101613 -2.70874e-07 3.87156e-11 -2.16188e-15 -891.751 1.89093
-    2.91067 0.00400194 -9.81505e-06 1.08972e-08 -4.20316e-12 -978.525 1.79304
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.7922
-    200 6000    1000
-    2.88643 0.00150997 -4.17814e-07 5.74148e-11 -3.01342e-15 -7028.67 3.40754
-    3.21176 0.00261844 -6.38319e-06 7.63762e-09 -3.05166e-12 -7205.09 1.26993
-;
-Tad = 1814.7
-
-phi = 2.84
-ft = 0.0769354
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.2534
-    200 6000    1000
-    3.0097 0.00101576 -2.70635e-07 3.86709e-11 -2.15906e-15 -891.6 1.88535
-    2.90958 0.00400956 -9.83356e-06 1.0915e-08 -4.20924e-12 -978.409 1.79091
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.763
-    200 6000    1000
-    2.88653 0.00150852 -4.17239e-07 5.73259e-11 -3.0085e-15 -7015.5 3.39816
-    3.20992 0.0026298 -6.41092e-06 7.66414e-09 -3.06082e-12 -7191.77 1.26868
-;
-Tad = 1812.1
-
-phi = 2.85
-ft = 0.0771854
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.23
-    200 6000    1000
-    3.00955 0.0010154 -2.70398e-07 3.86265e-11 -2.15625e-15 -891.45 1.87979
-    2.9085 0.00401715 -9.852e-06 1.09326e-08 -4.21529e-12 -978.293 1.78879
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.734
-    200 6000    1000
-    2.88663 0.00150708 -4.16667e-07 5.72373e-11 -3.0036e-15 -7002.39 3.38881
-    3.20809 0.00264111 -6.43854e-06 7.69054e-09 -3.06994e-12 -7178.51 1.26745
-;
-Tad = 1809.5
-
-phi = 2.86
-ft = 0.0774353
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.2067
-    200 6000    1000
-    3.00941 0.00101504 -2.70161e-07 3.85822e-11 -2.15345e-15 -891.3 1.87425
-    2.90742 0.00402471 -9.87037e-06 1.09502e-08 -4.22132e-12 -978.178 1.78668
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.705
-    200 6000    1000
-    2.88673 0.00150564 -4.16097e-07 5.7149e-11 -2.99871e-15 -6989.34 3.3795
-    3.20627 0.00265237 -6.46605e-06 7.71684e-09 -3.07903e-12 -7165.31 1.26621
-;
-Tad = 1806.91
-
-phi = 2.87
-ft = 0.077685
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.1835
-    200 6000    1000
-    3.00926 0.00101468 -2.69926e-07 3.8538e-11 -2.15066e-15 -891.151 1.86873
-    2.90635 0.00403225 -9.88866e-06 1.09678e-08 -4.22733e-12 -978.063 1.78458
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.6762
-    200 6000    1000
-    2.88683 0.00150421 -4.15529e-07 5.70612e-11 -2.99385e-15 -6976.34 3.37023
-    3.20445 0.00266359 -6.49344e-06 7.74302e-09 -3.08807e-12 -7152.16 1.26499
-;
-Tad = 1804.33
-
-phi = 2.88
-ft = 0.0779346
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.1604
-    200 6000    1000
-    3.00911 0.00101433 -2.69691e-07 3.84941e-11 -2.14788e-15 -891.003 1.86323
-    2.90528 0.00403975 -9.90689e-06 1.09852e-08 -4.23331e-12 -977.949 1.78249
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.6475
-    200 6000    1000
-    2.88692 0.00150279 -4.14964e-07 5.69737e-11 -2.98901e-15 -6963.39 3.361
-    3.20265 0.00267475 -6.52071e-06 7.7691e-09 -3.09708e-12 -7139.06 1.26376
-;
-Tad = 1801.76
-
-phi = 2.89
-ft = 0.078184
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.1374
-    200 6000    1000
-    3.00897 0.00101397 -2.69457e-07 3.84503e-11 -2.14511e-15 -890.855 1.85775
-    2.90422 0.00404723 -9.92505e-06 1.10026e-08 -4.23928e-12 -977.835 1.7804
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.619
-    200 6000    1000
-    2.88702 0.00150137 -4.14401e-07 5.68866e-11 -2.98419e-15 -6950.5 3.35181
-    3.20085 0.00268588 -6.54787e-06 7.79506e-09 -3.10605e-12 -7126.02 1.26255
-;
-Tad = 1799.2
-
-phi = 2.9
-ft = 0.0784334
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.1144
-    200 6000    1000
-    3.00883 0.00101361 -2.69224e-07 3.84066e-11 -2.14236e-15 -890.708 1.85229
-    2.90316 0.00405467 -9.94314e-06 1.102e-08 -4.24522e-12 -977.722 1.77832
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.5905
-    200 6000    1000
-    2.88711 0.00149996 -4.1384e-07 5.67998e-11 -2.97939e-15 -6937.66 3.34265
-    3.19905 0.00269695 -6.57492e-06 7.82092e-09 -3.11498e-12 -7113.04 1.26133
-;
-Tad = 1796.64
-
-phi = 2.91
-ft = 0.0786825
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.0915
-    200 6000    1000
-    3.00868 0.00101326 -2.68992e-07 3.83632e-11 -2.13961e-15 -890.561 1.84686
-    2.9021 0.00406209 -9.96116e-06 1.10372e-08 -4.25113e-12 -977.609 1.77625
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.5622
-    200 6000    1000
-    2.88721 0.00149855 -4.13282e-07 5.67134e-11 -2.97461e-15 -6924.88 3.33354
-    3.19727 0.00270798 -6.60185e-06 7.84667e-09 -3.12387e-12 -7100.11 1.26013
-;
-Tad = 1794.1
-
-phi = 2.92
-ft = 0.0789316
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.0688
-    200 6000    1000
-    3.00854 0.00101291 -2.6876e-07 3.83199e-11 -2.13687e-15 -890.415 1.84144
-    2.90105 0.00406949 -9.97911e-06 1.10544e-08 -4.25703e-12 -977.496 1.77419
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.534
-    200 6000    1000
-    2.8873 0.00149715 -4.12726e-07 5.66274e-11 -2.96985e-15 -6912.15 3.32446
-    3.19549 0.00271896 -6.62867e-06 7.87231e-09 -3.13273e-12 -7087.23 1.25893
-;
-Tad = 1791.56
-
-phi = 2.93
-ft = 0.0791805
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.0461
-    200 6000    1000
-    3.0084 0.00101256 -2.6853e-07 3.82767e-11 -2.13415e-15 -890.269 1.83604
-    2.9 0.00407685 -9.997e-06 1.10716e-08 -4.2629e-12 -977.384 1.77214
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.5059
-    200 6000    1000
-    2.8874 0.00149576 -4.12172e-07 5.65417e-11 -2.9651e-15 -6899.47 3.31542
-    3.19372 0.0027299 -6.65538e-06 7.89785e-09 -3.14155e-12 -7074.41 1.25773
-;
-Tad = 1789.04
-
-phi = 2.94
-ft = 0.0794293
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.0235
-    200 6000    1000
-    3.00825 0.00101221 -2.68301e-07 3.82338e-11 -2.13143e-15 -890.124 1.83067
-    2.89896 0.00408419 -1.00148e-05 1.10887e-08 -4.26875e-12 -977.272 1.77009
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.4779
-    200 6000    1000
-    2.88749 0.00149437 -4.11621e-07 5.64564e-11 -2.96038e-15 -6886.85 3.30642
-    3.19196 0.00274079 -6.68198e-06 7.92328e-09 -3.15033e-12 -7061.64 1.25654
-;
-Tad = 1786.52
-
-phi = 2.95
-ft = 0.0796779
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       14.0009
-    200 6000    1000
-    3.00811 0.00101186 -2.68072e-07 3.8191e-11 -2.12872e-15 -889.98 1.82531
-    2.89792 0.0040915 -1.00326e-05 1.11057e-08 -4.27458e-12 -977.161 1.76805
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.45
-    200 6000    1000
-    2.88759 0.00149299 -4.11072e-07 5.63714e-11 -2.95568e-15 -6874.27 3.29746
-    3.19021 0.00275163 -6.70846e-06 7.9486e-09 -3.15908e-12 -7048.92 1.25535
-;
-Tad = 1784.01
-
-phi = 2.96
-ft = 0.0799264
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       13.9785
-    200 6000    1000
-    3.00797 0.00101151 -2.67844e-07 3.81483e-11 -2.12603e-15 -889.836 1.81998
-    2.89688 0.00409878 -1.00503e-05 1.11226e-08 -4.28039e-12 -977.05 1.76602
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.4223
-    200 6000    1000
-    2.88768 0.00149161 -4.10525e-07 5.62868e-11 -2.951e-15 -6861.75 3.28853
-    3.18846 0.00276244 -6.73484e-06 7.97382e-09 -3.16779e-12 -7036.25 1.25417
-;
-Tad = 1781.5
-
-phi = 2.97
-ft = 0.0801748
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       13.9561
-    200 6000    1000
-    3.00783 0.00101117 -2.67617e-07 3.81058e-11 -2.12334e-15 -889.692 1.81466
-    2.89585 0.00410603 -1.00679e-05 1.11395e-08 -4.28617e-12 -976.939 1.76399
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.3946
-    200 6000    1000
-    2.88777 0.00149024 -4.09981e-07 5.62026e-11 -2.94633e-15 -6849.28 3.27964
-    3.18672 0.00277319 -6.76111e-06 7.99894e-09 -3.17647e-12 -7023.64 1.25299
-;
-Tad = 1779.01
-
-phi = 2.98
-ft = 0.080423
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       13.9339
-    200 6000    1000
-    3.00769 0.00101082 -2.67391e-07 3.80635e-11 -2.12067e-15 -889.549 1.80937
-    2.89482 0.00411326 -1.00854e-05 1.11563e-08 -4.29194e-12 -976.829 1.76198
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.3671
-    200 6000    1000
-    2.88787 0.00148888 -4.09439e-07 5.61186e-11 -2.94169e-15 -6836.86 3.27078
-    3.18499 0.0027839 -6.78727e-06 8.02395e-09 -3.18511e-12 -7011.08 1.25182
-;
-Tad = 1776.53
-
-phi = 2.99
-ft = 0.0806711
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       13.9117
-    200 6000    1000
-    3.00755 0.00101048 -2.67166e-07 3.80213e-11 -2.118e-15 -889.407 1.80409
-    2.8938 0.00412046 -1.01029e-05 1.11731e-08 -4.29768e-12 -976.72 1.75997
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.3397
-    200 6000    1000
-    2.88796 0.00148752 -4.08899e-07 5.60351e-11 -2.93707e-15 -6824.5 3.26197
-    3.18326 0.00279457 -6.81333e-06 8.04886e-09 -3.19371e-12 -6998.57 1.25065
-;
-Tad = 1774.05
-
-phi = 3
-ft = 0.0809191
-fuel fuel       1       2.01594
-    200 6000    1000
-    2.93287 0.000826608 -1.46402e-07 1.541e-11 -6.88805e-16 -813.066 -1.02433
-    2.34433 0.00798052 -1.94782e-05 2.01572e-08 -7.37612e-12 -917.935 0.68301
-;
-oxidant         1       28.8503
-    200 6000    1000
-    3.10134 0.00124139 -4.18821e-07 6.64165e-11 -3.91278e-15 -985.276 5.35602
-    3.58381 -0.000727005 1.67056e-06 -1.09178e-10 -4.31777e-13 -1050.54 3.11241
-;
-reactants       1       13.8896
-    200 6000    1000
-    3.00741 0.00101014 -2.66941e-07 3.79793e-11 -2.11534e-15 -889.265 1.79883
-    2.89277 0.00412763 -1.01203e-05 1.11898e-08 -4.3034e-12 -976.61 1.75797
-;
-burntProducts   1       24.543
-    200 6000    1000
-    2.85694 0.00194404 -5.90217e-07 8.40966e-11 -4.49004e-15 -10976.9 6.2227
-    3.76275 -0.000787587 1.93485e-06 -3.14906e-10 -3.04738e-13 -11198.7 1.64274
-;
-products        1       15.3124
-    200 6000    1000
-    2.88805 0.00148616 -4.08361e-07 5.59518e-11 -2.93246e-15 -6812.18 3.25318
-    3.18154 0.0028052 -6.83928e-06 8.07366e-09 -3.20228e-12 -6986.11 1.24949
-;
-Tad = 1771.58
-
-
-end
diff --git a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
index 8187f1fbfe..cff9efb946 100644
--- a/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
+++ b/applications/utilities/thermophysical/adiabaticFlameT/adiabaticFlameT.C
@@ -55,7 +55,15 @@ typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "Calculates the adiabatic flame temperature for a given fuel\n"
+        "over a range of unburnt temperatures and equivalence ratios."
+    );
+    argList::noParallel();
+    argList::noFunctionObjects();
     argList::validArgs.append("controlFile");
+
     argList args(argc, argv);
 
     const fileName controlFileName = args[1];
diff --git a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
index 80affad334..4ae601829e 100644
--- a/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
+++ b/applications/utilities/thermophysical/chemkinToFoam/chemkinToFoam.C
@@ -48,6 +48,13 @@ int main(int argc, char *argv[])
     // Increase the precision of the output for JANAF coefficients
     Ostream::defaultPrecision(10);
 
+    argList::addNote
+    (
+        "Converts CHEMKINIII thermodynamics and reaction data files into\n"
+        "OpenFOAM format."
+    );
+    argList::noParallel();
+    argList::noFunctionObjects();
     argList::validArgs.append("CHEMKINFile");
     argList::validArgs.append("CHEMKINThermodynamicsFile");
     argList::validArgs.append("CHEMKINTransport");
@@ -62,7 +69,7 @@ int main(int argc, char *argv[])
 
     argList args(argc, argv);
 
-    bool newFormat = args.optionFound("newFormat");
+    const bool newFormat = args.optionFound("newFormat");
 
     speciesTable species;
 
diff --git a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
index dd06b8ee1f..bbc5029e6a 100644
--- a/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
+++ b/applications/utilities/thermophysical/equilibriumCO/equilibriumCO.C
@@ -56,6 +56,13 @@ typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "Calculates the equilibrium level of carbon monoxide."
+    );
+    argList::noParallel();
+    argList::noFunctionObjects();
+
     #include "setRootCase.H"
     #include "createTime.H"
 
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log b/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
deleted file mode 100644
index b76af28186..0000000000
--- a/applications/utilities/thermophysical/equilibriumFlameT/Hydrogen.log
+++ /dev/null
@@ -1,481 +0,0 @@
-/*---------------------------------------------------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  plus                                  |
-|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-Build  : dev-27a117d1f441
-Exec   : equilibriumFlameT controlDict
-Date   : Jan 16 2013
-Time   : 15:40:39
-Host   : "dm"
-PID    : 4638
-Case   : /home/dm2/henry/OpenFOAM/OpenFOAM-dev/applications/utilities/thermophysical/equilibriumFlameT
-nProcs : 1
-sigFpe : Enabling floating point exception trapping (FOAM_SIGFPE).
-SetNaN : Initialising allocated memory to NaN (FOAM_SETNAN).
-fileModificationChecking : Monitoring run-time modified files using timeStampMaster
-allowSystemOperations : Allowing user-supplied system call operations
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-Reading thermodynamic data dictionary
-
-Reading thermodynamic data for relevant species
-
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 34.0741;
-Equilibrium flame temperature data (1 bar)
-
-Phi          ft     T0         Tad         Teq      Terror   O2res (mole frac)
-
-0.6    0.017304    300     1849.36     1848.92    0.441261   0.0746347
-0.6    0.017304    400     1932.16     1931.28    0.879009   0.0746693
-0.6    0.017304    500     2015.31     2013.66      1.6553   0.0747311
-0.6    0.017304    600      2099.1     2096.14     2.96655    0.074836
-0.6    0.017304    700     2183.84     2178.76     5.08632   0.0750065
-0.6    0.017304    800     2269.77      2261.4     8.37223   0.0752722
-0.6    0.017304    900     2356.97     2343.72     13.2521   0.0756689
-0.6    0.017304   1000     2445.26     2425.09     20.1747   0.0762341
-0.6    0.017304   1100     2534.41     2504.86     29.5499    0.077003
-0.6    0.017304   1200     2624.41     2582.69     41.7235   0.0780054
-0.6    0.017304   1300     2715.19     2658.28     56.9132   0.0792609
-0.6    0.017304   1400     2806.69     2731.49     75.1966   0.0807775
-0.6    0.017304   1500     2898.84     2802.32     96.5198   0.0825522
-0.6    0.017304   1600      2991.6     2870.87     120.724   0.0845729
-0.6    0.017304   1700      3084.9     2937.32     147.577   0.0868217
-0.6    0.017304   1800     3178.71      3001.9      176.81   0.0892764
-0.6    0.017304   1900     3272.98     3064.84     208.131   0.0919138
-0.6    0.017304   2000     3367.66      3126.4     241.253     0.09471
-0.6    0.017304   2100     3462.72     3186.82     275.903   0.0976445
-0.6    0.017304   2200     3558.12      3246.2     311.925    0.100726
-0.6    0.017304   2300     3653.84     3303.74     350.096    0.104207
-0.6    0.017304   2400     3749.83     3350.89     398.934    0.110203
-0.6    0.017304   2500     3846.07     3351.34      494.73    0.126061
-0.6    0.017304   2600     3942.53     3291.95      650.58    0.151488
-0.6    0.017304   2700     4039.19     3236.21     802.988     0.17406
-0.6    0.017304   2800     4136.03     3245.34     890.687    0.186501
-0.6    0.017304   2900     4233.03     3344.34     888.683    0.186501
-0.6    0.017304   3000     4330.16     3443.39      886.77    0.186501
-0.65    0.018719    300     1944.33     1943.23     1.10762   0.0647597
-0.65    0.018719    400     2026.59     2024.53     2.05315   0.0648355
-0.65    0.018719    500     2109.23     2105.61     3.62082   0.0649618
-0.65    0.018719    600     2192.53     2186.42     6.10504    0.065163
-0.65    0.018719    700     2276.78      2266.9     9.88012   0.0654705
-0.65    0.018719    800     2362.23     2346.84     15.3867   0.0659212
-0.65    0.018719    900     2448.96     2425.87     23.0886   0.0665545
-0.65    0.018719   1000     2536.81     2503.41     33.3941   0.0674057
-0.65    0.018719   1100     2625.53     2578.93     46.5953   0.0685004
-0.65    0.018719   1200     2715.11     2652.24     62.8776   0.0698558
-0.65    0.018719   1300     2805.51     2723.23     82.2781   0.0714767
-0.65    0.018719   1400     2896.63     2791.92      104.71   0.0733571
-0.65    0.018719   1500     2988.44     2858.44     129.993   0.0754833
-0.65    0.018719   1600     3080.86     2922.97     157.886   0.0778362
-0.65    0.018719   1700     3173.85     2985.73     188.117   0.0803935
-0.65    0.018719   1800     3267.36     3046.95     220.404   0.0831323
-0.65    0.018719   1900     3361.34     3106.87     254.469   0.0860297
-0.65    0.018719   2000     3455.75     3165.68     290.067   0.0890703
-0.65    0.018719   2100     3550.55     3223.35     327.196   0.0923026
-0.65    0.018719   2200     3645.71     3278.01     367.698   0.0962479
-0.65    0.018719   2300     3741.18     3314.72     426.463    0.104431
-0.65    0.018719   2400     3836.94     3292.03     544.908    0.124389
-0.65    0.018719   2500     3932.96     3229.29     703.673    0.149514
-0.65    0.018719   2600     4029.21     3177.81     851.399    0.170937
-0.65    0.018719   2700     4125.67     3175.22     950.445    0.184778
-0.65    0.018719   2800     4222.31      3274.1     948.203    0.184778
-0.65    0.018719   2900     4319.11     3373.04      946.07    0.184778
-0.65    0.018719   3000     4416.05     3472.02     944.031    0.184778
-0.7   0.0201299    300     2035.76     2033.25     2.51585   0.0551272
-0.7   0.0201299    400     2117.53     2113.15     4.37823   0.0552783
-0.7   0.0201299    500     2199.71     2192.43     7.27913   0.0555149
-0.7   0.0201299    600     2282.56     2270.96     11.6037   0.0558696
-0.7   0.0201299    700     2366.37     2348.58     17.7905   0.0563794
-0.7   0.0201299    800     2451.38     2425.09     26.2928   0.0570833
-0.7   0.0201299    900     2537.69     2500.17     37.5154   0.0580165
-0.7   0.0201299   1000     2625.11     2573.39     51.7294   0.0592034
-0.7   0.0201299   1100     2713.43     2644.39     69.0438   0.0606547
-0.7   0.0201299   1200     2802.64     2713.17     89.4684    0.062373
-0.7   0.0201299   1300     2892.67     2779.78     112.888     0.06435
-0.7   0.0201299   1400     2983.45     2844.35     139.106   0.0665705
-0.7   0.0201299   1500     3074.93     2907.05     167.878   0.0690147
-0.7   0.0201299   1600     3167.04      2968.1     198.938   0.0716609
-0.7   0.0201299   1700     3259.73     3027.72     232.012   0.0744866
-0.7   0.0201299   1800     3352.96     3086.12     266.841   0.0774712
-0.7   0.0201299   1900     3446.67     3143.43     303.236   0.0806124
-0.7   0.0201299   2000     3540.82     3199.29     341.528   0.0840445
-0.7   0.0201299   2100     3635.38      3249.5     385.874   0.0888593
-0.7   0.0201299   2200     3730.29     3268.93     461.361    0.100608
-0.7   0.0201299   2300     3825.54     3223.58     601.959    0.124079
-0.7   0.0201299   2400     3921.08     3163.25     757.829    0.147885
-0.7   0.0201299   2500     4016.89      3115.4      901.49    0.168314
-0.7   0.0201299   2600     4112.93     3104.31     1008.62    0.183086
-0.7   0.0201299   2700     4209.19     3203.06     1006.13    0.183086
-0.7   0.0201299   2800     4305.63     3301.88     1003.76    0.183086
-0.7   0.0201299   2900     4402.25     3400.75      1001.5    0.183086
-0.7   0.0201299   3000     4499.01     3499.67     999.336    0.183086
-0.75   0.0215368    300     2123.87      2118.6     5.26414   0.0457828
-0.75   0.0215368    400     2205.19     2196.54     8.64652   0.0460605
-0.75   0.0215368    500     2286.96     2273.35     13.6024   0.0464696
-0.75   0.0215368    600     2369.39     2348.84      20.555   0.0470463
-0.75   0.0215368    700     2452.79     2422.87     29.9229   0.0478271
-0.75   0.0215368    800      2537.4     2495.33     42.0731   0.0488441
-0.75   0.0215368    900     2623.32     2566.06     57.2623   0.0501209
-0.75   0.0215368   1000     2710.36     2634.79     75.5739   0.0516661
-0.75   0.0215368   1100     2798.31     2701.37     96.9358   0.0534755
-0.75   0.0215368   1200     2887.16     2765.93     121.226   0.0555401
-0.75   0.0215368   1300     2976.85     2828.61     148.241   0.0578437
-0.75   0.0215368   1400     3067.31     2889.57     177.736   0.0603667
-0.75   0.0215368   1500     3158.48     2949.02     209.456    0.063088
-0.75   0.0215368   1600      3250.3     3007.15     243.145   0.0659865
-0.75   0.0215368   1700     3342.71     3064.14     278.571    0.069047
-0.75   0.0215368   1800     3435.67     3119.98     315.691   0.0723035
-0.75   0.0215368   1900     3529.12     3173.54     355.588   0.0760823
-0.75   0.0215368   2000     3623.03     3215.17     407.865   0.0827504
-0.75   0.0215368   2100     3717.35     3207.15     510.202   0.0997809
-0.75   0.0215368   2200     3812.04        3147     665.038    0.124757
-0.75   0.0215368   2300     3907.07     3092.14     814.923    0.146832
-0.75   0.0215368   2400      4002.4     3047.13     955.268    0.166424
-0.75   0.0215368   2500        4098     3032.67     1065.33    0.181425
-0.75   0.0215368   2600     4193.84     3131.28     1062.56    0.181425
-0.75   0.0215368   2700     4289.91     3229.97     1059.94    0.181425
-0.75   0.0215368   2800     4386.16     3328.72     1057.44    0.181425
-0.75   0.0215368   2900     4482.59     3427.53     1055.06    0.181425
-0.75   0.0215368   3000     4579.17     3526.39     1052.78    0.181425
-0.8   0.0229397    300     2208.84     2198.55     10.2856   0.0368016
-0.8   0.0229397    400     2289.76     2273.78     15.9817   0.0372748
-0.8   0.0229397    500     2371.15     2347.32     23.8229   0.0379294
-0.8   0.0229397    600     2453.21     2419.04     34.1694   0.0387973
-0.8   0.0229397    700     2536.24     2488.92     47.3167    0.039905
-0.8   0.0229397    800     2620.48     2557.01     63.4684   0.0412715
-0.8   0.0229397    900     2706.03     2623.32     82.7038   0.0429054
-0.8   0.0229397   1000     2792.71     2687.77     104.941   0.0448014
-0.8   0.0229397   1100     2880.31     2750.32     129.984   0.0469441
-0.8   0.0229397   1200     2968.83     2811.18     157.651   0.0493193
-0.8   0.0229397   1300      3058.2     2870.49     187.709   0.0519078
-0.8   0.0229397   1400     3148.36     2928.44     219.918     0.05469
-0.8   0.0229397   1500     3239.24     2985.19     254.048   0.0576479
-0.8   0.0229397   1600     3330.78     3040.84     289.946   0.0607847
-0.8   0.0229397   1700     3422.93     3094.94     327.986   0.0642431
-0.8   0.0229397   1800     3515.63     3144.62     371.018   0.0687801
-0.8   0.0229397   1900     3608.84     3166.57     442.271   0.0796671
-0.8   0.0229397   2000     3702.52     3123.82     578.694    0.102453
-0.8   0.0229397   2100     3796.61     3062.37     734.239    0.126254
-0.8   0.0229397   2200     3891.08     3012.82     878.258    0.146769
-0.8   0.0229397   2300      3985.9     2969.95     1015.95    0.165648
-0.8   0.0229397   2400     4081.02     2960.34     1120.68    0.179795
-0.8   0.0229397   2500     4176.43     3058.81     1117.62    0.179795
-0.8   0.0229397   2600     4272.08     3157.36     1114.72    0.179795
-0.8   0.0229397   2700     4367.96     3255.99     1111.97    0.179795
-0.8   0.0229397   2800     4464.03     3354.68     1109.35    0.179795
-0.8   0.0229397   2900     4560.28     3453.43     1106.85    0.179795
-0.8   0.0229397   3000     4656.69     3552.23     1104.46    0.179795
-0.85   0.0243385    300     2290.86     2271.89     18.9685   0.0282998
-0.85   0.0243385    400     2371.41     2343.55     27.8685   0.0290475
-0.85   0.0243385    500     2452.45      2413.1     39.3563   0.0300172
-0.85   0.0243385    600     2534.18     2480.55     53.6235   0.0312269
-0.85   0.0243385    700     2616.86     2546.07     70.7851   0.0326882
-0.85   0.0243385    800     2700.75     2609.87     90.8809   0.0344063
-0.85   0.0243385    900     2785.96      2672.1      113.86   0.0363784
-0.85   0.0243385   1000     2872.32     2732.77     139.549   0.0385908
-0.85   0.0243385   1100     2959.59     2791.88     167.705    0.041024
-0.85   0.0243385   1200      3047.8     2849.65     198.145    0.043663
-0.85   0.0243385   1300     3136.87     2906.22     230.656   0.0464908
-0.85   0.0243385   1400     3226.75     2961.68      265.07   0.0495028
-0.85   0.0243385   1500     3317.35     3015.81     301.538   0.0527804
-0.85   0.0243385   1600     3408.63     3066.84     341.787   0.0568065
-0.85   0.0243385   1700     3500.53     3104.48     396.051   0.0640162
-0.85   0.0243385   1800     3592.99     3084.34     508.645   0.0828878
-0.85   0.0243385   1900     3685.97     3019.83     666.138    0.107717
-0.85   0.0243385   2000     3779.41     2965.44     813.977    0.129098
-0.85   0.0243385   2100     3873.29     2919.57      953.72    0.148417
-0.85   0.0243385   2200     3967.55     2878.14     1089.41    0.166695
-0.85   0.0243385   2300     4062.16     2887.39     1174.78    0.178193
-0.85   0.0243385   2400     4157.09      2985.7     1171.39    0.178193
-0.85   0.0243385   2500     4252.31      3084.1      1168.2    0.178193
-0.85   0.0243385   2600     4347.77     3182.59     1165.18    0.178193
-0.85   0.0243385   2700     4443.47     3281.16     1162.31    0.178193
-0.85   0.0243385   2800     4539.37     3379.79     1159.58    0.178193
-0.85   0.0243385   2900     4635.44     3478.48     1156.96    0.178193
-0.85   0.0243385   3000     4731.69     3577.23     1154.46    0.178193
-0.9   0.0257334    300     2370.09     2336.78     33.3173   0.0204491
-0.9   0.0257334    400     2450.31     2404.16     46.1529   0.0215394
-0.9   0.0257334    500     2531.04     2469.35     61.6865   0.0228649
-0.9   0.0257334    600     2612.44     2532.52      79.921   0.0244277
-0.9   0.0257334    700      2694.8     2593.97     100.836   0.0262275
-0.9   0.0257334    800     2778.38     2653.99      124.39   0.0282621
-0.9   0.0257334    900     2863.28     2712.78     150.491    0.030525
-0.9   0.0257334   1000     2949.32     2770.36     178.952   0.0330009
-0.9   0.0257334   1100     3036.28     2826.74     209.547    0.035672
-0.9   0.0257334   1200      3124.2     2882.03     242.174   0.0385401
-0.9   0.0257334   1300     3212.99     2935.98     277.011   0.0416893
-0.9   0.0257334   1400      3302.6      2986.9     315.702    0.045578
-0.9   0.0257334   1500     3392.94     3028.82      364.12   0.0515944
-0.9   0.0257334   1600     3483.97     3019.41     464.567    0.068226
-0.9   0.0257334   1700     3575.63      2951.2     624.433   0.0935821
-0.9   0.0257334   1800     3667.86     2892.42     775.443    0.115391
-0.9   0.0257334   1900     3760.61     2843.56      917.05    0.134916
-0.9   0.0257334   2000     3853.85     2799.75     1054.09    0.153338
-0.9   0.0257334   2100     3947.51     2759.06     1188.45    0.171094
-0.9   0.0257334   2200     4041.57     2813.86     1227.71    0.176619
-0.9   0.0257334   2300     4135.99        2912     1223.99    0.176619
-0.9   0.0257334   2400     4230.73     3010.24     1220.48    0.176619
-0.9   0.0257334   2500     4325.76     3108.59     1217.17    0.176619
-0.9   0.0257334   2600     4421.04     3207.02     1214.03    0.176619
-0.9   0.0257334   2700     4516.56     3305.52     1211.04    0.176619
-0.9   0.0257334   2800     4612.29      3404.1     1208.19    0.176619
-0.9   0.0257334   2900      4708.2     3502.73     1205.47    0.176619
-0.9   0.0257334   3000     4804.28     3601.43     1202.85    0.176619
-0.95   0.0271242    300     2446.69     2390.47     56.2165   0.0135013
-0.95   0.0271242    400      2526.6     2453.56     73.0446    0.014947
-0.95   0.0271242    500     2607.03     2514.76     92.2714    0.016606
-0.95   0.0271242    600     2688.14     2574.31     113.833   0.0184742
-0.95   0.0271242    700     2770.21     2632.51       137.7   0.0205501
-0.95   0.0271242    800     2853.49     2689.64      163.85   0.0228334
-0.95   0.0271242    900     2938.09     2745.85     192.246   0.0253261
-0.95   0.0271242   1000     3023.84     2800.95     222.894   0.0280617
-0.95   0.0271242   1100     3110.52     2854.04     256.478   0.0312581
-0.95   0.0271242   1200     3198.16     2901.95     296.209   0.0357143
-0.95   0.0271242   1300     3286.69     2937.18     349.506   0.0429733
-0.95   0.0271242   1400     3376.04     2901.93     474.111   0.0635068
-0.95   0.0271242   1500     3466.14     2818.66     647.478   0.0895965
-0.95   0.0271242   1600     3556.93     2756.28     800.654    0.110895
-0.95   0.0271242   1700     3648.36     2703.85     944.503    0.130251
-0.95   0.0271242   1800     3740.37     2656.95     1083.42    0.148612
-0.95   0.0271242   1900     3832.91     2615.22     1217.69    0.165993
-0.95   0.0271242   2000     3925.93     2641.98     1283.95    0.175073
-0.95   0.0271242   2100      4019.4      2739.8      1279.6    0.175073
-0.95   0.0271242   2200     4113.26     2837.76     1275.51    0.175073
-0.95   0.0271242   2300     4207.49     2935.83     1271.66    0.175073
-0.95   0.0271242   2400     4302.04     3034.02     1268.03    0.175073
-0.95   0.0271242   2500     4396.89      3132.3     1264.59    0.175073
-0.95   0.0271242   2600        4492     3230.67     1261.33    0.175073
-0.95   0.0271242   2700     4587.35     3329.12     1258.23    0.175073
-0.95   0.0271242   2800     4682.91     3427.64     1255.27    0.175073
-0.95   0.0271242   2900     4778.66     3526.22     1252.44    0.175073
-0.95   0.0271242   3000     4874.58     3624.86     1249.72    0.175073
-  1   0.0285111    300     2520.79     2428.95     91.8415  0.00783223
-  1   0.0285111    400     2600.42     2489.16     111.262  0.00954474
-  1   0.0285111    500     2680.58     2547.46     133.116   0.0115427
-  1   0.0285111    600     2761.42     2603.06     158.358   0.0140645
-  1   0.0285111    700     2843.21     2656.82     186.389   0.0169302
-  1   0.0285111    800     2926.22     2705.82     220.398   0.0208555
-  1   0.0285111    900     3010.54     2717.47     293.073    0.031931
-  1   0.0285111   1000     3096.01     2308.21     787.803    0.102583
-  1   0.0285111   1100     3182.42     2231.26     951.156    0.118119
-  1   0.0285111   1200      3269.8     2192.08     1077.72    0.134773
-  1   0.0285111   1300     3358.08     2047.07     1311.01    0.173419
-  1   0.0285111   1400     3447.18      2082.4     1364.79    0.173554
-  1   0.0285111   1500     3537.05     2179.02     1358.03    0.173554
-  1   0.0285111   1600     3627.61     2275.87     1351.74    0.173554
-  1   0.0285111   1700     3718.82     2372.94     1345.88    0.173554
-  1   0.0285111   1800     3810.62     2470.21     1340.41    0.173554
-  1   0.0285111   1900     3902.95     2567.65      1335.3    0.173554
-  1   0.0285111   2000     3995.78     2665.26     1330.52    0.173554
-  1   0.0285111   2100     4089.05     2763.02     1326.03    0.173554
-  1   0.0285111   2200     4182.73     2860.91     1321.82    0.173554
-  1   0.0285111   2300     4276.77     2958.92     1317.85    0.173554
-  1   0.0285111   2400     4371.14     3057.05      1314.1    0.173554
-  1   0.0285111   2500     4465.82     3155.27     1310.54    0.173554
-  1   0.0285111   2600     4560.76     3253.59     1307.17    0.173554
-  1   0.0285111   2700     4655.94     3351.98     1303.96    0.173554
-  1   0.0285111   2800     4751.34     3450.45     1300.89    0.173554
-  1   0.0285111   2900     4846.93     3548.98     1297.95    0.173554
-  1   0.0285111   3000      4942.7     3647.57     1295.13    0.173554
-1.05    0.029894    300     2492.46      2407.6     84.8585  0.00720339
-1.05    0.029894    400     2572.23     2468.77     103.454  0.00882851
-1.05    0.029894    500     2652.51     2528.16     124.356   0.0107005
-1.05    0.029894    600     2733.46     2585.15     148.303   0.0130117
-1.05    0.029894    700     2815.33     2639.93     175.395   0.0157578
-1.05    0.029894    800     2898.38     2693.11     205.275   0.0188396
-1.05    0.029894    900     2982.74     2723.45     259.288   0.0266549
-1.05    0.029894   1000     3068.23     2622.42     445.805   0.0547019
-1.05    0.029894   1100     3154.64     2157.67     996.976    0.129741
-1.05    0.029894   1200     3242.02     2280.98     961.044    0.127053
-1.05    0.029894   1300     3330.29     2050.85     1279.44    0.170376
-1.05    0.029894   1400     3419.38     2125.13     1294.25     0.16278
-1.05    0.029894   1500     3509.23     2169.74     1339.48    0.170593
-1.05    0.029894   1600     3599.77     2266.59     1333.18    0.170593
-1.05    0.029894   1700     3690.96     2363.65      1327.3    0.170593
-1.05    0.029894   1800     3782.73     2460.91     1321.82    0.170593
-1.05    0.029894   1900     3875.03     2558.35     1316.69    0.170593
-1.05    0.029894   2000     3967.83     2655.94     1311.88    0.170593
-1.05    0.029894   2100     4061.07     2753.69     1307.38    0.170593
-1.05    0.029894   2200     4154.72     2851.57     1303.14    0.170593
-1.05    0.029894   2300     4248.73     2949.58     1299.15    0.170593
-1.05    0.029894   2400     4343.07     3047.69     1295.38    0.170593
-1.05    0.029894   2500     4437.72     3145.91     1291.81    0.170593
-1.05    0.029894   2600     4532.63     3244.21     1288.42    0.170593
-1.05    0.029894   2700     4627.79      3342.6     1285.19    0.170593
-1.05    0.029894   2800     4723.16     3441.06     1282.11    0.170593
-1.05    0.029894   2900     4818.73     3539.58     1279.15    0.170593
-1.05    0.029894   3000     4914.48     3638.16     1276.32    0.170593
-1.1    0.031273    300     2464.87      2386.5     78.3786  0.00662398
-1.1    0.031273    400     2544.79     2448.61     96.1825  0.00816896
-1.1    0.031273    500      2625.2     2508.98     116.227   0.0099387
-1.1    0.031273    600     2706.25     2567.32     138.926   0.0120454
-1.1    0.031273    700      2788.2     2623.15     165.049   0.0146643
-1.1    0.031273    800     2871.31     2677.34     193.962    0.017615
-1.1    0.031273    900      2955.7     2719.78      235.92   0.0231087
-1.1    0.031273   1000     3041.21      2693.5      347.71   0.0402781
-1.1    0.031273   1100     3127.63     2167.25     960.385    0.125446
-1.1    0.031273   1200     3215.01     2111.06     1103.96     0.14489
-1.1    0.031273   1300     3303.28     2053.83     1249.45    0.167407
-1.1    0.031273   1400     3392.36     2173.47     1218.89     0.15138
-1.1    0.031273   1500     3482.19     2160.73     1321.46    0.167732
-1.1    0.031273   1600     3572.72     2257.57     1315.15    0.167732
-1.1    0.031273   1700     3663.88     2354.63     1309.25    0.167732
-1.1    0.031273   1800     3755.63     2451.88     1303.75    0.167732
-1.1    0.031273   1900     3847.91      2549.3     1298.61    0.167732
-1.1    0.031273   2000     3940.68     2646.89     1293.79    0.167732
-1.1    0.031273   2100     4033.89     2744.63     1289.26    0.167732
-1.1    0.031273   2200     4127.51     2842.51     1285.01    0.167732
-1.1    0.031273   2300      4221.5      2940.5        1281    0.167732
-1.1    0.031273   2400     4315.82     3038.61     1277.21    0.167732
-1.1    0.031273   2500     4410.43     3136.81     1273.62    0.167732
-1.1    0.031273   2600     4505.32     3235.11     1270.21    0.167732
-1.1    0.031273   2700     4600.46     3333.49     1266.97    0.167732
-1.1    0.031273   2800     4695.81     3431.94     1263.87    0.167732
-1.1    0.031273   2900     4791.36     3530.45      1260.9    0.167732
-1.1    0.031273   3000     4887.08     3629.03     1258.05    0.167732
-1.15   0.0326481    300     2438.01     2365.65     72.3675  0.00608988
-1.15   0.0326481    400     2518.07     2428.67     89.4064  0.00755975
-1.15   0.0326481    500     2598.61     2489.96     108.651  0.00924133
-1.15   0.0326481    600     2679.76     2549.42     130.344   0.0112026
-1.15   0.0326481    700     2761.79     2606.41     155.383   0.0136615
-1.15   0.0326481    800     2844.96     2661.52     183.443   0.0165071
-1.15   0.0326481    900     2929.39     2711.04      218.35   0.0205875
-1.15   0.0326481   1000     3014.93     2720.02     294.911   0.0321946
-1.15   0.0326481   1100     3101.36     2251.55     849.815    0.109583
-1.15   0.0326481   1200     3188.75     2233.94     954.807    0.119285
-1.15   0.0326481   1300     3277.01     2056.18     1220.83    0.164505
-1.15   0.0326481   1400     3366.09      2095.8     1270.29    0.164884
-1.15   0.0326481   1500     3455.91     2151.97     1303.94    0.164965
-1.15   0.0326481   1600     3546.42     2248.81     1297.61    0.164965
-1.15   0.0326481   1700     3637.57     2345.86     1291.71    0.164965
-1.15   0.0326481   1800     3729.29      2443.1     1286.19    0.164965
-1.15   0.0326481   1900     3821.55     2540.52     1281.03    0.164965
-1.15   0.0326481   2000      3914.3      2638.1      1276.2    0.164965
-1.15   0.0326481   2100     4007.49     2735.83     1271.66    0.164965
-1.15   0.0326481   2200     4101.08     2833.69     1267.39    0.164965
-1.15   0.0326481   2300     4195.04     2931.68     1263.36    0.164965
-1.15   0.0326481   2400     4289.34     3029.78     1259.56    0.164965
-1.15   0.0326481   2500     4383.93     3127.98     1255.95    0.164965
-1.15   0.0326481   2600      4478.8     3226.27     1252.53    0.164965
-1.15   0.0326481   2700     4573.91     3324.64     1249.27    0.164965
-1.15   0.0326481   2800     4669.24     3423.08     1246.16    0.164965
-1.15   0.0326481   2900     4764.77     3521.59     1243.18    0.164965
-1.15   0.0326481   3000     4860.48     3620.16     1240.32    0.164965
-1.2   0.0340193    300     2411.84     2345.05     66.7936  0.00559749
-1.2   0.0340193    400     2492.05     2408.96     83.0903  0.00699607
-1.2   0.0340193    500     2572.72     2471.14     101.574  0.00859836
-1.2   0.0340193    600     2653.97     2531.58     122.394    0.010447
-1.2   0.0340193    700     2736.08     2589.76     146.318    0.012734
-1.2   0.0340193    800     2819.31     2645.91       173.4   0.0154441
-1.2   0.0340193    900     2903.78     2699.56      204.22      0.0187
-1.2   0.0340193   1000     2989.35     2727.81     261.538   0.0270303
-1.2   0.0340193   1100      3075.8     2577.07     498.722   0.0617691
-1.2   0.0340193   1200     3163.19     2290.04     873.153    0.105911
-1.2   0.0340193   1300     3251.46     2053.86      1197.6    0.159385
-1.2   0.0340193   1400     3340.53      2100.7     1239.83    0.162141
-1.2   0.0340193   1500     3430.34     2143.45     1286.89    0.162287
-1.2   0.0340193   1600     3520.84     2240.28     1280.56    0.162287
-1.2   0.0340193   1700     3611.98     2337.33     1274.65    0.162287
-1.2   0.0340193   1800     3703.68     2434.56     1269.12    0.162287
-1.2   0.0340193   1900     3795.92     2531.98     1263.95    0.162287
-1.2   0.0340193   2000     3888.65     2629.55      1259.1    0.162287
-1.2   0.0340193   2100     3981.82     2727.27     1254.54    0.162287
-1.2   0.0340193   2200     4075.39     2825.13     1250.26    0.162287
-1.2   0.0340193   2300     4169.33     2923.11     1246.22    0.162287
-1.2   0.0340193   2400      4263.6      3021.2      1242.4    0.162287
-1.2   0.0340193   2500     4358.17     3119.39     1238.78    0.162287
-1.2   0.0340193   2600     4453.02     3217.67     1235.34    0.162287
-1.2   0.0340193   2700     4548.11     3316.04     1232.07    0.162287
-1.2   0.0340193   2800     4643.42     3414.48     1228.95    0.162287
-1.2   0.0340193   2900     4738.94     3512.98     1225.96    0.162287
-1.2   0.0340193   3000     4834.63     3611.54     1223.09    0.162287
-1.25   0.0353866    300     2386.33     2324.71     61.6276  0.00514364
-1.25   0.0353866    400     2466.68     2389.48     77.2031  0.00647404
-1.25   0.0353866    500     2547.49     2452.53     94.9548  0.00800299
-1.25   0.0353866    600     2628.85     2513.87     114.979  0.00975815
-1.25   0.0353866    700     2711.04     2573.29     137.745   0.0118577
-1.25   0.0353866    800     2794.33     2630.39     163.932   0.0144522
-1.25   0.0353866    900     2878.85      2685.7     193.145   0.0174261
-1.25   0.0353866   1000     2964.44     2726.14     238.301   0.0235026
-1.25   0.0353866   1100     3050.91     2678.75     372.156   0.0437591
-1.25   0.0353866   1200     3138.31     2278.54     859.767    0.105907
-1.25   0.0353866   1300     3226.58        2199     1027.58    0.135896
-1.25   0.0353866   1400     3315.66     2103.52     1212.14    0.159473
-1.25   0.0353866   1500     3405.47     2140.38     1265.09    0.159689
-1.25   0.0353866   1600     3495.96     2231.99     1263.97    0.159696
-1.25   0.0353866   1700     3587.08     2329.03     1258.05    0.159696
-1.25   0.0353866   1800     3678.77     2426.26     1252.51    0.159696
-1.25   0.0353866   1900        3771     2523.67     1247.33    0.159696
-1.25   0.0353866   2000      3863.7     2621.24     1242.47    0.159696
-1.25   0.0353866   2100     3956.85     2718.95      1237.9    0.159696
-1.25   0.0353866   2200      4050.4      2816.8      1233.6    0.159696
-1.25   0.0353866   2300     4144.32     2914.78     1229.55    0.159696
-1.25   0.0353866   2400     4238.57     3012.86     1225.72    0.159696
-1.25   0.0353866   2500     4333.13     3111.04     1222.08    0.159696
-1.25   0.0353866   2600     4427.96     3209.32     1218.64    0.159696
-1.25   0.0353866   2700     4523.03     3307.68     1215.35    0.159696
-1.25   0.0353866   2800     4618.33     3406.11     1212.22    0.159696
-1.25   0.0353866   2900     4713.83     3504.61     1209.22    0.159696
-1.25   0.0353866   3000     4809.51     3603.17     1206.34    0.159696
-1.3   0.0367501    300     2361.46     2304.62     56.8423   0.0047254
-1.3   0.0367501    400     2441.96     2370.24     71.7168  0.00599037
-1.3   0.0367501    500     2522.89     2434.13     88.7599  0.00745029
-1.3   0.0367501    600     2604.36     2496.32      108.04  0.00912394
-1.3   0.0367501    700     2686.63     2556.78     129.858    0.011087
-1.3   0.0367501    800     2769.99     2614.93     155.053   0.0135382
-1.3   0.0367501    900     2854.55     2671.11     183.441   0.0164082
-1.3   0.0367501   1000     2940.18     2719.34     220.839    0.020966
-1.3   0.0367501   1100     3026.67     2716.03     310.638   0.0345757
-1.3   0.0367501   1200     3114.09     2299.17     814.917   0.0995504
-1.3   0.0367501   1300     3202.36     2339.63     862.738    0.100832
-1.3   0.0367501   1400     3291.44     2105.72     1185.72    0.156866
-1.3   0.0367501   1500     3381.25     2198.32     1182.93    0.146587
-1.3   0.0367501   1600     3471.74     2223.91     1247.82    0.157186
-1.3   0.0367501   1700     3562.85     2320.95      1241.9    0.157186
-1.3   0.0367501   1800     3654.53     2418.18     1236.35    0.157186
-1.3   0.0367501   1900     3746.74     2515.58     1231.16    0.157186
-1.3   0.0367501   2000     3839.43     2613.14     1226.29    0.157186
-1.3   0.0367501   2100     3932.56     2710.86     1221.71    0.157186
-1.3   0.0367501   2200      4026.1      2808.7      1217.4    0.157186
-1.3   0.0367501   2300        4120     2906.67     1213.33    0.157186
-1.3   0.0367501   2400     4214.23     3004.75     1209.49    0.157186
-1.3   0.0367501   2500     4308.77     3102.92     1205.85    0.157186
-1.3   0.0367501   2600     4403.58     3201.19     1202.39    0.157186
-1.3   0.0367501   2700     4498.64     3299.55     1199.09    0.157186
-1.3   0.0367501   2800     4593.92     3397.98     1195.95    0.157186
-1.3   0.0367501   2900     4689.41     3496.47     1192.94    0.157186
-1.3   0.0367501   3000     4785.08     3595.03     1190.05    0.157186
-1.35   0.0381097    300      2337.2     2284.79      52.412  0.00434014
-1.35   0.0381097    400     2417.84     2351.24     66.6057  0.00554218
-1.35   0.0381097    500     2498.91     2415.95     82.9607  0.00693641
-1.35   0.0381097    600     2580.49     2478.96     101.531  0.00853635
-1.35   0.0381097    700     2662.85     2540.32     122.523   0.0103923
-1.35   0.0381097    800     2746.26     2599.53     146.737   0.0126998
-1.35   0.0381097    900     2830.88     2656.73     174.152   0.0154295
-1.35   0.0381097   1000     2916.54     2709.67     206.872    0.019057
-1.35   0.0381097   1100     3003.05     2730.09      272.96   0.0288177
-1.35   0.0381097   1200     3090.48     2251.76     838.725    0.106808
-1.35   0.0381097   1300     3178.77     2336.41     842.362   0.0992999
-1.35   0.0381097   1400     3267.85     2107.34     1160.51    0.154319
-1.35   0.0381097   1500     3357.67     2235.58     1122.08     0.13749
-1.35   0.0381097   1600     3448.15     2216.05      1232.1    0.154753
-1.35   0.0381097   1700     3539.25     2313.09     1226.17    0.154753
-1.35   0.0381097   1800     3630.93     2410.31     1220.62    0.154753
-1.35   0.0381097   1900     3723.12     2507.71     1215.42    0.154753
-1.35   0.0381097   2000      3815.8     2605.27     1210.53    0.154753
-1.35   0.0381097   2100     3908.92     2702.97     1205.95    0.154753
-1.35   0.0381097   2200     4002.44     2800.81     1201.63    0.154753
-1.35   0.0381097   2300     4096.33     2898.78     1197.55    0.154753
-1.35   0.0381097   2400     4190.55     2996.85      1193.7    0.154753
-1.35   0.0381097   2500     4285.07     3095.02     1190.04    0.154753
-1.35   0.0381097   2600     4379.86     3193.29     1186.58    0.154753
-1.35   0.0381097   2700     4474.91     3291.64     1183.27    0.154753
-1.35   0.0381097   2800     4570.18     3390.06     1180.12    0.154753
-1.35   0.0381097   2900     4665.65     3488.55      1177.1    0.154753
-1.35   0.0381097   3000     4761.31      3587.1     1174.21    0.154753
-
-end
diff --git a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
index c2bd11fcf0..0e26784285 100644
--- a/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
+++ b/applications/utilities/thermophysical/equilibriumFlameT/equilibriumFlameT.C
@@ -30,7 +30,7 @@ Group
 Description
     Calculates the equilibrium flame temperature for a given fuel and
     pressure for a range of unburnt gas temperatures and equivalence
-    ratios; the effects of dissociation on O2, H2O and CO2 are included.
+    ratios; includes the effects of dissociation on O2, H2O and CO2.
 
 \*---------------------------------------------------------------------------*/
 
@@ -57,7 +57,16 @@ typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "Calculates the equilibrium flame temperature for a given fuel\n"
+        "and pressure for a range of unburnt gas temperatures and equivalence\n"
+        "ratios; includes the effects of dissociation on O2, H2O and CO2."
+    );
+    argList::noParallel();
+    argList::noFunctionObjects();
     argList::validArgs.append("controlFile");
+
     argList args(argc, argv);
 
     const fileName controlFileName = args[1];
diff --git a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
index 98a572c5dc..eaa1eeb482 100644
--- a/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
+++ b/applications/utilities/thermophysical/mixtureAdiabaticFlameT/mixtureAdiabaticFlameT.C
@@ -55,6 +55,13 @@ typedef species::thermo<janafThermo<perfectGas<specie>>, absoluteEnthalpy>
 
 int main(int argc, char *argv[])
 {
+    argList::addNote
+    (
+        "Calculates the adiabatic flame temperature for a given mixture\n"
+        "at a given temperature."
+    );
+    argList::noParallel();
+    argList::noFunctionObjects();
     argList::validArgs.append("controlFile");
     argList args(argc, argv);
 
diff --git a/bin/foamCheckJobs b/bin/foamCheckJobs
index 02923b9289..e4142df73b 100755
--- a/bin/foamCheckJobs
+++ b/bin/foamCheckJobs
@@ -36,7 +36,6 @@
 #     file yet. Not supported by this script yet)
 #
 #------------------------------------------------------------------------------
-
 Script=${0##*/}
 
 #-------------------------------------------------------------------------------
@@ -52,6 +51,8 @@ TMPFILE=/tmp/${Script}$$.tmp
 MACHDIR=$HOME/.OpenFOAM/${Script}
 DEFSTATEFILE=$HOME/.OpenFOAM/foamCheckJobs.out
 
+# The default is "~/.OpenFOAM/jobControl"
+: ${FOAM_JOB_DIR:=$HOME/.OpenFOAM/jobControl}
 
 if [ `uname -s` = Linux ]
 then
@@ -77,7 +78,7 @@ The output from checking all running jobs is collected in an optional
 file.
 
 FILES:
-    \$FOAM_JOB_DIR/runningJobs    locks for running  processes
+    \$FOAM_JOB_DIR/runningJobs   locks for running  processes
                   /finishedJobs  locks for finished processes
 USAGE
     exit 1
@@ -196,13 +197,6 @@ fi
 
 #- Check a few things
 
-if [ ! "$FOAM_JOB_DIR" ]
-then
-    echo "$Script : FOAM_JOB_DIR environment variable not set."
-    echo
-    exit 1
-fi
-
 if [ ! -d "$FOAM_JOB_DIR" ]
 then
     echo "$Script : directory does not exist."
diff --git a/bin/foamCleanPath b/bin/foamCleanPath
index d3f8007023..70dd8c318b 100755
--- a/bin/foamCleanPath
+++ b/bin/foamCleanPath
@@ -4,7 +4,7 @@
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-#    \\/     M anipulation  |
+#    \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 #-------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
@@ -29,128 +29,134 @@
 #     Usage: foamCleanPath [-strip] path [wildcard] .. [wildcard]
 #
 #     Prints its argument (which should be a ':' separated path)
-#     without all
+#     without the following:
 #         - duplicate elements
 #         - elements whose start matches a wildcard
-#         - inaccessible directories (with the -strip (at your option)
+#         - inaccessible directories (with the -strip option)
 #
 # Note
 #     - this routine will fail when directories have embedded spaces
 #     - false matches possible if a wildcard contains '.' (sed regex)
-#     - the wildcards can themselves can be written together and separated
+#     - the wildcards themselves can be written together and separated
 #       by colons or whitespace
 #------------------------------------------------------------------------------
 usage() {
     cat <<USAGE 1>&2
 Usage: ${0##*/} [OPTION] path [wildcard1] .. [wildcardN]
 options:
+  -debug            print debug information to stderr
   -strip            remove inaccessible directories
   -help             print the usage
 
-  Prints its argument (which should be a ':' separated list) cleansed from
-    - duplicate elements
-    - elements whose start matches one of the wildcard(s)
-    - inaccessible directories (with the -strip option)
+Prints its argument (which should be a ':' separated list) cleansed from
+  - duplicate elements
+  - elements whose start matches one of the wildcard(s)
+  - inaccessible directories (with the -strip option)
 
-  Exit status
-      0  on success
-      1  for miscellaneous errors.
-      2  initial value of 'path' is empty
+Exit status
+    0  on success
+    1  for miscellaneous errors.
+    2  initial value of 'path' is empty
 
 USAGE
     exit 1
 }
 
 
-unset strip
-# parse options
+# Parse options
+unset optDebug optStrip
 while [ "$#" -gt 0 ]
 do
     case "$1" in
     -h | -help)
         usage
         ;;
+    -debug)
+        optDebug=true
+        ;;
     -strip)
-        strip=true
-        shift
+        optStrip=true
         ;;
     *)
         break
         ;;
     esac
+    shift
 done
 
-
+# Basic checks, setup
 [ "$#" -ge 1 ] || usage
 
 dirList="$1"
 shift
 
-[ -n "$dirList" ] || exit 2    # quick exit on empty 'dirList'
+[ -n "$dirList" ] || exit 2     # Quick exit on empty 'dirList'
 
+#-------------------------------------------------------------------------------
 
-##DEBUG echo "input>$dirList<" 1>&2
+# Debugging (optional)
+if [ -n "$optDebug" ]
+then
+    printDebug() { while [ "$#" -ge 1 ]; do echo "$1" 1>&2; shift; done; }
+else
+    printDebug() { true; }      # No-op
+fi
 
-# preserve current IFS and split on colon or whitespace
-oldIFS="$IFS"
-IFS=': '
+# Check directory existence (optional)
+if [ -n "$optStrip" ]
+then
+    isDir() { test -d "$1"; }   # Check for directory
+else
+    isDir() { true; }           # No check (always true)
+fi
 
-# "wildcard1 ... wildcardN" may have been passed as a single parameter
+# The "wildcard1 ... wildcardN" may have been passed as a single parameter
 # or may contain ':' separators
+
+oldIFS="$IFS"   # Preserve initial IFS
+IFS=': '        # Split on colon, whitespace
 set -- $*
 
+printDebug "input>$dirList<"
+
 # Strip out wildcards via sed. Path and wildcard cannot contain '?'.
 while [ "$#" -ge 1 ]
 do
-    wildcard=$1
+    wildcard="$1"
     shift
-    ##DEBUG echo "remove>$wildcard<" 1>&2
     if [ -n "$wildcard" ]
     then
+        printDebug "remove>$wildcard<"
         dirList=$(echo "$dirList:" | sed -e "s?${wildcard}[^:]*:??g")
     fi
 done
+printDebug "intermediate>$dirList<"
 
-# split on ':' (and on space as well to avoid any surprises)
-IFS=': '
+IFS=': '        # Split on colon, whitespace (to avoid surprises)
 set -- $dirList
 
-##DEBUG echo "intermediate>$dirList<" 1>&2
+IFS="$oldIFS"   # Restore initial IFS
 
-# rebuild the list from scratch
+# Rebuild the list
 unset dirList
 for dir
 do
-    ##DEBUG echo "check>$dir<" 1>&2
-    #- dirs must exist
-    if [ -e "$dir" ]
+    printDebug "check>$dir< in $dirList"
+    if isDir "$dir"
     then
-        #- no duplicate dirs
-        duplicate=$(echo " $dirList " | sed -ne "s: $dir :DUP:p")
+        # Detect duplicates (ie, dir already in the list)
+        duplicate=$(echo ":$dirList:" | sed -ne '\?:'"$dir"':?p')
 
-        if [ ! "$duplicate" ]
+        if [ -n "$duplicate" ]
         then
-            dirList="$dirList $dir"
+            printDebug "duplicate>$dir<"
+        else
+            dirList="${dirList}${dirList:+:}$dir"
         fi
-    elif [ "$strip" != true ]
-    then
-        # Print non-existing directories if not in 'strip' mode.
-        dirList="$dirList $dir"
     fi
 done
 
-# split on whitespace
-IFS=' '
-set -- $dirList
-
-# rejoin on ':'
-IFS=':'
-dirList="$*"
-
-# restore IFS
-IFS="$oldIFS"
-
-##DEBUG echo "output>$dirList<" 1>&2
+printDebug "output>$dirList<"
 echo "$dirList"
 
 #------------------------------------------------------------------------------
diff --git a/bin/foamEtcFile b/bin/foamEtcFile
index f071c6ff54..294cc26505 100755
--- a/bin/foamEtcFile
+++ b/bin/foamEtcFile
@@ -26,7 +26,7 @@
 #     foamEtcFile
 #
 # Description
-#     Locate user/group/shipped file with semantics similar to the
+#     Locate user/group/other files with semantics similar to the
 #     ~OpenFOAM/fileName expansion.
 #
 #     The -mode option can be used to allow chaining from
@@ -34,119 +34,174 @@
 #
 #     For example, within the user ~/.OpenFOAM/<VER>/prefs.sh:
 #     \code
-#        foamFile=$(foamEtcFile -mode go prefs.sh) && . $foamFile
+#        eval $(foamEtcFile -sh -mode=go prefs.sh)
 #     \endcode
 #
+# Environment
+#     - WM_PROJECT:         (unset defaults to OpenFOAM)
+#     - WM_PROJECT_SITE:    (unset defaults to PREFIX/site)
+#     - WM_PROJECT_VERSION: (unset defaults to detect from path)
+#
 # Note
-#     This script must exist in $FOAM_INST_DIR/OpenFOAM-<VERSION>/bin/
-#     or $FOAM_INST_DIR/openfoam<VERSION>/bin/ (for the debian version)
+#     This script must exist in one of these locations:
+#     - $WM_PROJECT_INST_DIR/OpenFOAM-<VERSION>/bin
+#     - $WM_PROJECT_INST_DIR/openfoam-<VERSION>/bin
+#     - $WM_PROJECT_INST_DIR/OpenFOAM+<VERSION>/bin
+#     - $WM_PROJECT_INST_DIR/openfoam+<VERSION>/bin
+#     - $WM_PROJECT_INST_DIR/openfoam<VERSION>/bin  (debian version)
 #
 #-------------------------------------------------------------------------------
 unset optQuiet optSilent
 usage() {
     [ "${optQuiet:-$optSilent}" = true ] && exit 1
-
     exec 1>&2
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
 Usage: foamEtcFile [OPTION] fileName
-       foamEtcFile [OPTION] -list
+       foamEtcFile [OPTION] [-list|-list-test] [fileName]
+
 options:
-  -a, -all          return all files (otherwise stop after the first match)
-  -l, -list         list the directories to be searched
-  -m, -mode MODE    any combination of u(user), g(group), o(other)
-  -p, -prefix DIR   specify an alternative installation prefix
-  -q, -quiet        suppress all normal output
-  -s, -silent       suppress stderr output, except for things that are emitted
-                    by -csh-verbose, -sh-verbose.
-  -v, -version VER  specify alternative OpenFOAM version (eg, 3.0, 1612, ...)
-  -csh | -sh        produce output suitable for a csh or sh 'eval'
-  -csh-verbose,
-  -sh-verbose       with additional verbosity
-  -help             print the usage
+  -a, -all          Return all files (otherwise stop after the first match)
+  -l, -list         List directories or files to be checked
+  -list-test        List (existing) directories or files to be checked
+  -mode=MODE        Any combination of u(user), g(group), o(other)
+  -prefix=DIR       Specify an alternative installation prefix
+  -version=VER      Specify alternative OpenFOAM version (eg, 3.0, 1612, ...)
+  -csh | -sh        Produce output suitable for a csh or sh 'eval'
+  -csh-verbose | -sh-verbose
+                    As per -csh | -sh, with additional verbosity
+  -q, -quiet        Suppress all normal output
+  -s, -silent       Suppress stderr, except -csh-verbose, -sh-verbose output
+  -help             Print the usage
 
-  Locate user/group/shipped file with semantics similar to the
-  ~OpenFOAM/fileName expansion.
+Locate user/group/other file with semantics similar to the
+~OpenFOAM/fileName expansion.
 
-  Many options can be specified as a single character, but must not be grouped.
+Single character options must not be grouped. Equivalent options:
+    -mode=MODE,   -mode MODE,   -m MODE
+    -prefix=DIR,  -prefix DIR,  -p DIR
+    -version=VER, -version VER, -v VER
 
-  Exit status
-      0  when the file is found. Print resolved path to stdout.
-      1  for miscellaneous errors.
-      2  when the file is not found.
+Exit status
+    0  when the file is found. Print resolved path to stdout.
+    1  for miscellaneous errors.
+    2  when the file is not found.
 
 USAGE
     exit 1
 }
+
+# Report error and exit
+die()
+{
+    [ "${optQuiet:-$optSilent}" = true ] && exit 1
+    exec 1>&2
+    echo
+    echo "Error encountered:"
+    while [ "$#" -ge 1 ]; do echo "    $1"; shift; done
+    echo
+    echo "See 'foamEtcFile -help' for usage"
+    echo
+    exit 1
+}
+
+#-------------------------------------------------------------------------------
+binDir="${0%/*}"                # The bin dir
+projectDir="${binDir%/bin}"     # The project dir
+prefixDir="${projectDir%/*}"    # The prefix dir (same as $WM_PROJECT_INST_DIR)
+
+# Could not resolve projectDir, prefixDir? (eg, called as ./bin/foamEtcFile)
+if [ "$prefixDir" = "$projectDir" ]
+then
+    binDir="$(cd $binDir && pwd -L)"
+    projectDir="${binDir%/bin}"
+    prefixDir="${projectDir%/*}"
+fi
+projectDirName="${projectDir##*/}"      # The project directory name
+
+projectVersion="$WM_PROJECT_VERSION"    # Empty? - will be treated later
+userDir="$HOME/.OpenFOAM"               # Hard-coded as per foamVersion.H
+
 #-------------------------------------------------------------------------------
 
-# The bin dir:
-binDir="${0%/*}"
-
-# The project dir:
-projectDir="${binDir%/bin}"
-
-# The prefix dir (same as $FOAM_INST_DIR):
-prefixDir="${projectDir%/*}"
-
-# The name used for the project directory
-projectDirName="${projectDir##*/}"
-
-# The versionNum is used for debian packaging
-unset versionNum
-
-#
+# Guess project version or simply get the stem part of the projectDirName.
 # Handle standard and debian naming conventions.
-# - projectDirBase: projectDirName without the version
-# - version
-# - versionNum (debian only)
 #
-case "$projectDirName" in
-OpenFOAM-* | openfoam-*)        # OpenFOAM-<VERSION> or openfoam-<VERSION>
-    projectDirBase="${projectDirName%%-*}-"
-    version="${projectDirName#*-}"
-    ;;
+# - projectVersion: update unless already set
+#
+# Helper variables:
+# - dirBase (for reassembling name) == projectDirName without the version
+# - versionNum (debian packaging)
+unset dirBase versionNum
+guessVersion()
+{
+    local version
 
-openfoam[0-9]*)                 # Debian: openfoam<VERSION>
-    projectDirBase="openfoam"
-    versionNum="${projectDirName#openfoam}"
-    case "${#versionNum}" in
-    (2|3|4) # Convert digits version number to decimal delineated
-        version=$(echo "$versionNum" | sed -e 's@\([0-9]\)@\1.@g')
-        version="${version%.}"
+    case "$projectDirName" in
+    (OpenFOAM-* | openfoam-*)
+        # Standard naming: OpenFOAM-<VERSION> or openfoam-<VERSION>
+        dirBase="${projectDirName%%-*}-"
+        version="${projectDirName#*-}"
+        version="${version%%*-}" # Extra safety, eg openfoam-version-packager
         ;;
 
-    (*) # Fallback - use current environment setting
-        version="$WM_PROJECT_VERSION"
+    (OpenFOAM+* | openfoam+*)
+        # Alternative naming: OpenFOAM+<VERSION> or openfoam+<VERSION>
+        dirBase="${projectDirName%%+*}+"
+        version="${projectDirName#*+}"
+        version="${version%%*-}" # Extra safety, eg openfoam-version-packager
+        ;;
+
+    (openfoam[0-9]*)
+        # Debian naming: openfoam<VERSION>
+        dirBase="openfoam"
+        version="${projectDirName#openfoam}"
+        versionNum="$version"
+
+        # Convert digits version number to decimal delineated
+        case "${#versionNum}" in (2|3|4)
+            version=$(echo "$versionNum" | sed -e 's@\([0-9]\)@\1.@g')
+            version="${version%.}"
+            ;;
+        esac
+
+        # Ignore special treatment if no decimals were inserted.
+        [ "${#version}" -gt "${#versionNum}" ] || unset versionNum
+        ;;
+
+    (*)
+        die "unknown/unsupported naming convention for '$projectDirName'"
         ;;
     esac
-    ;;
 
-*)
-    echo "foamEtcFile error: unknown/unsupported naming convention" 1>&2
-    exit 1
-    ;;
-esac
-
-
-# Set version and update versionNum, projectDirName accordingly
-setVersion()
-{
-    version="$1"
-
-    # Convert x.y.z -> xyz version (if installation looked like debian)
-    [ -n "$versionNum" ] && versionNum=$(echo "$version" | sed -e 's@\.@@g')
-
-    projectDirName="$projectDirBase${versionNum:-${version}}"
+    # Set projectVersion if required
+    : ${projectVersion:=$version}
 }
 
 
-# Default mode is always 'ugo'
-mode=ugo
-unset optAll optList optShell
+# Set projectVersion and update versionNum, projectDirName accordingly
+setVersion()
+{
+    projectVersion="$1"
 
-# parse options
+    # Need dirBase when reassembling projectDirName
+    [ -n "$dirBase" ] || guessVersion
+
+    # Debian: update x.y.z -> xyz version
+    if [ -n "$versionNum" ]
+    then
+        versionNum=$(echo "$projectVersion" | sed -e 's@\.@@g')
+    fi
+
+    projectDirName="$dirBase${versionNum:-$projectVersion}"
+}
+
+
+optMode=ugo         # Default mode is always 'ugo'
+unset optAll optList optShell optVersion
+
+# Parse options
 while [ "$#" -gt 0 ]
 do
     case "$1" in
@@ -161,34 +216,38 @@ do
         optList=true
         unset optShell
         ;;
+    -list-test)
+        optList='test'
+        unset optShell
+        ;;
     -csh | -sh | -csh-verbose | -sh-verbose)
         optShell="${1#-}"
         unset optAll
         ;;
     -mode=[ugo]*)
-        mode="${1#*=}"
+        optMode="${1#*=}"
         ;;
     -prefix=/*)
         prefixDir="${1#*=}"
         prefixDir="${prefixDir%/}"
         ;;
     -version=*)
-        setVersion "${1#*=}"
+        optVersion="${1#*=}"
         ;;
     -m | -mode)
-        mode="$2"
+        optMode="$2"
+        shift
         # Sanity check. Handles missing argument too.
-        case "$mode" in
-        [ugo]*)
+        case "$optMode" in
+        ([ugo]*)
             ;;
-        *)
-            usage "invalid mode '$mode'"
+        (*)
+            die "invalid mode '$optMode'"
             ;;
         esac
-        shift
         ;;
     -p | -prefix)
-        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
         prefixDir="${2%/}"
         shift
         ;;
@@ -199,8 +258,8 @@ do
         optSilent=true
         ;;
     -v | -version)
-        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
-        setVersion "$2"
+        [ "$#" -ge 2 ] || die "'$1' option requires an argument"
+        optVersion="$2"
         shift
         ;;
     --)
@@ -208,7 +267,7 @@ do
         break
         ;;
     -*)
-        usage "unknown option: '$1'"
+        die "unknown option: '$1'"
         ;;
     *)
         break
@@ -217,12 +276,27 @@ do
     shift
 done
 
-# Update projectDir accordingly
+
+#-------------------------------------------------------------------------------
+
+if [ -n "$optVersion" ]
+then
+    setVersion $optVersion
+elif [ -z "$projectVersion" ]
+then
+    guessVersion
+fi
+
+# Updates:
+# - projectDir  for changes via -prefix or -version
+# - groupDir    for changes via -prefix
 projectDir="$prefixDir/$projectDirName"
+groupDir="${WM_PROJECT_SITE:-$prefixDir/site}"
+
 
 # Debugging:
 # echo "Installed locations:" 1>&2
-# for i in projectDir prefixDir projectDirName version versionNum
+# for i in projectDir prefixDir projectDirName projectVersion
 # do
 #     eval echo "$i=\$$i" 1>&2
 # done
@@ -235,19 +309,17 @@ fileName="${1#~OpenFOAM/}"
 
 # Define the various places to be searched:
 unset dirList
-case "$mode" in (*u*)   # (U)ser
-    dir="$HOME/.${WM_PROJECT:-OpenFOAM}"
-    dirList="$dirList $dir/$version $dir"
+case "$optMode" in (*u*) # (U)ser
+    dirList="$dirList $userDir/$projectVersion $userDir"
     ;;
 esac
 
-case "$mode" in (*g*)   # (G)roup == site
-    dir="${WM_PROJECT_SITE:-$prefixDir/site}"
-    dirList="$dirList $dir/$version $dir"
+case "$optMode" in (*g*) # (G)roup == site
+    dirList="$dirList $groupDir/$projectVersion $groupDir"
     ;;
 esac
 
-case "$mode" in (*o*)   # (O)ther == shipped
+case "$optMode" in (*o*) # (O)ther == shipped
     dirList="$dirList $projectDir/etc"
     ;;
 esac
@@ -259,30 +331,54 @@ set -- $dirList
 #
 
 exitCode=0
-if [ "$optList" = true ]
+if [ -n "$optList" ]
 then
 
     # List directories, or potential file locations
-    [ "$nArgs" -le 1 ] || usage
+    [ "$nArgs" -le 1 ] || \
+    die "-list expects 0 or 1 filename, but $nArgs provided"
 
     # A silly combination, but -quiet does have precedence
     [ -n "$optQuiet" ] && exit 0
 
-    for dir
-    do
+    # Test for directory or file too?
+    if [ "$optList" = "test" ]
+    then
+        exitCode=2  # Fallback to a general error (file not found)
+
         if [ "$nArgs" -eq 1 ]
         then
-            echo "$dir/$fileName"
+            for dir
+            do
+                resolved="$dir/$fileName"
+                if [ -f "$resolved" ]
+                then
+                    echo "$resolved"
+                    exitCode=0  # OK
+                fi
+            done
         else
-            echo "$dir"
+            for dir
+            do
+                if [ -d "$dir" ]
+                then
+                    echo "$dir"
+                    exitCode=0  # OK
+                fi
+            done
         fi
-    done
+    else
+        for dir
+        do
+            echo "$dir${fileName:+/}$fileName"
+        done
+    fi
 
 else
 
-    [ "$nArgs" -eq 1 ] || usage
+    [ "$nArgs" -eq 1 ] || die "One filename expected - $nArgs provided"
 
-    exitCode=2  # Fallback to a general error, eg file not found
+    exitCode=2  # Fallback to a general error (file not found)
 
     for dir
     do
@@ -316,7 +412,6 @@ else
 
 fi
 
-
 exit $exitCode
 
 #------------------------------------------------------------------------------
diff --git a/bin/foamExec b/bin/foamExec
index cb6fec4bfa..38a032935c 100755
--- a/bin/foamExec
+++ b/bin/foamExec
@@ -26,7 +26,7 @@
 #     foamExec
 #
 # Description
-#     Usage: foamExec [-v foamVersion] <foamCommand> ...
+#     Usage: foamExec [-version=foamVersion] <foamCommand> ...
 #
 #     Runs the <foamVersion> version of executable <foamCommand>
 #     with the rest of the arguments.
@@ -34,7 +34,7 @@
 #     Can also be used for parallel runs. For example,
 #     \code
 #         mpirun -np <nProcs> \
-#             foamExec -version <foamVersion> <foamCommand> ... -parallel
+#             foamExec -version=VERSION <foamCommand> ... -parallel
 #     \endcode
 #
 # Note
@@ -55,34 +55,29 @@ usage() {
 Usage: ${0##*/} [OPTION] <application> ...
 
 options:
-  -prefix <dir>     specify an alternative installation prefix
+  -mode=MODE        Any combination of u(user), g(group), o(other)
+  -prefix=DIR       Specify an alternative installation prefix
                     pass through to foamEtcFile and set as FOAM_INST_DIR
-  -version <ver>    specify an alternative OpenFOAM version
+  -version=VER      Specify alternative OpenFOAM version (eg, 3.0, 1612, ...)
                     pass through to foamEtcFile
-  -help             print the usage
+  -help             Print the usage
 
-* run a particular OpenFOAM version of <application>
+Run a particular OpenFOAM version of <APPLICATION>
 
 USAGE
     exit 1
 }
 
 #-------------------------------------------------------------------------------
+binDir="${0%/*}"                # The bin dir
+projectDir="${binDir%/bin}"     # The project dir
+prefixDir="${projectDir%/*}"    # The prefix dir (same as $WM_PROJECT_INST_DIR)
 
-# the bin dir:
-binDir="${0%/*}"
+## projectDirName="${projectDir##*/}"      # The project directory name
 
-# the project dir:
-projectDir="${binDir%/bin}"
+version="${WM_PROJECT_VERSION:-unknown}"
 
-# the prefix dir (same as $FOAM_INST_DIR):
-prefixDir="${projectDir%/*}"
-
-# # the name used for the project directory
-# projectDirName="${projectDir##*/}"
-
-
-unset etcOpts version
+unset etcOpts
 # parse options
 while [ "$#" -gt 0 ]
 do
@@ -90,6 +85,17 @@ do
     -h | -help)
         usage
         ;;
+    -mode=*)
+        etcOpts="$etcOpts $1"       # pass-thru to foamEtcFile
+        ;;
+    -prefix=/*)
+        etcOpts="$etcOpts $1"       # pass-thru to foamEtcFile
+        prefixDir="${1#*=}"
+        ;;
+    -version=*)
+        etcOpts="$etcOpts $1"       # pass-thru to foamEtcFile
+        version="${1#*=}"
+        ;;
     -m | -mode)
         [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
         etcOpts="$etcOpts $1 $2"    # pass-thru to foamEtcFile
@@ -127,15 +133,15 @@ done
 #
 sourceRc()
 {
-    foamDotFile="$($binDir/foamEtcFile $etcOpts bashrc)" || {
-        echo "Error : bashrc file could not be found for OpenFOAM-${version:-${WM_PROJECT_VERSION:-???}}" 1>&2
+    rcFile="$($binDir/foamEtcFile $etcOpts bashrc)" || {
+        echo "Error : bashrc file could not be found for OpenFOAM-$version" 1>&2
         exit 1
     }
 
     # set to consistent value before sourcing the bashrc
     export FOAM_INST_DIR="$prefixDir"
 
-    . $foamDotFile $FOAM_SETTINGS
+    . $rcFile $FOAM_SETTINGS
 }
 
 
diff --git a/bin/foamPrintJobs b/bin/foamPrintJobs
index 7213e95e1f..58882edab9 100755
--- a/bin/foamPrintJobs
+++ b/bin/foamPrintJobs
@@ -34,6 +34,8 @@ Script=${0##*/}
 JOBSTRING='%4s %8s %20s %10s %8s %4s %12s %12s %20s\n'
 DEFSTATEFILE=$HOME/.OpenFOAM/foamCheckJobs.out
 
+# The default is "~/.OpenFOAM/jobControl"
+: ${FOAM_JOB_DIR:=$HOME/.OpenFOAM/jobControl}
 
 #-------------------------------------------------------------------------------
 #
@@ -120,12 +122,6 @@ fi
 
 #- Check a few things
 
-if [ ! "$FOAM_JOB_DIR" ]
-then
-    echo "$Script : FOAM_JOB_DIR environment variable not set."
-    echo
-    exit 1
-fi
 if [ ! -d "$FOAM_JOB_DIR" ]
 then
     echo "$Script : directory does not exist."
diff --git a/bin/paraFoam b/bin/paraFoam
index 23bf5cc971..dcfe4cf1d9 100755
--- a/bin/paraFoam
+++ b/bin/paraFoam
@@ -172,14 +172,12 @@ fvControls="system"
 
 if [ -n "$regionName" ]
 then
-    if [ ! -d constant/$regionName ]
-    then
+    [ -d constant/$regionName ] || {
         echo "FATAL ERROR: Region $regionName does not exist" 1>&2
         exit 1
-    else
-        caseFile="$caseName{$regionName}.$extension"
-        fvControls="$fvControls/$regionName"
-    fi
+    }
+    caseFile="$caseName{$regionName}.$extension"
+    fvControls="$fvControls/$regionName"
 fi
 
 case "${optTouch:-false}" in
@@ -212,11 +210,42 @@ true)
 esac
 
 
-# Parent directory for normal or parallel results
-case "$caseName" in
-    processor*) parentDir=".." ;;
-    *)          parentDir="."  ;;
-esac
+# Check existence of some essential OpenFOAM files.
+# If caseName appears to be a processor directory, check parent as fallback
+hasFiles() {
+    local warn="Cannot locate OpenFOAM-format case files:"
+    local parent
+    case "$caseName" in (processor*) parent="../" ;; esac
+
+    for file
+    do
+        if [ -s "$file" ]
+        then
+            continue
+        elif [ -n "$parent" -a -s "$parent$file" ]
+        then
+            continue
+        else
+            # Not found
+            [ -n "$warn" ] && echo "$warn" 1>&2
+            unset warn
+            if [ -n "$parent" ]
+            then
+                echo "    $file, or $parent$file" 1>&2
+            else
+                echo "    $file" 1>&2
+            fi
+        fi
+    done
+
+    if [ -n "$warn" ]
+    then
+        return 0        # No warnings were triggered
+    else
+        echo 1>&2       # Emit an additional separator line
+        return 1
+    fi
+}
 
 
 if [ "${hasData:-false}" = true ]
@@ -228,7 +257,7 @@ then
 else
 
     # Check existence of essential files
-    warn="WARN file does not exist:"
+    warn=false
     case $extension in
         blockMesh)
             blockMeshDict=system/blockMeshDict
@@ -236,40 +265,22 @@ else
             then
                 blockMeshDict=constant/polyMesh/blockMeshDict
             fi
-            for check in \
-                system/controlDict \
-                    $blockMeshDict \
-                ;
-            do
-                [ -s "$parentDir/$check" ] || {
-                    [ -n "$warn" ] && echo "$warn" 1>&2
-                    echo "    $parentDir/$check" 1>&2
-                    unset warn
-                }
-            done
+
+            hasFiles system/controlDict $blockMeshDict || warn=true
             ;;
 
         OpenFOAM)
-            for check in \
+            hasFiles \
                 system/controlDict \
-                    $fvControls/fvSchemes \
-                    $fvControls/fvSolution \
-                ;
-            do
-                [ -s "$parentDir/$check" ] || {
-                    [ -n "$warn" ] && echo "$warn" 1>&2
-                    echo "    $parentDir/$check" 1>&2
-                    unset warn
-                }
-            done
+                $fvControls/fvSchemes \
+                $fvControls/fvSolution || warn=true
             ;;
     esac
 
-    [ -n "$warn" ] || {
-        echo "Cannot locate OpenFOAM-format case files"
-        echo -n "Would you like to open ParaView anyway <Y|n>:"
+    [ "${warn:-false}" = false ] || {
+        echo -n "Would you like to open paraview anyway <Y|n>: "
         read open
-        [ "$open" = "" ] || echo $open | grep -iqE "^y" && paraview
+        case "${open:-y}" in ([Yy]*) paraview ;; esac
         exit
     }
 
diff --git a/bin/tools/change-sitedir.sh b/bin/tools/change-sitedir.sh
new file mode 100644
index 0000000000..61d9c3ea8b
--- /dev/null
+++ b/bin/tools/change-sitedir.sh
@@ -0,0 +1,94 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     . change-sitedir.sh PREFIX [SUFFIX]
+#
+#     Shortcuts (prefix)
+#         -prefix         "$WM_PROJECT_INST_DIR/site"
+#         -project        "$WM_PROJECT_DIR/site"
+#         -none           remove from environment
+#
+#     Shortcuts (suffix)
+#         -platforms      "platforms/$WM_OPTIONS"
+#
+# Description
+#     Change WM_PROJECT_SITE, FOAM_SITE_APPBIN, FOAM_SITE_LIBBIN
+#     and the respective entries in PATH, LD_LIBRARY_PATH.
+#
+#     This can be useful when temporarily reassigning the site directory
+#     when packaging OpenFOAM.
+#
+#     The suffix value should normally include "platforms/$WM_OPTIONS"
+#
+# Example
+#     . /path/change-sitedir.sh -prefix -platforms
+#
+#   corresponds to the standard site location:
+#
+#     $WM_PROJECT_INST_DIR/site{/$WM_PROJECT_VERSION/platforms/$WM_OPTIONS}
+#
+#------------------------------------------------------------------------------
+
+if [ "$#" -ge 1 ]
+then
+    prefix="$1"
+    suffix="$2"
+
+    foamOldDirs="$FOAM_SITE_APPBIN $FOAM_SITE_LIBBIN \
+        $WM_PROJECT_SITE $WM_PROJECT_INST_DIR/site $WM_PROJECT_DIR/site"
+    foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
+    if [ -x "$foamClean" ]
+    then
+        cleaned=$($foamClean "$PATH" "$foamOldDirs") && PATH="$cleaned"
+        cleaned=$($foamClean "$LD_LIBRARY_PATH" "$foamOldDirs") \
+            && LD_LIBRARY_PATH="$cleaned"
+    fi
+
+    case "$suffix" in
+        -plat*) suffix="platforms/$WM_OPTIONS" ;;
+    esac
+    case "$prefix" in
+        -prefix)  prefix="$WM_PROJECT_INST_DIR/site" ;;
+        -project) prefix="$WM_PROJECT_DIR/site" ;;
+        -none)    unset prefix ;;
+    esac
+
+    if [ -n "$prefix" ]
+    then
+        export WM_PROJECT_SITE="$prefix"
+
+        prefix="$prefix/${WM_PROJECT_VERSION:-unknown}${suffix:+/}${suffix}"
+
+        export FOAM_SITE_APPBIN="$prefix/bin"
+        export FOAM_SITE_LIBBIN="$prefix/lib"
+        PATH="$FOAM_SITE_APPBIN:$PATH"
+        LD_LIBRARY_PATH="$FOAM_SITE_LIBBIN:$LD_LIBRARY_PATH"
+    else
+        unset WM_PROJECT_SITE FOAM_SITE_APPBIN FOAM_SITE_LIBBIN
+    fi
+fi
+
+unset foamClean foamOldDirs cleaned prefix suffix
+
+#------------------------------------------------------------------------------
diff --git a/bin/tools/change-userdir.sh b/bin/tools/change-userdir.sh
new file mode 100644
index 0000000000..d126fcfe5d
--- /dev/null
+++ b/bin/tools/change-userdir.sh
@@ -0,0 +1,94 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# Script
+#     . change-userdir.sh PREFIX [SUFFIX]
+#
+#     Shortcuts (prefix)
+#         -home           "$HOME/OpenFOAM/$USER-$WM_PROJECT_VERSION"
+#         -none           remove from environment
+#
+#     Shortcuts (suffix)
+#         -platforms      "platforms/$WM_OPTIONS"
+#
+# Description
+#     Change WM_PROJECT_USER_DIR, FOAM_USER_APPBIN, FOAM_USER_LIBBIN
+#     and the respective entries in PATH, LD_LIBRARY_PATH.
+#     Also adjusts FOAM_RUN.
+#
+#     This can be useful with compiling additional OpenFOAM programs
+#     (that use FOAM_USER_APPBIN, FOAM_USER_LIBBIN for their build),
+#     to avoid conflicts with the normal user bin/lib files.
+#
+#     The suffix value should normally include "platforms/$WM_OPTIONS"
+#
+# Example
+#     . /path/change-userdir.sh -home -platforms
+#
+#   corresponds to the standard user location:
+#
+#     $HOME/OpenFOAM/$USER-$WM_PROJECT_VERSION/platforms/$WM_OPTIONS
+#
+#------------------------------------------------------------------------------
+
+if [ "$#" -ge 1 ]
+then
+    prefix="$1"
+    suffix="$2"
+
+    foamOldDirs="$FOAM_USER_APPBIN $FOAM_USER_LIBBIN"
+    foamClean=$WM_PROJECT_DIR/bin/foamCleanPath
+    if [ -x "$foamClean" ]
+    then
+        cleaned=$($foamClean "$PATH" "$foamOldDirs") && PATH="$cleaned"
+        cleaned=$($foamClean "$LD_LIBRARY_PATH" "$foamOldDirs") \
+            && LD_LIBRARY_PATH="$cleaned"
+    fi
+
+    case "$suffix" in
+        -plat*) suffix="platforms/$WM_OPTIONS" ;;
+    esac
+    case "$prefix" in
+        -home) prefix="$HOME/OpenFOAM/$USER-${WM_PROJECT_VERSION:-unknown}" ;;
+        -none) unset prefix ;;
+    esac
+
+    if [ -n "$prefix" ]
+    then
+        export WM_PROJECT_USER_DIR="$prefix"
+        export FOAM_RUN="$prefix/run"
+
+        prefix="$prefix${suffix:+/}${suffix}"
+        export FOAM_USER_APPBIN="$prefix/bin"
+        export FOAM_USER_LIBBIN="$prefix/lib"
+
+        PATH="$FOAM_USER_APPBIN:$PATH"
+        LD_LIBRARY_PATH="$FOAM_USER_LIBBIN:$LD_LIBRARY_PATH"
+    else
+        unset WM_PROJECT_USER_DIR FOAM_RUN FOAM_USER_APPBIN FOAM_USER_LIBBIN
+    fi
+fi
+
+unset foamClean foamOldDirs cleaned prefix suffix
+
+#------------------------------------------------------------------------------
diff --git a/doc/codingStyleGuide.org b/doc/codingStyleGuide.org
index 3cde03d85d..b8d1b0d98a 100644
--- a/doc/codingStyleGuide.org
+++ b/doc/codingStyleGuide.org
@@ -22,7 +22,7 @@
     + Stream output
       + =<<= is always four characters after the start of the stream,
         so that the =<<= symbols align, i.e.
-        #+begin_src c++
+        #+begin_src C++
         Info<< ...
         os  << ...
         #+end_src
@@ -215,7 +215,7 @@
 
 *** =for= and =while= Loops
     #+begin_src C++
-    for (i = 0; i < maxI; i++)
+    for (i = 0; i < maxI; ++i)
     {
         code;
     }
@@ -226,7 +226,7 @@
     (
         i = 0;
         i < maxI;
-        i++
+        ++i
     )
     {
         code;
@@ -234,15 +234,22 @@
     #+end_src
     *not* this (no space between =for= and =(= used)
     #+begin_src C++
-    for(i = 0; i < maxI; i++)
+    for(i = 0; i < maxI; ++i)
     {
         code;
     }
     #+end_src
-    Note that when indexing through iterators, it is often slightly more
-    efficient to use the pre-increment form. Eg, =++iter= instead of =iter++=
+    Range-base for should have a space surrounding the ':'
+    #+begin_src C++
+    for (auto i : range)
+    {
+        code;
+    }
+    #+end_src
+    Note that when indexing through iterators, it is often more efficient
+    to use the pre-increment form. Eg, =++iter= instead of =iter++=
 
-*** =forAll=, =forAllIter=, =forAllConstIter=, /etc./ loops
+*** =forAll=, =forAllIters=, =forAllConstIters=, /etc./ loops
     Like =for= loops, but
     #+begin_src C++
     forAll(
@@ -251,15 +258,22 @@
     #+begin_src C++
     forAll (
     #+end_src
-    Using the =forAllIter= and =forAllConstIter= macros is generally
-    advantageous - less typing, easier to find later.  However, since
-    they are macros, they will fail if the iterated object contains
-    any commas /e.g./ following will FAIL!:
+    In many cases, the new =forAllIters= and =forAllConstIters= macros
+    provide a good means of cycling through iterators (when a range-base
+    for doesn't apply). These use the C++11 decltype and work without
+    explicitly specifying the container class:
     #+begin_src C++
-    forAllIter(HashTable<labelPair, edge, Hash<edge>>, foo, iter)
+    forAllIters(myEdgeHash, iter)
+    #+end_src
+    Using the older =forAllIter= and =forAllConstIter= macros will
+    still be seen.  However, since they are macros, they will fail if
+    the iterated object contains any commas /e.g./ following will FAIL!:
+    #+begin_src C++
+    forAllIter(HashTable<labelPair, edge, Hash<edge>>, myEdgeHash, iter)
     #+end_src
     These convenience macros are also generally avoided in other
     container classes and OpenFOAM primitive classes.
+    In certain cases, the range-based for can also be used.
 
 *** Splitting Over Multiple Lines
 ***** Splitting return type and function name
diff --git a/etc/bashrc b/etc/bashrc
index 1cf31e7651..ccc6a3eebc 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -25,9 +25,9 @@
 #     etc/bashrc
 #
 # Description
-#     Startup file for OpenFOAM
-#     Sourced from ~/.profile or ~/.bashrc
-#     Should be usable by any POSIX-compliant shell (eg, dash, ksh)
+#     Set the environment for OpenFOAM when using a POSIX shell.
+#     To be sourced manually or from the ~/.profile or ~/.bashrc files.
+#     Should be usable by any POSIX-compliant shell (eg, bash,dash,zsh,...)
 #
 #------------------------------------------------------------------------------
 
@@ -65,7 +65,7 @@ export WM_COMPILER_TYPE=system
 
 #- Compiler:
 #    WM_COMPILER = Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-3] | GccKNL
-#                  | Clang | Clang3[8-9] | Icc | IccKNL
+#                  | Clang | Clang3[8-9] | Clang40 | Icc | IccKNL
 export WM_COMPILER=Gcc
 unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 
@@ -89,7 +89,7 @@ export WM_COMPILE_OPTION=Opt
 
 #- MPI implementation:
 #    WM_MPLIB = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPICH | MPICH-GM | HPMPI
-#               | MPI | FJMPI | QSMPI | SGIMPI | INTELMPI
+#               | MPI | FJMPI | QSMPI | SGIMPI | INTELMPI | USERMPI
 export WM_MPLIB=SYSTEMOPENMPI
 
 #- Operating System:
@@ -209,10 +209,11 @@ fi
 
 # Cleanup environment
 # ~~~~~~~~~~~~~~~~~~~
-unset cleaned foamClean foamOldDirs
 
-# Unload functions
-# ~~~~~~~~~~~~~~~~
+#- Functions
 . $WM_PROJECT_DIR/etc/config.sh/functions
 
+#- Variables (do as last for a clean exit code)
+unset cleaned foamClean foamOldDirs
+
 #------------------------------------------------------------------------------
diff --git a/etc/config.csh/ADIOS b/etc/config.csh/ADIOS
index 64dce79c5a..7eb1235542 100644
--- a/etc/config.csh/ADIOS
+++ b/etc/config.csh/ADIOS
@@ -68,6 +68,6 @@ if ( "$ending" != "adios-none" && "$ending" != "adios-system" ) then
     _foamAddPath $ADIOS_ARCH_PATH/bin
 endif
 
-unset adios_version ending cleaned
+unset adios_version ending
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.csh/compiler b/etc/config.csh/compiler
index f043508d85..2f1f7f0480 100644
--- a/etc/config.csh/compiler
+++ b/etc/config.csh/compiler
@@ -25,7 +25,7 @@
 #     etc/config.csh/compiler
 #
 # Description
-#     Startup file for custom compiler versions for OpenFOAM
+#     Setup file for custom compiler versions for OpenFOAM
 #     Sourced from OpenFOAM-<VERSION>/etc/config.csh/settings
 #
 #------------------------------------------------------------------------------
diff --git a/etc/config.csh/example/paraview b/etc/config.csh/example/paraview
index b65dd6a07d..3ce3baa299 100644
--- a/etc/config.csh/example/paraview
+++ b/etc/config.csh/example/paraview
@@ -38,7 +38,7 @@
 # Use other (shipped) paraview with a different ParaView_VERSION
 #
 
-set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode o config.csh/paraview`
+set foamFile=`$WM_PROJECT_DIR/bin/foamEtcFile -mode=o config.csh/paraview`
 if ( $status == 0 ) source $foamFile ParaView_VERSION=5.0.1
 
 unset foamFile
diff --git a/etc/config.csh/mpi b/etc/config.csh/mpi
index 5d5ac5c175..e6b57838b4 100644
--- a/etc/config.csh/mpi
+++ b/etc/config.csh/mpi
@@ -2,8 +2,8 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-#    \\/     M anipulation  |
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#    \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
@@ -25,12 +25,14 @@
 #     etc/config.csh/mpi
 #
 # Description
-#     Startup file for communications library (MPI) for OpenFOAM
+#     Setup file for communications library (MPI) for OpenFOAM
 #     Sourced from OpenFOAM-<VERSION>/etc/cshrc
 #
+#     For USERMPI, the user is responsible for supplying an appropriate
+#     wmake/rules/General/mplibUSERMPI file and managing all settings
+#
 #------------------------------------------------------------------------------
-
-unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
+unsetenv MPI_ARCH_PATH MPI_HOME
 
 switch ("$WM_MPLIB")
 case SYSTEMOPENMPI:
@@ -48,8 +50,7 @@ case SYSTEMOPENMPI:
 
 case OPENMPI:
     setenv FOAM_MPI openmpi-2.0.2
-    # Optional configuration tweaks:
-    _foamEtc config.csh/openmpi
+    _foamEtc config.csh/openmpi                 # <- Adjustments (optional)
 
     setenv MPI_ARCH_PATH $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
@@ -67,8 +68,15 @@ case OPENMPI:
     _foamAddMan     $MPI_ARCH_PATH/share/man
     breaksw
 
+case USERMPI:
+    # Use an arbitrary, user-specified mpi implementation
+    setenv FOAM_MPI mpi-user
+    _foamEtc config.csh/mpi-user                # <- Adjustments
+    breaksw
+
 case SYSTEMMPI:
     setenv FOAM_MPI mpi-system
+    _foamEtc config.csh/mpi-system              # <- Adjustments (optional)
 
     if ( ! $?MPI_ROOT ) then
         echo
@@ -241,16 +249,17 @@ endsw
 
 
 # Add (non-dummy) MPI implementation
-# Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
+# - dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
 if ( "$FOAM_MPI" != dummy ) then
-    _foamAddLib ${FOAM_LIBBIN}/${FOAM_MPI}:${FOAM_EXT_LIBBIN}/${FOAM_MPI}
+    if ( $?FOAM_EXT_LIBBIN ) then   # External libraries (allowed to be unset)
+        _foamAddLib ${FOAM_EXT_LIBBIN}/${FOAM_MPI}
+    endif
+    _foamAddLib ${FOAM_LIBBIN}/${FOAM_MPI}
 endif
 
 
-# Set the minimum MPI buffer size (used by all platforms except SGI MPI)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Minimum MPI buffer size (used by all except SGI MPI)
 if ( ! $?minBufferSize ) set minBufferSize=20000000
-
 if ( $?MPI_BUFFER_SIZE ) then
     if ( $MPI_BUFFER_SIZE < $minBufferSize ) then
         setenv MPI_BUFFER_SIZE $minBufferSize
diff --git a/etc/config.csh/settings b/etc/config.csh/settings
index fdf04a2615..98442b94a1 100644
--- a/etc/config.csh/settings
+++ b/etc/config.csh/settings
@@ -25,7 +25,7 @@
 #     etc/config.csh/settings
 #
 # Description
-#     Startup file for OpenFOAM
+#     Setup file for OpenFOAM
 #     Sourced from OpenFOAM-<VERSION>/etc/cshrc
 #
 #------------------------------------------------------------------------------
@@ -137,8 +137,8 @@ endsw
 
 #------------------------------------------------------------------------------
 
-# Location of the jobControl directory
-setenv FOAM_JOB_DIR $WM_PROJECT_INST_DIR/jobControl
+# Optional jobControl directory: unset is equivalent to ~/.OpenFOAM/jobControl
+# setenv FOAM_JOB_DIR "$HOME/.OpenFOAM/jobControl"
 
 # wmake configuration
 setenv WM_DIR $WM_PROJECT_DIR/wmake
@@ -178,8 +178,8 @@ setenv FOAM_ETC $WM_PROJECT_DIR/etc
 setenv FOAM_APP $WM_PROJECT_DIR/applications
 setenv FOAM_SRC $WM_PROJECT_DIR/src
 setenv FOAM_TUTORIALS $WM_PROJECT_DIR/tutorials
-setenv FOAM_UTILITIES $FOAM_APP/utilities
-setenv FOAM_SOLVERS $FOAM_APP/solvers
+setenv FOAM_UTILITIES $WM_PROJECT_DIR/applications/utilities
+setenv FOAM_SOLVERS $WM_PROJECT_DIR/applications/solvers
 setenv FOAM_RUN $WM_PROJECT_USER_DIR/run
 
 # Add wmake to the path - not required for runtime-only environment
@@ -197,8 +197,11 @@ endif
 unset siteDir
 
 _foamAddPath ${FOAM_USER_APPBIN}:${FOAM_SITE_APPBIN}:${FOAM_APPBIN}
-# Make sure to pick up dummy versions of external libraries last
-_foamAddLib  ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}:${FOAM_EXT_LIBBIN}:${FOAM_LIBBIN}/dummy
+_foamAddLib  $FOAM_LIBBIN/dummy     # Dummy versions of external libraries last
+if ( $?FOAM_EXT_LIBBIN ) then       # External libraries (allowed to be unset)
+    _foamAddLib $FOAM_EXT_LIBBIN
+endif
+_foamAddLib  ${FOAM_USER_LIBBIN}:${FOAM_SITE_LIBBIN}:${FOAM_LIBBIN}
 
 #------------------------------------------------------------------------------
 
diff --git a/etc/config.csh/unset b/etc/config.csh/unset
index 9d5cd806fd..6f52ec8c42 100644
--- a/etc/config.csh/unset
+++ b/etc/config.csh/unset
@@ -167,8 +167,6 @@ if ( $?foamClean ) then
 endif
 
 
-unset cleaned foamClean foamOldDirs
-
 #------------------------------------------------------------------------------
 # Cleanup aliases
 
@@ -198,5 +196,9 @@ unalias wmRefresh
 unalias foamVersion
 unalias foamPV
 
+#------------------------------------------------------------------------------
+# Intermediate variables (do as last for a clean exit code)
+
+unset cleaned foamClean foamOldDirs
 
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/ADIOS b/etc/config.sh/ADIOS
index 15fd0169f2..58ef50a9ce 100644
--- a/etc/config.sh/ADIOS
+++ b/etc/config.sh/ADIOS
@@ -58,7 +58,7 @@ then
     echo "Using adios ($adios_version)  ->  $ADIOS_ARCH_PATH" 1>&2
 fi
 
-if type _foamAddPath > /dev/null 2>&1    # normal sourcing
+if command -v _foamAddPath >/dev/null 2>&1  # normal sourcing
 then
     # If ADIOS_ARCH_PATH does not end with '-system' or '-none',
     # it is located within ThirdParty, or a central installation
@@ -71,7 +71,7 @@ then
         _foamAddPath $ADIOS_ARCH_PATH/bin
     fi
 
-    unset adios_version ending cleaned
+    unset adios_version ending
 
 fi
 
diff --git a/etc/config.sh/CGAL b/etc/config.sh/CGAL
index 837d0e438d..dc97d66a11 100644
--- a/etc/config.sh/CGAL
+++ b/etc/config.sh/CGAL
@@ -64,7 +64,7 @@ then
     echo "Using CGAL ($cgal_version)  ->  $CGAL_ARCH_PATH" 1>&2
 fi
 
-if type _foamAddLib > /dev/null 2>&1    # normal sourcing
+if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
 then
 
     # If BOOST_ARCH_PATH, CGAL_ARCH_PATH do not end with '-system' or '-none',
diff --git a/etc/config.sh/FFTW b/etc/config.sh/FFTW
index 47d3d22f8a..c8b707d6a5 100644
--- a/etc/config.sh/FFTW
+++ b/etc/config.sh/FFTW
@@ -58,7 +58,7 @@ then
     echo "Using fftw ($fftw_version)  ->  $FFTW_ARCH_PATH" 1>&2
 fi
 
-if type _foamAddLib > /dev/null 2>&1    # normal sourcing
+if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
 then
 
     # If FFTW_ARCH_PATH does not end with '-system' or '-none',
diff --git a/etc/config.sh/aliases b/etc/config.sh/aliases
index fbc0111677..23b8b636e8 100644
--- a/etc/config.sh/aliases
+++ b/etc/config.sh/aliases
@@ -69,7 +69,7 @@ alias run='cd $FOAM_RUN'
 
 # Refresh the environment
 # ~~~~~~~~~~~~~~~~~~~~~~~
-unset -f wmRefresh
+unset -f wmRefresh 2>/dev/null
 wmRefresh()
 {
     wmProjectDir=$WM_PROJECT_DIR
@@ -81,7 +81,7 @@ wmRefresh()
 
 # Change OpenFOAM version
 # ~~~~~~~~~~~~~~~~~~~~~~~
-unset -f foamVersion
+unset -f foamVersion 2>/dev/null
 foamVersion()
 {
     if [ "$1" ]; then
@@ -98,7 +98,7 @@ foamVersion()
 
 # Change ParaView version
 # ~~~~~~~~~~~~~~~~~~~~~~~
-unset -f foamPV
+unset -f foamPV 2>/dev/null
 foamPV()
 {
     . $WM_PROJECT_DIR/etc/config.sh/paraview "${@+ParaView_VERSION=$1}"
diff --git a/etc/config.sh/ccmio b/etc/config.sh/ccmio
index 28e7334e8e..782dcb7702 100644
--- a/etc/config.sh/ccmio
+++ b/etc/config.sh/ccmio
@@ -28,8 +28,8 @@
 #     Setup file for libccmio include/libraries.
 #     Sourced during wmake process only.
 #
-#     Dynamic libraries are found under the FOAM_EXT_LIBBIN path.
-#     Static libraries  are found under the CCMIO_ARCH_PATH/lib path.
+#     Static libraries (recommended) are found under CCMIO_ARCH_PATH/lib.
+#     Dynamic libraries are found under FOAM_EXT_LIBBIN path.
 #
 # Note
 #     A csh version is not needed, since the values here are only sourced
diff --git a/etc/config.sh/compiler b/etc/config.sh/compiler
index 8e9122a8d5..2235619f77 100644
--- a/etc/config.sh/compiler
+++ b/etc/config.sh/compiler
@@ -25,7 +25,7 @@
 #     etc/config.sh/compiler
 #
 # Description
-#     Startup file for custom compiler versions for OpenFOAM
+#     Setup file for custom compiler versions for OpenFOAM
 #     Sourced from OpenFOAM-<VERSION>/etc/config.sh/settings
 #
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/functions b/etc/config.sh/functions
index 4413108cdc..df3096d998 100644
--- a/etc/config.sh/functions
+++ b/etc/config.sh/functions
@@ -56,15 +56,13 @@ then
     }
 
     # Source an etc file, possibly with some verbosity
-    _foamEtc()
-    {
-        local file
-        if [ $# -gt 0 ] && file=$($WM_PROJECT_DIR/bin/foamEtcFile "$@")
-        then
-            [ "$FOAM_VERBOSE" -a "$PS1" ] && echo "Using: $file" 1>&2
-            . $file
-        fi
-    }
+    # - use eval to avoid intermediate variables (ksh doesn't have 'local')
+    if [ "$FOAM_VERBOSE" -a "$PS1" ]
+    then
+        _foamEtc(){ eval "$($WM_PROJECT_DIR/bin/foamEtcFile -sh-verbose $@)"; }
+    else
+        _foamEtc(){ eval "$($WM_PROJECT_DIR/bin/foamEtcFile -sh $@)"; }
+    fi
 
     # Evaluate command-line parameters
     _foamEval()
@@ -104,9 +102,9 @@ then
 else
     # Was previously loaded/defined - now unset
 
+    unset -f _foamAddPath _foamAddLib _foamAddMan 2>/dev/null
+    unset -f _foamEtc _foamEval 2>/dev/null
     unset WM_SHELL_FUNCTIONS
-    unset -f _foamAddPath _foamAddLib _foamAddMan
-    unset -f _foamEtc _foamEval
 
 fi
 
diff --git a/etc/config.sh/gperftools b/etc/config.sh/gperftools
index da49c76167..4e13f927bb 100644
--- a/etc/config.sh/gperftools
+++ b/etc/config.sh/gperftools
@@ -58,7 +58,7 @@ then
     echo "Using gperftools ($gperftools_version)  ->  $GPERFTOOLS_ARCH_PATH" 1>&2
 fi
 
-if type _foamAddLib > /dev/null 2>&1    # normal sourcing
+if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
 then
 
     # If GPERFTOOLS_ARCH_PATH does not end with '-system' or '-none',
diff --git a/etc/config.sh/metis b/etc/config.sh/metis
index 403730b1bf..2776a283c2 100644
--- a/etc/config.sh/metis
+++ b/etc/config.sh/metis
@@ -42,7 +42,7 @@
 #
 #     If using a central installation, but not located under ThirdParty:
 #         - specify metis-system
-#         - provide full paths for METIS_ARCH_PATH
+#         - provide full path for METIS_ARCH_PATH
 #
 # Note
 #     A csh version is not needed, since the values here are only sourced
diff --git a/etc/config.sh/mgridgen b/etc/config.sh/mgridgen
new file mode 100644
index 0000000000..ffc7239d28
--- /dev/null
+++ b/etc/config.sh/mgridgen
@@ -0,0 +1,61 @@
+#----------------------------------*-sh-*--------------------------------------
+# =========                 |
+# \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+#  \\    /   O peration     |
+#   \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+#    \\/     M anipulation  |
+#------------------------------------------------------------------------------
+# License
+#     This file is part of OpenFOAM.
+#
+#     OpenFOAM is free software: you can redistribute it and/or modify it
+#     under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+#
+#     OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+#     ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+#     FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+#     for more details.
+#
+#     You should have received a copy of the GNU General Public License
+#     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+#
+# File
+#     etc/config.sh/mgridgen
+#
+# Description
+#     Setup file for MGridGen include/libraries.
+#     Sourced during wmake process only.
+#
+#     Normally used to specify the MGridGen version and location for a
+#     ThirdParty installation.
+#
+#     If using system-wide installations, use the following setting:
+#
+#         MGRIDGEN_VERSION=mgridgen-system
+#
+#     If the system mgridgen is unusable and you don't have or want
+#     a ThirdParty installation:
+#
+#         MGRIDGEN_VERSION=mgridgen-none
+#
+#     If using a central installation, but not located under ThirdParty:
+#         - specify mgridgen-system
+#         - provide full path for MGRIDGEN_ARCH_PATH
+#
+# Note
+#     A csh version is not needed, since the values here are only sourced
+#     during the wmake process.
+#
+#     MGridGen can be entirely disabled, by either renaming this file or
+#     by creating an empty one with the same name at a user or site location.
+#
+#------------------------------------------------------------------------------
+# USER EDITABLE PART: Changes made here may be lost with the next upgrade
+
+MGRIDGEN_VERSION=ParMGridGen-1.0
+export MGRIDGEN_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER$WM_PRECISION_OPTION$WM_LABEL_OPTION/$MGRIDGEN_VERSION
+
+# END OF (NORMAL) USER EDITABLE PART
+#------------------------------------------------------------------------------
diff --git a/etc/config.sh/mpi b/etc/config.sh/mpi
index 5451a1ab86..812b354a1b 100644
--- a/etc/config.sh/mpi
+++ b/etc/config.sh/mpi
@@ -2,8 +2,8 @@
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-#    \\/     M anipulation  |
+#   \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+#    \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 #------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
@@ -25,12 +25,14 @@
 #     etc/config.sh/mpi
 #
 # Description
-#     Startup file for communications library (MPI) for OpenFOAM
+#     Setup file for communications library (MPI) for OpenFOAM
 #     Sourced from OpenFOAM-<VERSION>/etc/bashrc
 #
+#     For USERMPI, the user is responsible for supplying an appropriate
+#     wmake/rules/General/mplibUSERMPI file and managing all settings
+#
 #------------------------------------------------------------------------------
-
-unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
+unset MPI_ARCH_PATH MPI_HOME
 
 case "$WM_MPLIB" in
 SYSTEMOPENMPI)
@@ -54,8 +56,7 @@ SYSTEMOPENMPI)
 
 OPENMPI)
     export FOAM_MPI=openmpi-2.0.2
-    # Optional configuration tweaks:
-    _foamEtc config.sh/openmpi
+    _foamEtc config.sh/openmpi                  # <- Adjustments (optional)
 
     export MPI_ARCH_PATH=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/$FOAM_MPI
 
@@ -70,7 +71,7 @@ OPENMPI)
     fi
 
     # Could be sourced from ThirdParty with incomplete environment
-    if type _foamAddLib > /dev/null 2>&1
+    if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
     then
         _foamAddPath    $MPI_ARCH_PATH/bin
         _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
@@ -78,8 +79,15 @@ OPENMPI)
     fi
     ;;
 
+USERMPI)
+    # Use an arbitrary, user-specified mpi implementation
+    export FOAM_MPI=mpi-user
+    _foamEtc config.sh/mpi-user                 # <- Adjustments
+    ;;
+
 SYSTEMMPI)
     export FOAM_MPI=mpi-system
+    _foamEtc config.sh/mpi-system               # <- Adjustments (optional)
 
     if [ -z "$MPI_ROOT" ]
     then
@@ -132,7 +140,7 @@ MPICH)
     export MPI_HOME=$MPI_ARCH_PATH
 
     # Could be sourced from ThirdParty with incomplete environment
-    if type _foamAddLib > /dev/null 2>&1
+    if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
     then
         _foamAddPath    $MPI_ARCH_PATH/bin
         _foamAddLib     $MPI_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH
@@ -256,17 +264,19 @@ INTELMPI)
 esac
 
 # Add (non-dummy) MPI implementation
-# Dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
+# - dummy MPI already added to LD_LIBRARY_PATH and has no external libraries
 if [ "$FOAM_MPI" != dummy ] && type _foamAddLib > /dev/null 2>&1
 then
-    _foamAddLib $FOAM_LIBBIN/$FOAM_MPI:$FOAM_EXT_LIBBIN/$FOAM_MPI
+    if [ -n "$FOAM_EXT_LIBBIN" ]    # External libraries (allowed to be unset)
+    then
+        _foamAddLib $FOAM_EXT_LIBBIN/$FOAM_MPI
+    fi
+    _foamAddLib $FOAM_LIBBIN/$FOAM_MPI
 fi
 
 
-# Set the minimum MPI buffer size (used by all platforms except SGI MPI)
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+# Minimum MPI buffer size (used by all except SGI MPI)
 : ${minBufferSize:=20000000}
-
 if [ "${MPI_BUFFER_SIZE:=$minBufferSize}" -lt $minBufferSize ]
 then
     MPI_BUFFER_SIZE=$minBufferSize
diff --git a/etc/config.sh/paraview b/etc/config.sh/paraview
index 4aadf1dccc..05ae45ba44 100644
--- a/etc/config.sh/paraview
+++ b/etc/config.sh/paraview
@@ -173,7 +173,7 @@ unset -f _foamParaviewEval
 unset cleaned cmake cmake_version pvName pvMajor pvLibDir pvPython
 unset ParaView_MAJOR
 
-if type _foamAddLib > /dev/null 2>&1    # normal sourcing
+if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
 then
     unset ParaView_VERSION
 fi
diff --git a/etc/config.sh/settings b/etc/config.sh/settings
index d7a596505d..ebc4bf435a 100644
--- a/etc/config.sh/settings
+++ b/etc/config.sh/settings
@@ -25,7 +25,7 @@
 #     etc/config.sh/settings
 #
 # Description
-#     Startup file for OpenFOAM
+#     Setup file for OpenFOAM
 #     Sourced from OpenFOAM-<VERSION>/etc/bashrc
 #
 #------------------------------------------------------------------------------
@@ -140,8 +140,8 @@ esac
 
 #------------------------------------------------------------------------------
 
-# Location of the jobControl directory
-export FOAM_JOB_DIR=$WM_PROJECT_INST_DIR/jobControl
+# Optional jobControl directory: unset is equivalent to ~/.OpenFOAM/jobControl
+# export FOAM_JOB_DIR="$HOME/.OpenFOAM/jobControl"
 
 # wmake configuration
 export WM_DIR=$WM_PROJECT_DIR/wmake
@@ -177,8 +177,8 @@ export FOAM_ETC=$WM_PROJECT_DIR/etc
 export FOAM_APP=$WM_PROJECT_DIR/applications
 export FOAM_SRC=$WM_PROJECT_DIR/src
 export FOAM_TUTORIALS=$WM_PROJECT_DIR/tutorials
-export FOAM_UTILITIES=$FOAM_APP/utilities
-export FOAM_SOLVERS=$FOAM_APP/solvers
+export FOAM_UTILITIES=$WM_PROJECT_DIR/applications/utilities
+export FOAM_SOLVERS=$WM_PROJECT_DIR/applications/solvers
 export FOAM_RUN=$WM_PROJECT_USER_DIR/run
 
 # Add wmake to the path - not required for runtime-only environment
@@ -198,8 +198,12 @@ fi
 unset siteDir
 
 _foamAddPath $FOAM_USER_APPBIN:$FOAM_SITE_APPBIN:$FOAM_APPBIN
-# Make sure to pick up dummy versions of external libraries last
-_foamAddLib  $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN:$FOAM_EXT_LIBBIN:$FOAM_LIBBIN/dummy
+_foamAddLib  $FOAM_LIBBIN/dummy     # Dummy versions of external libraries last
+if [ -n "$FOAM_EXT_LIBBIN" ]        # External libraries (allowed to be unset)
+then
+    _foamAddLib $FOAM_EXT_LIBBIN
+fi
+_foamAddLib  $FOAM_USER_LIBBIN:$FOAM_SITE_LIBBIN:$FOAM_LIBBIN
 
 #------------------------------------------------------------------------------
 
diff --git a/etc/config.sh/unset b/etc/config.sh/unset
index 2fa155d8c7..d9aa0639eb 100644
--- a/etc/config.sh/unset
+++ b/etc/config.sh/unset
@@ -148,42 +148,42 @@ then
     cleaned=$($foamClean "$MANPATH" "$foamOldDirs") && MANPATH="$cleaned"
 fi
 
-
 [ -n "$LD_LIBRARY_PATH" ] || unset LD_LIBRARY_PATH
-[ -n "$MANPATH" ] || unset MANPATH
 [ -n "$LD_PRELOAD" ] || unset LD_PRELOAD
+[ -n "$MANPATH" ] || unset MANPATH
+
+#------------------------------------------------------------------------------
+# Cleanup aliases and functions
+
+unalias wmSet       2>/dev/null
+unalias wmInt32     2>/dev/null
+unalias wmInt64     2>/dev/null
+unalias wmSP        2>/dev/null
+unalias wmDP        2>/dev/null
+
+unalias wmUnset     2>/dev/null
+
+unalias wmSchedOn   2>/dev/null
+unalias wmSchedOff  2>/dev/null
+
+unalias foam        2>/dev/null
+unalias foamSite    2>/dev/null
+
+unalias src         2>/dev/null
+unalias lib         2>/dev/null
+unalias app         2>/dev/null
+unalias sol         2>/dev/null
+unalias util        2>/dev/null
+unalias tut         2>/dev/null
+unalias run         2>/dev/null
+
+unset -f wmRefresh  2>/dev/null
+unset -f foamVersion 2>/dev/null
+unset -f foamPV     2>/dev/null
+
+#------------------------------------------------------------------------------
+# Intermediate variables (do as last for a clean exit code)
 
 unset cleaned foamClean foamOldDirs
 
-
-#------------------------------------------------------------------------------
-# Cleanup aliases
-
-unalias wmSet
-unalias wmInt32
-unalias wmInt64
-unalias wmSP
-unalias wmDP
-
-unalias wmUnset
-
-unalias wmSchedOn
-unalias wmSchedOff
-
-unalias foam
-unalias foamSite
-
-unalias src
-unalias lib
-unalias app
-unalias sol
-unalias util
-unalias tut
-unalias run
-
-unset -f wmRefresh
-unset -f foamVersion
-unset -f foamPV
-
-
 #------------------------------------------------------------------------------
diff --git a/etc/config.sh/vtk b/etc/config.sh/vtk
index 004a8d2b82..9c2a0fe33e 100644
--- a/etc/config.sh/vtk
+++ b/etc/config.sh/vtk
@@ -57,7 +57,7 @@ then
     echo "Using mesa ($mesa_version)  ->  $MESA_ARCH_PATH" 1>&2
 fi
 
-if type _foamAddLib > /dev/null 2>&1    # normal sourcing
+if command -v _foamAddLib > /dev/null 2>&1  # normal sourcing
 then
 
     # Set paths if binaries are present
diff --git a/etc/controlDict b/etc/controlDict
index a0151fc0bd..a2302326dc 100644
--- a/etc/controlDict
+++ b/etc/controlDict
@@ -40,6 +40,9 @@ InfoSwitches
     writeDictionaries 0;
     writeOptionalEntries 0;
 
+    // Allow profiling
+    allowProfiling  1;
+
     // Allow case-supplied C++ code (#codeStream, codedFixedValue)
     allowSystemOperations   1;
 }
@@ -78,6 +81,15 @@ OptimisationSwitches
     stopAtWriteNowSignal        -1;
 }
 
+/* Can specify fallback profiling settings
+profiling
+{
+    active      true;
+    cpuInfo     true;
+    memInfo     false;
+    sysInfo     true;
+}
+*/
 
 DebugSwitches
 {
diff --git a/etc/cshrc b/etc/cshrc
index 9d3fc7e38d..4fb51cad68 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -25,8 +25,8 @@
 #     etc/cshrc
 #
 # Description
-#     Startup file for OpenFOAM
-#     Sourced from ~/.login or ~/.cshrc
+#     Set the environment for OpenFOAM when using a cshell.
+#     To be sourced manually or from the ~/.login or ~/.cshrc files.
 #
 #------------------------------------------------------------------------------
 
@@ -42,7 +42,7 @@ setenv WM_PROJECT_VERSION plus
 # - If this does not produce the desired result, please set one of the fallback
 #   values to an appropriate path.
 #
-setenv FOAM_INST_DIR `/usr/bin/lsof +p $$ |& \
+setenv FOAM_INST_DIR `lsof +p $$ |& \
     sed -n -e 's@[^/]*@@' -e 's@/'$WM_PROJECT'[^/]*/etc/cshrc@@p'`
 # setenv FOAM_INST_DIR  $HOME/$WM_PROJECT
 # setenv FOAM_INST_DIR  /opt/$WM_PROJECT
@@ -61,7 +61,7 @@ setenv WM_COMPILER_TYPE system
 
 #- Compiler:
 #    WM_COMPILER = Gcc | Gcc4[8-9] | Gcc5[1-4] | Gcc6[1-3] | GccKNL
-#                  | Clang | Clang3[8-9] | Icc | IccKNL
+#                  | Clang | Clang3[8-9] | Clang40 | Icc | IccKNL
 setenv WM_COMPILER Gcc
 setenv WM_COMPILER_ARCH # defined but empty
 unsetenv WM_COMPILER_LIB_ARCH
@@ -86,7 +86,7 @@ setenv WM_COMPILE_OPTION Opt
 
 #- MPI implementation:
 #    WM_MPLIB = SYSTEMOPENMPI | OPENMPI | SYSTEMMPI | MPICH | MPICH-GM | HPMPI
-#               | MPI | FJMPI | QSMPI | SGIMPI | INTELMPI
+#               | MPI | FJMPI | QSMPI | SGIMPI | INTELMPI | USERMPI
 setenv WM_MPLIB SYSTEMOPENMPI
 
 #- Operating System:
@@ -145,7 +145,7 @@ endif
 # ~~~~~~~~~~~~~~~~~~~~~~
 setenv WM_PROJECT_USER_DIR $HOME/$WM_PROJECT/$LOGNAME-$WM_PROJECT_VERSION
 
-# Source etc files, possibly with some verbosity
+# Source an etc file, possibly with some verbosity
 if ($?FOAM_VERBOSE && $?prompt) then
     alias _foamEtc 'eval `$WM_PROJECT_DIR/bin/foamEtcFile -csh-verbose \!*`'
 else
diff --git a/src/Allwmake b/src/Allwmake
index 01aa91102e..4934d5be21 100755
--- a/src/Allwmake
+++ b/src/Allwmake
@@ -5,8 +5,8 @@ cd ${0%/*} && wmakeCheckPwd "$WM_PROJECT_DIR/src" 2>/dev/null || {
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
-[ -n "$FOAM_EXT_LIBBIN" ] || {
-    echo "Error (${0##*/}) : FOAM_EXT_LIBBIN not set"
+[ -d "$WM_PROJECT_DIR" -a -f "$WM_PROJECT_DIR/etc/bashrc" ] || {
+    echo "Error (${0##*/}) : WM_PROJECT_DIR appears to be incorrect"
     echo "    Check your OpenFOAM environment and installation"
     exit 1
 }
diff --git a/src/OSspecific/POSIX/POSIX.C b/src/OSspecific/POSIX/POSIX.C
index 3c8a2b2553..d444b83a0b 100644
--- a/src/OSspecific/POSIX/POSIX.C
+++ b/src/OSspecific/POSIX/POSIX.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,7 +59,6 @@ Description
 #include <link.h>
 
 #include <netinet/in.h>
-
 #ifdef USE_RANDOM
     #include <climits>
     #if INT_MAX    != 2147483647
@@ -76,6 +75,41 @@ namespace Foam
 }
 
 
+// * * * * * * * * * * * * * * Static Functions  * * * * * * * * * * * * * * //
+
+//
+//! \cond fileScope
+//
+// Return true if filename appears to be a backup file
+//
+static inline bool isBackupName(const Foam::fileName& name)
+{
+    if (name.empty())
+    {
+        return false;
+    }
+    else if (name[name.size()-1] == '~')
+    {
+        return true;
+    }
+
+    // Now check the extension
+    const Foam::word ext = name.ext();
+    if (ext.empty())
+    {
+        return false;
+    }
+
+    return
+    (
+        ext == "bak" || ext == "BAK"
+     || ext == "old" || ext == "save"
+    );
+}
+
+//! \endcond
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 pid_t Foam::pid()
@@ -98,13 +132,15 @@ pid_t Foam::pgid()
 
 bool Foam::env(const std::string& envName)
 {
-    return ::getenv(envName.c_str()) != nullptr;
+    // An empty envName => always false
+    return !envName.empty() && ::getenv(envName.c_str()) != nullptr;
 }
 
 
 Foam::string Foam::getEnv(const std::string& envName)
 {
-    char* env = ::getenv(envName.c_str());
+    // Ignore an empty envName => always ""
+    char* env = envName.empty() ? nullptr : ::getenv(envName.c_str());
 
     if (env)
     {
@@ -126,7 +162,12 @@ bool Foam::setEnv
     const bool overwrite
 )
 {
-    return ::setenv(envName.c_str(), value.c_str(), overwrite) == 0;
+    // Ignore an empty envName => always false
+    return
+    (
+        !envName.empty()
+     && ::setenv(envName.c_str(), value.c_str(), overwrite) == 0
+    );
 }
 
 
@@ -173,14 +214,13 @@ Foam::string Foam::domainName()
 Foam::string Foam::userName()
 {
     struct passwd* pw = ::getpwuid(::getuid());
-
     if (pw != nullptr)
     {
         return pw->pw_name;
     }
     else
     {
-        return string::null;
+        return string();
     }
 }
 
@@ -194,54 +234,39 @@ bool Foam::isAdministrator()
 Foam::fileName Foam::home()
 {
     char* env = ::getenv("HOME");
-
-    if (env != nullptr)
+    if (env)
     {
         return fileName(env);
     }
+
+    struct passwd* pw = ::getpwuid(::getuid());
+    if (pw)
+    {
+        return pw->pw_dir;
+    }
     else
     {
-        struct passwd* pw = ::getpwuid(getuid());
-
-        if (pw != nullptr)
-        {
-            return pw->pw_dir;
-        }
-        else
-        {
-            return fileName::null;
-        }
+        return fileName();
     }
 }
 
 
 Foam::fileName Foam::home(const std::string& userName)
 {
-    struct passwd* pw;
-
-    if (userName.size())
+    // An empty userName => same as home()
+    if (userName.empty())
     {
-        pw = ::getpwnam(userName.c_str());
-    }
-    else
-    {
-        char* env = ::getenv("HOME");
-
-        if (env != nullptr)
-        {
-            return fileName(env);
-        }
-
-        pw = ::getpwuid(::getuid());
+        return Foam::home();
     }
 
-    if (pw != nullptr)
+    struct passwd* pw = ::getpwnam(userName.c_str());
+    if (pw)
     {
         return pw->pw_dir;
     }
     else
     {
-        return fileName::null;
+        return fileName();
     }
 }
 
@@ -260,7 +285,7 @@ Foam::fileName Foam::cwd()
         }
         else if (errno == ERANGE)
         {
-            // Increment path length upto the pathLengthMax limit
+            // Increment path length up to the pathLengthMax limit
             if
             (
                 (pathLengthLimit += POSIX::pathLengthChunk)
@@ -291,19 +316,20 @@ Foam::fileName Foam::cwd()
 
 bool Foam::chDir(const fileName& dir)
 {
-    return ::chdir(dir.c_str()) == 0;
+    // Ignore an empty dir name => always false
+    return !dir.empty() && ::chdir(dir.c_str()) == 0;
 }
 
 
 bool Foam::mkDir(const fileName& pathName, mode_t mode)
 {
-    // empty names are meaningless
+    // Ignore an empty pathName => always false
     if (pathName.empty())
     {
         return false;
     }
 
-    // Construct instance path directory if does not exist
+    // Construct path directory if does not exist
     if (::mkdir(pathName.c_str(), mode) == 0)
     {
         // Directory made OK so return true
@@ -443,26 +469,35 @@ bool Foam::mkDir(const fileName& pathName, mode_t mode)
 
 bool Foam::chMod(const fileName& name, const mode_t m)
 {
-    return ::chmod(name.c_str(), m) == 0;
+    // Ignore an empty name => always false
+    return !name.empty() && ::chmod(name.c_str(), m) == 0;
 }
 
 
 mode_t Foam::mode(const fileName& name, const bool followLink)
 {
-    fileStat fileStatus(name, followLink);
-    if (fileStatus.isValid())
+    // Ignore an empty name => always 0
+    if (!name.empty())
     {
-        return fileStatus.status().st_mode;
-    }
-    else
-    {
-        return 0;
+        fileStat fileStatus(name, followLink);
+        if (fileStatus.isValid())
+        {
+            return fileStatus.status().st_mode;
+        }
     }
+
+    return 0;
 }
 
 
 Foam::fileName::Type Foam::type(const fileName& name, const bool followLink)
 {
+    // Ignore an empty name => always UNDEFINED
+    if (name.empty())
+    {
+        return fileName::UNDEFINED;
+    }
+
     mode_t m = mode(name, followLink);
 
     if (S_ISREG(m))
@@ -477,10 +512,8 @@ Foam::fileName::Type Foam::type(const fileName& name, const bool followLink)
     {
         return fileName::DIRECTORY;
     }
-    else
-    {
-        return fileName::UNDEFINED;
-    }
+
+    return fileName::UNDEFINED;
 }
 
 
@@ -491,13 +524,19 @@ bool Foam::exists
     const bool followLink
 )
 {
-    return mode(name, followLink) || isFile(name, checkGzip, followLink);
+    // Ignore an empty name => always false
+    return
+    (
+        !name.empty()
+     && (mode(name, followLink) || isFile(name, checkGzip, followLink))
+    );
 }
 
 
 bool Foam::isDir(const fileName& name, const bool followLink)
 {
-    return S_ISDIR(mode(name, followLink));
+    // Ignore an empty name => always false
+    return !name.empty() && S_ISDIR(mode(name, followLink));
 }
 
 
@@ -508,53 +547,65 @@ bool Foam::isFile
     const bool followLink
 )
 {
+    // Ignore an empty name => always false
     return
-        S_ISREG(mode(name, followLink))
-     || (checkGzip && S_ISREG(mode(name + ".gz", followLink)));
+    (
+        !name.empty()
+     && (
+            S_ISREG(mode(name, followLink))
+         || (checkGzip && S_ISREG(mode(name + ".gz", followLink)))
+        )
+    );
 }
 
 
 off_t Foam::fileSize(const fileName& name, const bool followLink)
 {
-    fileStat fileStatus(name, followLink);
-    if (fileStatus.isValid())
+    // Ignore an empty name
+    if (!name.empty())
     {
-        return fileStatus.status().st_size;
-    }
-    else
-    {
-        return -1;
+        fileStat fileStatus(name, followLink);
+        if (fileStatus.isValid())
+        {
+            return fileStatus.status().st_size;
+        }
     }
+
+    return -1;
 }
 
 
 time_t Foam::lastModified(const fileName& name, const bool followLink)
 {
-    fileStat fileStatus(name, followLink);
-    if (fileStatus.isValid())
+    // Ignore an empty name
+    if (!name.empty())
     {
-        return fileStatus.status().st_mtime;
-    }
-    else
-    {
-        return 0;
+        fileStat fileStatus(name, followLink);
+        if (fileStatus.isValid())
+        {
+            return fileStatus.status().st_mtime;
+        }
     }
+
+    return 0;
 }
 
 
 double Foam::highResLastModified(const fileName& name)
 {
-    fileStat fileStatus(name);
-    if (fileStatus.isValid())
+    // Ignore an empty name
+    if (!name.empty())
     {
-        return
-            fileStatus.status().st_mtime
-          + 1e-9*fileStatus.status().st_atim.tv_nsec;
-    }
-    else
-    {
-        return 0;
+        fileStat fileStatus(name);
+        if (fileStatus.isValid())
+        {
+            return
+                fileStatus.status().st_mtime
+              + 1e-9*fileStatus.status().st_atim.tv_nsec;
+        }
     }
+
+    return 0;
 }
 
 
@@ -570,92 +621,85 @@ Foam::fileNameList Foam::readDir
     // also used as increment if initial size found to be insufficient
     static const int maxNnames = 100;
 
+    // Basic sanity: cannot strip '.gz' from directory names
+    const bool stripgz = filtergz && (type != fileName::DIRECTORY);
+    const word extgz("gz");
+
+    // Open directory and set the structure pointer
+    // Do not attempt to open an empty directory name
+    DIR *source;
+    if
+    (
+        directory.empty()
+     || (source = ::opendir(directory.c_str())) == nullptr
+    )
+    {
+        if (POSIX::debug)
+        {
+            InfoInFunction
+                << "cannot open directory " << directory << endl;
+        }
+
+        return fileNameList();
+    }
+
     if (POSIX::debug)
     {
         InfoInFunction
             << "reading directory " << directory << endl;
     }
 
-    // Setup empty string list MAXTVALUES long
+    label nEntries = 0;
     fileNameList dirEntries(maxNnames);
 
-    // Pointers to the directory entries
-    DIR *source;
-    struct dirent *list;
-
-    // Temporary variables and counters
-    label nEntries = 0;
-
-    // Attempt to open directory and set the structure pointer
-    if ((source = ::opendir(directory.c_str())) == nullptr)
+    // Read and parse all the entries in the directory
+    for (struct dirent *list; (list = ::readdir(source)) != nullptr; /*nil*/)
     {
-        dirEntries.setSize(0);
+        const fileName name(list->d_name);
 
-        if (POSIX::debug)
+        // Ignore files/directories beginning with "."
+        // These are the ".", ".." directories and any hidden files/dirs
+        if (name.empty() || name[0] == '.')
         {
-            InfoInFunction
-                << "cannot open directory " << directory << endl;
+            continue;
         }
-    }
-    else
-    {
-        // Read and parse all the entries in the directory
-        while ((list = ::readdir(source)) != nullptr)
+
+        if
+        (
+            (type == fileName::DIRECTORY)
+         || (type == fileName::FILE && !isBackupName(name))
+        )
         {
-            fileName fName(list->d_name);
-
-            // ignore files beginning with ., i.e. '.', '..' and '.*'
-            if (fName.size() && fName[0] != '.')
+            if ((directory/name).type(followLink) == type)
             {
-                const word fExt = fName.ext();
-
-                if
-                (
-                    (type == fileName::DIRECTORY)
-                 ||
-                    (
-                        type == fileName::FILE
-                     && fName[fName.size()-1] != '~'
-                     && fExt != "bak"
-                     && fExt != "BAK"
-                     && fExt != "old"
-                     && fExt != "save"
-                    )
-                )
+                if (nEntries >= dirEntries.size())
                 {
-                    if ((directory/fName).type(followLink) == type)
-                    {
-                        if (nEntries >= dirEntries.size())
-                        {
-                            dirEntries.setSize(dirEntries.size() + maxNnames);
-                        }
+                    dirEntries.setSize(dirEntries.size() + maxNnames);
+                }
 
-                        if (filtergz && fExt == "gz")
-                        {
-                            dirEntries[nEntries++] = fName.lessExt();
-                        }
-                        else
-                        {
-                            dirEntries[nEntries++] = fName;
-                        }
-                    }
+                if (stripgz && name.hasExt(extgz))
+                {
+                    dirEntries[nEntries++] = name.lessExt();
+                }
+                else
+                {
+                    dirEntries[nEntries++] = name;
                 }
             }
         }
-
-        // Reset the length of the entries list
-        dirEntries.setSize(nEntries);
-
-        ::closedir(source);
     }
 
+    // Reset the length of the entries list
+    dirEntries.setSize(nEntries);
+    ::closedir(source);
+
     return dirEntries;
 }
 
 
 bool Foam::cp(const fileName& src, const fileName& dest, const bool followLink)
 {
-    // Make sure source exists.
+    // Make sure source exists - this also handles an empty source name
     if (!exists(src))
     {
         return false;
@@ -789,6 +833,20 @@ bool Foam::ln(const fileName& src, const fileName& dst)
             << endl;
     }
 
+    if (src.empty())
+    {
+        WarningInFunction
+            << "source name is empty: not linking." << endl;
+        return false;
+    }
+
+    if (dst.empty())
+    {
+        WarningInFunction
+            << "destination name is empty: not linking." << endl;
+        return false;
+    }
+
     if (exists(dst))
     {
         WarningInFunction
@@ -825,6 +883,12 @@ bool Foam::mv(const fileName& src, const fileName& dst, const bool followLink)
             << "Move : " << src << " to " << dst << endl;
     }
 
+    // Ignore an empty names => always false
+    if (src.empty() || dst.empty())
+    {
+        return false;
+    }
+
     if
     (
         dst.type() == fileName::DIRECTORY
@@ -850,17 +914,23 @@ bool Foam::mvBak(const fileName& src, const std::string& ext)
             << "mvBak : " << src << " to extension " << ext << endl;
     }
 
+    // Ignore an empty name or extension => always false
+    if (src.empty() || ext.empty())
+    {
+        return false;
+    }
+
     if (exists(src, false))
     {
         const int maxIndex = 99;
         char index[3];
 
-        for (int n = 0; n <= maxIndex; n++)
+        for (int n = 0; n <= maxIndex; ++n)
         {
             fileName dstName(src + "." + ext);
             if (n)
             {
-                sprintf(index, "%02d", n);
+                ::sprintf(index, "%02d", n);
                 dstName += index;
             }
 
@@ -870,7 +940,6 @@ bool Foam::mvBak(const fileName& src, const std::string& ext)
             {
                 return ::rename(src.c_str(), dstName.c_str()) == 0;
             }
-
         }
     }
 
@@ -887,6 +956,12 @@ bool Foam::rm(const fileName& file)
             << "Removing : " << file << endl;
     }
 
+    // Ignore an empty name => always false
+    if (file.empty())
+    {
+        return false;
+    }
+
     // Try returning plain file name; if not there, try with .gz
     if (::remove(file.c_str()) == 0)
     {
@@ -899,89 +974,91 @@ bool Foam::rm(const fileName& file)
 }
 
 
-bool Foam::rmDir(const fileName& directory)
+bool Foam::rmDir(const fileName& directory, const bool silent)
 {
+    // Open directory and set the structure pointer
+    // Do not attempt to open an empty directory name
+    DIR *source;
+    if
+    (
+        directory.empty()
+     || (source = ::opendir(directory.c_str())) == nullptr
+    )
+    {
+        if (!silent)
+        {
+            WarningInFunction
+                << "cannot open directory " << directory << endl;
+        }
+
+        return false;
+    }
+
     if (POSIX::debug)
     {
         InfoInFunction
             << "removing directory " << directory << endl;
     }
 
-    // Pointers to the directory entries
-    DIR *source;
-    struct dirent *list;
-
-    // Attempt to open directory and set the structure pointer
-    if ((source = ::opendir(directory.c_str())) == nullptr)
+    // Process each directory entry, counting any errors encountered
+    label nErrors = 0;
+    for (struct dirent *list; (list = ::readdir(source)) != nullptr; /*nil*/)
     {
-        WarningInFunction
-            << "cannot open directory " << directory << endl;
+        const fileName name(list->d_name);
+        if (name.empty() || name == "." || name == "..")
+        {
+            // Ignore "." and ".." directories
+            continue;
+        }
 
-        return false;
+        const fileName path = directory/name;
+        if (path.type(false) == fileName::DIRECTORY)
+        {
+            if (!rmDir(path, true))  // Only report errors at the top-level
+            {
+                ++nErrors;
+            }
+        }
+        else
+        {
+            if (!rm(path))
+            {
+                ++nErrors;
+            }
+        }
+    }
+
+    if (nErrors)
+    {
+        if (!silent)
+        {
+            WarningInFunction
+                << "failed to remove directory " << directory << nl
+                << "could not remove " << nErrors << " sub-entries" << endl;
+        }
     }
     else
     {
-        // Read and parse all the entries in the directory
-        while ((list = ::readdir(source)) != nullptr)
-        {
-            fileName fName(list->d_name);
-
-            if (fName != "." && fName != "..")
-            {
-                fileName path = directory/fName;
-
-                if (path.type(false) == fileName::DIRECTORY)
-                {
-                    if (!rmDir(path))
-                    {
-                        WarningInFunction
-                            << "failed to remove directory " << fName
-                            << " while removing directory " << directory
-                            << endl;
-
-                        ::closedir(source);
-
-                        return false;
-                    }
-                }
-                else
-                {
-                    if (!rm(path))
-                    {
-                        WarningInFunction
-                            << "failed to remove file " << fName
-                            << " while removing directory " << directory
-                            << endl;
-
-                        ::closedir(source);
-
-                        return false;
-                    }
-                }
-            }
-
-        }
-
         if (!rm(directory))
         {
-            WarningInFunction
-                << "failed to remove directory " << directory << endl;
-
-            ::closedir(source);
-
-            return false;
+            ++nErrors;
+            if (!silent)
+            {
+                WarningInFunction
+                    << "failed to remove directory " << directory << endl;
+            }
         }
-
-        ::closedir(source);
-
-        return true;
     }
+
+    // clean up
+    ::closedir(source);
+    return !nErrors;
 }
 
 
-unsigned int Foam::sleep(const unsigned int s)
+unsigned int Foam::sleep(const unsigned int sec)
 {
-    return ::sleep(s);
+    return ::sleep(sec);
 }
 
 
@@ -1161,7 +1238,7 @@ int Foam::system(const std::string& command)
         (
             "/bin/sh",          // Path of the shell
             "sh",               // Command-name (name for the shell)
-            "-c",               // Read commands from the command_string operand.
+            "-c",               // Read commands from command_string operand
             command.c_str(),    // Command string
             reinterpret_cast<char *>(0)
         );
@@ -1352,6 +1429,15 @@ Foam::fileNameList Foam::dlLoaded()
     return libs;
 }
 
+Foam::label Foam::osRandomBufferSize()
+{
+    #ifdef USE_RANDOM
+    return sizeof(random_data);
+    #else
+    return sizeof(drand48_data);
+    #endif
+}
+
 
 void Foam::osRandomSeed(const label seed)
 {
@@ -1383,4 +1469,42 @@ Foam::scalar Foam::osRandomDouble()
 }
 
 
+void Foam::osRandomSeed(const label seed, List<char>& buffer)
+{
+    #ifdef USE_RANDOM
+    srandom_r((unsigned int)seed, reinterpret_cast<random_data*>(buffer.begin()));
+    #else
+    srand48_r(seed, reinterpret_cast<drand48_data*>(buffer.begin()));
+    #endif
+}
+
+
+Foam::label Foam::osRandomInteger(List<char>& buffer)
+{
+    #ifdef USE_RANDOM
+    int32_t result;
+    random_r(reinterpret_cast<random_data*>(buffer.begin()), &result);
+    return result;
+    #else
+    long result;
+    lrand48_r(reinterpret_cast<drand48_data*>(buffer.begin()), &result);
+    return result;
+    #endif
+}
+
+
+Foam::scalar Foam::osRandomDouble(List<char>& buffer)
+{
+    #ifdef USE_RANDOM
+    int32_t result;
+    random_r(reinterpret_cast<random_data*>(buffer.begin()), &result);
+    return (scalar)result/INT_MAX;
+    #else
+    double result;
+    drand48_r(reinterpret_cast<drand48_data*>(buffer.begin()), &result);
+    return result;
+    #endif
+}
+
+
 // ************************************************************************* //
diff --git a/src/OSspecific/POSIX/regExp.C b/src/OSspecific/POSIX/regExp.C
index 15d0ea2ba2..a22ba01a56 100644
--- a/src/OSspecific/POSIX/regExp.C
+++ b/src/OSspecific/POSIX/regExp.C
@@ -24,16 +24,14 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "regExp.H"
-#include "string.H"
 #include "List.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-template<class StringType>
 bool Foam::regExp::matchGrouping
 (
     const std::string& text,
-    List<StringType>& groups
+    List<std::string>& groups
 ) const
 {
     if (preg_ && !text.empty())
@@ -194,7 +192,7 @@ std::string::size_type Foam::regExp::find(const std::string& text) const
         }
     }
 
-    return string::npos;
+    return std::string::npos;
 }
 
 
@@ -231,28 +229,4 @@ bool Foam::regExp::match
 }
 
 
-bool Foam::regExp::match
-(
-    const std::string& text,
-    List<Foam::string>& groups
-) const
-{
-    return matchGrouping(text, groups);
-}
-
-
-// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
-
-void Foam::regExp::operator=(const char* pattern)
-{
-    set(pattern);
-}
-
-
-void Foam::regExp::operator=(const std::string& pattern)
-{
-    set(pattern);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OSspecific/POSIX/regExp.H b/src/OSspecific/POSIX/regExp.H
index 03ce52b39e..76d2deba93 100644
--- a/src/OSspecific/POSIX/regExp.H
+++ b/src/OSspecific/POSIX/regExp.H
@@ -51,7 +51,6 @@ namespace Foam
 {
 
 // Forward declaration of classes
-class string;
 template<class T> class List;
 
 
@@ -76,12 +75,10 @@ class regExp
         void operator=(const regExp&) = delete;
 
         //- Return true if it matches and sets the sub-groups matched.
-        //  Templated to support both std::string and Foam::string
-        template<class StringType>
         bool matchGrouping
         (
             const std::string&,
-            List<StringType>& groups
+            List<std::string>& groups
         ) const;
 
 
@@ -96,16 +93,7 @@ public:
         //  range: '[', ']' \n
         //
         //  Don't bother checking for '{digit}' bounds
-        inline static bool meta(const char c)
-        {
-            return
-            (
-                (c == '.')                           // any character
-             || (c == '*' || c == '+' || c == '?')   // quantifiers
-             || (c == '(' || c == ')' || c == '|')   // grouping/branching
-             || (c == '[' || c == ']')               // range
-            );
-        }
+        inline static bool meta(const char c);
 
 
     // Constructors
@@ -129,22 +117,13 @@ public:
       // Access
 
         //- Return true if a precompiled expression does not exist
-        inline bool empty() const
-        {
-            return !preg_;
-        }
+        inline bool empty() const;
 
         //- Does a precompiled expression exist?
-        inline bool exists() const
-        {
-            return preg_ ? true : false;
-        }
+        inline bool exists() const;
 
         //- The number of capture groups for a non-empty expression
-        inline unsigned ngroups() const
-        {
-            return preg_ ? preg_->re_nsub : 0;
-        }
+        inline unsigned ngroups() const;
 
 
       // Editing
@@ -173,26 +152,19 @@ public:
         //  The begin-of-line (^) and end-of-line ($) anchors are implicit
         bool match(const std::string& text, List<std::string>& groups) const;
 
-        //- Return true if it matches and sets the sub-groups matched
-        //  The begin-of-line (^) and end-of-line ($) anchors are implicit
-        bool match(const std::string& text, List<string>& groups) const;
-
         //- Return true if the regex was found within string
-        bool search(const std::string& text) const
-        {
-            return std::string::npos != find(text);
-        }
+        bool search(const std::string& text) const;
 
 
     // Member Operators
 
         //- Assign and compile pattern from a character array
         //  Always case sensitive
-        void operator=(const char* pattern);
+        inline void operator=(const char* pattern);
 
         //- Assign and compile pattern from string
         //  Always case sensitive
-        void operator=(const std::string& pattern);
+        inline void operator=(const std::string& pattern);
 };
 
 
@@ -202,6 +174,8 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "regExpI.H"
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OSspecific/POSIX/regExpI.H b/src/OSspecific/POSIX/regExpI.H
new file mode 100644
index 0000000000..64865c95fa
--- /dev/null
+++ b/src/OSspecific/POSIX/regExpI.H
@@ -0,0 +1,81 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+inline bool Foam::regExp::meta(const char c)
+{
+    return
+    (
+        (c == '.')                           // any character
+     || (c == '*' || c == '+' || c == '?')   // quantifiers
+     || (c == '(' || c == ')' || c == '|')   // grouping/branching
+     || (c == '[' || c == ']')               // range
+    );
+}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+inline bool Foam::regExp::empty() const
+{
+    return !preg_;
+}
+
+
+inline bool Foam::regExp::exists() const
+{
+    return preg_ ? true : false;
+}
+
+
+inline unsigned Foam::regExp::ngroups() const
+{
+    return preg_ ? preg_->re_nsub : 0;
+}
+
+
+inline bool Foam::regExp::search(const std::string& text) const
+{
+    return std::string::npos != find(text);
+}
+
+
+// * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * * //
+
+inline void Foam::regExp::operator=(const char* pattern)
+{
+    set(pattern);
+}
+
+
+inline void Foam::regExp::operator=(const std::string& pattern)
+{
+    set(pattern);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index 996d17717e..6dcfde5113 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -4,7 +4,9 @@ global/global.Cver
 global/argList/argList.C
 global/clock/clock.C
 global/profiling/profiling.C
+global/profiling/profilingInformation.C
 global/profiling/profilingSysInfo.C
+global/profiling/profilingTrigger.C
 global/etcFiles/etcFiles.C
 
 bools = primitives/bools
@@ -115,7 +117,6 @@ $(sha1)/SHA1.C
 $(sha1)/SHA1Digest.C
 
 primitives/random/Random/Random.C
-primitives/random/cachedRandom/cachedRandom.C
 
 ranges = primitives/ranges
 $(ranges)/labelRange/labelRange.C
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
index 288d16dbc6..9370dd26ed 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.C
@@ -31,7 +31,7 @@ License
 template<class T, class Key, class Hash>
 Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const label size)
 :
-    HashTable<T*, Key, Hash>(size)
+    parent_type(size)
 {}
 
 
@@ -41,11 +41,11 @@ Foam::HashPtrTable<T, Key, Hash>::HashPtrTable
     const HashPtrTable<T, Key, Hash>& ht
 )
 :
-    HashTable<T*, Key, Hash>()
+    parent_type(ht.capacity())
 {
     for (const_iterator iter = ht.begin(); iter != ht.end(); ++iter)
     {
-        const T* ptr = *iter;
+        const T* ptr = iter.object();
         if (ptr)
         {
             this->insert(iter.key(), new T(*ptr));
@@ -72,47 +72,56 @@ Foam::HashPtrTable<T, Key, Hash>::~HashPtrTable()
 template<class T, class Key, class Hash>
 T* Foam::HashPtrTable<T, Key, Hash>::remove(iterator& iter)
 {
-    T* ptr = *iter;
-    HashTable<T*, Key, Hash>::erase(iter);
-    return ptr;
+    if (iter.found())
+    {
+        T* ptr = iter.object();
+        this->parent_type::erase(iter);
+        return ptr;
+    }
+
+    return nullptr;
 }
 
 
 template<class T, class Key, class Hash>
 bool Foam::HashPtrTable<T, Key, Hash>::erase(iterator& iter)
 {
-    T* ptr = *iter;
-
-    if (HashTable<T*, Key, Hash>::erase(iter))
+    if (iter.found())
     {
-        if (ptr)
+        T* ptr = iter.object();
+
+        if (this->parent_type::erase(iter))
         {
-            delete ptr;
-        }
+            if (ptr)
+            {
+                delete ptr;
+            }
 
-        return true;
-    }
-    else
-    {
-        return false;
+            return true;
+        }
     }
+
+    return false;
+}
+
+
+template<class T, class Key, class Hash>
+bool Foam::HashPtrTable<T, Key, Hash>::erase(const Key& key)
+{
+    auto iter = this->find(key);
+    return this->erase(iter);
 }
 
 
 template<class T, class Key, class Hash>
 void Foam::HashPtrTable<T, Key, Hash>::clear()
 {
-    for
-    (
-        iterator iter = this->begin();
-        iter != this->end();
-        ++iter
-    )
+    for (iterator iter = this->begin(); iter != this->end(); ++iter)
     {
-        delete *iter;
+        delete iter.object();
     }
 
-    HashTable<T*, Key, Hash>::clear();
+    this->parent_type::clear();
 }
 
 
@@ -136,7 +145,7 @@ void Foam::HashPtrTable<T, Key, Hash>::operator=
 
     for (const_iterator iter = rhs.begin(); iter != rhs.end(); ++iter)
     {
-        const T* ptr = *iter;
+        const T* ptr = iter.object();
         if (ptr)
         {
             this->insert(iter.key(), new T(*ptr));
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
index de85df3bd6..f83c04e313 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTable.H
@@ -25,7 +25,7 @@ Class
     Foam::HashPtrTable
 
 Description
-    A HashTable specialization for hashing pointers.
+    A HashTable of pointers to objects of type \<T\>.
 
 SourceFiles
     HashPtrTable.C
@@ -51,10 +51,10 @@ class Ostream;
 template<class T, class Key, class Hash> class HashPtrTable;
 
 template<class T, class Key, class Hash>
-Istream& operator>>(Istream&, HashPtrTable<T, Key, Hash>&);
+Istream& operator>>(Istream& is, HashPtrTable<T, Key, Hash>& tbl);
 
 template<class T, class Key, class Hash>
-Ostream& operator<<(Ostream&, const HashPtrTable<T, Key, Hash>&);
+Ostream& operator<<(Ostream& os, const HashPtrTable<T, Key, Hash>& tbl);
 
 
 /*---------------------------------------------------------------------------*\
@@ -77,11 +77,16 @@ class HashPtrTable
         void read(const dictionary& dict, const INew& inewt);
 
 
-
 public:
 
-    typedef typename HashTable<T*, Key, Hash>::iterator iterator;
-    typedef typename HashTable<T*, Key, Hash>::const_iterator const_iterator;
+    //- The template instance used for this table
+    typedef HashPtrTable<T, Key, Hash> this_type;
+
+    //- The template instance used for the parent HashTable
+    typedef HashTable<T*, Key, Hash> parent_type;
+
+    using iterator = typename parent_type::iterator;
+    using const_iterator = typename parent_type::const_iterator;
 
 
     // Constructors
@@ -96,12 +101,11 @@ public:
         //- Construct from Istream using default Istream constructor class
         HashPtrTable(Istream& is);
 
-        //- Construct from dictionary using default dictionary constructor
-        //  class
+        //- Construct from dictionary with default dictionary constructor class
         HashPtrTable(const dictionary& dict);
 
         //- Construct as copy
-        HashPtrTable(const HashPtrTable<T, Key, Hash>& ht);
+        HashPtrTable(const this_type& ht);
 
 
     //- Destructor
@@ -110,39 +114,44 @@ public:
 
     // Member Functions
 
-        // Edit
+      // Edit
 
-            //- Remove and return the pointer specified by given iterator
-            T* remove(iterator& iter);
+        //- Remove and return the pointer specified by given iterator.
+        //  Includes a safeguard against the end-iterator.
+        T* remove(iterator& iter);
 
-            //- Erase an hashedEntry specified by given iterator
-            bool erase(iterator& iter);
+        //- Erase an entry specified by given iterator
+        //  Includes a safeguard against the end-iterator.
+        bool erase(iterator& iter);
 
-            //- Clear all entries from table
-            void clear();
+        //- Erase an entry specified by the given key
+        bool erase(const Key& key);
 
-            //- Write
-            void write(Ostream& os) const;
+        //- Clear all entries from table
+        void clear();
+
+        //- Write
+        void write(Ostream& os) const;
 
 
     // Member Operators
 
         //- Copy assignment
-        void operator=(const HashPtrTable<T, Key, Hash>& rhs);
+        void operator=(const this_type& rhs);
 
 
     // IOstream Operators
 
         friend Istream& operator>> <T, Key, Hash>
         (
-            Istream&,
-            HashPtrTable<T, Key, Hash>&
+            Istream& is,
+            HashPtrTable<T, Key, Hash>& tbl
         );
 
         friend Ostream& operator<< <T, Key, Hash>
         (
-            Ostream&,
-            const HashPtrTable<T, Key, Hash>&
+            Ostream& os,
+            const HashPtrTable<T, Key, Hash>& tbl
         );
 };
 
diff --git a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
index a19dd42b03..7a679ef149 100644
--- a/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/HashPtrTable/HashPtrTableIO.C
@@ -35,7 +35,7 @@ template<class T, class Key, class Hash>
 template<class INew>
 void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
 {
-    is.fatalCheck("HashPtrTable<T, Key, Hash>::read(Istream&, const INew&)");
+    is.fatalCheck(FUNCTION_NAME);
 
     token firstToken(is);
 
@@ -131,7 +131,7 @@ void Foam::HashPtrTable<T, Key, Hash>::read(Istream& is, const INew& inewt)
             << exit(FatalIOError);
     }
 
-    is.fatalCheck("HashPtrTable<T, Key, Hash>::read(Istream&, const INew&)");
+    is.fatalCheck(FUNCTION_NAME);
 }
 
 
@@ -145,11 +145,9 @@ void Foam::HashPtrTable<T, Key, Hash>::read
 {
     forAllConstIter(dictionary, dict, iter)
     {
-        this->insert
-        (
-            iter().keyword(),
-            inewt(dict.subDict(iter().keyword())).ptr()
-        );
+        const word& k = iter().keyword();
+
+        this->insert(k, inewt(dict.subDict(k)).ptr());
     }
 }
 
@@ -157,16 +155,9 @@ void Foam::HashPtrTable<T, Key, Hash>::read
 template<class T, class Key, class Hash>
 void Foam::HashPtrTable<T, Key, Hash>::write(Ostream& os) const
 {
-
-    for
-    (
-        typename HashPtrTable<T, Key, Hash>::const_iterator
-        iter = this->begin();
-        iter != this->end();
-        ++iter
-    )
+    for (const_iterator iter = this->begin(); iter != this->end(); ++iter)
     {
-        const T* ptr = *iter;
+        const T* ptr = iter.object();
         if (ptr)
         {
             ptr->write(os);
@@ -202,10 +193,10 @@ Foam::HashPtrTable<T, Key, Hash>::HashPtrTable(const dictionary& dict)
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
-Foam::Istream& Foam::operator>>(Istream& is, HashPtrTable<T, Key, Hash>& L)
+Foam::Istream& Foam::operator>>(Istream& is, HashPtrTable<T, Key, Hash>& tbl)
 {
-    L.clear();
-    L.read(is, INew<T>());
+    tbl.clear();
+    tbl.read(is, INew<T>());
 
     return is;
 }
@@ -215,21 +206,18 @@ template<class T, class Key, class Hash>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const HashPtrTable<T, Key, Hash>& L
+    const HashPtrTable<T, Key, Hash>& tbl
 )
 {
+    using const_iterator = typename HashPtrTable<T, Key, Hash>::const_iterator;
+
     // Write size and start delimiter
-    os << nl << L.size() << nl << token::BEGIN_LIST << nl;
+    os << nl << tbl.size() << nl << token::BEGIN_LIST << nl;
 
     // Write contents
-    for
-    (
-        typename HashPtrTable<T, Key, Hash>::const_iterator iter = L.begin();
-        iter != L.end();
-        ++iter
-    )
+    for (const_iterator iter = tbl.cbegin(); iter != tbl.cend(); ++iter)
     {
-        const T* ptr = *iter;
+        const T* ptr = iter.object();
 
         os << iter.key();
         if (ptr)
@@ -242,8 +230,7 @@ Foam::Ostream& Foam::operator<<
     // Write end delimiter
     os << token::END_LIST;
 
-    // Check state of IOstream
-    os.check("Ostream& operator<<(Ostream&, const HashPtrTable&)");
+    os.check(FUNCTION_NAME);
 
     return os;
 }
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
index 75bea5ce59..77ab200a42 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,6 +27,52 @@ License
 #define HashSet_C
 
 #include "HashSet.H"
+#include "FixedList.H"
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Key, class Hash>
+template<class InputIter>
+inline Foam::label Foam::HashSet<Key, Hash>::insertMultiple
+(
+    const InputIter begIter,
+    const InputIter endIter
+)
+{
+    label changed = 0;
+    for (InputIter iter = begIter; iter != endIter; ++iter)
+    {
+        if (insert(*iter))
+        {
+            ++changed;
+        }
+    }
+    return changed;
+}
+
+
+template<class Key, class Hash>
+template<class InputIter>
+inline Foam::label Foam::HashSet<Key, Hash>::assignMultiple
+(
+    const InputIter begIter,
+    const InputIter endIter,
+    const label sz
+)
+{
+    if (!this->capacity())
+    {
+        // Could be zero-sized from a previous transfer()?
+        this->resize(sz);
+    }
+    else
+    {
+        this->clear();
+    }
+
+    return insertMultiple(begIter, endIter);
+}
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -35,9 +81,22 @@ Foam::HashSet<Key, Hash>::HashSet(const UList<Key>& lst)
 :
     HashTable<nil, Key, Hash>(2*lst.size())
 {
-    forAll(lst, elemI)
+    for (const auto& k : lst)
     {
-        this->insert(lst[elemI]);
+        this->insert(k);
+    }
+}
+
+
+template<class Key, class Hash>
+template<unsigned Size>
+Foam::HashSet<Key, Hash>::HashSet(const FixedList<Key, Size>& lst)
+:
+    HashTable<nil, Key, Hash>(2*lst.size())
+{
+    for (const auto& k : lst)
+    {
+        this->insert(k);
     }
 }
 
@@ -47,7 +106,7 @@ Foam::HashSet<Key, Hash>::HashSet(std::initializer_list<Key> lst)
 :
     HashTable<nil, Key, Hash>(2*lst.size())
 {
-    for (const Key& k : lst)
+    for (const auto& k : lst)
     {
         this->insert(k);
     }
@@ -58,20 +117,17 @@ template<class Key, class Hash>
 template<class AnyType, class AnyHash>
 Foam::HashSet<Key, Hash>::HashSet
 (
-    const HashTable<AnyType, Key, AnyHash>& h
+    const HashTable<AnyType, Key, AnyHash>& tbl
 )
 :
-    HashTable<nil, Key, Hash>(h.size())
+    HashTable<nil, Key, Hash>(tbl.capacity())
 {
-    for
-    (
-        typename HashTable<AnyType, Key, AnyHash>::const_iterator
-        cit = h.cbegin();
-        cit != h.cend();
-        ++cit
-    )
+    using other_iter =
+        typename HashTable<AnyType, Key, AnyHash>::const_iterator;
+
+    for (other_iter iter = tbl.cbegin(); iter != tbl.cend(); ++iter)
     {
-        this->insert(cit.key());
+        this->insert(iter.key());
     }
 }
 
@@ -81,36 +137,49 @@ Foam::HashSet<Key, Hash>::HashSet
 template<class Key, class Hash>
 Foam::label Foam::HashSet<Key, Hash>::insert(const UList<Key>& lst)
 {
-    label count = 0;
-    forAll(lst, elemI)
-    {
-        if (this->insert(lst[elemI]))
-        {
-            ++count;
-        }
-    }
-
-    return count;
+    return insertMultiple(lst.begin(), lst.end());
 }
 
+
+template<class Key, class Hash>
+template<unsigned Size>
+Foam::label Foam::HashSet<Key, Hash>::insert(const FixedList<Key, Size>& lst)
+{
+    return insertMultiple(lst.begin(), lst.end());
+}
+
+
 template<class Key, class Hash>
 Foam::label Foam::HashSet<Key, Hash>::insert(std::initializer_list<Key> lst)
 {
-    label count = 0;
-    for (const Key& k : lst)
-    {
-        if (this->insert(k))
-        {
-            ++count;
-        }
-    }
-
-    return count;
+    return insertMultiple(lst.begin(), lst.end());
 }
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
+template<class Key, class Hash>
+void Foam::HashSet<Key, Hash>::operator=(const UList<Key>& lst)
+{
+    assignMultiple(lst.begin(), lst.end(), 2*lst.size());
+}
+
+
+template<class Key, class Hash>
+template<unsigned Size>
+void Foam::HashSet<Key, Hash>::operator=(const FixedList<Key, Size>& lst)
+{
+    assignMultiple(lst.begin(), lst.end(), 2*lst.size());
+}
+
+
+template<class Key, class Hash>
+void Foam::HashSet<Key, Hash>::operator=(std::initializer_list<Key> lst)
+{
+    assignMultiple(lst.begin(), lst.end(), 2*lst.size());
+}
+
+
 template<class Key, class Hash>
 inline bool Foam::HashSet<Key, Hash>::operator[](const Key& key) const
 {
@@ -121,16 +190,12 @@ inline bool Foam::HashSet<Key, Hash>::operator[](const Key& key) const
 template<class Key, class Hash>
 bool Foam::HashSet<Key, Hash>::operator==(const HashSet<Key, Hash>& rhs) const
 {
-    // Are all lhs elements in rhs?
-    for (const_iterator iter = this->cbegin(); iter != this->cend(); ++iter)
+    // Sizes (number of keys) must match
+    if (this->size() != rhs.size())
     {
-        if (!rhs.found(iter.key()))
-        {
-            return false;
-        }
+        return false;
     }
 
-    // Are all rhs elements in lhs?
     for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
         if (!this->found(iter.key()))
@@ -146,7 +211,7 @@ bool Foam::HashSet<Key, Hash>::operator==(const HashSet<Key, Hash>& rhs) const
 template<class Key, class Hash>
 bool Foam::HashSet<Key, Hash>::operator!=(const HashSet<Key, Hash>& rhs) const
 {
-    return !(operator==(rhs));
+    return !operator==(rhs);
 }
 
 
@@ -162,16 +227,9 @@ void Foam::HashSet<Key, Hash>::operator|=(const HashSet<Key, Hash>& rhs)
 
 
 template<class Key, class Hash>
-void Foam::HashSet<Key, Hash>::operator&=(const HashSet<Key, Hash>& rhs)
+inline void Foam::HashSet<Key, Hash>::operator&=(const HashSet<Key, Hash>& rhs)
 {
-    // Remove elements not also found in rhs
-    for (iterator iter = this->begin(); iter != this->end(); ++iter)
-    {
-        if (!rhs.found(iter.key()))
-        {
-            this->erase(iter);
-        }
-    }
+    this->parent_type::retain(rhs);
 }
 
 
@@ -194,13 +252,18 @@ void Foam::HashSet<Key, Hash>::operator^=(const HashSet<Key, Hash>& rhs)
 
 
 template<class Key, class Hash>
-void Foam::HashSet<Key, Hash>::operator-=(const HashSet<Key, Hash>& rhs)
+inline void Foam::HashSet<Key, Hash>::operator-=(const HashSet<Key, Hash>& rhs)
 {
-    // Remove rhs elements from lhs
-    for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
-    {
-        this->erase(iter.key());
-    }
+    this->parent_type::erase(rhs);
+}
+
+
+// * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
+
+template<class Key, class Hash>
+Foam::Ostream& Foam::operator<<(Ostream& os, const HashSet<Key, Hash>& tbl)
+{
+    return tbl.writeList(os, 10);  // 10=consistent with UList
 }
 
 
@@ -247,6 +310,66 @@ Foam::operator^
     return out;
 }
 
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Key, class Hash>
+inline typename Foam::HashSet<Key, Hash>::iterator
+Foam::HashSet<Key, Hash>::begin()
+{
+    return HashTableCore::iterator_begin<iterator>
+    (
+        static_cast<parent_type&>(*this)
+    );
+}
+
+
+template<class Key, class Hash>
+inline typename Foam::HashSet<Key, Hash>::const_iterator
+Foam::HashSet<Key, Hash>::begin() const
+{
+    return HashTableCore::iterator_begin<const_iterator>
+    (
+        static_cast<const parent_type&>(*this)
+    );
+}
+
+
+template<class Key, class Hash>
+inline typename Foam::HashSet<Key, Hash>::const_iterator
+Foam::HashSet<Key, Hash>::cbegin() const
+{
+    return HashTableCore::iterator_begin<const_iterator>
+    (
+        static_cast<const parent_type&>(*this)
+    );
+}
+
+
+template<class Key, class Hash>
+inline const typename Foam::HashSet<Key, Hash>::iterator&
+Foam::HashSet<Key, Hash>::end()
+{
+    return HashTableCore::iterator_end<iterator>();
+}
+
+
+template<class Key, class Hash>
+inline const typename Foam::HashSet<Key, Hash>::const_iterator&
+Foam::HashSet<Key, Hash>::end() const
+{
+    return HashTableCore::iterator_end<const_iterator>();
+}
+
+
+template<class Key, class Hash>
+inline const typename Foam::HashSet<Key, Hash>::const_iterator&
+Foam::HashSet<Key, Hash>::cend() const
+{
+    return HashTableCore::iterator_cend<const_iterator>();
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #endif
diff --git a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
index 3328ac65b2..d6171ad585 100644
--- a/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
+++ b/src/OpenFOAM/containers/HashTables/HashSet/HashSet.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -52,6 +52,13 @@ Description
 namespace Foam
 {
 
+// Forward declaration of friend functions and operators
+template<class Key, class Hash> class HashSet;
+
+template<class Key, class Hash>
+Ostream& operator<<(Ostream& os, const HashSet<Key, Hash>& tbl);
+
+
 /*---------------------------------------------------------------------------*\
                            Class HashSet Declaration
 \*---------------------------------------------------------------------------*/
@@ -61,11 +68,39 @@ class HashSet
 :
     public HashTable<nil, Key, Hash>
 {
+    // Private Member Functions
+
+        //- Insert values, using begin/end iterators.
+        template<class InputIter>
+        inline label insertMultiple
+        (
+            const InputIter begIter,
+            const InputIter endIter
+        );
+
+        //- Assign using begin/end iterators.
+        template<class InputIter>
+        inline label assignMultiple
+        (
+            const InputIter begIter,
+            const InputIter endIter,
+            const label sz
+        );
+
 
 public:
 
-    typedef typename HashTable<nil, Key, Hash>::iterator iterator;
-    typedef typename HashTable<nil, Key, Hash>::const_iterator const_iterator;
+    //- The template instance used for this HashSet
+    typedef HashSet<Key, Hash> this_type;
+
+    //- The template instance used for the parent HashTable
+    typedef HashTable<nil, Key, Hash> parent_type;
+
+    //- An iterator, returning reference to the key
+    using iterator = typename parent_type::key_iterator;
+
+    //- A const_iterator, returning reference to the key
+    using const_iterator = typename parent_type::const_key_iterator;
 
 
     // Constructors
@@ -73,59 +108,68 @@ public:
         //- Construct given initial size
         HashSet(const label size = 128)
         :
-            HashTable<nil, Key, Hash>(size)
+            parent_type(size)
         {}
 
         //- Construct from Istream
         HashSet(Istream& is)
         :
-            HashTable<nil, Key, Hash>(is)
+            parent_type(is)
         {}
 
         //- Construct from UList of Key
-        HashSet(const UList<Key>&);
+        explicit HashSet(const UList<Key>& lst);
+
+        //- Construct from FixedList of Key
+        template<unsigned Size>
+        explicit HashSet(const FixedList<Key, Size>& lst);
 
         //- Construct from an initializer list of Key
-        HashSet(std::initializer_list<Key>);
+        HashSet(std::initializer_list<Key> lst);
 
         //- Construct as copy
         HashSet(const HashSet<Key, Hash>& hs)
         :
-            HashTable<nil, Key, Hash>(hs)
+            parent_type(hs)
         {}
 
         //- Construct by transferring the parameter contents
         HashSet(const Xfer<HashSet<Key, Hash>>& hs)
         :
-            HashTable<nil, Key, Hash>(hs)
+            parent_type(hs)
         {}
 
         //- Construct by transferring the parameter contents
         HashSet(const Xfer<HashTable<nil, Key, Hash>>& hs)
         :
-            HashTable<nil, Key, Hash>(hs)
+            parent_type(hs)
         {}
 
         //- Construct from the keys of another HashTable,
         //  the type of values held is arbitrary.
         template<class AnyType, class AnyHash>
-        HashSet(const HashTable<AnyType, Key, AnyHash>&);
+        explicit HashSet(const HashTable<AnyType, Key, AnyHash>& tbl);
 
 
     // Member Functions
 
-        // Edit
+      // Edit
 
         //- Insert a new entry
         bool insert(const Key& key)
         {
-            return HashTable<nil, Key, Hash>::insert(key, nil());
+            return this->parent_type::insert(key, nil());
         }
 
-        //- Insert keys from a UList of Key
+        //- Insert keys from the list of Key
         //  Return the number of new elements inserted
         label insert(const UList<Key>& lst);
 
+        //- Insert keys from the list of Key
+        //  Return the number of new elements inserted
+        template<unsigned Size>
+        label insert(const FixedList<Key, Size>& lst);
+
         //- Insert keys from a initializer list of Key
         //  Return the number of new elements inserted
         label insert(std::initializer_list<Key> lst);
@@ -142,6 +186,13 @@ public:
             return insert(lst);
         }
 
+        //- Same as insert (cannot overwrite nil content)
+        template<unsigned Size>
+        label set(const FixedList<Key, Size>& lst)
+        {
+            return insert(lst);
+        }
+
         //- Same as insert (cannot overwrite nil content)
         label set(std::initializer_list<Key> lst)
         {
@@ -151,31 +202,85 @@ public:
         //- Unset the specified key - same as erase
         bool unset(const Key& key)
         {
-            return HashTable<nil, Key, Hash>::erase(key);
+            return this->parent_type::erase(key);
+        }
+
+        //- Unset the listed keys - same as erase
+        label unset(const UList<Key>& lst)
+        {
+            return this->parent_type::erase(lst);
+        }
+
+        //- Unset the listed keys - same as erase
+        template<unsigned Size>
+        label unset(const FixedList<Key, Size>& lst)
+        {
+            return this->parent_type::erase(lst);
+        }
+
+        //- Unset the listed keys - same as erase
+        label unset(std::initializer_list<Key> lst)
+        {
+            return this->parent_type::erase(lst);
+        }
+
+
+    // STL iterators
+
+        iterator begin();
+        const_iterator begin() const;
+        const_iterator cbegin() const;
+
+        const iterator& end();
+        const const_iterator& end() const;
+        const const_iterator& cend() const;
+
+
+    // Writing
+
+        //- Write the unordered keys as a list, with line-breaks if list length
+        //  exceeds shortListLen. Using '0' suppresses line-breaks entirely.
+        Ostream& writeList(Ostream& os, const label shortListLen=0) const
+        {
+            return this->writeKeys(os, shortListLen);
         }
 
 
     // Member Operators
 
-        //- Return true if the entry exists, same as found()
-        inline bool operator[](const Key&) const;
+        //- This operation doesn't make much sense for a hash-set
+        void operator()(const Key& key) = delete;
 
-        //- Equality. Two hashtables are equal when their contents are equal.
+        //- Return true if the entry exists, same as found()
+        inline bool operator[](const Key& key) const;
+
+        //- Equality. Two hashset are equal when they have the same keys.
         //  Independent of table size or order.
-        bool operator==(const HashSet<Key, Hash>&) const;
+        bool operator==(const this_type& rhs) const;
 
         //- The opposite of the equality operation.
-        bool operator!=(const HashSet<Key, Hash>&) const;
+        bool operator!=(const this_type& rhs) const;
+
+
+        //- Assignment from a UList of keys
+        void operator=(const UList<Key>& lst);
+
+        //- Assignment from a FixedList of keys
+        template<unsigned Size>
+        void operator=(const FixedList<Key, Size>& lst);
+
+        //- Assignment from an initializer list of keys
+        void operator=(std::initializer_list<Key> lst);
 
 
         //- Combine entries from HashSets
-        void operator|=(const HashSet<Key, Hash>&);
+        void operator|=(const HashSet<Key, Hash>& rhs);
 
         //- Only retain entries found in both HashSets
-        void operator&=(const HashSet<Key, Hash>&);
+        inline void operator&=(const HashSet<Key, Hash>& rhs);
 
         //- Only retain unique entries (xor)
-        void operator^=(const HashSet<Key, Hash>&);
+        void operator^=(const HashSet<Key, Hash>& rhs);
 
         //- Add entries listed in the given HashSet to this HashSet
         inline void operator+=(const HashSet<Key, Hash>& rhs)
@@ -184,7 +289,17 @@ public:
         }
 
         //- Remove entries listed in the given HashSet from this HashSet
-        void operator-=(const HashSet<Key, Hash>&);
+        inline void operator-=(const HashSet<Key, Hash>& rhs);
+
+
+    // IOstream Operator
+
+        friend Ostream& operator<< <Key, Hash>
+        (
+            Ostream& os,
+            const HashSet<Key, Hash>& tbl
+        );
+
 };
 
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
index 0c5df4c034..276f617dba 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,8 +28,38 @@ License
 
 #include "HashTable.H"
 #include "List.H"
+#include "FixedList.H"
 #include "Tuple2.H"
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class T, class Key, class Hash>
+template<class InputIter>
+Foam::label Foam::HashTable<T, Key, Hash>::eraseMultiple
+(
+    const InputIter begIter,
+    const InputIter endIter
+)
+{
+    const label nTotal = this->size();
+    label changed = 0;
+
+    for
+    (
+        InputIter iter = begIter;
+        changed < nTotal && iter != endIter; // terminate early
+        ++iter
+    )
+    {
+        if (this->erase(*iter))
+        {
+            ++changed;
+        }
+    }
+    return changed;
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -46,7 +76,7 @@ Foam::HashTable<T, Key, Hash>::HashTable(const label size)
 
         for (label hashIdx = 0; hashIdx < tableSize_; hashIdx++)
         {
-            table_[hashIdx] = 0;
+            table_[hashIdx] = nullptr;
         }
     }
 }
@@ -59,7 +89,7 @@ Foam::HashTable<T, Key, Hash>::HashTable(const HashTable<T, Key, Hash>& ht)
 {
     for (const_iterator iter = ht.cbegin(); iter != ht.cend(); ++iter)
     {
-        insert(iter.key(), *iter);
+        insert(iter.key(), iter.object());
     }
 }
 
@@ -85,7 +115,7 @@ Foam::HashTable<T, Key, Hash>::HashTable
     std::initializer_list<Tuple2<Key, T>> lst
 )
 :
-    HashTable<T, Key, Hash>(lst.size())
+    HashTable<T, Key, Hash>(2*lst.size())
 {
     for (const Tuple2<Key, T>& pair : lst)
     {
@@ -227,7 +257,7 @@ template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::set
 (
     const Key& key,
-    const T& newEntry,
+    const T& obj,
     const bool protect
 )
 {
@@ -238,8 +268,8 @@ bool Foam::HashTable<T, Key, Hash>::set
 
     const label hashIdx = hashKeyIndex(key);
 
-    hashedEntry* existing = 0;
-    hashedEntry* prev = 0;
+    hashedEntry* existing = nullptr;
+    hashedEntry* prev = nullptr;
 
     for (hashedEntry* ep = table_[hashIdx]; ep; ep = ep->next_)
     {
@@ -251,10 +281,10 @@ bool Foam::HashTable<T, Key, Hash>::set
         prev = ep;
     }
 
-    // Not found, insert it at the head
     if (!existing)
     {
-        table_[hashIdx] = new hashedEntry(key, table_[hashIdx], newEntry);
+        // Not found, insert it at the head
+        table_[hashIdx] = new hashedEntry(key, obj, table_[hashIdx]);
         nElmts_++;
 
         if (double(nElmts_)/tableSize_ > 0.8 && tableSize_ < maxTableSize)
@@ -286,7 +316,7 @@ bool Foam::HashTable<T, Key, Hash>::set
     {
         // Found - overwrite existing entry
         // this corresponds to the Perl convention
-        hashedEntry* ep = new hashedEntry(key, existing->next_, newEntry);
+        hashedEntry* ep = new hashedEntry(key, obj, existing->next_);
 
         // Replace existing element - within list or insert at the head
         if (prev)
@@ -306,17 +336,17 @@ bool Foam::HashTable<T, Key, Hash>::set
 
 
 template<class T, class Key, class Hash>
-bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
+bool Foam::HashTable<T, Key, Hash>::iterator_base::erase()
 {
     // Note: entryPtr_ is nullptr for end(), so this catches that too
     if (entryPtr_)
     {
         // Search element before entryPtr_
-        hashedEntry* prev = 0;
+        entry_type* prev = nullptr;
 
         for
         (
-            hashedEntry* ep = hashTable_->table_[hashIndex_];
+            entry_type* ep = hashTable_->table_[hashIndex_];
             ep;
             ep = ep->next_
         )
@@ -341,8 +371,7 @@ bool Foam::HashTable<T, Key, Hash>::iteratorBase::erase()
             hashTable_->table_[hashIndex_] = entryPtr_->next_;
             delete entryPtr_;
 
-            // Assign any non-nullptr value so it doesn't look
-            // like end()/cend()
+            // Assign any non-nullptr value so it doesn't look like end()
             entryPtr_ = reinterpret_cast<hashedEntry*>(this);
 
             // Mark with special hashIndex value to signal it has been rewound.
@@ -382,26 +411,36 @@ bool Foam::HashTable<T, Key, Hash>::erase(const iterator& iter)
 template<class T, class Key, class Hash>
 bool Foam::HashTable<T, Key, Hash>::erase(const Key& key)
 {
-    return erase(find(key));
+    auto iter = find(key);
+    return erase(iter);
 }
 
 
 template<class T, class Key, class Hash>
 Foam::label Foam::HashTable<T, Key, Hash>::erase(const UList<Key>& keys)
 {
-    const label nTotal = nElmts_;
-    label count = 0;
+    return eraseMultiple(keys.begin(), keys.end());
+}
 
-    // Remove listed keys from this table - terminates early if possible
-    for (label keyI = 0; count < nTotal && keyI < keys.size(); ++keyI)
-    {
-        if (erase(keys[keyI]))
-        {
-            count++;
-        }
-    }
 
-    return count;
+template<class T, class Key, class Hash>
+template<unsigned Size>
+Foam::label Foam::HashTable<T, Key, Hash>::erase
+(
+    const FixedList<Key, Size>& keys
+)
+{
+    return eraseMultiple(keys.begin(), keys.end());
+}
+
+
+template<class T, class Key, class Hash>
+Foam::label Foam::HashTable<T, Key, Hash>::erase
+(
+    std::initializer_list<Key> keys
+)
+{
+    return eraseMultiple(keys.begin(), keys.end());
 }
 
 
@@ -409,29 +448,90 @@ template<class T, class Key, class Hash>
 template<class AnyType, class AnyHash>
 Foam::label Foam::HashTable<T, Key, Hash>::erase
 (
-    const HashTable<AnyType, Key, AnyHash>& rhs
+    const HashTable<AnyType, Key, AnyHash>& other
 )
 {
-    label count = 0;
+    const label nTotal = this->size();
+    label changed = 0;
 
-    // Remove rhs keys from this table - terminates early if possible
-    // Could optimize depending on which hash is smaller ...
-    for (iterator iter = begin(); iter != end(); ++iter)
+    using other_iter =
+        typename HashTable<AnyType, Key, AnyHash>::const_iterator;
+
+    if (other.size() <= nTotal)
     {
-        if (rhs.found(iter.key()) && erase(iter))
+        // The other is smaller/same-size, use its keys for removal
+
+        for
+        (
+            other_iter iter = other.begin();
+            changed < nTotal && iter != other.end(); // terminate early
+            ++iter
+        )
         {
-            count++;
+            if (erase(iter.key()))
+            {
+                ++changed;
+            }
+        }
+    }
+    else
+    {
+        // We are smaller: remove if found in the other hash
+        for
+        (
+            iterator iter = begin();
+            changed < nTotal && iter != end(); // terminate early
+            ++iter
+        )
+        {
+            if (other.found(iter.key()) && erase(iter))
+            {
+                ++changed;
+            }
         }
     }
 
-    return count;
+    return changed;
+}
+
+
+template<class T, class Key, class Hash>
+template<class AnyType, class AnyHash>
+Foam::label Foam::HashTable<T, Key, Hash>::retain
+(
+    const HashTable<AnyType, Key, AnyHash>& other
+)
+{
+    const label nTotal = this->size();
+    label changed = 0;
+
+    if (other.empty())
+    {
+        // Trivial case
+        changed = nTotal;
+        this->clear();
+    }
+    else
+    {
+        // Inverted logic: remove if *not* found in the other hash
+
+        for (iterator iter = begin(); iter != end(); ++iter)
+        {
+            if (!other.found(iter.key()) && erase(iter))
+            {
+                ++changed;
+            }
+        }
+    }
+
+    return changed;
 }
 
 
 template<class T, class Key, class Hash>
 void Foam::HashTable<T, Key, Hash>::resize(const label sz)
 {
-    label newSize = HashTableCore::canonicalSize(sz);
+    const label newSize = HashTableCore::canonicalSize(sz);
 
     if (newSize == tableSize_)
     {
@@ -449,10 +549,10 @@ void Foam::HashTable<T, Key, Hash>::resize(const label sz)
 
     for (const_iterator iter = cbegin(); iter != cend(); ++iter)
     {
-        tmpTable->insert(iter.key(), *iter);
+        tmpTable->insert(iter.key(), iter.object());
     }
 
-    label oldSize = tableSize_;
+    const label oldSize = tableSize_;
     tableSize_ = tmpTable->tableSize_;
     tmpTable->tableSize_ = oldSize;
 
@@ -480,7 +580,7 @@ void Foam::HashTable<T, Key, Hash>::clear()
                     ep = next;
                 }
                 delete ep;
-                table_[hashIdx] = 0;
+                table_[hashIdx] = nullptr;
             }
         }
         nElmts_ = 0;
@@ -496,19 +596,6 @@ void Foam::HashTable<T, Key, Hash>::clearStorage()
 }
 
 
-template<class T, class Key, class Hash>
-void Foam::HashTable<T, Key, Hash>::shrink()
-{
-    const label newSize = HashTableCore::canonicalSize(nElmts_);
-
-    if (newSize < tableSize_)
-    {
-        // Avoid having the table disappear on us
-        resize(newSize ? newSize : 2);
-    }
-}
-
-
 template<class T, class Key, class Hash>
 void Foam::HashTable<T, Key, Hash>::transfer(HashTable<T, Key, Hash>& ht)
 {
@@ -558,7 +645,7 @@ void Foam::HashTable<T, Key, Hash>::operator=
 
     for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
-        insert(iter.key(), *iter);
+        insert(iter.key(), iter.object());
     }
 }
 
@@ -572,14 +659,14 @@ void Foam::HashTable<T, Key, Hash>::operator=
     // Could be zero-sized from a previous transfer()
     if (!tableSize_)
     {
-        resize(lst.size());
+        resize(2*lst.size());
     }
     else
     {
         clear();
     }
 
-    for (const Tuple2<Key, T>& pair : lst)
+    for (const auto& pair : lst)
     {
         insert(pair.first(), pair.second());
     }
@@ -600,9 +687,9 @@ bool Foam::HashTable<T, Key, Hash>::operator==
 
     for (const_iterator iter = rhs.cbegin(); iter != rhs.cend(); ++iter)
     {
-        const_iterator fnd = find(iter.key());
+        const_iterator other = find(iter.key());
 
-        if (fnd == cend() || fnd() != iter())
+        if (!other.found() || other.object() != iter.object())
         {
             return false;
         }
@@ -618,7 +705,7 @@ bool Foam::HashTable<T, Key, Hash>::operator!=
     const HashTable<T, Key, Hash>& rhs
 ) const
 {
-    return !(operator==(rhs));
+    return !operator==(rhs);
 }
 
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
index cc32bf9fd0..9eef011d10 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTable.H
@@ -34,9 +34,18 @@ Note
     often result in a different hash order. Use a sorted table-of-contents
     when the hash order is important.
 
+    The end iterator of all hash-tables has a nullptr to the hash entry.
+    Thus avoid separate allocation for each table and use a single one with
+    a nullptr. The hash-table iterators always have an entry-pointer as the
+    first member data, which allows reinterpret_cast from anything else with
+    a nullptr as its first data member.
+    The nullObject is such an item (with a nullptr data member).
+
 SourceFiles
     HashTableI.H
     HashTable.C
+    HashTableCoreI.H
+    HashTableCore.C
     HashTableIO.C
 
 \*---------------------------------------------------------------------------*/
@@ -49,7 +58,10 @@ SourceFiles
 #include "word.H"
 #include "Xfer.H"
 #include "className.H"
+#include "nullObject.H"
+
 #include <initializer_list>
+#include <iterator>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -60,32 +72,30 @@ namespace Foam
 
 template<class T> class List;
 template<class T> class UList;
+template<class T, unsigned Size> class FixedList;
+template<class T1, class T2> class Tuple2;
 template<class T, class Key, class Hash> class HashTable;
-template<class T, class Key, class Hash> class HashPtrTable;
-
-template<class Type1, class Type2>
-class Tuple2;
 
 template<class T, class Key, class Hash>
-Istream& operator>>(Istream&, HashTable<T, Key, Hash>&);
+Istream& operator>>(Istream& is, HashTable<T, Key, Hash>& L);
 
 template<class T, class Key, class Hash>
-Ostream& operator<<(Ostream&, const HashTable<T, Key, Hash>&);
+Ostream& operator<<(Ostream& os, const HashTable<T, Key, Hash>& tbl);
 
 
 /*---------------------------------------------------------------------------*\
-                         Class HashTableCore Declaration
+                        Class HashTableCore Declaration
 \*---------------------------------------------------------------------------*/
 
-//- Template-invariant bits for HashTable
+//- Bits that are independent of the HashTable template parameters.
 struct HashTableCore
 {
-    //- Return a canonical (power-of-two) size
-    static label canonicalSize(const label);
-
-    //- Maximum allowable table size
+    //- Maximum allowable internal table size. Approximately labelMax/4
     static const label maxTableSize;
 
+    //- Return a canonical (power-of-two) of the requested size.
+    static label canonicalSize(const label requested_size);
+
     //- Construct null
     HashTableCore()
     {}
@@ -93,25 +103,57 @@ struct HashTableCore
     //- Define template name and debug
     ClassName("HashTable");
 
-    //- A zero-sized end iterator
-    struct iteratorEnd
+    static_assert
+    (
+        sizeof(NullObject) >= sizeof(void*),
+        "NullObject is too small to reinterpret_cast as HashTable::iterator"
+    );
+
+
+    //- Factory method to create a non-const iterator begin
+    template<class IteratorType, class TableType>
+    inline static IteratorType iterator_begin(TableType& table);
+
+    //- Factory method to create a const iterator begin
+    template<class IteratorType, class TableType>
+    inline static IteratorType iterator_begin(const TableType& table);
+
+    //- Factory method to create a const iterator begin
+    template<class IteratorType, class TableType>
+    inline static IteratorType iterator_cbegin(const TableType& table);
+
+    //- Factory method to create a non-const iterator end
+    //  Simply reinterprets a NullObject as a hash-table iterator.
+    template<class IteratorType>
+    inline static const IteratorType& iterator_end();
+
+    //- Factory method to create a const iterator cend
+    //  Simply reinterprets a NullObject as a hash-table iterator.
+    template<class IteratorType>
+    inline static const IteratorType& iterator_cend();
+
+
+    //- Factory class for creating a begin/end pair for any const iterator.
+    template<class IteratorType, class TableType>
+    class const_iterator_pair
     {
-        //- Construct null
-        iteratorEnd()
-        {}
+        label size_;
+        IteratorType iter_;
+
+    public:
+
+        inline const_iterator_pair(const TableType& tbl);
+
+        inline label size() const;
+        inline bool empty() const;
+
+        inline IteratorType begin() const;
+        inline IteratorType cbegin() const;
+
+        inline const IteratorType& end() const;
+        inline const IteratorType& cend() const;
     };
 
-    //- iteratorEnd set to beyond the end of any HashTable
-    inline static iteratorEnd cend()
-    {
-        return iteratorEnd();
-    }
-
-    //- iteratorEnd set to beyond the end of any HashTable
-    inline static iteratorEnd end()
-    {
-        return iteratorEnd();
-    }
 };
 
 
@@ -124,23 +166,66 @@ class HashTable
 :
     public HashTableCore
 {
+public:
+
+    //- The template instance used for this HashTable
+    typedef HashTable<T, Key, Hash> this_type;
+
+
+    // STL type definitions
+
+        //- Type of keys that the HashTable uses.
+        typedef Key key_type;
+
+        //- Type of values that the HashTable contains.
+        typedef T value_type;
+
+        //- The type used for storing into value_type objects.
+        //  This type is usually value_type&.
+        typedef T* pointer;
+
+        //- The type used for storing into value_type objects.
+        //  This type is usually value_type&.
+        typedef T& reference;
+
+        //- The type used for reading from constant value_type objects.
+        typedef const T* const_pointer;
+
+        //- The type used for reading from constant value_type objects.
+        typedef const T& const_reference;
+
+        //- The type to represent the difference between two iterators
+        typedef label difference_type;
+
+        //- The type that can represent the size of a HashTable.
+        typedef label size_type;
+
+
+        //- Forward iterator with non-const access
+        class iterator;
+
+        //- Forward iterator with const access
+        class const_iterator;
+
+
+private:
+
     // Private data type for table entries
 
-        //- Structure to hold a hashed entry with SLList for collisions
+        //- Structure to hold a hashed entry, with a SLList for collisions
         struct hashedEntry
         {
             //- The lookup key
             Key key_;
 
-            //- Pointer to next hashedEntry in sub-list
-            hashedEntry* next_;
-
             //- The data object
             T obj_;
 
-            //- Construct from key, next pointer and object
-            inline hashedEntry(const Key&, hashedEntry* next, const T&);
+            //- Pointer to next hashedEntry in sub-list
+            hashedEntry* next_;
 
+            //- Construct from key, next pointer and object
+            inline hashedEntry(const Key& key, const T& obj, hashedEntry* next);
 
         private:
             //- Disallow default bitwise copy construct
@@ -165,55 +250,53 @@ class HashTable
 
     // Private Member Functions
 
-        //- Return a canonical (power-of-two) size
-        static label canonicalSize(const label);
-
         //- Return the hash index of the Key within the current table size.
         //  No checks for zero-sized tables.
-        inline label hashKeyIndex(const Key&) const;
+        inline label hashKeyIndex(const Key& key) const;
 
-        //- Assign a new hashedEntry to a possibly already existing key
-        bool set(const Key&, const T& newElmt, bool protect);
+        //- Assign a new hash-entry to a possibly already existing key.
+        //  Return true if the new entry was set.
+        bool set(const Key& key, const T& obj, const bool protect);
+
+
+protected:
+
+        //- Internally used base for iterator and const_iterator
+        class iterator_base;
+
+        //- Friendship with the iterator_base is required.
+        friend class iterator_base;
+
+
+    // Protected Member Functions
+
+        //- Remove using begin/end iterators of listed keys
+        template<class InputIter>
+        inline label eraseMultiple
+        (
+            const InputIter begIter,
+            const InputIter endIter
+        );
 
 
 public:
 
-    // Forward declaration of iterators
-
-        class iteratorBase;
-        class iterator;
-        class const_iterator;
-
-        //- Declare friendship with the HashPtrTable class
-        template<class T2, class Key2, class Hash2>
-        friend class HashPtrTable;
-
-        //- Declare friendship with the iteratorBase
-        friend class iteratorBase;
-
-        //- Declare friendship with the iterator
-        friend class iterator;
-
-        //- Declare friendship with the const_iterator
-        friend class const_iterator;
-
-
     // Constructors
 
         //- Construct given initial table size
         HashTable(const label size = 128);
 
         //- Construct from Istream
-        HashTable(Istream&, const label size = 128);
+        HashTable(Istream& is, const label size = 128);
 
         //- Construct as copy
-        HashTable(const HashTable<T, Key, Hash>&);
+        HashTable(const HashTable<T, Key, Hash>& ht);
 
         //- Construct by transferring the parameter contents
-        HashTable(const Xfer<HashTable<T, Key, Hash>>&);
+        HashTable(const Xfer<HashTable<T, Key, Hash>>& ht);
 
         //- Construct from an initializer list
-        HashTable(std::initializer_list<Tuple2<Key, T>>);
+        HashTable(std::initializer_list<Tuple2<Key, T>> lst);
 
 
     //- Destructor
@@ -222,332 +305,411 @@ public:
 
     // Member Functions
 
-        // Access
+      // Access
 
-            //- The size of the underlying table
-            inline label capacity() const;
+        //- The size of the underlying table
+        inline label capacity() const;
 
-            //- Return number of elements in table
-            inline label size() const;
+        //- Return number of elements in table
+        inline label size() const;
 
-            //- Return true if the hash table is empty
-            inline bool empty() const;
+        //- Return true if the hash table is empty
+        inline bool empty() const;
 
-            //- Return true if hashedEntry is found in table
-            bool found(const Key&) const;
+        //- Return true if hashed entry is found in table
+        bool found(const Key& key) const;
 
-            //- Find and return an iterator set at the hashedEntry
-            //  If not found iterator = end()
-            iterator find(const Key&);
+        //- Find and return an iterator set at the hashed entry
+        //  If not found iterator = end()
+        iterator find(const Key& key);
 
-            //- Find and return an const_iterator set at the hashedEntry
-            //  If not found iterator = end()
-            const_iterator find(const Key&) const;
+        //- Find and return an const_iterator set at the hashed entry
+        //  If not found iterator = end()
+        const_iterator find(const Key& key) const;
 
-            //- Return the table of contents
-            List<Key> toc() const;
+        //- Return hashed entry if it exists, or return the given default
+        inline const T& lookup(const Key& key, const T& deflt) const;
 
-            //- Return the table of contents as a sorted list
-            List<Key> sortedToc() const;
+        //- Return the table of contents
+        List<Key> toc() const;
 
-            //- Print information
-            Ostream& printInfo(Ostream&) const;
+        //- Return the table of contents as a sorted list
+        List<Key> sortedToc() const;
 
 
-        // Edit
+      // Edit
 
-            //- Insert a new hashedEntry
-            inline bool insert(const Key&, const T& newElmt);
+        //- Insert a new entry
+        //  Return true if the entry inserted, which means that it did
+        //  not previously exist in the table.
+        inline bool insert(const Key& key, const T& obj);
 
-            //- Assign a new hashedEntry, overwriting existing entries
-            inline bool set(const Key&, const T& newElmt);
+        //- Assign a new entry, overwriting existing entries.
+        //  Returns true.
+        inline bool set(const Key& key, const T& obj);
 
-            //- Erase a hashedEntry specified by given iterator
-            //  This invalidates the iterator until the next operator++
-            bool erase(const iterator&);
+        //- Erase an entry specified by given iterator
+        //  This invalidates the iterator until the next ++ operation.
+        //
+        //  Includes a safeguard against the end-iterator such that the
+        //  following is safe:
+        //  \code
+        //      auto iter = table.find(unknownKey);
+        //      table.erase(iter);
+        //  \endcode
+        //  which is what \code table.erase(unknownKey) \endcode does anyhow
+        bool erase(const iterator& iter);
 
-            //- Erase a hashedEntry specified by the given key
-            bool erase(const Key&);
+        //- Erase an entry specified by the given key
+        bool erase(const Key& key);
 
-            //- Remove entries given by the listed keys from this HashTable
-            //  Return the number of elements removed
-            label erase(const UList<Key>&);
+        //- Remove table entries given by the listed keys
+        //  Return the number of elements removed
+        label erase(const UList<Key>& keys);
 
-            //- Remove entries given by the given keys from this HashTable
-            //  Return the number of elements removed.
-            //  The parameter HashTable needs the same type of key, but the
-            //  type of values held and the hashing function are arbitrary.
-            template<class AnyType, class AnyHash>
-            label erase(const HashTable<AnyType, Key, AnyHash>&);
+        //- Remove table entries given by the listed keys
+        //  Return the number of elements removed
+        template<unsigned Size>
+        label erase(const FixedList<Key, Size>& keys);
 
-            //- Resize the hash table for efficiency
-            void resize(const label newSize);
+        //- Remove table entries given by the listed keys
+        //  Return the number of elements removed
+        label erase(std::initializer_list<Key> keys);
 
-            //- Clear all entries from table
-            void clear();
+        //- Remove table entries given by keys of the other hash-table.
+        //  Return the number of elements removed.
+        //
+        //  The other hash-table must have the same type of key, but the
+        //  type of values held and the hashing function are arbitrary.
+        template<class AnyType, class AnyHash>
+        label erase(const HashTable<AnyType, Key, AnyHash>& other);
 
-            //- Clear the table entries and the table itself.
-            //  Equivalent to clear() followed by resize(0)
-            void clearStorage();
+        //- Retain table entries given by keys of the other hash-table.
+        //
+        //  The other hash-table must have the same type of key, but the
+        //  type of values held and the hashing function are arbitrary.
+        template<class AnyType, class AnyHash>
+        label retain(const HashTable<AnyType, Key, AnyHash>& other);
 
-            //- Shrink the allocated table to approx. twice number of elements
-            void shrink();
+        //- Resize the hash table for efficiency
+        void resize(const label sz);
 
-            //- Transfer the contents of the argument table into this table
-            //  and annul the argument table.
-            void transfer(HashTable<T, Key, Hash>&);
+        //- Clear all entries from table
+        void clear();
 
-            //- Transfer contents to the Xfer container
-            inline Xfer<HashTable<T, Key, Hash>> xfer();
+        //- Clear the table entries and the table itself.
+        //  Equivalent to clear() followed by resize(0)
+        void clearStorage();
+
+        //- Transfer the contents of the argument table into this table
+        //  and annul the argument table.
+        void transfer(HashTable<T, Key, Hash>& ht);
+
+        //- Transfer contents to the Xfer container
+        inline Xfer<HashTable<T, Key, Hash>> xfer();
 
 
     // Member Operators
 
-        //- Find and return a hashedEntry
-        inline T& operator[](const Key&);
+        //- Find and return a hashed entry. FatalError if it does not exist.
+        inline T& operator[](const Key& key);
 
-        //- Find and return a hashedEntry
-        inline const T& operator[](const Key&) const;
+        //- Find and return a hashed entry. FatalError if it does not exist.
+        inline const T& operator[](const Key& key) const;
 
-        //- Find and return a hashedEntry, create it null if not present
-        inline T& operator()(const Key&);
+        //- Return existing entry or create a new entry.
+        //  A newly created entry is created as a nameless T() and is thus
+        //  value-initialized. For primitives, this will be zero.
+        inline T& operator()(const Key& key);
+
+        //- Return existing entry or insert a new entry.
+        inline T& operator()(const Key& key, const T& deflt);
+
+        //- Return hashed entry if it exists, or return the given default
+        inline const T& operator()(const Key& key, const T& deflt) const;
 
         //- Assignment
-        void operator=(const HashTable<T, Key, Hash>&);
+        void operator=(const HashTable<T, Key, Hash>& rhs);
 
-        //- Assignment to an initializer list
-        void operator=(std::initializer_list<Tuple2<Key, T>>);
+        //- Assignment from an initializer list
+        void operator=(std::initializer_list<Tuple2<Key, T>> lst);
 
         //- Equality. Hash tables are equal if the keys and values are equal.
         //  Independent of table storage size and table order.
-        bool operator==(const HashTable<T, Key, Hash>&) const;
+        bool operator==(const HashTable<T, Key, Hash>& rhs) const;
 
         //- The opposite of the equality operation. Takes linear time.
-        bool operator!=(const HashTable<T, Key, Hash>&) const;
+        bool operator!=(const HashTable<T, Key, Hash>& rhs) const;
 
 
-
-    // STL type definitions
-
-        //- Type of values the HashTable contains.
-        typedef T value_type;
-
-        //- Type that can be used for storing into HashTable::value_type
-        //  objects.  This type is usually List::value_type&.
-        typedef T& reference;
-
-        //- Type that can be used for storing into constant
-        //  HashTable::value_type objects.  This type is usually const
-        //  HashTable::value_type&.
-        typedef const T& const_reference;
-
-        //- The type that can represent the size of a HashTable.
-        typedef label size_type;
-
+protected:
 
     // Iterators and helpers
 
-        //- The iterator base for HashTable
+        //- The iterator base for HashTable (internal use only).
         //  Note: data and functions are protected, to allow reuse by iterator
         //  and prevent most external usage.
         //  iterator and const_iterator have the same size, allowing
         //  us to reinterpret_cast between them (if desired)
-        class iteratorBase
+        class iterator_base
         {
-            // Private Data
+        public:
+            // Public typedefs
+            using table_type = this_type;
+            using key_type   = this_type::key_type;
+            using iterator_category = std::forward_iterator_tag;
+            using difference_type  = this_type::difference_type;
 
-                //- Pointer to the HashTable for which this is an iterator
-                //  This also lets us use the default bitwise copy/assignment
-                HashTable<T, Key, Hash>* hashTable_;
+        private:
+            using entry_type = hashedEntry;
 
-                //- Current element
-                hashedEntry* entryPtr_;
+          // Private Data
 
-                //- Current hash index
-                label hashIndex_;
+            //- Currently selected entry.
+            //  MUST be the first member for easy comparison between iterators
+            //  and for reinterpret_cast from nullObject
+            entry_type* entryPtr_;
 
+            //- Pointer to the hash-table for which this is an iterator
+            //  This allows use of the default bitwise copy/assignment
+            table_type* hashTable_;
+
+            //- Current hash index within the hash-table data.
+            //  A signed value, since erase() uses a negative value to signal
+            //  the erasure state.
+            label hashIndex_;
 
         protected:
 
-            // Constructors
+          // Protected Member Functions
 
-                //- Construct null - equivalent to an 'end' position
-                inline iteratorBase();
+            //- Increment to the next position
+            inline void increment();
 
-                //- Construct from hash table, moving to its 'begin' position
-                inline explicit iteratorBase
-                (
-                    const HashTable<T, Key, Hash>* curHashTable
-                );
+            //- The referenced object/value element
+            inline T& element() const;
 
-                //- Construct from hash table, element and hash index
-                inline iteratorBase
-                (
-                    const HashTable<T, Key, Hash>* curHashTable,
-                    const hashedEntry* elmt,
-                    const label hashIndex
-                );
+            //- Erase the entry at the current position
+            bool erase();
 
 
-            // Protected Member Functions
-
-                //- Increment to the next position
-                inline void increment();
-
-                //- Erase the HashTable element at the current position
-                bool erase();
-
-                //- Return non-const access to referenced object
-                inline T& object();
-
         public:
 
-            // Member operators
+          // Constructors
 
-                // Access
+            //- Construct null (end iterator)
+            inline iterator_base();
 
-                //- Return the Key corresponding to the iterator
-                inline const Key& key() const;
+            //- Construct from begin of hash-table
+            inline explicit iterator_base(const table_type* hashTbl);
 
-                //- Return const access to referenced object
-                inline const T& cobject() const;
+            //- Construct from hash table, element and hash index
+            inline iterator_base
+            (
+                const table_type* hashTbl,
+                const entry_type* elmt,
+                const label hashIndex
+            );
 
-                //- Compare hashedEntry element pointers
-                inline bool operator==(const iteratorBase&) const;
-                inline bool operator!=(const iteratorBase&) const;
+          // Member functions/operators
 
-                //- Compare hashedEntry to iteratorEnd pointers
-                inline bool operator==(const iteratorEnd& unused) const;
-                inline bool operator!=(const iteratorEnd& unused) const;
+            //- True if iterator points to an entry
+            //  This can be used directly instead of comparing to end()
+            inline bool found() const;
+
+            //- Return the Key corresponding to the iterator
+            inline const Key& key() const;
+
+            //- Compare hash-entry element pointers
+            inline bool operator==(const iterator_base& iter) const;
+            inline bool operator!=(const iterator_base& iter) const;
         };
 
 
-        //- An STL-conforming iterator
+public:
+
+        //- An iterator wrapper for returning a reference to the key
+        template<class WrappedIterator>
+        class key_iterator_base
+        :
+            public WrappedIterator
+        {
+        public:
+            using value_type = this_type::key_type;
+            using pointer    = const Key*;
+            using reference  = const Key&;
+
+            //- Implicit conversion
+            inline key_iterator_base(const WrappedIterator& iter);
+
+            //- Return the key
+            inline reference operator*() const;
+            inline reference operator()() const;
+
+            inline key_iterator_base& operator++();
+            inline key_iterator_base operator++(int);
+        };
+
+
+    // STL iterator
+
+        //- Forward iterator with non-const access
         class iterator
         :
-            public iteratorBase
+            public iterator_base
         {
-            friend class HashTable;
-
-            // Private Member Functions
-
-                //- Construct from hash table, moving to its 'begin' position
-                inline explicit iterator
-                (
-                    HashTable<T, Key, Hash>* curHashTable
-                );
-
-                //- Construct from hash table, element and hash index
-                inline iterator
-                (
-                    HashTable<T, Key, Hash>* curHashTable,
-                    hashedEntry* elmt,
-                    const label hashIndex
-                );
-
+            friend class HashTable;  // Uses iterator::erase() method
+            using entry_type = hashedEntry;
 
         public:
 
-            // Constructors
+          // Public typedefs
+            using table_type = this_type;
+            using value_type = this_type::value_type;
+            using pointer    = this_type::pointer;
+            using reference  = this_type::reference;
 
-                //- Construct null (end iterator)
-                inline iterator();
+          // Constructors
 
-                //- Construct end iterator
-                inline iterator(const iteratorEnd& unused);
+            //- Construct null (end iterator)
+            inline iterator();
 
+            //- Construct from begin of hash-table
+            inline explicit iterator(table_type* hashTbl);
 
-            // Member operators
+            //- Construct from hash table, element and hash index
+            //  Used by the hash-table find() method.
+            inline iterator
+            (
+                table_type* hashTbl,
+                entry_type* elmt,
+                const label hashIndex
+            );
 
-                //- Return non-const access to referenced object
-                using iteratorBase::object;
+          // Member functions/operators
 
-                //- Return non-const access to referenced object
-                inline T& operator*();
-                inline T& operator()();
+            //- Return non-const access to referenced object
+            inline reference object() const;
 
-                //- Return const access to referenced object
-                inline const T& operator*() const;
-                inline const T& operator()() const;
+            //- Return non-const access to referenced object
+            inline reference operator*() const;
+            inline reference operator()() const;
 
-                inline iterator& operator++();
-                inline iterator operator++(int);
+            inline iterator& operator++();
+            inline iterator operator++(int);
         };
 
-        //- Iterator set to the beginning of the HashTable
-        inline iterator begin();
-
 
     // STL const_iterator
 
-        //- An STL-conforming const_iterator
+        //- Forward iterator with const access
         class const_iterator
         :
-            public iteratorBase
+            public iterator_base
         {
-            friend class HashTable;
-
-            // Private Member Functions
-
-                //- Construct from hash table, moving to its 'begin' position
-                inline explicit const_iterator
-                (
-                    const HashTable<T, Key, Hash>* curHashTable
-                );
-
-                //- Construct from hash table, element and hash index
-                inline const_iterator
-                (
-                    const HashTable<T, Key, Hash>* curHashTable,
-                    const hashedEntry* elmt,
-                    const label hashIndex
-                );
-
+            using entry_type = const hashedEntry;
 
         public:
 
-            // Constructors
+          // Public typedefs
+            using table_type = const this_type;
+            using value_type = const this_type::value_type;
+            using pointer    = this_type::const_pointer;
+            using reference  = this_type::const_reference;
 
-                //- Construct null (end iterator)
-                inline const_iterator();
+          // Constructors
 
-                //- Construct from iterator
-                inline const_iterator(const iterator&);
+            //- Construct null (end iterator)
+            inline const_iterator();
 
-                //- Construct end iterator
-                inline const_iterator(const iteratorEnd& unused);
+            //- Construct from begin of hash-table
+            inline explicit const_iterator(table_type* hashTbl);
 
+            //- Construct from hash table, element and hash index.
+            //  Used by the hash-table find() method.
+            inline const_iterator
+            (
+                table_type* hashTbl,
+                entry_type* elmt,
+                const label hashIndex
+            );
 
-            // Member operators
+            //- Copy construct from iterator
+            inline const_iterator(const iterator& iter);
 
-                //- Return const access to referenced object
-                inline const T& operator*() const;
-                inline const T& operator()() const;
+          // Member functions/operators
 
-                inline const_iterator& operator++();
-                inline const_iterator operator++(int);
+            //- Return const access to referenced object
+            inline reference object() const;
+
+            //- Return const access to referenced object
+            inline reference operator*() const;
+            inline reference operator()() const;
+
+            inline const_iterator& operator++();
+            inline const_iterator operator++(int);
         };
 
 
+    //- Iterating over keys only
+
+        //- Forward iterator returning the key
+        using key_iterator = key_iterator_base<iterator>;
+
+        //- Forward const iterator returning the key
+        using const_key_iterator = key_iterator_base<const_iterator>;
+
+        //- A const iterator begin/end pair for iterating over keys
+        const_iterator_pair<const_key_iterator, this_type> keys() const
+        {
+            return
+                const_iterator_pair<const_key_iterator,this_type>(*this);
+        }
+
+
+    // Iterator access
+
+        //- Iterator set to the beginning of the HashTable
+        inline iterator begin();
+
+        //- const_iterator set to the beginning of the HashTable
+        inline const_iterator begin() const;
+
         //- const_iterator set to the beginning of the HashTable
         inline const_iterator cbegin() const;
 
-        //- const_iterator set to the beginning of the HashTable
-        inline const_iterator begin() const;
+        //- iterator to signal the end for any HashTable
+        inline const iterator& end();
+
+        //- const_iterator to signal the end for any HashTable
+        inline const const_iterator& end() const;
+
+        //- const_iterator to signal the end for any HashTable
+        inline const const_iterator& cend() const;
+
+
+    // Writing
+
+        //- Print information
+        Ostream& printInfo(Ostream& os) const;
+
+        //- Write the unordered keys as a list, with line-breaks if list length
+        //  exceeds shortListLen. Using '0' suppresses line-breaks entirely.
+        Ostream& writeKeys(Ostream& os, const label shortListLen=0) const;
 
 
     // IOstream Operator
 
         friend Istream& operator>> <T, Key, Hash>
         (
-            Istream&,
-            HashTable<T, Key, Hash>&
+            Istream& is,
+            HashTable<T, Key, Hash>& L
         );
 
         friend Ostream& operator<< <T, Key, Hash>
         (
-            Ostream&,
-            const HashTable<T, Key, Hash>&
+            Ostream& os,
+            const HashTable<T, Key, Hash>& tbl
         );
 };
 
@@ -558,7 +720,8 @@ public:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    #include "HashTableI.H"
+#include "HashTableCoreI.H"
+#include "HashTableI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.C
index 58fcdf27b1..e57192f1e3 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableCore.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -33,38 +33,53 @@ namespace Foam
 defineTypeNameAndDebug(HashTableCore, 0);
 }
 
-const Foam::label Foam::HashTableCore::maxTableSize
-(
-    Foam::HashTableCore::canonicalSize
-    (
-        Foam::labelMax/2
-    )
-);
+
+// Approximately labelMax/4
+const Foam::label Foam::HashTableCore::maxTableSize(1 << (sizeof(label)*8-3));
 
 
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
-Foam::label Foam::HashTableCore::canonicalSize(const label size)
+Foam::label Foam::HashTableCore::canonicalSize(const label requested_size)
 {
-    if (size < 1)
+    if (requested_size < 1)
     {
         return 0;
     }
 
-    // enforce power of two
-    uLabel goodSize = size;
+    // Enforce power of two - makes for a vey fast modulus etc.
+    // Use unsigned for these calculations.
+    //
+    // - The lower limit (8) is somewhat arbitrary, but if the hash table
+    //   is too small, there will be many direct table collisions.
+    // - The uper limit (approx. labelMax/4) must be a power of two,
+    //   need not be extremely large for hashing.
 
-    if (goodSize & (goodSize - 1))
+    uLabel powerOfTwo = 8; // lower-limit
+
+    const uLabel size = requested_size;
+    if (size < powerOfTwo)
     {
-        // brute-force is fast enough
-        goodSize = 1;
-        while (goodSize < unsigned(size))
-        {
-            goodSize <<= 1;
-        }
+        return powerOfTwo;
     }
+    else if (requested_size >= maxTableSize)
+    {
+        return maxTableSize;
+    }
+    else if (size & (size-1))  // <- Modulus of i^2
+    {
+        // Determine power-of-two. Brute-force is fast enough.
+        while (powerOfTwo < size)
+        {
+            powerOfTwo <<= 1;
+        }
 
-    return goodSize;
+        return powerOfTwo;
+    }
+    else
+    {
+        return size;
+    }
 }
 
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableCoreI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableCoreI.H
new file mode 100644
index 0000000000..8198e2e4c3
--- /dev/null
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableCoreI.H
@@ -0,0 +1,146 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+// * * * * * * * * * * * * * * * helper methods  * * * * * * * * * * * * * * //
+
+template<class IteratorType, class TableType>
+inline IteratorType Foam::HashTableCore::iterator_begin
+(
+    TableType& table
+)
+{
+    return IteratorType(table.begin());
+}
+
+
+template<class IteratorType, class TableType>
+inline IteratorType Foam::HashTableCore::iterator_begin
+(
+    const TableType& table
+)
+{
+    return IteratorType(table.begin());
+}
+
+
+template<class IteratorType, class TableType>
+inline IteratorType Foam::HashTableCore::iterator_cbegin
+(
+    const TableType& table
+)
+{
+    return IteratorType(table.cbegin());
+}
+
+
+template<class IteratorType>
+inline const IteratorType& Foam::HashTableCore::iterator_end()
+{
+    return *reinterpret_cast<const IteratorType*>(nullObjectPtr);
+}
+
+
+template<class IteratorType>
+inline const IteratorType& Foam::HashTableCore::iterator_cend()
+{
+    return *reinterpret_cast<const IteratorType*>(nullObjectPtr);
+}
+
+
+// * * * * * * * * * * * * * const iterator pair * * * * * * * * * * * * * * //
+
+template<class IteratorType, class TableType>
+inline Foam::HashTableCore::const_iterator_pair<IteratorType, TableType>
+::const_iterator_pair
+(
+    const TableType& tbl
+)
+:
+    size_(tbl.size()),
+    iter_(tbl.begin())
+{}
+
+
+template<class IteratorType, class TableType>
+inline Foam::label
+Foam::HashTableCore::const_iterator_pair<IteratorType, TableType>::size() const
+{
+    return size_;
+}
+
+
+template<class IteratorType, class TableType>
+inline bool
+Foam::HashTableCore::const_iterator_pair<IteratorType, TableType>::empty() const
+{
+    return !size_;
+}
+
+
+template<class IteratorType, class TableType>
+inline IteratorType Foam::HashTableCore::const_iterator_pair
+<
+    IteratorType,
+    TableType
+>::begin() const
+{
+    return iter_;
+}
+
+
+template<class IteratorType, class TableType>
+inline IteratorType Foam::HashTableCore::const_iterator_pair
+<
+    IteratorType,
+    TableType
+>::cbegin() const
+{
+    return iter_;
+}
+
+
+template<class IteratorType, class TableType>
+inline const IteratorType& Foam::HashTableCore::const_iterator_pair
+<
+    IteratorType,
+    TableType
+>::end() const
+{
+    return HashTableCore::iterator_cend<IteratorType>();
+}
+
+
+template<class IteratorType, class TableType>
+inline const IteratorType& Foam::HashTableCore::const_iterator_pair
+<
+    IteratorType,
+    TableType
+>::cend() const
+{
+    return HashTableCore::iterator_cend<IteratorType>();
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
index 2303497585..4d8028ca13 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,13 +31,13 @@ template<class T, class Key, class Hash>
 inline Foam::HashTable<T, Key, Hash>::hashedEntry::hashedEntry
 (
     const Key& key,
-    hashedEntry* next,
-    const T& obj
+    const T& obj,
+    hashedEntry* next
 )
 :
     key_(key),
-    next_(next),
-    obj_(obj)
+    obj_(obj),
+    next_(next)
 {}
 
 
@@ -79,10 +79,10 @@ template<class T, class Key, class Hash>
 inline bool Foam::HashTable<T, Key, Hash>::insert
 (
     const Key& key,
-    const T& newEntry
+    const T& obj
 )
 {
-    return this->set(key, newEntry, true);
+    return this->set(key, obj, true);
 }
 
 
@@ -90,10 +90,10 @@ template<class T, class Key, class Hash>
 inline bool Foam::HashTable<T, Key, Hash>::set
 (
     const Key& key,
-    const T& newEntry
+    const T& obj
 )
 {
-    return this->set(key, newEntry, false);
+    return this->set(key, obj, false);
 }
 
 
@@ -105,6 +105,18 @@ Foam::HashTable<T, Key, Hash>::xfer()
 }
 
 
+template<class T, class Key, class Hash>
+inline const T& Foam::HashTable<T, Key, Hash>::lookup
+(
+    const Key& key,
+    const T& deflt
+) const
+{
+    const_iterator iter = this->find(key);
+    return iter.found() ? iter.object() : deflt;
+}
+
+
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -112,7 +124,7 @@ inline T& Foam::HashTable<T, Key, Hash>::operator[](const Key& key)
 {
     iterator iter = this->find(key);
 
-    if (iter == this->end())
+    if (!iter.found())
     {
         FatalErrorInFunction
             << key << " not found in table.  Valid entries: "
@@ -120,7 +132,7 @@ inline T& Foam::HashTable<T, Key, Hash>::operator[](const Key& key)
             << exit(FatalError);
     }
 
-    return *iter;
+    return iter.object();
 }
 
 
@@ -129,7 +141,7 @@ inline const T& Foam::HashTable<T, Key, Hash>::operator[](const Key& key) const
 {
     const_iterator iter = this->find(key);
 
-    if (iter == this->cend())
+    if (!iter.found())
     {
         FatalErrorInFunction
             << key << " not found in table.  Valid entries: "
@@ -137,7 +149,7 @@ inline const T& Foam::HashTable<T, Key, Hash>::operator[](const Key& key) const
             << exit(FatalError);
     }
 
-    return *iter;
+    return iter.object();
 }
 
 
@@ -146,40 +158,82 @@ inline T& Foam::HashTable<T, Key, Hash>::operator()(const Key& key)
 {
     iterator iter = this->find(key);
 
-    if (iter == this->end())
+    if (iter.found())
     {
-        this->insert(key, T());
-        return *find(key);
+        return iter.object();
     }
-    else
+
+    this->insert(key, T());
+    return find(key).object();
+}
+
+
+template<class T, class Key, class Hash>
+inline T& Foam::HashTable<T, Key, Hash>::operator()
+(
+    const Key& key,
+    const T& deflt
+)
+{
+    iterator iter = this->find(key);
+
+    if (iter.found())
     {
-        return *iter;
+        return iter.object();
     }
+
+    this->insert(key, deflt);
+    return find(key).object();
+}
+
+
+template<class T, class Key, class Hash>
+inline const T& Foam::HashTable<T, Key, Hash>::operator()
+(
+    const Key& key,
+    const T& deflt
+) const
+{
+    return this->lookup(key, deflt);
 }
 
 
 // * * * * * * * * * * * * * * * iterator base * * * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
-inline Foam::HashTable<T, Key, Hash>::iteratorBase::iteratorBase()
+inline Foam::HashTable<T, Key, Hash>::iterator_base::iterator_base()
 :
-    hashTable_(0),
-    entryPtr_(0),
+    entryPtr_(nullptr),
+    hashTable_(nullptr),
     hashIndex_(0)
 {}
 
 
 template<class T, class Key, class Hash>
-inline Foam::HashTable<T, Key, Hash>::iteratorBase::iteratorBase
+inline Foam::HashTable<T, Key, Hash>::iterator_base::iterator_base
 (
-    const HashTable<T, Key, Hash>* hashTbl
+    const table_type* hashTbl,
+    const entry_type* elmt,
+    const label hashIndex
 )
 :
-    hashTable_(const_cast<HashTable<T, Key, Hash>*>(hashTbl)),
-    entryPtr_(0),
+    entryPtr_(const_cast<entry_type*>(elmt)),
+    hashTable_(const_cast<table_type*>(hashTbl)),
+    hashIndex_(hashIndex)
+{}
+
+
+template<class T, class Key, class Hash>
+inline Foam::HashTable<T, Key, Hash>::iterator_base::iterator_base
+(
+    const table_type* hashTbl
+)
+:
+    entryPtr_(nullptr),
+    hashTable_(const_cast<table_type*>(hashTbl)),
     hashIndex_(0)
 {
-    if (hashTable_->nElmts_)
+    if (hashTable_ && hashTable_->nElmts_)
     {
         // find first non-nullptr table entry
         while
@@ -192,30 +246,16 @@ inline Foam::HashTable<T, Key, Hash>::iteratorBase::iteratorBase
         if (hashIndex_ >= hashTable_->tableSize_)
         {
             // make into an end iterator
-            entryPtr_ = 0;
+            entryPtr_ = nullptr;
             hashIndex_ = 0;
         }
     }
 }
 
 
-template<class T, class Key, class Hash>
-inline Foam::HashTable<T, Key, Hash>::iteratorBase::iteratorBase
-(
-    const HashTable<T, Key, Hash>* hashTbl,
-    const hashedEntry* elmt,
-    const label hashIndex
-)
-:
-    hashTable_(const_cast<HashTable<T, Key, Hash>*>(hashTbl)),
-    entryPtr_(const_cast<hashedEntry*>(elmt)),
-    hashIndex_(hashIndex)
-{}
-
-
 template<class T, class Key, class Hash>
 inline void
-Foam::HashTable<T, Key, Hash>::iteratorBase::increment()
+Foam::HashTable<T, Key, Hash>::iterator_base::increment()
 {
     // A negative index is a special value from erase
     if (hashIndex_ < 0)
@@ -251,40 +291,38 @@ Foam::HashTable<T, Key, Hash>::iteratorBase::increment()
     if (hashIndex_ >= hashTable_->tableSize_)
     {
         // make into an end iterator
-        entryPtr_ = 0;
+        entryPtr_ = nullptr;
         hashIndex_ = 0;
     }
 }
 
 
 template<class T, class Key, class Hash>
-inline
-const Key& Foam::HashTable<T, Key, Hash>::iteratorBase::key() const
+inline bool
+Foam::HashTable<T, Key, Hash>::iterator_base::found() const
+{
+    return entryPtr_;
+}
+
+
+template<class T, class Key, class Hash>
+inline const Key& Foam::HashTable<T, Key, Hash>::iterator_base::key() const
 {
     return entryPtr_->key_;
 }
 
 
 template<class T, class Key, class Hash>
-inline T&
-Foam::HashTable<T, Key, Hash>::iteratorBase::object()
+inline T& Foam::HashTable<T, Key, Hash>::iterator_base::element() const
 {
     return entryPtr_->obj_;
 }
 
 
 template<class T, class Key, class Hash>
-inline const T&
-Foam::HashTable<T, Key, Hash>::iteratorBase::cobject() const
-{
-    return entryPtr_->obj_;
-}
-
-
-template<class T, class Key, class Hash>
-inline bool Foam::HashTable<T, Key, Hash>::iteratorBase::operator==
+inline bool Foam::HashTable<T, Key, Hash>::iterator_base::operator==
 (
-    const iteratorBase& iter
+    const iterator_base& iter
 ) const
 {
     return entryPtr_ == iter.entryPtr_;
@@ -292,32 +330,69 @@ inline bool Foam::HashTable<T, Key, Hash>::iteratorBase::operator==
 
 
 template<class T, class Key, class Hash>
-inline bool Foam::HashTable<T, Key, Hash>::iteratorBase::operator!=
+inline bool Foam::HashTable<T, Key, Hash>::iterator_base::operator!=
 (
-    const iteratorBase& iter
+    const iterator_base& iter
 ) const
 {
     return entryPtr_ != iter.entryPtr_;
 }
 
 
+// * * * * * * * * * * * * * * key iterator base * * * * * * * * * * * * * * //
+
 template<class T, class Key, class Hash>
-inline bool Foam::HashTable<T, Key, Hash>::iteratorBase::operator==
+template<class WrappedIterator>
+inline Foam::HashTable<T, Key, Hash>::key_iterator_base<WrappedIterator>
+::key_iterator_base
 (
-    const iteratorEnd&
-) const
+    const WrappedIterator& iter
+)
+:
+    WrappedIterator(iter)
+{}
+
+
+template<class T, class Key, class Hash>
+template<class WrappedIterator>
+inline const Key&
+Foam::HashTable<T, Key, Hash>::key_iterator_base<WrappedIterator>
+::operator*() const
 {
-    return !entryPtr_;
+    return this->key();
 }
 
 
 template<class T, class Key, class Hash>
-inline bool Foam::HashTable<T, Key, Hash>::iteratorBase::operator!=
-(
-    const iteratorEnd&
-) const
+template<class WrappedIterator>
+inline const Key&
+Foam::HashTable<T, Key, Hash>::key_iterator_base<WrappedIterator>
+::operator()() const
 {
-    return entryPtr_;
+    return this->key();
+}
+
+
+template<class T, class Key, class Hash>
+template<class WrappedIterator>
+inline Foam::HashTable<T, Key, Hash>::key_iterator_base<WrappedIterator>&
+Foam::HashTable<T, Key, Hash>::key_iterator_base<WrappedIterator>
+::operator++()
+{
+    this->increment();
+    return *this;
+}
+
+
+template<class T, class Key, class Hash>
+template<class WrappedIterator>
+inline Foam::HashTable<T, Key, Hash>::key_iterator_base<WrappedIterator>
+Foam::HashTable<T, Key, Hash>::key_iterator_base<WrappedIterator>
+::operator++(int)
+{
+    key_iterator_base old = *this;
+    this->increment();
+    return old;
 }
 
 
@@ -326,45 +401,43 @@ inline bool Foam::HashTable<T, Key, Hash>::iteratorBase::operator!=
 template<class T, class Key, class Hash>
 inline Foam::HashTable<T, Key, Hash>::iterator::iterator()
 :
-    iteratorBase()
+    iterator_base()
 {}
 
 
 template<class T, class Key, class Hash>
 inline Foam::HashTable<T, Key, Hash>::iterator::iterator
 (
-    const iteratorEnd&
+    table_type* hashTbl
 )
 :
-    iteratorBase()
+    iterator_base(hashTbl)
 {}
 
 
 template<class T, class Key, class Hash>
 inline Foam::HashTable<T, Key, Hash>::iterator::iterator
 (
-    HashTable<T, Key, Hash>* hashTbl
-)
-:
-    iteratorBase(hashTbl)
-{}
-
-
-template<class T, class Key, class Hash>
-inline Foam::HashTable<T, Key, Hash>::iterator::iterator
-(
-    HashTable<T, Key, Hash>* hashTbl,
-    hashedEntry* elmt,
+    table_type* hashTbl,
+    entry_type* elmt,
     const label hashIndex
 )
 :
-    iteratorBase(hashTbl, elmt, hashIndex)
+    iterator_base(hashTbl, elmt, hashIndex)
 {}
 
 
 template<class T, class Key, class Hash>
 inline T&
-Foam::HashTable<T, Key, Hash>::iterator::operator*()
+Foam::HashTable<T, Key, Hash>::iterator::object() const
+{
+    return this->element();
+}
+
+
+template<class T, class Key, class Hash>
+inline T&
+Foam::HashTable<T, Key, Hash>::iterator::operator*() const
 {
     return this->object();
 }
@@ -372,31 +445,14 @@ Foam::HashTable<T, Key, Hash>::iterator::operator*()
 
 template<class T, class Key, class Hash>
 inline T&
-Foam::HashTable<T, Key, Hash>::iterator::operator()()
+Foam::HashTable<T, Key, Hash>::iterator::operator()() const
 {
     return this->object();
 }
 
 
 template<class T, class Key, class Hash>
-inline const T&
-Foam::HashTable<T, Key, Hash>::iterator::operator*() const
-{
-    return this->cobject();
-}
-
-
-template<class T, class Key, class Hash>
-inline const T&
-Foam::HashTable<T, Key, Hash>::iterator::operator()() const
-{
-    return this->cobject();
-}
-
-
-template<class T, class Key, class Hash>
-inline
-typename Foam::HashTable<T, Key, Hash>::iterator&
+inline typename Foam::HashTable<T, Key, Hash>::iterator&
 Foam::HashTable<T, Key, Hash>::iterator::operator++()
 {
     this->increment();
@@ -414,20 +470,12 @@ Foam::HashTable<T, Key, Hash>::iterator::operator++(int)
 }
 
 
-template<class T, class Key, class Hash>
-inline typename Foam::HashTable<T, Key, Hash>::iterator
-Foam::HashTable<T, Key, Hash>::begin()
-{
-    return iterator(this);
-}
-
-
-// * * * * * * * * * * * * * * * STL const_iterator * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * STL const_iterator  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
 inline Foam::HashTable<T, Key, Hash>::const_iterator::const_iterator()
 :
-    iteratorBase()
+    iterator_base()
 {}
 
 
@@ -437,47 +485,45 @@ inline Foam::HashTable<T, Key, Hash>::const_iterator::const_iterator
     const HashTable<T, Key, Hash>::iterator& iter
 )
 :
-    iteratorBase(iter)
+    iterator_base(iter)
 {}
 
 
 template<class T, class Key, class Hash>
 inline Foam::HashTable<T, Key, Hash>::const_iterator::const_iterator
 (
-    const iteratorEnd&
+    table_type* hashTbl
 )
 :
-    iteratorBase()
+    iterator_base(hashTbl)
 {}
 
 
 template<class T, class Key, class Hash>
 inline Foam::HashTable<T, Key, Hash>::const_iterator::const_iterator
 (
-    const HashTable<T, Key, Hash>* hashTbl
-)
-:
-    iteratorBase(hashTbl)
-{}
-
-
-template<class T, class Key, class Hash>
-inline Foam::HashTable<T, Key, Hash>::const_iterator::const_iterator
-(
-    const HashTable<T, Key, Hash>* hashTbl,
-    const hashedEntry* elmt,
+    table_type* hashTbl,
+    entry_type* elmt,
     const label hashIndex
 )
 :
-    iteratorBase(hashTbl, elmt, hashIndex)
+    iterator_base(hashTbl, elmt, hashIndex)
 {}
 
 
+template<class T, class Key, class Hash>
+inline const T&
+Foam::HashTable<T, Key, Hash>::const_iterator::object() const
+{
+    return this->element();
+}
+
+
 template<class T, class Key, class Hash>
 inline const T&
 Foam::HashTable<T, Key, Hash>::const_iterator::operator*() const
 {
-    return this->cobject();
+    return this->object();
 }
 
 
@@ -485,13 +531,12 @@ template<class T, class Key, class Hash>
 inline const T&
 Foam::HashTable<T, Key, Hash>::const_iterator::operator()() const
 {
-    return this->cobject();
+    return this->object();
 }
 
 
 template<class T, class Key, class Hash>
-inline
-typename Foam::HashTable<T, Key, Hash>::const_iterator&
+inline typename Foam::HashTable<T, Key, Hash>::const_iterator&
 Foam::HashTable<T, Key, Hash>::const_iterator::operator++()
 {
     this->increment();
@@ -509,6 +554,24 @@ Foam::HashTable<T, Key, Hash>::const_iterator::operator++(int)
 }
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class T, class Key, class Hash>
+inline typename Foam::HashTable<T, Key, Hash>::iterator
+Foam::HashTable<T, Key, Hash>::begin()
+{
+    return iterator(this);
+}
+
+
+template<class T, class Key, class Hash>
+inline typename Foam::HashTable<T, Key, Hash>::const_iterator
+Foam::HashTable<T, Key, Hash>::begin() const
+{
+    return const_iterator(this);
+}
+
+
 template<class T, class Key, class Hash>
 inline typename Foam::HashTable<T, Key, Hash>::const_iterator
 Foam::HashTable<T, Key, Hash>::cbegin() const
@@ -518,10 +581,26 @@ Foam::HashTable<T, Key, Hash>::cbegin() const
 
 
 template<class T, class Key, class Hash>
-inline typename Foam::HashTable<T, Key, Hash>::const_iterator
-Foam::HashTable<T, Key, Hash>::begin() const
+inline const typename Foam::HashTable<T, Key, Hash>::iterator&
+Foam::HashTable<T, Key, Hash>::end()
 {
-    return this->cbegin();
+    return iterator_end<iterator>();
+}
+
+
+template<class T, class Key, class Hash>
+inline const typename Foam::HashTable<T, Key, Hash>::const_iterator&
+Foam::HashTable<T, Key, Hash>::end() const
+{
+    return iterator_end<const_iterator>();
+}
+
+
+template<class T, class Key, class Hash>
+inline const typename Foam::HashTable<T, Key, Hash>::const_iterator&
+Foam::HashTable<T, Key, Hash>::cend() const
+{
+    return iterator_cend<const_iterator>();
 }
 
 
diff --git a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
index 4d9c373845..0eb3fadb45 100644
--- a/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
+++ b/src/OpenFOAM/containers/HashTables/HashTable/HashTableIO.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -43,7 +43,7 @@ Foam::HashTable<T, Key, Hash>::HashTable(Istream& is, const label size)
 
         for (label hashIdx = 0; hashIdx < tableSize_; ++hashIdx)
         {
-            table_[hashIdx] = 0;
+            table_[hashIdx] = nullptr;
         }
     }
 
@@ -54,8 +54,7 @@ Foam::HashTable<T, Key, Hash>::HashTable(Istream& is, const label size)
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
-Foam::Ostream&
-Foam::HashTable<T, Key, Hash>::printInfo(Ostream& os) const
+Foam::Ostream& Foam::HashTable<T, Key, Hash>::printInfo(Ostream& os) const
 {
     label used = 0;
     label maxChain = 0;
@@ -90,6 +89,53 @@ Foam::HashTable<T, Key, Hash>::printInfo(Ostream& os) const
 }
 
 
+template<class T, class Key, class Hash>
+Foam::Ostream& Foam::HashTable<T, Key, Hash>::writeKeys
+(
+    Ostream& os,
+    const label shortListLen
+) const
+{
+    // Similar to UList::writeList version except the following:
+    // - the keys can never be uniform
+    // - never write in binary
+
+    label i = this->size();
+
+    if (i <= 1 || !shortListLen || (i <= shortListLen))
+    {
+        // Write size and start delimiter
+        os << i << token::BEGIN_LIST;
+
+        i = 0;
+        for (const_iterator iter = this->cbegin(); iter != this->cend(); ++iter)
+        {
+            if (i++) os << token::SPACE;
+            os << iter.key();
+        }
+
+        os << token::END_LIST;  // End delimiter
+    }
+    else
+    {
+        // Write size and start delimiter
+        os << nl << i << nl << token::BEGIN_LIST << nl;
+
+        for (const_iterator iter = this->cbegin(); iter != this->cend(); ++iter)
+        {
+            os << iter.key() << nl;
+        }
+
+        os << token::END_LIST << nl;  // End delimiter
+    }
+
+    // Check state of IOstream
+    os.check(FUNCTION_NAME);
+
+    return os;
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -215,28 +261,25 @@ template<class T, class Key, class Hash>
 Foam::Ostream& Foam::operator<<
 (
     Ostream& os,
-    const HashTable<T, Key, Hash>& L
+    const HashTable<T, Key, Hash>& tbl
 )
 {
+    using const_iterator = typename HashTable<T, Key, Hash>::const_iterator;
+
     // Write size and start delimiter
-    os << nl << L.size() << nl << token::BEGIN_LIST << nl;
+    os << nl << tbl.size() << nl << token::BEGIN_LIST << nl;
 
     // Write contents
-    for
-    (
-        typename HashTable<T, Key, Hash>::const_iterator iter = L.cbegin();
-        iter != L.cend();
-        ++iter
-    )
+    for (const_iterator iter = tbl.cbegin(); iter != tbl.cend(); ++iter)
     {
-        os << iter.key() << token::SPACE << iter() << nl;
+        os << iter.key() << token::SPACE << iter.object() << nl;
     }
 
     // Write end delimiter
     os << token::END_LIST;
 
     // Check state of IOstream
-    os.check("Ostream& operator<<(Ostream&, const HashTable&)");
+    os.check(FUNCTION_NAME);
 
     return os;
 }
diff --git a/src/OpenFOAM/containers/HashTables/Map/Map.H b/src/OpenFOAM/containers/HashTables/Map/Map.H
index 8ef2f560bc..4ac6e90e60 100644
--- a/src/OpenFOAM/containers/HashTables/Map/Map.H
+++ b/src/OpenFOAM/containers/HashTables/Map/Map.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,50 +51,54 @@ class Map
 :
     public HashTable<T, label, Hash<label>>
 {
-
 public:
 
-    typedef typename HashTable<T, label, Hash<label>>::iterator iterator;
+    //- The template instance used for this Map
+    typedef Map<T> this_type;
+
+    //- The template instance used for the parent HashTable
+    typedef HashTable<T, label, Hash<label>> parent_type;
+
+    using iterator = typename parent_type::iterator;
+    using const_iterator = typename parent_type::const_iterator;
 
-    typedef typename HashTable<T, label, Hash<label>>::const_iterator
-        const_iterator;
 
     // Constructors
 
         //- Construct given initial size
         Map(const label size = 128)
         :
-            HashTable<T, label, Hash<label>>(size)
+            parent_type(size)
         {}
 
         //- Construct from Istream
         Map(Istream& is)
         :
-            HashTable<T, label, Hash<label>>(is)
+            parent_type(is)
         {}
 
         //- Construct as copy
         Map(const Map<T>& map)
         :
-            HashTable<T, label, Hash<label>>(map)
+            parent_type(map)
         {}
 
         //- Construct by transferring the parameter contents
         Map(const Xfer<Map<T>>& map)
         :
-            HashTable<T, label, Hash<label>>(map)
+            parent_type(map)
         {}
 
         //- Construct by transferring the parameter contents
         Map(const Xfer<HashTable<T, label, Hash<label>>>& map)
         :
-            HashTable<T, label, Hash<label>>(map)
+            parent_type(map)
         {}
 
         //- Construct from an initializer list
         Map(std::initializer_list<Tuple2<label, T>> map)
         :
-            HashTable<T, label, Hash<label>>(map)
+            parent_type(map)
         {}
 };
 
diff --git a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
index 134a7fa9b0..178bc67098 100644
--- a/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
+++ b/src/OpenFOAM/containers/HashTables/PtrMap/PtrMap.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,27 +51,33 @@ class PtrMap
 :
     public HashPtrTable<T, label, Hash<label>>
 {
-
 public:
 
+    //- The template instance used for this PtrMap
+    typedef PtrMap<T> this_type;
+
+    //- The template instance used for the parent HashTable
+    typedef HashPtrTable<T, label, Hash<label>> parent_type;
+
+
     // Constructors
 
         //- Construct given initial map size
         PtrMap(const label size = 128)
         :
-            HashPtrTable<T, label, Hash<label>>(size)
+            parent_type(size)
         {}
 
         //- Construct from Istream
         PtrMap(Istream& is)
         :
-            HashPtrTable<T, label, Hash<label>>(is)
+            parent_type(is)
         {}
 
         //- Construct as copy
-        PtrMap(const PtrMap<T>& map)
+        PtrMap(const this_type& map)
         :
-            HashPtrTable<T, label, Hash<label>>(map)
+            parent_type(map)
         {}
 };
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
index 05ad88f33e..ec30dfc20a 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.C
@@ -30,32 +30,6 @@ License
 #include "List.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
-
-Foam::label Foam::StaticHashTableCore::canonicalSize(const label size)
-{
-    if (size < 1)
-    {
-        return 0;
-    }
-
-    // Enforce power of two
-    unsigned int goodSize = size;
-
-    if (goodSize & (goodSize - 1))
-    {
-        // Brute-force is fast enough
-        goodSize = 1;
-        while (goodSize < unsigned(size))
-        {
-            goodSize <<= 1;
-        }
-    }
-
-    return goodSize;
-}
-
-
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -229,7 +203,7 @@ template<class T, class Key, class Hash>
 bool Foam::StaticHashTable<T, Key, Hash>::set
 (
     const Key& key,
-    const T& newEntry,
+    const T& obj,
     const bool protect
 )
 {
@@ -255,7 +229,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::set
         localObjects.setSize(existing+1);
 
         localKeys[existing] = key;
-        localObjects[existing] = newEntry;
+        localObjects[existing] = obj;
 
         nElmts_++;
     }
@@ -276,7 +250,7 @@ bool Foam::StaticHashTable<T, Key, Hash>::set
     {
         // Found - overwrite existing entry
         // this corresponds to the Perl convention
-        objects_[hashIdx][existing] = newEntry;
+        objects_[hashIdx][existing] = obj;
     }
 
     return true;
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
index 67dfdfa5a9..5b0a3ef8a5 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTable.H
@@ -78,8 +78,8 @@ template<class T, class Key, class Hash> Ostream& operator<<
 //- Template-invariant bits for StaticHashTable
 struct StaticHashTableCore
 {
-    //- Return a canonical (power-of-two) size
-    static label canonicalSize(const label);
+    //- Return a canonical (power-of-two) of the requested size.
+    static label canonicalSize(const label requested_size);
 
     //- Construct null
     StaticHashTableCore()
@@ -119,15 +119,12 @@ class StaticHashTable
         //- The current number of elements in table
         label nElmts_;
 
-        //- Return a canonical (power-of-two) size
-        static label canonicalSize(const label);
-
         //- Return the hash index of the Key within the current table size.
         //  No checks for zero-sized tables.
-        inline label hashKeyIndex(const Key&) const;
+        inline label hashKeyIndex(const Key& key) const;
 
         //- Assign a new hashed entry to a possibly already existing key
-        bool set(const Key&, const T& newElmt, bool protect);
+        bool set(const Key& key, const T& obj, bool protect);
 
 
 public:
@@ -397,7 +394,7 @@ private:
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-    #include "StaticHashTableI.H"
+#include "StaticHashTableI.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableCore.C b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableCore.C
index 760839b0c6..31c02ebf5e 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableCore.C
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableCore.C
@@ -24,6 +24,7 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "StaticHashTable.H"
+#include "uLabel.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -33,4 +34,53 @@ defineTypeNameAndDebug(StaticHashTableCore, 0);
 }
 
 
+// Approximately labelMax/4
+static const Foam::label maxTableSize(1 << (sizeof(Foam::label)*8-3));
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+Foam::label Foam::StaticHashTableCore::canonicalSize(const label requested_size)
+{
+    if (requested_size < 1)
+    {
+        return 0;
+    }
+
+    // Enforce power of two - makes for a vey fast modulus etc.
+    // Use unsigned for these calculations.
+    //
+    // - The lower limit (8) is somewhat arbitrary, but if the hash table
+    //   is too small, there will be many direct table collisions.
+    // - The uper limit (approx. labelMax/4) must be a power of two,
+    //   need not be extremely large for hashing.
+
+    uLabel powerOfTwo = 8; // lower-limit
+
+    const uLabel size = requested_size;
+    if (size < powerOfTwo)
+    {
+        return powerOfTwo;
+    }
+    else if (requested_size >= maxTableSize)
+    {
+        return maxTableSize;
+    }
+    else if (size & (size-1))  // <- Modulus of i^2
+    {
+        // Determine power-of-two. Brute-force is fast enough.
+        while (powerOfTwo < size)
+        {
+            powerOfTwo <<= 1;
+        }
+
+        return powerOfTwo;
+    }
+    else
+    {
+        return size;
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
index cebb3852aa..2e6b5db0ea 100644
--- a/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
+++ b/src/OpenFOAM/containers/HashTables/StaticHashTable/StaticHashTableI.H
@@ -26,8 +26,6 @@ License
 #include "error.H"
 #include "IOstreams.H"
 
-// * * * * * * * * * * * * * Private Member Classes * * * * * * * * * * * * //
-
 // * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * * //
 
 template<class T, class Key, class Hash>
@@ -59,10 +57,10 @@ template<class T, class Key, class Hash>
 inline bool Foam::StaticHashTable<T, Key, Hash>::insert
 (
     const Key& key,
-    const T& newEntry
+    const T& obj
 )
 {
-    return set(key, newEntry, true);
+    return set(key, obj, true);
 }
 
 
@@ -70,10 +68,10 @@ template<class T, class Key, class Hash>
 inline bool Foam::StaticHashTable<T, Key, Hash>::set
 (
     const Key& key,
-    const T& newEntry
+    const T& obj
 )
 {
-    return set(key, newEntry, false);
+    return set(key, obj, false);
 }
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
index cac481545e..eefabca329 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LList/LList.H
@@ -254,14 +254,14 @@ public:
 
             // Member operators
 
-                T& operator*()
+                T& operator*() const
                 {
                     return
                         static_cast<link&>
                         (LListBase_iterator::operator*()).obj_;
                 }
 
-                T& operator()()
+                T& operator()() const
                 {
                     return operator*();
                 }
@@ -312,14 +312,14 @@ public:
 
             // Member operators
 
-                const T& operator*()
+                const T& operator*() const
                 {
                     return
                         static_cast<const link&>
                         (LListBase_const_iterator::operator*()).obj_;
                 }
 
-                const T& operator()()
+                const T& operator()() const
                 {
                     return operator*();
                 }
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
index e2b7e49a5a..a0e22917f9 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/LPtrList/LPtrList.H
@@ -196,12 +196,12 @@ public:
 
             // Member operators
 
-                T& operator*()
+                T& operator*() const
                 {
                     return *(LList<LListBase, T*>::iterator::operator*());
                 }
 
-                T& operator()()
+                T& operator()() const
                 {
                     return operator*();
                 }
@@ -235,12 +235,12 @@ public:
 
             // Member operators
 
-                const T& operator*()
+                const T& operator*() const
                 {
                     return *(LList<LListBase, T*>::const_iterator::operator*());
                 }
 
-                const T& operator()()
+                const T& operator()() const
                 {
                     return operator*();
                 }
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C
index 0a7f057286..9c7ee2d550 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.C
@@ -57,19 +57,19 @@ bool Foam::UILList<LListBase, T>::operator==
     const UILList<LListBase, T>& rhs
 ) const
 {
-    if (this->size() != rhs.size())
+    bool equal = (this->size() == rhs.size());
+    if (!equal)
     {
         return false;
     }
 
-    bool equal = true;
-
     const_iterator iter1 = this->begin();
     const_iterator iter2 = rhs.begin();
 
     for (; iter1 != this->end(); ++iter1, ++iter2)
     {
-        equal = equal && iter1() == iter2();
+        equal = (iter1() == iter2());
+        if (!equal) break;
     }
 
     return equal;
diff --git a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
index 28d1231762..1f5b01b326 100644
--- a/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
+++ b/src/OpenFOAM/containers/LinkedLists/accessTypes/UILList/UILList.H
@@ -192,12 +192,12 @@ public:
 
             // Member operators
 
-                T& operator*()
+                T& operator*() const
                 {
                     return static_cast<T&>(LListBase_iterator::operator*());
                 }
 
-                T& operator()()
+                T& operator()() const
                 {
                     return operator*();
                 }
@@ -247,14 +247,14 @@ public:
 
             // Member operators
 
-                const T& operator*()
+                const T& operator*() const
                 {
                     return
                         static_cast<const T&>
                         (LListBase_const_iterator::operator*());
                 }
 
-                const T& operator()()
+                const T& operator()() const
                 {
                     return operator*();
                 }
@@ -309,14 +309,14 @@ public:
 
             // Member operators
 
-                const T& operator*()
+                const T& operator*() const
                 {
                     return
                         static_cast<const T&>
                         (LListBase::const_reverse_iterator::operator*());
                 }
 
-                const T& operator()()
+                const T& operator()() const
                 {
                     return operator*();
                 }
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
index e8e6b721c3..f428836f43 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.C
@@ -188,7 +188,7 @@ Foam::DLListBase::link* Foam::DLListBase::removeHead()
 
     if (!first_)
     {
-        last_ = 0;
+        last_ = nullptr;
     }
 
     f->deregister();
@@ -204,8 +204,8 @@ Foam::DLListBase::link* Foam::DLListBase::remove(DLListBase::link* l)
 
     if (l == first_ && first_ == last_)
     {
-        first_ = 0;
-        last_ = 0;
+        first_ = nullptr;
+        last_ = nullptr;
     }
     else if (l == first_)
     {
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
index 3208c250a9..d65363113e 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBase.H
@@ -25,9 +25,10 @@ Class
     Foam::DLListBase
 
 Description
-    Base doubly-linked list.
+    Base for doubly-linked lists.
 
 SourceFiles
+    DLListBaseI.H
     DLListBase.C
 
 \*---------------------------------------------------------------------------*/
@@ -84,10 +85,10 @@ private:
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        DLListBase(const DLListBase&);
+        DLListBase(const DLListBase&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const DLListBase&);
+        void operator=(const DLListBase&) = delete;
 
 
 public:
@@ -184,18 +185,14 @@ public:
             friend class DLListBase;
             friend class const_iterator;
 
-            // Private data
+            //- Reference to the list this is an iterator for
+            DLListBase& curList_;
 
-                //- Reference to the list this is an iterator for
-                DLListBase& curList_;
+            //- Current element
+            link* curElmt_;
 
-                //- Current element
-                link* curElmt_;
-
-                //- Copy of the link
-                link curLink_;
-
-            // Private Member Functions
+            //- Copy of the link
+            link curLink_;
 
             //- Construct for a given SLListBase with nullptr element and link.
             //  Only used to create endIter
@@ -206,17 +203,18 @@ public:
             //- Construct for a given DLListBase and link
             inline iterator(DLListBase&, link*);
 
-            // Member operators
+            //- Currently pointing at a valid entry
+            inline bool found() const;
 
-                inline void operator=(const iterator&);
+            inline void operator=(const iterator& iter);
 
-                inline bool operator==(const iterator&) const;
-                inline bool operator!=(const iterator&) const;
+            inline bool operator==(const iterator& iter) const;
+            inline bool operator!=(const iterator& iter) const;
 
-                inline link& operator*();
+            inline link& operator*() const;
 
-                inline iterator& operator++();
-                inline iterator operator++(int);
+            inline iterator& operator++();
+            inline iterator operator++(int);
         };
 
         inline iterator begin();
@@ -228,13 +226,11 @@ public:
         //- An STL-conforming const_iterator
         class const_iterator
         {
-            // Private data
+            //- Reference to the list this is an iterator for
+            const DLListBase& curList_;
 
-                //- Reference to the list this is an iterator for
-                const DLListBase& curList_;
-
-                //- Current element
-                const link* curElmt_;
+            //- Current element
+            const link* curElmt_;
 
         public:
 
@@ -242,19 +238,20 @@ public:
             inline const_iterator(const DLListBase&, const link*);
 
             //- Construct from a non-const iterator
-            inline const_iterator(const iterator&);
+            inline const_iterator(const DLListBase::iterator& iter);
 
-            // Member operators
+            //- Currently pointing at a valid entry
+            inline bool found() const;
 
-                inline void operator=(const const_iterator&);
+            inline void operator=(const const_iterator& iter);
 
-                inline bool operator==(const const_iterator&) const;
-                inline bool operator!=(const const_iterator&) const;
+            inline bool operator==(const const_iterator& iter) const;
+            inline bool operator!=(const const_iterator& iter) const;
 
-                inline const link& operator*();
+            inline const link& operator*() const;
 
-                inline const_iterator& operator++();
-                inline const_iterator operator++(int);
+            inline const_iterator& operator++();
+            inline const_iterator operator++(int);
         };
 
         inline const_iterator cbegin() const;
@@ -269,30 +266,29 @@ public:
         //- An STL-conforming const_reverse_iterator
         class const_reverse_iterator
         {
-            // Private data
+            //- Reference to the list this is an reverse_iterator for
+            const DLListBase& curList_;
 
-                //- Reference to the list this is an reverse_iterator for
-                const DLListBase& curList_;
-
-                //- Current element
-                const link* curElmt_;
+            //- Current element
+            const link* curElmt_;
 
         public:
 
             //- Construct for a given DLListBase and link
-            inline const_reverse_iterator(const DLListBase&, const link*);
+            inline const_reverse_iterator(const DLListBase& lst, const link*);
 
-            // Member operators
+            //- Currently pointing at a valid entry
+            inline bool found() const;
 
-                inline void operator=(const const_reverse_iterator&);
+            inline void operator=(const const_reverse_iterator& iter);
 
-                inline bool operator==(const const_reverse_iterator&) const;
-                inline bool operator!=(const const_reverse_iterator&) const;
+            inline bool operator==(const const_reverse_iterator& iter) const;
+            inline bool operator!=(const const_reverse_iterator& iter) const;
 
-                inline const link& operator*();
+            inline const link& operator*() const;
 
-                inline const_reverse_iterator& operator++();
-                inline const_reverse_iterator operator++(int);
+            inline const_reverse_iterator& operator++();
+            inline const_reverse_iterator operator++(int);
         };
 
         inline const_reverse_iterator crbegin() const;
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
index 91c0bc9ddb..6dc080777a 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/DLListBase/DLListBaseI.H
@@ -29,15 +29,15 @@ License
 
 inline Foam::DLListBase::link::link()
 :
-    prev_(0),
-    next_(0)
+    prev_(nullptr),
+    next_(nullptr)
 {}
 
 
 inline Foam::DLListBase::DLListBase()
 :
-    first_(0),
-    last_(0),
+    first_(nullptr),
+    last_(nullptr),
     nElmts_(0)
 {}
 
@@ -63,14 +63,14 @@ inline Foam::DLListBase::~DLListBase()
 
 inline bool Foam::DLListBase::link::registered() const
 {
-    return prev_ != 0 && next_ != 0;
+    return prev_ != nullptr && next_ != nullptr;
 }
 
 
 inline void Foam::DLListBase::link::deregister()
 {
-    prev_ = 0;
-    next_ = 0;
+    prev_ = nullptr;
+    next_ = nullptr;
 }
 
 
@@ -140,8 +140,8 @@ Foam::DLListBase::last() const
 
 inline void Foam::DLListBase::clear()
 {
-    first_ = 0;
-    last_  = 0;
+    first_ = nullptr;
+    last_  = nullptr;
     nElmts_ = 0;
 }
 
@@ -195,6 +195,12 @@ inline Foam::DLListBase::iterator::iterator(DLListBase& s)
 {}
 
 
+inline bool Foam::DLListBase::iterator::found() const
+{
+    return (curElmt_ != nullptr);
+}
+
+
 inline void Foam::DLListBase::iterator::operator=(const iterator& iter)
 {
     curElmt_ = iter.curElmt_;
@@ -215,7 +221,7 @@ inline bool Foam::DLListBase::iterator::operator!=(const iterator& iter) const
 
 
 inline Foam::DLListBase::link&
-Foam::DLListBase::iterator::operator*()
+Foam::DLListBase::iterator::operator*() const
 {
     return *curElmt_;
 }
@@ -226,9 +232,9 @@ Foam::DLListBase::iterator::operator++()
 {
     // Check if the curElmt_ is the last element (if it points to itself)
     // or if the list is empty because the last element may have been removed
-    if (curLink_.next_ == curElmt_ || curList_.last_ == 0)
+    if (curLink_.next_ == curElmt_ || curList_.last_ == nullptr)
     {
-        curElmt_ = 0;
+        curElmt_ = nullptr;
     }
     else
     {
@@ -282,13 +288,22 @@ inline Foam::DLListBase::const_iterator::const_iterator
 {}
 
 
-inline Foam::DLListBase::const_iterator::const_iterator(const iterator& iter)
+inline Foam::DLListBase::const_iterator::const_iterator
+(
+    const DLListBase::iterator& iter
+)
 :
     curList_(iter.curList_),
     curElmt_(iter.curElmt_)
 {}
 
 
+inline bool Foam::DLListBase::const_iterator::found() const
+{
+    return (curElmt_ != nullptr);
+}
+
+
 inline void Foam::DLListBase::const_iterator::operator=
 (
     const const_iterator& iter
@@ -317,7 +332,7 @@ inline bool Foam::DLListBase::const_iterator::operator!=
 
 
 inline const Foam::DLListBase::link&
-Foam::DLListBase::const_iterator::operator*()
+Foam::DLListBase::const_iterator::operator*() const
 {
     return *curElmt_;
 }
@@ -328,7 +343,7 @@ Foam::DLListBase::const_iterator::operator++()
 {
     if (curElmt_ == curList_.last_)
     {
-        curElmt_ = 0;
+        curElmt_ = nullptr;
     }
     else
     {
@@ -387,15 +402,21 @@ Foam::DLListBase::end() const
 
 inline Foam::DLListBase::const_reverse_iterator::const_reverse_iterator
 (
-    const DLListBase& s,
+    const DLListBase& lst,
     const link* elmt
 )
 :
-    curList_(s),
+    curList_(lst),
     curElmt_(elmt)
 {}
 
 
+inline bool Foam::DLListBase::const_reverse_iterator::found() const
+{
+    return (curElmt_ != nullptr);
+}
+
+
 inline void Foam::DLListBase::const_reverse_iterator::operator=
 (
     const const_reverse_iterator& iter
@@ -424,7 +445,7 @@ inline bool Foam::DLListBase::const_reverse_iterator::operator!=
 
 
 inline const Foam::DLListBase::link&
-Foam::DLListBase::const_reverse_iterator::operator*()
+Foam::DLListBase::const_reverse_iterator::operator*() const
 {
     return *curElmt_;
 }
@@ -435,7 +456,7 @@ Foam::DLListBase::const_reverse_iterator::operator++()
 {
     if (curElmt_ == curList_.first_)
     {
-        curElmt_ = 0;
+        curElmt_ = nullptr;
     }
     else
     {
@@ -460,7 +481,7 @@ Foam::DLListBase::crbegin() const
 {
     if (size())
     {
-        return const_reverse_iterator(*this, last());
+        return const_reverse_iterator(*this, this->last());
     }
     else
     {
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
index c314cdc752..693530d595 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.C
@@ -79,7 +79,7 @@ Foam::SLListBase::link* Foam::SLListBase::removeHead()
 {
     nElmts_--;
 
-    if (last_ == 0)
+    if (last_ == nullptr)
     {
         FatalErrorInFunction
             << "remove from empty list"
@@ -90,7 +90,7 @@ Foam::SLListBase::link* Foam::SLListBase::removeHead()
 
     if (f == last_)
     {
-        last_ = 0;
+        last_ = nullptr;
     }
     else
     {
@@ -132,7 +132,7 @@ Foam::SLListBase::link* Foam::SLListBase::remove(SLListBase::link* it)
         prev = p;
     }
 
-    return 0;
+    return nullptr;
 }
 
 
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
index add6424455..421922d3b8 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBase.H
@@ -25,9 +25,10 @@ Class
     Foam::SLListBase
 
 Description
-    Base singly-linked list.
+    Base for singly-linked lists.
 
 SourceFiles
+    SLListBaseI.H
     SLListBase.C
 
 \*---------------------------------------------------------------------------*/
@@ -81,10 +82,10 @@ private:
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        SLListBase(const SLListBase&);
+        SLListBase(const SLListBase&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const SLListBase&);
+        void operator=(const SLListBase&) = delete;
 
 
 public:
@@ -166,18 +167,14 @@ public:
             friend class SLListBase;
             friend class const_iterator;
 
-            // Private data
+            //- Reference to the list this is an iterator for
+            SLListBase& curList_;
 
-                //- Reference to the list this is an iterator for
-                SLListBase& curList_;
+            //- Current element
+            link* curElmt_;
 
-                //- Current element
-                link* curElmt_;
-
-                //- Copy of the link
-                link curLink_;
-
-            // Private Member Functions
+            //- Copy of the link
+            link curLink_;
 
             //- Construct for a given SLListBase with nullptr element and link.
             //  Only used to create endIter
@@ -188,17 +185,18 @@ public:
             //- Construct for a given SLListBase and link
             inline iterator(SLListBase&, link*);
 
-            // Member operators
+            //- Currently pointing at a valid entry
+            inline bool found() const;
 
-                inline void operator=(const iterator&);
+            inline void operator=(const iterator& iter);
 
-                inline bool operator==(const iterator&) const;
-                inline bool operator!=(const iterator&) const;
+            inline bool operator==(const iterator& iter) const;
+            inline bool operator!=(const iterator& iter) const;
 
-                inline link& operator*();
+            inline link& operator*() const;
 
-                inline iterator& operator++();
-                inline iterator operator++(int);
+            inline iterator& operator++();
+            inline iterator operator++(int);
         };
 
         inline iterator begin();
@@ -210,13 +208,11 @@ public:
         //- An STL-conforming const_iterator
         class const_iterator
         {
-            // Private data
+            //- Reference to the list this is an iterator for
+            const SLListBase& curList_;
 
-                //- Reference to the list this is an iterator for
-                const SLListBase& curList_;
-
-                //- Current element
-                const link* curElmt_;
+            //- Current element
+            const link* curElmt_;
 
         public:
 
@@ -224,20 +220,20 @@ public:
             inline const_iterator(const SLListBase&, const link*);
 
             //- Construct from a non-const iterator
-            inline const_iterator(const iterator&);
+            inline const_iterator(const SLListBase::iterator& iter);
 
+            //- Currently pointing at a valid entry
+            inline bool found() const;
 
-            // Member operators
+            inline void operator=(const const_iterator& iter);
 
-                inline void operator=(const const_iterator&);
+            inline bool operator==(const const_iterator& iter) const;
+            inline bool operator!=(const const_iterator& iter) const;
 
-                inline bool operator==(const const_iterator&) const;
-                inline bool operator!=(const const_iterator&) const;
+            inline const link& operator*() const;
 
-                inline const link& operator*();
-
-                inline const_iterator& operator++();
-                inline const_iterator operator++(int);
+            inline const_iterator& operator++();
+            inline const_iterator operator++(int);
         };
 
         inline const_iterator cbegin() const;
diff --git a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
index fc9b9f007c..8c4ebdb7c3 100644
--- a/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
+++ b/src/OpenFOAM/containers/LinkedLists/linkTypes/SLListBase/SLListBaseI.H
@@ -21,9 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    Base singly-linked list.
-
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
@@ -32,7 +29,7 @@ Description
 
 inline Foam::SLListBase::link::link()
 :
-    next_(0)
+    next_(nullptr)
 {}
 
 
@@ -44,16 +41,22 @@ inline Foam::SLListBase::link::link(link* p)
 
 inline Foam::SLListBase::SLListBase()
 :
-    last_(0),
+    last_(nullptr),
     nElmts_(0)
 {}
 
 
 inline Foam::SLListBase::SLListBase(link* a)
 :
-    last_(a->next_ = a),
-    nElmts_(1)
-{}
+    last_(a),
+    nElmts_(0)
+{
+    if (a)  // protect against nullptr
+    {
+        a->next_ = a;
+        nElmts_  = 1;
+    }
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -130,7 +133,7 @@ Foam::SLListBase::last() const
 
 inline void Foam::SLListBase::clear()
 {
-    last_ = 0;
+    last_ = nullptr;
     nElmts_ = 0;
 }
 
@@ -171,6 +174,12 @@ inline Foam::SLListBase::iterator::iterator(SLListBase& s)
 {}
 
 
+inline bool Foam::SLListBase::iterator::found() const
+{
+    return (curElmt_ != nullptr);
+}
+
+
 inline void Foam::SLListBase::iterator::operator=(const iterator& iter)
 {
     curElmt_ = iter.curElmt_;
@@ -190,7 +199,7 @@ inline bool Foam::SLListBase::iterator::operator!=(const iterator& iter) const
 }
 
 
-inline Foam::SLListBase::link& Foam::SLListBase::iterator::operator*()
+inline Foam::SLListBase::link& Foam::SLListBase::iterator::operator*() const
 {
     return *curElmt_;
 }
@@ -198,9 +207,9 @@ inline Foam::SLListBase::link& Foam::SLListBase::iterator::operator*()
 
 inline Foam::SLListBase::iterator& Foam::SLListBase::iterator::operator++()
 {
-    if (curElmt_ == curList_.last_ || curList_.last_ == 0)
+    if (curElmt_ == curList_.last_ || curList_.last_ == nullptr)
     {
-        curElmt_ = 0;
+        curElmt_ = nullptr;
     }
     else
     {
@@ -255,13 +264,22 @@ inline Foam::SLListBase::const_iterator::const_iterator
 {}
 
 
-inline Foam::SLListBase::const_iterator::const_iterator(const iterator& iter)
+inline Foam::SLListBase::const_iterator::const_iterator
+(
+    const SLListBase::iterator& iter
+)
 :
     curList_(iter.curList_),
     curElmt_(iter.curElmt_)
 {}
 
 
+inline bool Foam::SLListBase::const_iterator::found() const
+{
+    return (curElmt_ != nullptr);
+}
+
+
 inline void Foam::SLListBase::const_iterator::operator=
 (
     const const_iterator& iter
@@ -290,7 +308,7 @@ inline bool Foam::SLListBase::const_iterator::operator!=
 
 
 inline const Foam::SLListBase::link&
-Foam::SLListBase::const_iterator::operator*()
+Foam::SLListBase::const_iterator::operator*() const
 {
     return *curElmt_;
 }
@@ -301,7 +319,7 @@ Foam::SLListBase::const_iterator::operator++()
 {
     if (curElmt_ == curList_.last_)
     {
-        curElmt_ = 0;
+        curElmt_ = nullptr;
     }
     else
     {
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
index be198f8ffa..6c03173401 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,14 +59,14 @@ class DynamicList;
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 Ostream& operator<<
 (
-    Ostream&,
-    const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
+    Ostream& os,
+    const DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
 );
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 Istream& operator>>
 (
-    Istream&,
-    DynamicList<T, SizeInc, SizeMult, SizeDiv>&
+    Istream& is,
+    DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
 );
 
 
@@ -105,29 +105,37 @@ public:
         inline DynamicList();
 
         //- Construct given size.
-        explicit inline DynamicList(const label);
+        explicit inline DynamicList(const label nElem);
 
         //- Construct with given size and value for all elements.
-        inline DynamicList(const label, const T&);
+        inline DynamicList(const label nElem, const T& a);
 
         //- Construct copy.
-        inline DynamicList(const DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
+        inline DynamicList
+        (
+            const DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
+        );
 
         //- Construct from UList. Size set to UList size.
         //  Also constructs from DynamicList with different sizing parameters.
-        explicit inline DynamicList(const UList<T>&);
+        explicit inline DynamicList(const UList<T>& lst);
+
+        //- Construct given begin/end iterators.
+        //  Uses std::distance to determine the size.
+        template<class InputIterator>
+        inline DynamicList(InputIterator begIter, InputIterator endIter);
 
         //- Construct from an initializer list. Size set to list size.
-        explicit inline DynamicList(std::initializer_list<T>);
+        explicit inline DynamicList(std::initializer_list<T> lst);
 
         //- Construct from UIndirectList. Size set to UIndirectList size.
-        explicit inline DynamicList(const UIndirectList<T>&);
+        explicit inline DynamicList(const UIndirectList<T>& lst);
 
         //- Construct by transferring the parameter contents
-        explicit inline DynamicList(const Xfer<List<T>>&);
+        explicit inline DynamicList(const Xfer<List<T>>& lst);
 
         //- Construct from Istream. Size set to size of list read.
-        explicit DynamicList(Istream&);
+        explicit DynamicList(Istream& is);
 
 
     // Member Functions
@@ -143,31 +151,31 @@ public:
             //  The addressed size will be truncated if needed to fit, but will
             //  remain otherwise untouched.
             //  Use this or reserve() in combination with append().
-            inline void setCapacity(const label);
+            inline void setCapacity(const label nElem);
 
             //- Alter the addressed list size.
             //  New space will be allocated if required.
             //  Use this to resize the list prior to using the operator[] for
             //  setting values (as per List usage).
-            inline void setSize(const label);
+            inline void setSize(const label nElem);
 
             //- Alter the addressed list size and fill new space with a
             //  constant.
-            inline void setSize(const label, const T&);
+            inline void setSize(const label nElem, const T& t);
 
             //- Alter the addressed list size.
             //  New space will be allocated if required.
             //  Use this to resize the list prior to using the operator[] for
             //  setting values (as per List usage).
-            inline void resize(const label);
+            inline void resize(const label nElem);
 
             //- Alter the addressed list size and fill new space with a
             //  constant.
-            inline void resize(const label, const T&);
+            inline void resize(const label nElem, const T& t);
 
             //- Reserve allocation space for at least this size.
             //  Never shrinks the allocated size, use setCapacity() for that.
-            inline void reserve(const label);
+            inline void reserve(const label nElem);
 
             //- Clear the addressed list, i.e. set the size to zero.
             //  Allocated size does not change
@@ -181,10 +189,13 @@ public:
             inline DynamicList<T, SizeInc, SizeMult, SizeDiv>& shrink();
 
             //- Transfer contents of the argument List into this.
-            inline void transfer(List<T>&);
+            inline void transfer(List<T>& lst);
 
             //- Transfer contents of the argument DynamicList into this.
-            inline void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
+            inline void transfer
+            (
+                DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
+            );
 
             //- Transfer contents to the Xfer container as a plain List
             inline Xfer<List<T>> xfer();
@@ -195,25 +206,25 @@ public:
             //- Append an element at the end of the list
             inline DynamicList<T, SizeInc, SizeMult, SizeDiv>& append
             (
-                const T&
+                const T& t
             );
 
             //- Append a List at the end of this list
             inline DynamicList<T, SizeInc, SizeMult, SizeDiv>& append
             (
-                const UList<T>&
+                const UList<T>& lst
             );
 
             //- Append an initializer list at the end of this list.
             inline DynamicList<T, SizeInc, SizeMult, SizeDiv>& append
             (
-                std::initializer_list<T>
+                std::initializer_list<T> lst
             );
 
             //- Append a UIndirectList at the end of this list
             inline DynamicList<T, SizeInc, SizeMult, SizeDiv>& append
             (
-                const UIndirectList<T>&
+                const UIndirectList<T>& lst
             );
 
             //- Remove and return the top element
@@ -221,32 +232,35 @@ public:
 
             //- Return non-const access to an element, resizing list if
             //  necessary
-            inline T& operator()(const label);
+            inline T& operator()(const label elemI);
 
             //- Assignment of all addressed entries to the given value
-            inline void operator=(const T&);
+            inline void operator=(const T& t);
 
             //- Assignment to DynamicList
             inline void operator=
             (
-                const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
+                const DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
             );
 
             //- Assignment to UList
-            inline void operator=(const UList<T>&);
+            inline void operator=(const UList<T>& lst);
 
             //- Assignment from initializer list
-            inline void operator=(std::initializer_list<T>);
+            inline void operator=(std::initializer_list<T> lst);
 
             //- Assignment to UIndirectList
-            inline void operator=(const UIndirectList<T>&);
+            inline void operator=(const UIndirectList<T>& lst);
 
 
         // STL member functions
 
             //- Erase an element, move the remaining elements to fill the gap
             //  and resize the List
-            typename UList<T>::iterator erase(typename UList<T>::iterator);
+            typename UList<T>::iterator erase
+            (
+                typename UList<T>::iterator curIter
+            );
 
 
         // IOstream operators
@@ -254,15 +268,15 @@ public:
             // Write DynamicList to Ostream.
             friend Ostream& operator<< <T, SizeInc, SizeMult, SizeDiv>
             (
-                Ostream&,
-                const DynamicList<T, SizeInc, SizeMult, SizeDiv>&
+                Ostream& os,
+                const DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
             );
 
             //- Read from Istream, discarding contents of existing DynamicList.
             friend Istream& operator>> <T, SizeInc, SizeMult, SizeDiv>
             (
-                Istream&,
-                DynamicList<T, SizeInc, SizeMult, SizeDiv>&
+                Istream& is,
+                DynamicList<T, SizeInc, SizeMult, SizeDiv>& lst
             );
 };
 
diff --git a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
index 82f28f5cb5..e6ba973b48 100644
--- a/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
+++ b/src/OpenFOAM/containers/Lists/DynamicList/DynamicListI.H
@@ -80,6 +80,19 @@ inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 {}
 
 
+template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
+template<class InputIterator>
+inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
+(
+    InputIterator begIter,
+    InputIterator endIter
+)
+:
+    List<T>(begIter, endIter),
+    capacity_(this->size())
+{}
+
+
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 inline Foam::DynamicList<T, SizeInc, SizeMult, SizeDiv>::DynamicList
 (
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.C b/src/OpenFOAM/containers/Lists/FixedList/FixedList.C
index 6b919cf037..03c3d16768 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.C
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.C
@@ -53,7 +53,8 @@ bool Foam::FixedList<T, Size>::operator==(const FixedList<T, Size>& a) const
     List_CONST_ACCESS(T, (a), ap);
 
     List_FOR_ALL((*this), i)
-        equal = equal && (List_ELEM((*this), vp, i) == List_ELEM((a), ap, i));
+        equal = (List_ELEM((*this), vp, i) == List_ELEM((a), ap, i));
+        if (!equal) break;
     List_END_FOR_ALL
 
     return equal;
@@ -70,31 +71,24 @@ bool Foam::FixedList<T, Size>::operator!=(const FixedList<T, Size>& a) const
 template<class T, unsigned Size>
 bool Foam::FixedList<T, Size>::operator<(const FixedList<T, Size>& a) const
 {
-    for
-    (
-        const_iterator vi = cbegin(), ai = a.cbegin();
-        vi < cend() && ai < a.cend();
-        vi++, ai++
-    )
+    const T* const __restrict__ ptr1 = this->begin();
+    const T* const __restrict__ ptr2 = a.begin();
+
+    for (unsigned i=0; i<Size; ++i)
     {
-        if (*vi < *ai)
+        if (ptr1[i] < ptr2[i])
         {
             return true;
         }
-        else if (*vi > *ai)
+        else if (ptr1[i] > ptr2[i])
         {
             return false;
         }
     }
 
-    if (Size < a.Size)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
+    // Contents look to be identical.
+    // The sizes are identical by definition (template parameter)
+    return false;
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
index c969f4f4ad..dce2cad0c6 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedList.H
@@ -128,11 +128,12 @@ public:
         explicit inline FixedList(const T& t);
 
         //- Construct from C-array
-        explicit inline FixedList(const T v[Size]);
+        explicit inline FixedList(const T lst[Size]);
 
-        //- Construct given start and end iterators
+        //- Construct given begin/end iterators
+        //  Uses std::distance when verifying the size.
         template<class InputIterator>
-        inline FixedList(InputIterator first, InputIterator last);
+        inline FixedList(InputIterator begIter, InputIterator endIter);
 
         //- Construct from an initializer list
         inline FixedList(std::initializer_list<T> lst);
@@ -329,7 +330,7 @@ public:
         //- Return size of the largest possible FixedList
         inline label max_size() const;
 
-        //- Return true if the FixedList is empty (ie, size() is zero)
+        //- Always false since zero-sized FixedList is compile-time disabled.
         inline bool empty() const;
 
         //- Swap two FixedLists of the same type in constant time
diff --git a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
index 2f97b93169..1df4fb958a 100644
--- a/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
+++ b/src/OpenFOAM/containers/Lists/FixedList/FixedListI.H
@@ -37,7 +37,7 @@ inline Foam::FixedList<T, Size>::FixedList()
 template<class T, unsigned Size>
 inline Foam::FixedList<T, Size>::FixedList(const T& t)
 {
-    for (unsigned i=0; i<Size; i++)
+    for (unsigned i=0; i<Size; ++i)
     {
         v_[i] = t;
     }
@@ -45,11 +45,11 @@ inline Foam::FixedList<T, Size>::FixedList(const T& t)
 
 
 template<class T, unsigned Size>
-inline Foam::FixedList<T, Size>::FixedList(const T v[Size])
+inline Foam::FixedList<T, Size>::FixedList(const T lst[Size])
 {
-    for (unsigned i=0; i<Size; i++)
+    for (unsigned i=0; i<Size; ++i)
     {
-        v_[i] = v[i];
+        v_[i] = lst[i];
     }
 }
 
@@ -58,25 +58,33 @@ template<class T, unsigned Size>
 template<class InputIterator>
 Foam::FixedList<T, Size>::FixedList
 (
-    InputIterator first,
-    InputIterator last
+    InputIterator begIter,
+    InputIterator endIter
 )
 {
-    checkSize(std::distance(first, last));
+    checkSize(std::distance(begIter, endIter));
 
-    InputIterator iter = first;
-    for (unsigned i=0; i<Size; i++)
+    InputIterator iter = begIter;
+    for (unsigned i=0; i<Size; ++i)
     {
-        v_[i] = *iter++;
+        v_[i] = *iter;
+        ++iter;
     }
 }
 
 
 template<class T, unsigned Size>
 inline Foam::FixedList<T, Size>::FixedList(std::initializer_list<T> lst)
-:
-    FixedList<T, Size>(lst.begin(), lst.end())
-{}
+{
+    checkSize(lst.size());
+
+    auto iter = lst.begin();
+    for (unsigned i=0; i<Size; ++i)
+    {
+        v_[i] = *iter;
+        ++iter;
+    }
+}
 
 
 template<class T, unsigned Size>
@@ -84,7 +92,7 @@ inline Foam::FixedList<T, Size>::FixedList(const UList<T>& lst)
 {
     checkSize(lst.size());
 
-    for (unsigned i=0; i<Size; i++)
+    for (unsigned i=0; i<Size; ++i)
     {
         v_[i] = lst[i];
     }
@@ -97,9 +105,10 @@ inline Foam::FixedList<T, Size>::FixedList(const SLList<T>& lst)
     checkSize(lst.size());
 
     typename SLList<T>::const_iterator iter = lst.begin();
-    for (unsigned i=0; i<Size; i++)
+    for (unsigned i=0; i<Size; ++i)
     {
-        v_[i] = *iter++;
+        v_[i] = *iter;
+        ++iter;
     }
 }
 
@@ -107,7 +116,7 @@ inline Foam::FixedList<T, Size>::FixedList(const SLList<T>& lst)
 template<class T, unsigned Size>
 inline Foam::FixedList<T, Size>::FixedList(const FixedList<T, Size>& lst)
 {
-    for (unsigned i=0; i<Size; i++)
+    for (unsigned i=0; i<Size; ++i)
     {
         v_[i] = lst[i];
     }
@@ -200,7 +209,7 @@ inline void Foam::FixedList<T, Size>::setSize(const label s)
 template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::transfer(const FixedList<T, Size>& lst)
 {
-    for (unsigned i=0; i<Size; i++)
+    for (unsigned i=0; i<Size; ++i)
     {
         v_[i] = lst[i];
     }
@@ -276,7 +285,7 @@ inline const T& Foam::FixedList<T, Size>::operator[](const label i) const
 template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::operator=(const T lst[Size])
 {
-    for (unsigned i=0; i<Size; i++)
+    for (unsigned i=0; i<Size; ++i)
     {
         v_[i] = lst[i];
     }
@@ -287,7 +296,7 @@ inline void Foam::FixedList<T, Size>::operator=(const UList<T>& lst)
 {
     checkSize(lst.size());
 
-    for (unsigned i=0; i<Size; i++)
+    for (unsigned i=0; i<Size; ++i)
     {
         v_[i] = lst[i];
     }
@@ -299,9 +308,10 @@ inline void Foam::FixedList<T, Size>::operator=(const SLList<T>& lst)
     checkSize(lst.size());
 
     typename SLList<T>::const_iterator iter = lst.begin();
-    for (unsigned i=0; i<Size; i++)
+    for (unsigned i=0; i<Size; ++i)
     {
-        v_[i] = *iter++;
+        v_[i] = *iter;
+        ++iter;
     }
 }
 
@@ -310,17 +320,18 @@ inline void Foam::FixedList<T, Size>::operator=(std::initializer_list<T> lst)
 {
     checkSize(lst.size());
 
-    typename std::initializer_list<T>::iterator iter = lst.begin();
-    for (unsigned i=0; i<Size; i++)
+    auto iter = lst.begin();
+    for (unsigned i=0; i<Size; ++i)
     {
-        v_[i] = *iter++;
+        v_[i] = *iter;
+        ++iter;
     }
 }
 
 template<class T, unsigned Size>
 inline void Foam::FixedList<T, Size>::operator=(const T& t)
 {
-    for (unsigned i=0; i<Size; i++)
+    for (unsigned i=0; i<Size; ++i)
     {
         v_[i] = t;
     }
@@ -464,7 +475,7 @@ inline unsigned Foam::FixedList<T, Size>::Hash<HashT>::operator()
         // Hash incrementally
         unsigned val = seed;
 
-        for (unsigned i=0; i<Size; i++)
+        for (unsigned i=0; i<Size; ++i)
         {
             val = HashT()(lst[i], val);
         }
diff --git a/src/OpenFOAM/containers/Lists/List/List.C b/src/OpenFOAM/containers/Lists/List/List.C
index 0e4dee96ac..6ba01a2edc 100644
--- a/src/OpenFOAM/containers/Lists/List/List.C
+++ b/src/OpenFOAM/containers/Lists/List/List.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -160,7 +160,7 @@ Foam::List<T>::List(List<T>& a, bool reuse)
     if (reuse)
     {
         this->v_ = a.v_;
-        a.v_ = 0;
+        a.v_ = nullptr;
         a.size_ = 0;
     }
     else if (this->size_)
@@ -186,19 +186,19 @@ Foam::List<T>::List(List<T>& a, bool reuse)
 
 
 template<class T>
-Foam::List<T>::List(const UList<T>& a, const labelUList& map)
+Foam::List<T>::List(const UList<T>& a, const labelUList& mapAddressing)
 :
-    UList<T>(nullptr, map.size())
+    UList<T>(nullptr, mapAddressing.size())
 {
     if (this->size_)
     {
-        // Note:cannot use List_ELEM since third argument has to be index.
+        // Note: cannot use List_ELEM since third argument has to be index.
 
         alloc();
 
         forAll(*this, i)
         {
-            this->operator[](i) = a[map[i]];
+            this->operator[](i) = a[mapAddressing[i]];
         }
     }
 }
@@ -206,9 +206,9 @@ Foam::List<T>::List(const UList<T>& a, const labelUList& map)
 
 template<class T>
 template<class InputIterator>
-Foam::List<T>::List(InputIterator first, InputIterator last)
+Foam::List<T>::List(InputIterator begIter, InputIterator endIter)
 :
-    List<T>(first, last, std::distance(first, last))
+    List<T>(begIter, endIter, std::distance(begIter, endIter))
 {}
 
 
@@ -231,6 +231,8 @@ Foam::List<T>::List(const PtrList<T>& lst)
 }
 
 
+// Note: using first/last is not entirely accurate.
+// But since the list size is correct, last() is actually ignored.
 template<class T>
 Foam::List<T>::List(const SLList<T>& lst)
 :
@@ -259,7 +261,7 @@ Foam::List<T>::List(const BiIndirectList<T>& lst)
 template<class T>
 Foam::List<T>::List(std::initializer_list<T> lst)
 :
-    List<T>(lst.begin(), lst.end())
+    List<T>(lst.begin(), lst.end(), lst.size())
 {}
 
 
@@ -326,7 +328,7 @@ void Foam::List<T>::setSize(const label newSize)
 template<class T>
 void Foam::List<T>::setSize(const label newSize, const T& a)
 {
-    label oldSize = label(this->size_);
+    const label oldSize = label(this->size_);
     this->setSize(newSize);
 
     if (newSize > oldSize)
@@ -346,7 +348,7 @@ void Foam::List<T>::transfer(List<T>& a)
     this->v_ = a.v_;
 
     a.size_ = 0;
-    a.v_ = 0;
+    a.v_ = nullptr;
 }
 
 
@@ -419,14 +421,9 @@ void Foam::List<T>::operator=(const SLList<T>& lst)
     if (this->size_)
     {
         label i = 0;
-        for
-        (
-            typename SLList<T>::const_iterator iter = lst.begin();
-            iter != lst.end();
-            ++iter
-        )
+        for (auto iter = lst.cbegin(); iter != lst.cend(); ++iter)
         {
-            this->operator[](i++) = iter();
+            this->operator[](i++) = *iter;
         }
     }
 }
@@ -453,10 +450,11 @@ void Foam::List<T>::operator=(std::initializer_list<T> lst)
 {
     reAlloc(lst.size());
 
-    typename std::initializer_list<T>::iterator iter = lst.begin();
+    auto iter = lst.begin();
     forAll(*this, i)
     {
-        this->operator[](i) = *iter++;
+        this->operator[](i) = *iter;
+        ++iter;
     }
 }
 
diff --git a/src/OpenFOAM/containers/Lists/List/List.H b/src/OpenFOAM/containers/Lists/List/List.H
index fdb4559bf7..c8e3219d99 100644
--- a/src/OpenFOAM/containers/Lists/List/List.H
+++ b/src/OpenFOAM/containers/Lists/List/List.H
@@ -58,7 +58,7 @@ class Ostream;
 // Forward declaration of friend functions and operators
 template<class T> class List;
 
-template<class T> Istream& operator>>(Istream&, List<T>&);
+template<class T> Istream& operator>>(Istream& is, List<T>& L);
 
 template<class T, unsigned Size> class FixedList;
 template<class T> class PtrList;
@@ -95,22 +95,28 @@ class List
 
         //- Copy list of given type
         template<class List2>
-        inline void copyList(const List2&);
+        inline void copyList(const List2& lst);
 
         //- Allocate storage and copy list of given type
         template<class List2>
-        inline void allocCopyList(const List2&);
+        inline void allocCopyList(const List2& lst);
 
-        //- Construct given start and end iterators and number of elements
+        //- Construct given begin/end iterators and number of elements
+        //  Since the size is provided, the end iterator is actually ignored.
         template<class InputIterator>
-        inline List(InputIterator first, InputIterator last, const label s);
+        inline List
+        (
+            InputIterator begIter,
+            InputIterator endIter,
+            const label s
+        );
 
 
 protected:
 
     //- Override size to be inconsistent with allocated storage.
     //  Use with care
-    inline void size(const label);
+    inline void size(const label n);
 
 
 public:
@@ -127,55 +133,56 @@ public:
         inline List();
 
         //- Construct with given size
-        explicit List(const label);
+        explicit List(const label s);
 
         //- Construct with given size and value for all elements
-        List(const label, const T&);
+        List(const label s, const T& a);
 
         //- Construct with given size initializing all elements to zero
-        List(const label, const zero);
+        List(const label s, const zero);
 
         //- Copy constructor
-        List(const List<T>&);
+        List(const List<T>& a);
 
         //- Copy constructor from list containing another type
         template<class T2>
-        explicit List(const List<T2>&);
+        explicit List(const List<T2>& a);
 
         //- Construct by transferring the parameter contents
-        List(const Xfer<List<T>>&);
+        List(const Xfer<List<T>>& lst);
 
         //- Construct as copy or re-use as specified
-        List(List<T>&, bool reuse);
+        List(List<T>& a, bool reuse);
 
         //- Construct as subset
-        List(const UList<T>&, const labelUList& mapAddressing);
+        List(const UList<T>& a, const labelUList& mapAddressing);
 
-        //- Construct given start and end iterators
+        //- Construct given begin/end iterators.
+        //  Uses std::distance to determine the size.
         template<class InputIterator>
-        List(InputIterator first, InputIterator last);
+        List(InputIterator begIter, InputIterator endIter);
 
         //- Construct as copy of FixedList<T, Size>
         template<unsigned Size>
-        explicit List(const FixedList<T, Size>&);
+        explicit List(const FixedList<T, Size>& lst);
 
         //- Construct as copy of PtrList<T>
-        explicit List(const PtrList<T>&);
+        explicit List(const PtrList<T>& lst);
 
         //- Construct as copy of SLList<T>
-        explicit List(const SLList<T>&);
+        explicit List(const SLList<T>& lst);
 
         //- Construct as copy of UIndirectList<T>
-        explicit List(const UIndirectList<T>&);
+        explicit List(const UIndirectList<T>& lst);
 
         //- Construct as copy of BiIndirectList<T>
-        explicit List(const BiIndirectList<T>&);
+        explicit List(const BiIndirectList<T>& lst);
 
         //- Construct from an initializer list
-        List(std::initializer_list<T>);
+        List(std::initializer_list<T> lst);
 
         //- Construct from Istream
-        List(Istream&);
+        List(Istream& is);
 
         //- Clone
         inline autoPtr<List<T>> clone() const;
@@ -200,47 +207,48 @@ public:
         // Edit
 
             //- Alias for setSize(const label)
-            inline void resize(const label);
+            inline void resize(const label newSize);
 
             //- Alias for setSize(const label, const T&)
-            inline void resize(const label, const T&);
+            inline void resize(const label newSize, const T& a);
 
             //- Reset size of List
-            void setSize(const label);
+            void setSize(const label newSize);
 
             //- Reset size of List and value for new elements
-            void setSize(const label, const T&);
+            void setSize(const label newSize, const T& a);
 
             //- Clear the list, i.e. set size to zero
             inline void clear();
 
             //- Append an element at the end of the list
-            inline void append(const T&);
+            inline void append(const T& t);
 
             //- Append a List at the end of this list
-            inline void append(const UList<T>&);
+            inline void append(const UList<T>& lst);
 
             //- Append a UIndirectList at the end of this list
-            inline void append(const UIndirectList<T>&);
+            inline void append(const UIndirectList<T>& lst);
 
             //- Transfer the contents of the argument List into this list
             //  and annul the argument list
-            void transfer(List<T>&);
+            void transfer(List<T>& a);
 
             //- Transfer the contents of the argument List into this list
             //  and annul the argument list
             template<unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
-            void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>&);
+            void transfer(DynamicList<T, SizeInc, SizeMult, SizeDiv>& a);
 
             //- Transfer the contents of the argument List into this list
             //  and annul the argument list
-            void transfer(SortableList<T>&);
+            void transfer(SortableList<T>& a);
 
             //- Transfer contents to the Xfer container
             inline Xfer<List<T>> xfer();
 
-            //- Return subscript-checked element of UList
-            inline T& newElmt(const label);
+            //- Return subscript-checked element of UList.
+            //  Resize list if required.
+            inline T& newElmt(const label i);
 
 
         //- Disallow implicit shallowCopy
@@ -250,25 +258,25 @@ public:
     // Member operators
 
         //- Assignment to UList operator. Takes linear time
-        void operator=(const UList<T>&);
+        void operator=(const UList<T>& a);
 
         //- Assignment operator. Takes linear time
-        void operator=(const List<T>&);
+        void operator=(const List<T>& a);
 
         //- Assignment to SLList operator. Takes linear time
-        void operator=(const SLList<T>&);
+        void operator=(const SLList<T>& lst);
 
         //- Assignment to UIndirectList operator. Takes linear time
-        void operator=(const UIndirectList<T>&);
+        void operator=(const UIndirectList<T>& lst);
 
         //- Assignment to BiIndirectList operator. Takes linear time
-        void operator=(const BiIndirectList<T>&);
+        void operator=(const BiIndirectList<T>& lst);
 
         //- Assignment to an initializer list
-        void operator=(std::initializer_list<T>);
+        void operator=(std::initializer_list<T> lst);
 
         //- Assignment of all entries to the given value
-        inline void operator=(const T&);
+        inline void operator=(const T& t);
 
         //- Assignment of all entries to zero
         inline void operator=(const zero);
@@ -278,7 +286,7 @@ public:
 
         //- Read List from Istream, discarding contents of existing List
         friend Istream& operator>> <T>
-        (Istream&, List<T>&);
+        (Istream& is, List<T>& L);
 };
 
 
@@ -290,7 +298,7 @@ public:
 //  \endcode
 //  Mostly useful for handling command-line arguments
 template<class T>
-List<T> readList(Istream&);
+List<T> readList(Istream& is);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/containers/Lists/List/ListI.H b/src/OpenFOAM/containers/Lists/List/ListI.H
index 5709c258ec..8aa5bc016a 100644
--- a/src/OpenFOAM/containers/Lists/List/ListI.H
+++ b/src/OpenFOAM/containers/Lists/List/ListI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -77,8 +77,8 @@ template<class T>
 template<class InputIterator>
 inline Foam::List<T>::List
 (
-    InputIterator first,
-    InputIterator last,
+    InputIterator begIter,
+    InputIterator endIter,
     const label s
 )
 :
@@ -88,10 +88,11 @@ inline Foam::List<T>::List
     {
         alloc();
 
-        InputIterator iter = first;
+        InputIterator iter = begIter;
         forAll(*this, i)
         {
-            this->operator[](i) = *iter++;
+            this->operator[](i) = *iter;
+            ++iter;
         }
     }
 }
@@ -126,7 +127,7 @@ inline void Foam::List<T>::clear()
     if (this->v_)
     {
         delete[] this->v_;
-        this->v_ = 0;
+        this->v_ = nullptr;
     }
 
     this->size_ = 0;
diff --git a/src/OpenFOAM/containers/Lists/List/ListLoopM.H b/src/OpenFOAM/containers/Lists/List/ListLoopM.H
index 9e68826205..032edb3052 100644
--- a/src/OpenFOAM/containers/Lists/List/ListLoopM.H
+++ b/src/OpenFOAM/containers/Lists/List/ListLoopM.H
@@ -22,8 +22,7 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Description
-    List\<T\> is a 1D vector of objects of type T, where the size of the
-    vector is known and used for subscript bounds checking, etc.
+    Macros for accessing List elements
 
 \*---------------------------------------------------------------------------*/
 
@@ -37,8 +36,8 @@ Description
 // Element access looping using [] for vector machines
 
 #define List_FOR_ALL(f, i)                      \
-        const label _n##i = (f).size();\
-        for (label i=0; i<_n##i; i++)  \
+        const label _n##i = (f).size();         \
+        for (label i=0; i<_n##i; ++i)           \
         {
 
 #define List_END_FOR_ALL  }
@@ -60,7 +59,7 @@ Description
 // Pointer looping for scalar machines
 
 #define List_FOR_ALL(f, i)                      \
-        label i = (f).size();          \
+        label i = (f).size();                   \
         while (i--)                             \
         {                                       \
 
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
index fbafc9cf0f..a35334507a 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.C
@@ -28,7 +28,7 @@ License
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class T>
-Foam::SortableList<T>::SortableList()
+inline Foam::SortableList<T>::SortableList()
 {}
 
 
@@ -51,14 +51,14 @@ Foam::SortableList<T>::SortableList(const Xfer<List<T>>& values)
 
 
 template<class T>
-Foam::SortableList<T>::SortableList(const label size)
+inline Foam::SortableList<T>::SortableList(const label size)
 :
     List<T>(size)
 {}
 
 
 template<class T>
-Foam::SortableList<T>::SortableList(const label size, const T& val)
+inline Foam::SortableList<T>::SortableList(const label size, const T& val)
 :
     List<T>(size, val)
 {}
@@ -72,6 +72,20 @@ Foam::SortableList<T>::SortableList(const SortableList<T>& lst)
 {}
 
 
+template<class T>
+template<class InputIterator>
+inline Foam::SortableList<T>::SortableList
+(
+    InputIterator begIter,
+    InputIterator endIter
+)
+:
+    List<T>(begIter, endIter)
+{
+    sort();
+}
+
+
 template<class T>
 Foam::SortableList<T>::SortableList(std::initializer_list<T> values)
 :
@@ -140,9 +154,9 @@ Foam::Xfer<Foam::List<T>> Foam::SortableList<T>::xfer()
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
 template<class T>
-inline void Foam::SortableList<T>::operator=(const T& t)
+inline void Foam::SortableList<T>::operator=(const T& val)
 {
-    UList<T>::operator=(t);
+    UList<T>::operator=(val);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
index 65fb6dc7f4..cd005a09c2 100644
--- a/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
+++ b/src/OpenFOAM/containers/Lists/SortableList/SortableList.H
@@ -65,27 +65,32 @@ public:
     // Constructors
 
         //- Null constructor, sort later (eg, after assignment or transfer)
-        SortableList();
+        inline SortableList();
 
         //- Construct from UList, sorting immediately
-        explicit SortableList(const UList<T>&);
+        explicit SortableList(const UList<T>& values);
 
         //- Construct from transferred List, sorting immediately
-        explicit SortableList(const Xfer<List<T>>&);
+        explicit SortableList(const Xfer<List<T>>& values);
 
         //- Construct given size. Sort later on
         //  The indices remain empty until the list is sorted
-        explicit SortableList(const label size);
+        explicit inline SortableList(const label size);
 
         //- Construct given size and initial value. Sort later on
         //  The indices remain empty until the list is sorted
-        SortableList(const label size, const T&);
+        inline SortableList(const label size, const T& val);
+
+        //- Construct given begin/end iterators.
+        //  Uses std::distance to determine the size.
+        template<class InputIterator>
+        inline SortableList(InputIterator begIter, InputIterator endIter);
 
         //- Construct as copy
-        SortableList(const SortableList<T>&);
+        inline SortableList(const SortableList<T>& lst);
 
         //- Construct from an initializer list, sorting immediately
-        SortableList(std::initializer_list<T>);
+        SortableList(std::initializer_list<T> values);
 
 
     // Member Functions
@@ -122,16 +127,16 @@ public:
     // Member Operators
 
         //- Assignment of all entries to the given value
-        inline void operator=(const T&);
+        inline void operator=(const T& val);
 
         //- Assignment to UList operator. Takes linear time
-        inline void operator=(const UList<T>&);
+        inline void operator=(const UList<T>& lst);
 
         //- Assignment operator. Takes linear time
-        inline void operator=(const SortableList<T>&);
+        inline void operator=(const SortableList<T>& lst);
 
         //- Assignment to an initializer list
-        void operator=(std::initializer_list<T>);
+        void operator=(std::initializer_list<T> lst);
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubList.H b/src/OpenFOAM/containers/Lists/SubList/SubList.H
index b55fced6bb..1a02f11d79 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubList.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -40,6 +40,7 @@ SourceFiles
 #define SubList_H
 
 #include "List.H"
+#include "labelRange.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -55,7 +56,6 @@ class SubList
 :
     public UList<T>
 {
-
 public:
 
     // Static Member Functions
@@ -81,6 +81,23 @@ public:
             const label startIndex
         );
 
+        //- Construct from UList and a (start,size) range.
+        //  The range is subsetted with the list size itself to ensure that the
+        //  result always addresses a valid section of the list.
+        inline SubList
+        (
+            const UList<T>& list,
+            const labelRange& range
+        );
+
+        //- Construct from UList and a (start,size) range, but bypassing
+        //  run-time range checking.
+        inline SubList
+        (
+            const labelRange& range,
+            const UList<T>& list
+        );
+
 
     // Member operators
 
@@ -88,13 +105,13 @@ public:
         inline operator const Foam::List<T>&() const;
 
         //- Assignment of all entries to the given sub-list
-        inline void operator=(const SubList<T>&);
+        inline void operator=(const SubList<T>& list);
 
         //- Assignment of all entries to the given list
-        inline void operator=(const UList<T>&);
+        inline void operator=(const UList<T>& list);
 
         //- Assignment of all entries to the given value
-        inline void operator=(const T&);
+        inline void operator=(const T& t);
 };
 
 
diff --git a/src/OpenFOAM/containers/Lists/SubList/SubListI.H b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
index 733b813b51..42accb1871 100644
--- a/src/OpenFOAM/containers/Lists/SubList/SubListI.H
+++ b/src/OpenFOAM/containers/Lists/SubList/SubListI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -51,7 +51,6 @@ inline Foam::SubList<T>::SubList
     UList<T>(&(list.v_[startIndex]), subSize)
 {
     #ifdef FULLDEBUG
-
     // Artificially allow the start of a zero-sized subList to be
     // one past the end of the original list.
     if (subSize)
@@ -69,6 +68,28 @@ inline Foam::SubList<T>::SubList
 }
 
 
+template<class T>
+inline Foam::SubList<T>::SubList
+(
+    const UList<T>& list,
+    const labelRange& range
+)
+:
+    SubList<T>(list.validateRange(range), list)
+{}
+
+
+template<class T>
+inline Foam::SubList<T>::SubList
+(
+    const labelRange& range,
+    const UList<T>& list
+)
+:
+    SubList<T>(list, range.size(), range.start())
+{}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
@@ -88,16 +109,16 @@ inline Foam::SubList<T>::operator const Foam::List<T>&() const
 
 
 template<class T>
-inline void Foam::SubList<T>::operator=(const SubList<T>& sl)
+inline void Foam::SubList<T>::operator=(const SubList<T>& list)
 {
-    UList<T>::deepCopy(sl);
+    UList<T>::deepCopy(list);
 }
 
 
 template<class T>
-inline void Foam::SubList<T>::operator=(const UList<T>& l)
+inline void Foam::SubList<T>::operator=(const UList<T>& list)
 {
-    UList<T>::deepCopy(l);
+    UList<T>::deepCopy(list);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.C b/src/OpenFOAM/containers/Lists/UList/UList.C
index 320b22f68f..f479698744 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.C
+++ b/src/OpenFOAM/containers/Lists/UList/UList.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,9 +26,49 @@ License
 #include "UList.H"
 #include "ListLoopM.H"
 #include "contiguous.H"
+#include "labelRange.H"
 
 #include <algorithm>
 
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+template<class T>
+Foam::labelRange Foam::UList<T>::validateRange(const labelRange& range) const
+{
+    const labelRange slice = range.subset0(this->size());
+
+    #ifdef FULLDEBUG
+    this->checkStart(slice.start());
+    this->checkSize(slice.start() + slice.size());
+    #endif
+
+    return slice;
+}
+
+
+template<class T>
+Foam::labelRange Foam::UList<T>::validateRange
+(
+    std::initializer_list<label> start_size_pair
+) const
+{
+    if (start_size_pair.size() != 2)
+    {
+        FatalErrorInFunction
+            << "range specified with " << start_size_pair.size()
+            << " elements instead of 2"
+            << abort(FatalError);
+    }
+
+    auto iter = start_size_pair.begin();
+
+    const label beg = *(iter++);
+    const label sz  = *iter;
+
+    return this->validateRange(labelRange(beg, sz));
+}
+
+
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class T>
@@ -64,6 +104,49 @@ void Foam::UList<T>::deepCopy(const UList<T>& a)
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
+template<class T>
+Foam::UList<T> Foam::UList<T>::operator[](const labelRange& range)
+{
+    const labelRange slice = validateRange(range);
+
+    return UList<T>(&(this->v_[slice.start()]), slice.size()); // SubList
+}
+
+
+template<class T>
+const Foam::UList<T> Foam::UList<T>::operator[](const labelRange& range) const
+{
+    const labelRange slice = validateRange(range);
+
+    return UList<T>(&(this->v_[slice.start()]), slice.size()); // SubList
+}
+
+
+template<class T>
+Foam::UList<T> Foam::UList<T>::operator[]
+(
+    std::initializer_list<label> start_size_pair
+)
+{
+    const labelRange slice = validateRange(start_size_pair);
+
+    return UList<T>(&(this->v_[slice.start()]), slice.size()); // SubList
+}
+
+
+template<class T>
+const Foam::UList<T> Foam::UList<T>::operator[]
+(
+    std::initializer_list<label> start_size_range
+) const
+{
+    // Restricted range
+    const labelRange slice = validateRange(start_size_range);
+
+    return UList<T>(&(this->v_[slice.start()]), slice.size()); // SubList
+}
+
+
 template<class T>
 void Foam::UList<T>::operator=(const T& t)
 {
@@ -151,18 +234,18 @@ void Foam::shuffle(UList<T>& a)
 template<class T>
 bool Foam::UList<T>::operator==(const UList<T>& a) const
 {
-    if (this->size_ != a.size_)
+    bool equal = (this->size_ == a.size_);
+    if (!equal)
     {
         return false;
     }
 
-    bool equal = true;
-
     List_CONST_ACCESS(T, (*this), vp);
     List_CONST_ACCESS(T, (a), ap);
 
     List_FOR_ALL((*this), i)
-        equal = equal && (List_ELEM((*this), vp, i) == List_ELEM((a), ap, i));
+        equal = (List_ELEM((*this), vp, i) == List_ELEM((a), ap, i));
+        if (!equal) break;
     List_END_FOR_ALL
 
     return equal;
@@ -196,14 +279,8 @@ bool Foam::UList<T>::operator<(const UList<T>& a) const
         }
     }
 
-    if (this->size_ < a.size_)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
+    // Contents look to be identical, or lists have different sizes
+    return (this->size_ < a.size_);
 }
 
 
diff --git a/src/OpenFOAM/containers/Lists/UList/UList.H b/src/OpenFOAM/containers/Lists/UList/UList.H
index 362a15ccbc..6b58437b36 100644
--- a/src/OpenFOAM/containers/Lists/UList/UList.H
+++ b/src/OpenFOAM/containers/Lists/UList/UList.H
@@ -47,13 +47,16 @@ SourceFiles
 #include "uLabel.H"
 #include "nullObject.H"
 #include "zero.H"
+#include "stdFoam.H"
+#include <initializer_list>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// Forward declaration of friend classes
+// Forward declarations
+class labelRange;
 template<class T> class List;
 template<class T> class SubList;
 
@@ -100,6 +103,16 @@ protected:
         //- Write the UList with its compound type
         void writeEntry(Ostream& os) const;
 
+        //- Return a validated (start,size) subset range, which means that it
+        //  always addresses a valid section of the list.
+        labelRange validateRange(const labelRange& range) const;
+
+        //- Return a validated (start,size) subset range, which means that it
+        //  always addresses a valid section of the list.
+        labelRange validateRange
+        (
+            std::initializer_list<label> start_size_pair
+        ) const;
 
 public:
 
@@ -238,6 +251,29 @@ public:
         //  an out-of-range element returns false without any ill-effects
         inline const T& operator[](const label i) const;
 
+        //- Return (start,size) subset from UList with non-const access.
+        //  The range is subsetted with the list size itself to ensure that the
+        //  result always addresses a valid section of the list.
+        UList<T> operator[](const labelRange& range);
+
+        //- Return (start,size) subset from UList with const access.
+        //  The range is subsetted with the list size itself to ensure that the
+        //  result always addresses a valid section of the list.
+        const UList<T> operator[](const labelRange& range) const;
+
+        //- Return (start,size) subset from UList with non-const access.
+        //  The range is subsetted with the list size itself to ensure that the
+        //  result always addresses a valid section of the list.
+        UList<T> operator[](std::initializer_list<label> start_size_range);
+
+        //- Return (start,size) subset from UList with const access.
+        //  The range is subsetted with the list size itself to ensure that the
+        //  result always addresses a valid section of the list.
+        const UList<T> operator[]
+        (
+            std::initializer_list<label> start_size_range
+        ) const;
+
         //- Allow cast to a const List<T>&
         inline operator const Foam::List<T>&() const;
 
@@ -253,12 +289,10 @@ public:
         //- Type of values the UList contains
         typedef T value_type;
 
-        //- Type that can be used for storing into
-        //  UList::value_type objects
+        //- The type used for storing into value_type objects
         typedef T& reference;
 
-        //- Type that can be used for storing into
-        //  constant UList::value_type objects
+        //- The type used for reading from constant value_type objects.
         typedef const T& const_reference;
 
         //- The type that can represent the difference between any two
@@ -427,69 +461,6 @@ inline void reverse(UList<T>& ul);
 
 #include "UListI.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-//- Loop across all elements in \a list
-// \par Usage
-// \code
-// forAll(anyList, i)
-// {
-//      statements;
-// }
-// \endcode
-// \sa forAllReverse
-#define forAll(list, i) \
-    for (Foam::label i=0; i<(list).size(); ++i)
-
-//- Reverse loop across all elements in \a list
-//  \par Usage
-//  \code
-//  forAllReverse(anyList, i)
-//  {
-//       statements;
-//  }
-//  \endcode
-//  \sa forAll
-#define forAllReverse(list, i) \
-    for (Foam::label i=(list).size()-1; i>=0; --i)
-
-//- Iterate across all elements in the \a container object of type
-//  \a Container.
-//  \par Usage
-//  \code
-//  forAll(ContainerType, container, iter)
-//  {
-//      statements;
-//  }
-//  \endcode
-//  \sa forAllConstIter
-#define forAllIter(Container,container,iter)                                   \
-    for                                                                        \
-    (                                                                          \
-        Container::iterator iter = (container).begin();                        \
-        iter != (container).end();                                             \
-        ++iter                                                                 \
-    )
-
-//- Iterate across all elements in the \a container object of type
-//  \a Container with const access.
-//  \par Usage
-//  \code
-//  forAllConstIter(ContainerType, container, iter)
-//  {
-//      statements;
-//  }
-//  \endcode
-//  \sa forAllIter
-#define forAllConstIter(Container,container,iter)                              \
-    for                                                                        \
-    (                                                                          \
-        Container::const_iterator iter = (container).cbegin();                 \
-        iter != (container).cend();                                            \
-        ++iter                                                                 \
-    )
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 #ifdef NoRepository
diff --git a/src/OpenFOAM/containers/Lists/UList/UListI.H b/src/OpenFOAM/containers/Lists/UList/UListI.H
index bd9fe339eb..971fa7faa0 100644
--- a/src/OpenFOAM/containers/Lists/UList/UListI.H
+++ b/src/OpenFOAM/containers/Lists/UList/UListI.H
@@ -71,7 +71,7 @@ inline Foam::label Foam::UList<T>::rcIndex(const label i) const
 template<class T>
 inline void Foam::UList<T>::checkStart(const label start) const
 {
-    if (start<0 || (start && start>=size_))
+    if (start < 0 || (start && start >= size_))
     {
         FatalErrorInFunction
             << "start " << start << " out of range 0 ... " << max(size_-1, 0)
@@ -83,7 +83,7 @@ inline void Foam::UList<T>::checkStart(const label start) const
 template<class T>
 inline void Foam::UList<T>::checkSize(const label size) const
 {
-    if (size<0 || size>size_)
+    if (size < 0 || size > size_)
     {
         FatalErrorInFunction
             << "size " << size << " out of range 0 ... " << size_
@@ -162,7 +162,6 @@ inline void Foam::UList<T>::shallowCopy(const UList<T>& a)
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-
 template<class T>
 inline T& Foam::UList<T>::operator[](const label i)
 {
@@ -172,7 +171,6 @@ inline T& Foam::UList<T>::operator[](const label i)
     return v_[i];
 }
 
-
 namespace Foam
 {
     // Template specialization for bool
@@ -191,7 +189,6 @@ namespace Foam
     }
 }
 
-
 template<class T>
 inline const T& Foam::UList<T>::operator[](const label i) const
 {
diff --git a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
index 99f723d987..89784a1400 100644
--- a/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
+++ b/src/OpenFOAM/containers/NamedEnum/NamedEnum.C
@@ -64,14 +64,14 @@ Enum Foam::NamedEnum<Enum, nEnum>::read(Istream& is) const
 
     HashTable<int>::const_iterator iter = find(name);
 
-    if (iter == HashTable<int>::end())
+    if (!iter.found())
     {
         FatalIOErrorInFunction(is)
             << name << " is not in enumeration: "
             << sortedToc() << exit(FatalIOError);
     }
 
-    return Enum(iter());
+    return Enum(iter.object());
 }
 
 
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.C b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
index f58bab4214..1f96009a52 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.C
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.C
@@ -91,9 +91,9 @@ Foam::IOobjectList::IOobjectList
 }
 
 
-Foam::IOobjectList::IOobjectList(const IOobjectList& ioOL)
+Foam::IOobjectList::IOobjectList(const IOobjectList& iolist)
 :
-    HashPtrTable<IOobject>(ioOL)
+    HashPtrTable<IOobject>(iolist)
 {}
 
 
@@ -113,17 +113,7 @@ bool Foam::IOobjectList::add(IOobject& io)
 
 bool Foam::IOobjectList::remove(IOobject& io)
 {
-    HashPtrTable<IOobject>::iterator iter =
-        HashPtrTable<IOobject>::find(io.name());
-
-    if (iter != end())
-    {
-        return erase(iter);
-    }
-    else
-    {
-        return false;
-    }
+    return erase(io.name());
 }
 
 
@@ -131,7 +121,7 @@ Foam::IOobject* Foam::IOobjectList::lookup(const word& name) const
 {
     HashPtrTable<IOobject>::const_iterator iter = find(name);
 
-    if (iter != end())
+    if (iter.found())
     {
         if (IOobject::debug)
         {
@@ -152,68 +142,80 @@ Foam::IOobject* Foam::IOobjectList::lookup(const word& name) const
 }
 
 
-Foam::IOobjectList Foam::IOobjectList::lookup(const wordRe& name) const
+Foam::IOobjectList Foam::IOobjectList::lookup(const wordRe& matcher) const
 {
-    IOobjectList objectsOfName(size());
+    IOobjectList results(size());
 
-    forAllConstIter(HashPtrTable<IOobject>, *this, iter)
+    forAllConstIters(*this, iter)
     {
-        if (name.match(iter()->name()))
+        if (matcher.match(iter.key()))
         {
             if (IOobject::debug)
             {
                 InfoInFunction << "Found " << iter.key() << endl;
             }
 
-            objectsOfName.insert(iter.key(), new IOobject(*iter()));
+            results.insert
+            (
+                iter.key(),
+                new IOobject(*(iter.object()))
+            );
         }
     }
 
-    return objectsOfName;
+    return results;
 }
 
 
-Foam::IOobjectList Foam::IOobjectList::lookup(const wordReList& patterns) const
+Foam::IOobjectList Foam::IOobjectList::lookup(const wordReList& matcher) const
 {
-    wordReListMatcher names(patterns);
+    wordReListMatcher mat(matcher);
 
-    IOobjectList objectsOfName(size());
+    IOobjectList results(size());
 
-    forAllConstIter(HashPtrTable<IOobject>, *this, iter)
+    forAllConstIters(*this, iter)
     {
-        if (names.match(iter()->name()))
+        if (mat.match(iter.key()))
         {
             if (IOobject::debug)
             {
                 InfoInFunction << "Found " << iter.key() << endl;
             }
 
-            objectsOfName.insert(iter.key(), new IOobject(*iter()));
+            results.insert
+            (
+                iter.key(),
+                new IOobject(*(iter.object()))
+            );
         }
     }
 
-    return objectsOfName;
+    return results;
 }
 
 
-Foam::IOobjectList Foam::IOobjectList::lookupClass(const word& ClassName) const
+Foam::IOobjectList Foam::IOobjectList::lookupClass(const word& clsName) const
 {
-    IOobjectList objectsOfClass(size());
+    IOobjectList results(size());
 
-    forAllConstIter(HashPtrTable<IOobject>, *this, iter)
+    forAllConstIters(*this, iter)
     {
-        if (iter()->headerClassName() == ClassName)
+        if (iter()->headerClassName() == clsName)
         {
             if (IOobject::debug)
             {
                 InfoInFunction << "Found " << iter.key() << endl;
             }
 
-            objectsOfClass.insert(iter.key(), new IOobject(*iter()));
+            results.insert
+            (
+                iter.key(),
+                new IOobject(*(iter.object()))
+            );
         }
     }
 
-    return objectsOfClass;
+    return results;
 }
 
 
@@ -231,33 +233,33 @@ Foam::wordList Foam::IOobjectList::sortedNames() const
 
 Foam::wordList Foam::IOobjectList::names
 (
-    const word& ClassName
+    const word& clsName
 ) const
 {
-    wordList objectNames(size());
+    wordList objNames(size());
 
     label count = 0;
-    forAllConstIter(HashPtrTable<IOobject>, *this, iter)
+    forAllConstIters(*this, iter)
     {
-        if (iter()->headerClassName() == ClassName)
+        if (iter()->headerClassName() == clsName)
         {
-            objectNames[count++] = iter.key();
+            objNames[count++] = iter.key();
         }
     }
 
-    objectNames.setSize(count);
+    objNames.setSize(count);
 
-    return objectNames;
+    return objNames;
 }
 
 
 Foam::wordList Foam::IOobjectList::names
 (
-    const word& ClassName,
+    const word& clsName,
     const wordRe& matcher
 ) const
 {
-    wordList objNames = names(ClassName);
+    wordList objNames = names(clsName);
 
     return wordList(objNames, findStrings(matcher, objNames));
 }
@@ -265,11 +267,11 @@ Foam::wordList Foam::IOobjectList::names
 
 Foam::wordList Foam::IOobjectList::names
 (
-    const word& ClassName,
+    const word& clsName,
     const wordReList& matcher
 ) const
 {
-    wordList objNames = names(ClassName);
+    wordList objNames = names(clsName);
 
     return wordList(objNames, findStrings(matcher, objNames));
 }
@@ -277,10 +279,10 @@ Foam::wordList Foam::IOobjectList::names
 
 Foam::wordList Foam::IOobjectList::sortedNames
 (
-    const word& ClassName
+    const word& clsName
 ) const
 {
-    wordList sortedLst = names(ClassName);
+    wordList sortedLst = names(clsName);
     sort(sortedLst);
 
     return sortedLst;
@@ -289,11 +291,11 @@ Foam::wordList Foam::IOobjectList::sortedNames
 
 Foam::wordList Foam::IOobjectList::sortedNames
 (
-    const word& ClassName,
+    const word& clsName,
     const wordRe& matcher
 ) const
 {
-    wordList sortedLst = names(ClassName, matcher);
+    wordList sortedLst = names(clsName, matcher);
     sort(sortedLst);
 
     return sortedLst;
@@ -302,11 +304,11 @@ Foam::wordList Foam::IOobjectList::sortedNames
 
 Foam::wordList Foam::IOobjectList::sortedNames
 (
-    const word& ClassName,
+    const word& clsName,
     const wordReList& matcher
 ) const
 {
-    wordList sortedLst = names(ClassName, matcher);
+    wordList sortedLst = names(clsName, matcher);
     sort(sortedLst);
 
     return sortedLst;
diff --git a/src/OpenFOAM/db/IOobjectList/IOobjectList.H b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
index 926135222f..17f75233ed 100644
--- a/src/OpenFOAM/db/IOobjectList/IOobjectList.H
+++ b/src/OpenFOAM/db/IOobjectList/IOobjectList.H
@@ -77,7 +77,7 @@ public:
         );
 
         //- Construct as copy
-        IOobjectList(const IOobjectList&);
+        IOobjectList(const IOobjectList& iolist);
 
 
     //- Destructor
@@ -87,52 +87,56 @@ public:
     // Member functions
 
         //- Add an IOobject to the list
-        bool add(IOobject&);
+        bool add(IOobject& io);
 
         //- Remove an IOobject from the list
-        bool remove(IOobject&);
+        bool remove(IOobject& io);
 
         //- Lookup a given name and return IOobject ptr if found else nullptr
         IOobject* lookup(const word& name) const;
 
-        //- Return the list for all IOobects whose name matches name
-        IOobjectList lookup(const wordRe& name) const;
+        //- The list of all IOobects with matching names
+        IOobjectList lookup(const wordRe& matcher) const;
 
-        //- Return the list for all IOobects whose name matches name
-        IOobjectList lookup(const wordReList& patterns) const;
+        //- The list of all IOobjects with matching names
+        IOobjectList lookup(const wordReList& matcher) const;
 
-        //- Return the list for all IOobjects of a given class
-        IOobjectList lookupClass(const word& className) const;
+        //- The list of all IOobjects with the given class name
+        IOobjectList lookupClass(const word& clsName) const;
 
 
         //- A list of names of the IOobjects
         wordList names() const;
 
-        //- A list of names of IOobjects of the given class
-        wordList names(const word& className) const;
+        //- The names of IOobjects with the given class name
+        wordList names(const word& clsName) const;
 
-        //- A list of names of IOobjects of the given class,
-        //  and that also satisfy the input matcher
-        wordList names(const word& className, const wordRe&) const;
+        //- The names of IOobjects with the given class name that also
+        //  have a name satisfying the input matcher
+        wordList names(const word& clsName, const wordRe& matcher) const;
 
-        //- A list of names of IOobjects of the given class,
-        //  and that also satisfy the input matchers
-        wordList names(const word& className, const wordReList&) const;
+        //- The names of IOobjects with the given class name that also
+        //  have a name satisfying the input matcher
+        wordList names(const word& clsName, const wordReList& matcher) const;
 
 
         //- A sorted list of names of the IOobjects
         wordList sortedNames() const;
 
-        //- A sorted list of names of IOobjects of given class
-        wordList sortedNames(const word& className) const;
+        //- The sorted names of IOobjects with the given class name
+        wordList sortedNames(const word& clsName) const;
 
-        //- A sorted list of names of IOobjects of the given class,
-        //  and that also satisfy the input matcher
-        wordList sortedNames(const word& className, const wordRe&) const;
+        //- The sorted names of IOobjects with the given class name that also
+        //  have a name satisfying the input matcher
+        wordList sortedNames(const word& clsName, const wordRe& matcher) const;
 
-        //- A sorted list of names of IOobjects of the given class,
-        //  and that also satisfy the input matchers
-        wordList sortedNames(const word& className, const wordReList&) const;
+        //- The sorted names of IOobjects with the given class name that also
+        //  have a name satisfying the input matcher
+        wordList sortedNames
+        (
+            const word& clsName,
+            const wordReList& matcher
+        ) const;
 };
 
 
diff --git a/src/OpenFOAM/db/Time/Time.C b/src/OpenFOAM/db/Time/Time.C
index f3297c314b..fbf6ebff65 100644
--- a/src/OpenFOAM/db/Time/Time.C
+++ b/src/OpenFOAM/db/Time/Time.C
@@ -28,6 +28,7 @@ License
 #include "argList.H"
 #include "HashSet.H"
 #include "profiling.H"
+#include "demandDrivenData.H"
 
 #include <sstream>
 
@@ -331,9 +332,14 @@ void Foam::Time::setControls()
 }
 
 
-void Foam::Time::setMonitoring(bool forceProfiling)
+void Foam::Time::setMonitoring(const bool forceProfiling)
 {
     const dictionary* profilingDict = controlDict_.subDictPtr("profiling");
+    if (!profilingDict)
+    {
+        // ... or from etc/controlDict
+        profilingDict = debug::controlDict().subDictPtr("profiling");
+    }
 
     // initialize profiling on request
     // otherwise rely on profiling entry within controlDict
@@ -419,6 +425,7 @@ Foam::Time::Time
 
     objectRegistry(*this),
 
+    loopProfiling_(nullptr),
     libs_(),
 
     controlDict_
@@ -478,6 +485,7 @@ Foam::Time::Time
     (
         args.parRunControl().parRun(),
         args.rootPath(),
+        args.distributed(),
         args.globalCaseName(),
         args.caseName(),
         systemName,
@@ -486,6 +494,7 @@ Foam::Time::Time
 
     objectRegistry(*this),
 
+    loopProfiling_(nullptr),
     libs_(),
 
     controlDict_
@@ -563,6 +572,7 @@ Foam::Time::Time
 
     objectRegistry(*this),
 
+    loopProfiling_(nullptr),
     libs_(),
 
     controlDict_
@@ -633,6 +643,7 @@ Foam::Time::Time
 
     objectRegistry(*this),
 
+    loopProfiling_(nullptr),
     libs_(),
 
     controlDict_
@@ -676,6 +687,8 @@ Foam::Time::Time
 
 Foam::Time::~Time()
 {
+    deleteDemandDrivenData(loopProfiling_);
+
     forAllReverse(controlDict_.watchIndices(), i)
     {
         removeWatch(controlDict_.watchIndices()[i]);
@@ -759,18 +772,15 @@ const Foam::fileName& Foam::Time::getFile(const label watchIndex) const
 }
 
 
-Foam::fileMonitor::fileState Foam::Time::getState
-(
-    const label watchFd
-) const
+Foam::fileMonitor::fileState Foam::Time::getState(const label watchIndex) const
 {
-    return monitorPtr_().getState(watchFd);
+    return monitorPtr_().getState(watchIndex);
 }
 
 
-void Foam::Time::setUnmodified(const label watchFd) const
+void Foam::Time::setUnmodified(const label watchIndex) const
 {
-    monitorPtr_().setUnmodified(watchFd);
+    monitorPtr_().setUnmodified(watchIndex);
 }
 
 
@@ -917,13 +927,15 @@ Foam::dimensionedScalar Foam::Time::endTime() const
 
 bool Foam::Time::run() const
 {
-    bool running = value() < (endTime_ - 0.5*deltaT_);
+    deleteDemandDrivenData(loopProfiling_);
+
+    bool isRunning = value() < (endTime_ - 0.5*deltaT_);
 
     if (!subCycling_)
     {
         // Only execute when the condition is no longer true
         // ie, when exiting the control loop
-        if (!running && timeIndex_ != startTimeIndex_)
+        if (!isRunning && timeIndex_ != startTimeIndex_)
         {
             // Ensure functionObjects execute on last time step
             // (and hence write uptodate functionObjectProperties)
@@ -937,7 +949,7 @@ bool Foam::Time::run() const
         }
     }
 
-    if (running)
+    if (isRunning)
     {
         if (!subCycling_)
         {
@@ -953,27 +965,45 @@ bool Foam::Time::run() const
                 addProfiling(functionObjects, "functionObjects.execute()");
                 functionObjects_.execute();
             }
+
+            // Check if the execution of functionObjects require re-reading
+            // any files. This moves effect of e.g. 'timeActivatedFileUpdate'
+            // one time step forward. Note that we cannot call
+            // readModifiedObjects from within timeActivatedFileUpdate since
+            // it might re-read the functionObjects themselves (and delete
+            // the timeActivatedFileUpdate one)
+            if (functionObjects_.filesModified())
+            {
+                const_cast<Time&>(*this).readModifiedObjects();
+            }
         }
 
-        // Update the "running" status following the
+        // Update the "is-running" status following the
         // possible side-effects from functionObjects
-        running = value() < (endTime_ - 0.5*deltaT_);
+        isRunning = value() < (endTime_ - 0.5*deltaT_);
+
+        // (re)trigger profiling
+        if (profiling::active())
+        {
+            loopProfiling_ =
+                new profilingTrigger("time.run() " + objectRegistry::name());
+        }
     }
 
-    return running;
+    return isRunning;
 }
 
 
 bool Foam::Time::loop()
 {
-    bool running = run();
+    const bool isRunning = run();
 
-    if (running)
+    if (isRunning)
     {
         operator++();
     }
 
-    return running;
+    return isRunning;
 }
 
 
@@ -1064,19 +1094,19 @@ void Foam::Time::setEndTime(const scalar endTime)
 void Foam::Time::setDeltaT
 (
     const dimensionedScalar& deltaT,
-    const bool bAdjustDeltaT
+    const bool adjust
 )
 {
-    setDeltaT(deltaT.value(), bAdjustDeltaT);
+    setDeltaT(deltaT.value(), adjust);
 }
 
 
-void Foam::Time::setDeltaT(const scalar deltaT, const bool bAdjustDeltaT)
+void Foam::Time::setDeltaT(const scalar deltaT, const bool adjust)
 {
     deltaT_ = deltaT;
     deltaTchanged_ = true;
 
-    if (bAdjustDeltaT)
+    if (adjust)
     {
         adjustDeltaT();
     }
diff --git a/src/OpenFOAM/db/Time/Time.H b/src/OpenFOAM/db/Time/Time.H
index d6869a208f..5f6dc17321 100644
--- a/src/OpenFOAM/db/Time/Time.H
+++ b/src/OpenFOAM/db/Time/Time.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -62,6 +62,7 @@ namespace Foam
 
 // Forward declaration of classes
 class argList;
+class profilingTrigger;
 
 /*---------------------------------------------------------------------------*\
                              Class Time Declaration
@@ -80,6 +81,9 @@ class Time
         //- file-change monitor for all registered files
         mutable autoPtr<fileMonitor> monitorPtr_;
 
+        //- Profiling trigger for time-loop (for run, loop)
+        mutable profilingTrigger* loopProfiling_;
+
         //- Any loaded dynamic libraries. Make sure to construct before
         //  reading controlDict.
         dlLibraryTable libs_;
@@ -333,29 +337,33 @@ public:
                 void readModifiedObjects();
 
                 //- Helper: add watches for list of files
-                void addWatches(regIOobject&, const fileNameList&) const;
+                void addWatches
+                (
+                    regIOobject& rio,
+                    const fileNameList& files
+                ) const;
 
                 //- Find index (or -1) of file in list of handles
                 label findWatch
                 (
                     const labelList& watchIndices,
-                    const fileName&
+                    const fileName& fName
                 ) const;
 
                 //- Add watching of a file. Returns handle
-                label addTimeWatch(const fileName&) const;
+                label addTimeWatch(const fileName& fName) const;
 
                 //- Remove watch on a file (using handle)
-                bool removeWatch(const label) const;
+                bool removeWatch(const label watchIndex) const;
 
                 //- Get name of file being watched (using handle)
-                const fileName& getFile(const label) const;
+                const fileName& getFile(const label watchIndex) const;
 
                 //- Get current state of file (using handle)
-                fileMonitor::fileState getState(const label) const;
+                fileMonitor::fileState getState(const label watchIndex) const;
 
                 //- Set current state of file (using handle) to unmodified
-                void setUnmodified(const label) const;
+                void setUnmodified(const label watchIndex) const;
 
 
             //- Return the location of "dir" containing the file "name".
@@ -375,20 +383,24 @@ public:
 
             //- Search the case for the time directory path
             //  corresponding to the given instance
-            word findInstancePath(const fileName& path, const instant&) const;
+            word findInstancePath
+            (
+                const fileName& directory,
+                const instant& t
+            ) const;
 
             //- Search the case for the time directory path
             //  corresponding to the given instance
-            word findInstancePath(const instant&) const;
+            word findInstancePath(const instant& t) const;
 
             //- Search the case for the time closest to the given time
-            instant findClosestTime(const scalar) const;
+            instant findClosestTime(const scalar t) const;
 
             //- Search instantList for the time index closest to the given time
             static label findClosestTimeIndex
             (
-                const instantList&,
-                const scalar,
+                const instantList& timeDirs,
+                const scalar t,
                 const word& constantName = "constant"
             );
 
@@ -398,9 +410,9 @@ public:
             //- Write using given format, version and compression
             virtual bool writeObject
             (
-                IOstream::streamFormat,
-                IOstream::versionNumber,
-                IOstream::compressionType
+                IOstream::streamFormat fmt,
+                IOstream::versionNumber ver,
+                IOstream::compressionType cmp
             ) const;
 
             //- Write the objects now (not at end of iteration) and continue
@@ -420,7 +432,7 @@ public:
             //  formatted with given precision
             static word timeName
             (
-                const scalar,
+                const scalar t,
                 const int precision = precision_
             );
 
@@ -430,7 +442,7 @@ public:
             //- Search a given directory for valid time directories
             static instantList findTimes
             (
-                const fileName&,
+                const fileName& directory,
                 const word& constantName = "constant"
             );
 
@@ -521,42 +533,42 @@ public:
             //- Adjust the current stopAtControl. Note that this value
             //  only persists until the next time the dictionary is read.
             //  Return true if the stopAtControl changed.
-            virtual bool stopAt(const stopAtControls) const;
+            virtual bool stopAt(const stopAtControls sa) const;
 
             //- Reset the time and time-index to those of the given time
-            virtual void setTime(const Time&);
+            virtual void setTime(const Time& t);
 
             //- Reset the time and time-index
-            virtual void setTime(const instant&, const label newIndex);
+            virtual void setTime(const instant& inst, const label newIndex);
 
             //- Reset the time and time-index
             virtual void setTime
             (
-                const dimensionedScalar&,
+                const dimensionedScalar& newTime,
                 const label newIndex
             );
 
             //- Reset the time and time-index
-            virtual void setTime(const scalar, const label newIndex);
+            virtual void setTime(const scalar newTime, const label newIndex);
 
             //- Reset end time
-            virtual void setEndTime(const dimensionedScalar&);
+            virtual void setEndTime(const dimensionedScalar& endTime);
 
             //- Reset end time
-            virtual void setEndTime(const scalar);
+            virtual void setEndTime(const scalar endTime);
 
-            //- Reset time step
+            //- Reset time step, normally also calling adjustDeltaT()
             virtual void setDeltaT
             (
-                const dimensionedScalar&,
-                const bool adjustDeltaT = true
+                const dimensionedScalar& deltaT,
+                const bool adjust = true
             );
 
-            //- Reset time step
+            //- Reset time step, normally also calling adjustDeltaT()
             virtual void setDeltaT
             (
-                const scalar,
-                const bool adjustDeltaT = true
+                const scalar deltaT,
+                const bool adjust = true
             );
 
             //- Set time to sub-cycle for the given number of steps
@@ -575,10 +587,10 @@ public:
     // Member operators
 
         //- Set deltaT to that specified and increment time via operator++()
-        virtual Time& operator+=(const dimensionedScalar&);
+        virtual Time& operator+=(const dimensionedScalar& deltaT);
 
         //- Set deltaT to that specified and increment time via operator++()
-        virtual Time& operator+=(const scalar);
+        virtual Time& operator+=(const scalar deltaT);
 
         //- Prefix increment,
         //  also invokes the functionObjectList::start() or
diff --git a/src/OpenFOAM/db/Time/TimePaths.C b/src/OpenFOAM/db/Time/TimePaths.C
index ae5b5d182f..05126252c6 100644
--- a/src/OpenFOAM/db/Time/TimePaths.C
+++ b/src/OpenFOAM/db/Time/TimePaths.C
@@ -70,6 +70,7 @@ Foam::TimePaths::TimePaths
 :
     processorCase_(false),
     rootPath_(rootPath),
+    distributed_(false),
     globalCaseName_(caseName),
     case_(caseName),
     system_(systemName),
@@ -84,6 +85,7 @@ Foam::TimePaths::TimePaths
 (
     const bool processorCase,
     const fileName& rootPath,
+    const bool distributed,
     const fileName& globalCaseName,
     const fileName& caseName,
     const word& systemName,
@@ -92,6 +94,7 @@ Foam::TimePaths::TimePaths
 :
     processorCase_(processorCase),
     rootPath_(rootPath),
+    distributed_(distributed),
     globalCaseName_(globalCaseName),
     case_(caseName),
     system_(systemName),
diff --git a/src/OpenFOAM/db/Time/TimePaths.H b/src/OpenFOAM/db/Time/TimePaths.H
index f7bbc25d29..32674008b2 100644
--- a/src/OpenFOAM/db/Time/TimePaths.H
+++ b/src/OpenFOAM/db/Time/TimePaths.H
@@ -53,6 +53,7 @@ class TimePaths
 
         bool processorCase_;
         const fileName rootPath_;
+        bool distributed_;
         fileName globalCaseName_;
         fileName case_;
         const word system_;
@@ -84,6 +85,7 @@ public:
         (
             const bool processorCase,
             const fileName& rootPath,
+            const bool distributed,
             const fileName& globalCaseName,
             const fileName& caseName,
             const word& systemName,
@@ -139,6 +141,13 @@ public:
                 return constant_;
             }
 
+            //- Is case running with parallel distributed directories
+            //  (i.e. not NFS mounted)
+            bool distributed() const
+            {
+                return distributed_;
+            }
+
             //- Return constant name for the case
             //  which for parallel runs returns ../constant()
             fileName caseConstant() const;
diff --git a/src/OpenFOAM/db/dictionary/dictionary.C b/src/OpenFOAM/db/dictionary/dictionary.C
index 46d3fae44f..067fbb2c2b 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.C
+++ b/src/OpenFOAM/db/dictionary/dictionary.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -60,121 +60,108 @@ const Foam::entry* Foam::dictionary::lookupScopedSubEntryPtr
         // Non-scoped lookup
         return lookupEntryPtr(keyword, recursive, patternMatch);
     }
-    else
+    else if (dotPos == 0)
     {
-        if (dotPos == 0)
+        // Starting with a '.' -> go up for every further '.' found
+        ++dotPos;
+
+        const dictionary* dictPtr = this;
+        for
+        (
+            string::const_iterator it = keyword.begin()+1;
+            it != keyword.end() && *it == '.';
+            ++dotPos, ++it
+        )
         {
-            // Starting with a '.'. Go up for every 2nd '.' found
-
-            const dictionary* dictPtr = this;
-
-            string::size_type begVar = dotPos + 1;
-            string::const_iterator iter = keyword.begin() + begVar;
-            string::size_type endVar = begVar;
-            while (iter != keyword.end() && *iter == '.')
+            // Go to parent
+            if (&dictPtr->parent_ != &dictionary::null)
             {
-                ++iter;
-                ++endVar;
-
-                // Go to parent
-                if (&dictPtr->parent_ == &dictionary::null)
-                {
-                    FatalIOErrorInFunction
-                    (
-                        *this
-                    )   << "No parent of current dictionary"
-                        << " when searching for "
-                        << keyword.substr(begVar, keyword.size()-begVar)
-                        << exit(FatalIOError);
-                }
                 dictPtr = &dictPtr->parent_;
             }
+            else
+            {
+                FatalIOErrorInFunction
+                (
+                    *this
+                )   << "No parent of current dictionary when searching for "
+                    << keyword.substr(1)
+                    << exit(FatalIOError);
 
-            return dictPtr->lookupScopedSubEntryPtr
+                return nullptr;
+            }
+        }
+
+        return dictPtr->lookupScopedSubEntryPtr
+        (
+            keyword.substr(dotPos),
+            false,
+            patternMatch
+        );
+    }
+    else
+    {
+        // The first word
+        const entry* entPtr = lookupScopedSubEntryPtr
+        (
+            keyword.substr(0, dotPos),
+            false,
+            patternMatch
+        );
+
+        if (!entPtr)
+        {
+            // Fall back to finding key with '.' so e.g. if keyword is
+            // a.b.c.d it would try
+            // a.b, a.b.c, a.b.c.d
+
+            while (true)
+            {
+                dotPos = keyword.find('.', dotPos+1);
+
+                entPtr = lookupEntryPtr
+                (
+                    keyword.substr(0, dotPos),
+                    false,
+                    patternMatch
+                );
+
+                if (dotPos == string::npos)
+                {
+                    // Parsed the whole word. Return entry or null.
+                    return entPtr;
+                }
+
+                if (entPtr && entPtr->isDict())
+                {
+                    return entPtr->dict().lookupScopedSubEntryPtr
+                    (
+                        keyword.substr(dotPos),
+                        false,
+                        patternMatch
+                    );
+                }
+            }
+        }
+
+        if (entPtr->isDict())
+        {
+            return entPtr->dict().lookupScopedSubEntryPtr
             (
-                keyword.substr(endVar),
+                keyword.substr(dotPos),
                 false,
                 patternMatch
             );
         }
-        else
-        {
-            // Extract the first word
-            word firstWord = keyword.substr(0, dotPos);
-
-            const entry* entPtr = lookupScopedSubEntryPtr
-            (
-                firstWord,
-                false,          //recursive
-                patternMatch
-            );
-
-            if (!entPtr)
-            {
-                // Fall back to finding key with '.' so e.g. if keyword is
-                // a.b.c.d it would try
-                // a.b, a.b.c, a.b.c.d
-
-                string::size_type nextDotPos = keyword.find
-                (
-                    '.',
-                    dotPos+1
-                );
-
-                while (true)
-                {
-                    const entry* subEntPtr = lookupEntryPtr
-                    (
-                        keyword.substr(0, nextDotPos),
-                        false,  //recursive,
-                        patternMatch
-                    );
-                    if (nextDotPos == string::npos)
-                    {
-                        // Parsed the whole word. Return entry or null.
-                        return subEntPtr;
-                    }
-
-                    if (subEntPtr && subEntPtr->isDict())
-                    {
-                        return subEntPtr->dict().lookupScopedSubEntryPtr
-                        (
-                            keyword.substr
-                            (
-                                nextDotPos,
-                                keyword.size()-nextDotPos
-                            ),
-                            false,
-                            patternMatch
-                        );
-                    }
-
-                    nextDotPos = keyword.find('.', nextDotPos+1);
-                }
-            }
-
-            if (entPtr->isDict())
-            {
-                return entPtr->dict().lookupScopedSubEntryPtr
-                (
-                    keyword.substr(dotPos, keyword.size()-dotPos),
-                    false,
-                    patternMatch
-                );
-            }
-            else
-            {
-                return nullptr;
-            }
-        }
     }
+
+    return nullptr;
 }
 
 
 bool Foam::dictionary::findInPatterns
 (
     const bool patternMatch,
-    const word& Keyword,
+    const word& keyword,
     DLList<entry*>::const_iterator& wcLink,
     DLList<autoPtr<regExp>>::const_iterator& reLink
 ) const
@@ -186,8 +173,8 @@ bool Foam::dictionary::findInPatterns
             if
             (
                 patternMatch
-              ? reLink()->match(Keyword)
-              : wcLink()->keyword() == Keyword
+              ? reLink()->match(keyword)
+              : wcLink()->keyword() == keyword
             )
             {
                 return true;
@@ -205,7 +192,7 @@ bool Foam::dictionary::findInPatterns
 bool Foam::dictionary::findInPatterns
 (
     const bool patternMatch,
-    const word& Keyword,
+    const word& keyword,
     DLList<entry*>::iterator& wcLink,
     DLList<autoPtr<regExp>>::iterator& reLink
 )
@@ -217,8 +204,8 @@ bool Foam::dictionary::findInPatterns
             if
             (
                 patternMatch
-              ? reLink()->match(Keyword)
-              : wcLink()->keyword() == Keyword
+              ? reLink()->match(keyword)
+              : wcLink()->keyword() == keyword
             )
             {
                 return true;
@@ -588,7 +575,7 @@ const Foam::entry* Foam::dictionary::lookupScopedEntryPtr
     bool patternMatch
 ) const
 {
-    if (keyword[0] == ':')
+    if (keyword[0] == ':' || keyword[0] == '^')
     {
         // Go up to top level
         const dictionary* dictPtr = this;
@@ -597,10 +584,9 @@ const Foam::entry* Foam::dictionary::lookupScopedEntryPtr
             dictPtr = &dictPtr->parent_;
         }
 
-        // At top. Recurse to find entries
         return dictPtr->lookupScopedSubEntryPtr
         (
-            keyword.substr(1, keyword.size()-1),
+            keyword.substr(1),
             false,
             patternMatch
         );
@@ -617,9 +603,13 @@ const Foam::entry* Foam::dictionary::lookupScopedEntryPtr
 }
 
 
-bool Foam::dictionary::substituteScopedKeyword(const word& keyword)
+bool Foam::dictionary::substituteScopedKeyword
+(
+    const word& keyword,
+    bool mergeEntry
+)
 {
-    word varName = keyword(1, keyword.size()-1);
+    const word varName = keyword(1, keyword.size()-1);
 
     // Lookup the variable name in the given dictionary
     const entry* ePtr = lookupScopedEntryPtr(varName, true, true);
@@ -631,7 +621,7 @@ bool Foam::dictionary::substituteScopedKeyword(const word& keyword)
 
         forAllConstIter(IDLList<entry>, addDict, iter)
         {
-            add(iter());
+            add(iter(), mergeEntry);
         }
 
         return true;
@@ -961,11 +951,11 @@ void Foam::dictionary::set(const keyType& k, const dictionary& d)
 }
 
 
-bool Foam::dictionary::remove(const word& Keyword)
+bool Foam::dictionary::remove(const word& keyword)
 {
-    HashTable<entry*>::iterator iter = hashedEntries_.find(Keyword);
+    HashTable<entry*>::iterator iter = hashedEntries_.find(keyword);
 
-    if (iter != hashedEntries_.end())
+    if (iter.found())
     {
         // Delete from patterns first
         DLList<entry*>::iterator wcLink =
@@ -974,7 +964,7 @@ bool Foam::dictionary::remove(const word& Keyword)
             patternRegexps_.begin();
 
         // Find in pattern using exact match only
-        if (findInPatterns(false, Keyword, wcLink, reLink))
+        if (findInPatterns(false, keyword, wcLink, reLink))
         {
             patternEntries_.remove(wcLink);
             patternRegexps_.remove(reLink);
@@ -1052,7 +1042,6 @@ bool Foam::dictionary::changeKeyword
             IDLList<entry>::replace(iter2(), iter());
             delete iter2();
             hashedEntries_.erase(iter2);
-
         }
         else
         {
diff --git a/src/OpenFOAM/db/dictionary/dictionary.H b/src/OpenFOAM/db/dictionary/dictionary.H
index 81fdd99c79..9a2296632b 100644
--- a/src/OpenFOAM/db/dictionary/dictionary.H
+++ b/src/OpenFOAM/db/dictionary/dictionary.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,26 +25,57 @@ Class
     Foam::dictionary
 
 Description
-    A list of keyword definitions, which are a keyword followed by any number
-    of values (e.g. words and numbers). The keywords can represent patterns
-    which are matched using Posix regular expressions. The general order for
-    searching is as follows:
-    - exact match
-    - pattern match (in reverse order)
-    - optional recursion into the enclosing (parent) dictionaries
+    A list of keyword definitions, which are a keyword followed by a number
+    of values (eg, words and numbers) or by a sub-dictionary.
+    Since the dictionary format is used extensively throughout OpenFOAM for
+    input/output files, there are many examples of its use.
 
-    The dictionary class is the base class for IOdictionary.
-    It also serves as a bootstrap dictionary for the objectRegistry data
-    dictionaries since, unlike the IOdictionary class, it does not use an
-    objectRegistry itself to work.
+    Dictionary keywords are a plain word or a pattern (regular expression).
+    The general order for searching is as follows:
+      - exact match
+      - pattern match (in reverse order)
+      - optional recursion into the enclosing (parent) dictionaries
 
-    To add - a merge() member function with a non-const dictionary parameter?
-    This would avoid unnecessary cloning in the add(entry*, bool) method.
+    The dictionary class is the base class for IOdictionary and also serves
+    as a bootstrap dictionary for the objectRegistry data dictionaries.
+
+Note
+    Within dictionaries, entries can be referenced by using the '$' syntax
+    familiar from shell programming. A '.' separator is used when referencing
+    sub-dictionary entries. Leading '.' prefixes can be used to specify
+    an entry from a parent directory. A leading ':' or '^' prefix specifies
+    starting from the top-level entry. For example,
+
+    \verbatim
+    key1        val1;
+    key2        $key1;   // use key1 value from current scope
+    key3        $.key1;  // use key1 value from current scope
+
+    subdict1
+    {
+        key1        val1b;
+        key2        $..key1; // use key1 value from parent
+        subdict2
+        {
+            key2        val2;
+            key3        $...key1; // use key1 value from grandparent
+        }
+    }
+
+    key4        $^subdict1.subdict2.key3;  // lookup with absolute scoping
+    \endverbatim
+
+    It is also possible to use the '${}' syntax for clarity.
 
 SourceFiles
     dictionary.C
     dictionaryIO.C
 
+SeeAlso
+    - Foam::entry
+    - Foam::dictionaryEntry
+    - Foam::primitiveEntry
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef dictionary_H
@@ -76,6 +107,7 @@ Ostream& operator<<(Ostream&, const dictionary&);
                         Class dictionaryName Declaration
 \*---------------------------------------------------------------------------*/
 
+//- Holds name for a dictionary
 class dictionaryName
 {
     // Private data
@@ -87,11 +119,11 @@ public:
 
     // Constructors
 
-        //- Construct dictionaryName null
+        //- Construct null
         dictionaryName()
         {}
 
-        //- Construct dictionaryName as copy of the given fileName
+        //- Construct as copy of the given fileName
         dictionaryName(const fileName& name)
         :
             name_(name)
@@ -116,16 +148,15 @@ public:
         const word dictName() const
         {
             const word scopedName = name_.name();
+            const std::string::size_type i = scopedName.rfind('.');
 
-            string::size_type i = scopedName.rfind('.');
-
-            if (i == scopedName.npos)
+            if (i == std::string::npos)
             {
                 return scopedName;
             }
             else
             {
-                return scopedName.substr(i + 1, scopedName.npos);
+                return scopedName.substr(i+1);
             }
         }
 };
@@ -142,8 +173,7 @@ class dictionary
 {
     // Private data
 
-        //- If true write optional keywords and values
-        //  if not present in dictionary
+        //- Report optional keywords and values if not present in dictionary
         static bool writeOptionalEntries;
 
         //- HashTable of the entries held on the DL-list for quick lookup
@@ -165,7 +195,7 @@ class dictionary
         //  otherwise return nullptr. Allows scoping using '.'
         const entry* lookupScopedSubEntryPtr
         (
-            const word&,
+            const word& keyword,
             bool recursive,
             bool patternMatch
         ) const;
@@ -217,38 +247,38 @@ public:
         (
             const fileName& name,
             const dictionary& parentDict,
-            Istream&
+            Istream& is
         );
 
         //- Construct top-level dictionary from Istream,
         //  reading entries until EOF
-        dictionary(Istream&);
+        dictionary(Istream& is);
 
         //- Construct top-level dictionary from Istream,
         //  reading entries until EOF, optionally keeping the header
-        dictionary(Istream&, const bool keepHeader);
+        dictionary(Istream& is, const bool keepHeader);
 
         //- Construct as copy given the parent dictionary
         dictionary(const dictionary& parentDict, const dictionary&);
 
         //- Construct top-level dictionary as copy
-        dictionary(const dictionary&);
+        dictionary(const dictionary& dict);
 
         //- Construct top-level dictionary as copy from pointer to dictionary.
         //  A null pointer is treated like an empty dictionary.
-        dictionary(const dictionary*);
+        dictionary(const dictionary* dictPtr);
 
         //- Construct by transferring parameter contents given parent dictionary
-        dictionary(const dictionary& parentDict, const Xfer<dictionary>&);
+        dictionary(const dictionary& parentDict, const Xfer<dictionary>& dict);
 
         //- Construct top-level dictionary by transferring parameter contents
-        dictionary(const Xfer<dictionary>&);
+        dictionary(const Xfer<dictionary>& dict);
 
         //- Construct and return clone
         autoPtr<dictionary> clone() const;
 
         //- Construct top-level dictionary on freestore from Istream
-        static autoPtr<dictionary> New(Istream&);
+        static autoPtr<dictionary> New(Istream& is);
 
 
     //- Destructor
@@ -286,8 +316,8 @@ public:
             //  If patternMatch, use regular expressions
             bool found
             (
-                const word&,
-                bool recursive=false,
+                const word& keyword,
+                bool recursive = false,
                 bool patternMatch = true
             ) const;
 
@@ -297,7 +327,7 @@ public:
             //  If patternMatch, use regular expressions
             const entry* lookupEntryPtr
             (
-                const word&,
+                const word& keyword,
                 bool recursive,
                 bool patternMatch
             ) const;
@@ -308,7 +338,7 @@ public:
             //  If patternMatch, use regular expressions.
             entry* lookupEntryPtr
             (
-                const word&,
+                const word& keyword,
                 bool recursive,
                 bool patternMatch
             );
@@ -318,7 +348,7 @@ public:
             //  If patternMatch, use regular expressions.
             const entry& lookupEntry
             (
-                const word&,
+                const word& keyword,
                 bool recursive,
                 bool patternMatch
             ) const;
@@ -328,9 +358,9 @@ public:
             //  If patternMatch, use regular expressions.
             ITstream& lookup
             (
-                const word&,
-                bool recursive=false,
-                bool patternMatch=true
+                const word& keyword,
+                bool recursive = false,
+                bool patternMatch = true
             ) const;
 
             //- Find and return a T,
@@ -345,17 +375,16 @@ public:
                 bool patternMatch=true
             ) const;
 
-            //- Find and return a T,
-            //  if not found return the given default value.
+            //- Find and return a T, or return the given default value
             //  If recursive, search parent dictionaries.
             //  If patternMatch, use regular expressions.
             template<class T>
             T lookupOrDefault
             (
-                const word&,
-                const T&,
-                bool recursive=false,
-                bool patternMatch=true
+                const word& keyword,
+                const T& deflt,
+                bool recursive = false,
+                bool patternMatch = true
             ) const;
 
             //- Find and return a T, if not found return the given
@@ -365,10 +394,10 @@ public:
             template<class T>
             T lookupOrAddDefault
             (
-                const word&,
-                const T&,
-                bool recursive=false,
-                bool patternMatch=true
+                const word& keyword,
+                const T& deflt,
+                bool recursive = false,
+                bool patternMatch = true
             );
 
             //- Find an entry if present, and assign to T
@@ -378,10 +407,10 @@ public:
             template<class T>
             bool readIfPresent
             (
-                const word&,
-                T&,
-                bool recursive=false,
-                bool patternMatch=true
+                const word& keyword,
+                T& val,
+                bool recursive = false,
+                bool patternMatch = true
             ) const;
 
             //- Find and return an entry data stream pointer if present
@@ -389,33 +418,33 @@ public:
             //  Special handling for ':' at start of keyword and '..'.
             const entry* lookupScopedEntryPtr
             (
-                const word&,
+                const word& keyword,
                 bool recursive,
                 bool patternMatch
             ) const;
 
             //- Check if entry is a sub-dictionary
-            bool isDict(const word&) const;
+            bool isDict(const word& keyword) const;
 
             //- Find and return a sub-dictionary pointer if present
             //  otherwise return nullptr.
-            const dictionary* subDictPtr(const word&) const;
+            const dictionary* subDictPtr(const word& keyword) const;
 
             //- Find and return a sub-dictionary pointer if present
             //  otherwise return nullptr.
-            dictionary* subDictPtr(const word&);
+            dictionary* subDictPtr(const word& keyword);
 
             //- Find and return a sub-dictionary
-            const dictionary& subDict(const word&) const;
+            const dictionary& subDict(const word& keyword) const;
 
             //- Find and return a sub-dictionary for manipulation
-            dictionary& subDict(const word&);
+            dictionary& subDict(const word& keyword);
 
             //- Find and return a sub-dictionary as a copy, or
             //  return an empty dictionary if the sub-dictionary does not exist
             dictionary subOrEmptyDict
             (
-                const word&,
+                const word& keyword,
                 const bool mustRead = false
             ) const;
 
@@ -430,74 +459,78 @@ public:
             wordList sortedToc() const;
 
             //- Return the list of available keys or patterns
-            List<keyType> keys(bool patterns=false) const;
+            List<keyType> keys(bool patterns = false) const;
 
 
         // Editing
 
             //- Substitute the given keyword prepended by '$' with the
             //  corresponding sub-dictionary entries
-            bool substituteKeyword(const word& keyword);
+            bool substituteKeyword(const word& keyword, bool mergeEntry=false);
 
             //- Substitute the given scoped keyword prepended by '$' with the
             //  corresponding sub-dictionary entries
-            bool substituteScopedKeyword(const word& keyword);
+            bool substituteScopedKeyword
+            (
+                const word& keyword,
+                bool mergeEntry=false
+            );
 
             //- Add a new entry
             //  With the merge option, dictionaries are interwoven and
             //  primitive entries are overwritten
-            bool add(entry*, bool mergeEntry=false);
+            bool add(entry* entryPtr, bool mergeEntry=false);
 
             //- Add an entry
             //  With the merge option, dictionaries are interwoven and
             //  primitive entries are overwritten
-            void add(const entry&, bool mergeEntry=false);
+            void add(const entry& e, bool mergeEntry=false);
 
             //- Add a word entry
             //  optionally overwrite an existing entry
-            void add(const keyType&, const word&, bool overwrite=false);
+            void add(const keyType& k, const word& w, bool overwrite=false);
 
             //- Add a string entry
             //  optionally overwrite an existing entry
-            void add(const keyType&, const string&, bool overwrite=false);
+            void add(const keyType& k, const string& s, bool overwrite=false);
 
             //- Add a label entry
             //  optionally overwrite an existing entry
-            void add(const keyType&, const label, bool overwrite=false);
+            void add(const keyType&, const label l, bool overwrite=false);
 
             //- Add a scalar entry
             //  optionally overwrite an existing entry
-            void add(const keyType&, const scalar, bool overwrite=false);
+            void add(const keyType&, const scalar s, bool overwrite=false);
 
             //- Add a dictionary entry
             //  optionally merge with an existing sub-dictionary
             void add
             (
-                const keyType&,
-                const dictionary&,
-                bool mergeEntry=false
+                const keyType& k,
+                const dictionary& d,
+                bool mergeEntry = false
             );
 
             //- Add a T entry
             //  optionally overwrite an existing entry
             template<class T>
-            void add(const keyType&, const T&, bool overwrite=false);
+            void add(const keyType& k, const T& t, bool overwrite=false);
 
             //- Assign a new entry, overwrite any existing entry
-            void set(entry*);
+            void set(entry* entryPtr);
 
             //- Assign a new entry, overwrite any existing entry
-            void set(const entry&);
+            void set(const entry& e);
 
             //- Assign a dictionary entry, overwrite any existing entry
-            void set(const keyType&, const dictionary&);
+            void set(const keyType& k, const dictionary& d);
 
             //- Assign a T entry, overwrite any existing entry
             template<class T>
-            void set(const keyType&, const T&);
+            void set(const keyType& k, const T& t);
 
             //- Remove an entry specified by keyword
-            bool remove(const word&);
+            bool remove(const word& Keyword);
 
             //- Change the keyword for an entry,
             //  optionally forcing overwrite of an existing entry
@@ -510,13 +543,13 @@ public:
 
             //- Merge entries from the given dictionary.
             //  Also merge sub-dictionaries as required.
-            bool merge(const dictionary&);
+            bool merge(const dictionary& dict);
 
             //- Clear the dictionary
             void clear();
 
             //- Transfer the contents of the argument and annul the argument.
-            void transfer(dictionary&);
+            void transfer(dictionary& dict);
 
             //- Transfer contents to the Xfer container
             Xfer<dictionary> xfer();
@@ -525,53 +558,53 @@ public:
         // Read
 
             //- Read dictionary from Istream
-            bool read(Istream&);
+            bool read(Istream& is);
 
             //- Read dictionary from Istream, optionally keeping the header
-            bool read(Istream&, const bool keepHeader);
+            bool read(Istream& is, const bool keepHeader);
 
 
         // Write
 
             //- Write sub-dictionary with the keyword as its header
-            void writeEntry(const keyType& keyword, Ostream&) const;
+            void writeEntry(const keyType& keyword, Ostream& os) const;
 
             //- Write dictionary entries.
             //  Optionally with extra new line between entries for
             //  "top-level" dictionaries
-            void writeEntries(Ostream&, const bool extraNewLine=false) const;
+            void writeEntries(Ostream& os, const bool extraNewLine=false) const;
 
             //- Write dictionary, normally with sub-dictionary formatting
-            void write(Ostream&, const bool subDict=true) const;
+            void write(Ostream& os, const bool subDict=true) const;
 
 
     // Member Operators
 
         //- Find and return entry
-        ITstream& operator[](const word&) const;
+        ITstream& operator[](const word& keyword) const;
 
-        void operator=(const dictionary&);
+        void operator=(const dictionary& rhs);
 
         //- Include entries from the given dictionary.
         //  Warn, but do not overwrite existing entries.
-        void operator+=(const dictionary&);
+        void operator+=(const dictionary& rhs);
 
         //- Conditionally include entries from the given dictionary.
         //  Do not overwrite existing entries.
-        void operator|=(const dictionary&);
+        void operator|=(const dictionary& rhs);
 
         //- Unconditionally include entries from the given dictionary.
         //  Overwrite existing entries.
-        void operator<<=(const dictionary&);
+        void operator<<=(const dictionary& rhs);
 
 
     // IOstream operators
 
         //- Read dictionary from Istream
-        friend Istream& operator>>(Istream&, dictionary&);
+        friend Istream& operator>>(Istream& is, dictionary& dict);
 
         //- Write dictionary to Ostream
-        friend Ostream& operator<<(Ostream&, const dictionary&);
+        friend Ostream& operator<<(Ostream& os, const dictionary& dict);
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/dictionaryIO.C b/src/OpenFOAM/db/dictionary/dictionaryIO.C
index 231e3bc44b..1d55ff2794 100644
--- a/src/OpenFOAM/db/dictionary/dictionaryIO.C
+++ b/src/OpenFOAM/db/dictionary/dictionaryIO.C
@@ -128,21 +128,21 @@ bool Foam::dictionary::read(Istream& is)
 }
 
 
-bool Foam::dictionary::substituteKeyword(const word& keyword)
+bool Foam::dictionary::substituteKeyword(const word& keyword, bool mergeEntry)
 {
-    word varName = keyword(1, keyword.size()-1);
+    const word varName = keyword(1, keyword.size()-1);
 
-    // lookup the variable name in the given dictionary
+    // Lookup the variable name in the given dictionary
     const entry* ePtr = lookupEntryPtr(varName, true, true);
 
-    // if defined insert its entries into this dictionary
+    // If defined insert its entries into this dictionary
     if (ePtr != nullptr)
     {
         const dictionary& addDict = ePtr->dict();
 
         forAllConstIter(IDLList<entry>, addDict, iter)
         {
-            add(iter());
+            add(iter(), mergeEntry);
         }
 
         return true;
diff --git a/src/OpenFOAM/db/dictionary/entry/entry.H b/src/OpenFOAM/db/dictionary/entry/entry.H
index c37809927a..dcbe358f18 100644
--- a/src/OpenFOAM/db/dictionary/entry/entry.H
+++ b/src/OpenFOAM/db/dictionary/entry/entry.H
@@ -57,7 +57,7 @@ class dictionary;
 // Forward declaration of friend functions and operators
 
 class entry;
-Ostream& operator<<(Ostream&, const entry&);
+Ostream& operator<<(Ostream& os, const entry& e);
 
 /*---------------------------------------------------------------------------*\
                            Class entry Declaration
@@ -75,11 +75,16 @@ class entry
 
     // Private Member Functions
 
-        //- Get the next valid keyword. Return true if is valid keyType.
-        static bool getKeyword(keyType&, token&, Istream&);
+        //- Get the next valid keyword. Return true if a valid keyType.
+        static bool getKeyword
+        (
+            keyType& keyword,
+            token& keywordToken,
+            Istream& is
+        );
 
         //- Get the next valid keyword otherwise return false
-        static bool getKeyword(keyType&, Istream&);
+        static bool getKeyword(keyType& keyword, Istream& is);
 
 
 public:
@@ -90,10 +95,10 @@ public:
     // Constructors
 
         //- Construct from keyword
-        entry(const keyType&);
+        entry(const keyType& keyword);
 
         //- Construct as copy
-        entry(const entry&);
+        entry(const entry& e);
 
         //- Construct on freestore as copy with reference to the
         //  dictionary the copy belongs to
@@ -107,7 +112,7 @@ public:
         virtual autoPtr<entry> clone() const;
 
         //- Construct from Istream and insert into dictionary
-        static bool New(dictionary& parentDict, Istream&);
+        static bool New(dictionary& parentDict, Istream& is);
 
         //- Construct on freestore from Istream and return
         static autoPtr<entry> New(Istream& is);
@@ -179,7 +184,7 @@ public:
 
     // Ostream operator
 
-        friend Ostream& operator<<(Ostream&, const entry&);
+        friend Ostream& operator<<(Ostream& os, const entry& e);
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/entry/entryIO.C b/src/OpenFOAM/db/dictionary/entry/entryIO.C
index 2a10aee4b8..3d554bd619 100644
--- a/src/OpenFOAM/db/dictionary/entry/entryIO.C
+++ b/src/OpenFOAM/db/dictionary/entry/entryIO.C
@@ -73,7 +73,7 @@ bool Foam::entry::getKeyword(keyType& keyword, token& keywordToken, Istream& is)
 bool Foam::entry::getKeyword(keyType& keyword, Istream& is)
 {
     token keywordToken;
-    bool ok = getKeyword(keyword, keywordToken, is);
+    const bool ok = getKeyword(keyword, keywordToken, is);
 
     if (ok)
     {
@@ -106,13 +106,13 @@ bool Foam::entry::getKeyword(keyType& keyword, Istream& is)
 
 bool Foam::entry::New(dictionary& parentDict, Istream& is)
 {
-    is.fatalCheck("entry::New(const dictionary& parentDict, Istream&)");
+    is.fatalCheck(FUNCTION_NAME);
 
     keyType keyword;
     token keyToken;
 
     // Get the next keyword and if a valid keyword return true
-    bool valid = getKeyword(keyword, keyToken, is);
+    const bool valid = getKeyword(keyword, keyToken, is);
 
     if (!valid)
     {
@@ -153,7 +153,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
     {
         if (keyword[0] == '#')      // ... Function entry
         {
-            word functionName = keyword(1, keyword.size()-1);
+            const word functionName = keyword(1, keyword.size()-1);
             if (disableFunctionEntries)
             {
                 return parentDict.add
@@ -195,7 +195,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
 
             if (nextToken == token::BEGIN_BLOCK)
             {
-                word varName = keyword(1, keyword.size()-1);
+                const word varName = keyword(1, keyword.size()-1);
 
                 // lookup the variable name in the given dictionary
                 const entry* ePtr = parentDict.lookupScopedEntryPtr
@@ -227,7 +227,14 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
             }
             else
             {
-                parentDict.substituteScopedKeyword(keyword);
+                // Deal with duplicate entries (at least partially)
+                const bool mergeEntry =
+                (
+                    functionEntries::inputModeEntry::merge()
+                 || functionEntries::inputModeEntry::overwrite()
+                );
+
+                parentDict.substituteScopedKeyword(keyword, mergeEntry);
             }
 
             return true;
@@ -317,7 +324,7 @@ bool Foam::entry::New(dictionary& parentDict, Istream& is)
 
 Foam::autoPtr<Foam::entry> Foam::entry::New(Istream& is)
 {
-    is.fatalCheck("entry::New(Istream&)");
+    is.fatalCheck(FUNCTION_NAME);
 
     keyType keyword;
 
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H
index b27175a569..f5eae2e556 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/includeFuncEntry/includeFuncEntry.H
@@ -40,7 +40,7 @@ Description
     - \b group (site) settings (when $WM_PROJECT_SITE is not set):
       - $WM_PROJECT_INST_DIR/site/\<VERSION\>/caseDicts/postProcessing
       - $WM_PROJECT_INST_DIR/site/caseDicts/postProcessing
-    - \b other (shipped) settings:
+    - \b other (project) settings:
       - $WM_PROJECT_DIR/etc/caseDicts/postProcessing
 
     The optional field arguments included in the name are inserted in 'field' or
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
index 96472b71cd..fbb6787ca1 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
+++ b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.C
@@ -62,7 +62,7 @@ void Foam::functionEntries::inputModeEntry::setMode(Istream& is)
 {
     clear();
 
-    word mode(is);
+    const word mode(is);
     if (mode == "merge" || mode == "default")
     {
         mode_ = MERGE;
@@ -97,7 +97,7 @@ void Foam::functionEntries::inputModeEntry::setMode(Istream& is)
 
 bool Foam::functionEntries::inputModeEntry::execute
 (
-    dictionary& parentDict,
+    dictionary& unused,
     Istream& is
 )
 {
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
index 623524cd80..66c98243ad 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/inputModeEntry/inputModeEntry.H
@@ -34,12 +34,20 @@ Description
     \endverbatim
 
     The possible input modes:
-      - \par merge      merge sub-dictionaries when possible
-      - \par overwrite  keep last entry and silently remove previous ones
-      - \par protect    keep initial entry and silently ignore subsequent ones
-      - \par warn       keep initial entry and warn about subsequent ones
-      - \par error      issue a FatalError for duplicate entries
-      - \par default    currently identical to merge
+      - \par merge
+        merge sub-dictionaries when possible
+      - \par overwrite
+        keep last entry and silently remove previous ones
+      - \par protect
+        keep initial entry and silently ignore subsequent ones
+      - \par warn
+        keep initial entry and warn about subsequent ones
+      - \par error
+        issue a FatalError for duplicate entries
+      - \par default
+        The default treatment - currently identical to \b merge.
+
+      Note that the clear() method resets to the default mode (merge).
 
 SourceFiles
     inputModeEntry.C
@@ -83,13 +91,13 @@ class inputModeEntry
     // Private Member Functions
 
         //- Read the mode as a word and set enum appropriately
-        static void setMode(Istream&);
+        static void setMode(Istream& is);
 
         //- Disallow default bitwise copy construct
-        inputModeEntry(const inputModeEntry&);
+        inputModeEntry(const inputModeEntry&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const inputModeEntry&);
+        void operator=(const inputModeEntry&) = delete;
 
 
 public:
@@ -101,7 +109,7 @@ public:
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
-        static bool execute(dictionary& parentDict, Istream&);
+        static bool execute(dictionary& parentDict, Istream& is);
 
         //- Reset the inputMode to %default (ie, %merge)
         static void clear();
diff --git a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
index 6ad9eb402e..8508141f64 100644
--- a/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
+++ b/src/OpenFOAM/db/dictionary/functionEntries/removeEntry/removeEntry.H
@@ -67,10 +67,10 @@ class removeEntry
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        removeEntry(const removeEntry&);
+        removeEntry(const removeEntry&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const removeEntry&);
+        void operator=(const removeEntry&) = delete;
 
 
 public:
@@ -82,7 +82,7 @@ public:
     // Member Functions
 
         //- Execute the functionEntry in a sub-dict context
-        static bool execute(dictionary& parentDict, Istream&);
+        static bool execute(dictionary& parentDict, Istream& is);
 };
 
 
diff --git a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
index 8777819d45..1c447e88ab 100644
--- a/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
+++ b/src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntryIO.C
@@ -21,9 +21,6 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-    PrimitiveEntry constructor from Istream and Ostream output operator.
-
 \*---------------------------------------------------------------------------*/
 
 #include "primitiveEntry.H"
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
index b0a92bc5c1..4ce4821b46 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -146,6 +146,12 @@ bool Foam::functionObject::adjustTimeStep()
 }
 
 
+bool Foam::functionObject::filesModified() const
+{
+    return false;
+}
+
+
 void Foam::functionObject::updateMesh(const mapPolyMesh&)
 {}
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
index 9c7d56a340..367c0094ee 100644
--- a/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
+++ b/src/OpenFOAM/db/functionObjects/functionObject/functionObject.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -233,6 +233,9 @@ public:
         //- Called at the end of Time::adjustDeltaT() if adjustTime is true
         virtual bool adjustTimeStep();
 
+        //- Did any file get changed during execution?
+        virtual bool filesModified() const;
+
         //- Update for changes of mesh
         virtual void updateMesh(const mapPolyMesh& mpm);
 
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
index 142da30fa6..d64e264eda 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -819,6 +819,21 @@ bool Foam::functionObjectList::read()
 }
 
 
+bool Foam::functionObjectList::filesModified() const
+{
+    bool ok = false;
+    if (execution_)
+    {
+        forAll(*this, objectI)
+        {
+            bool changed = operator[](objectI).filesModified();
+            ok = ok || changed;
+        }
+    }
+    return ok;
+}
+
+
 void Foam::functionObjectList::updateMesh(const mapPolyMesh& mpm)
 {
     if (execution_)
diff --git a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
index 917c71fc28..2a3efb45ed 100644
--- a/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
+++ b/src/OpenFOAM/db/functionObjects/functionObjectList/functionObjectList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -221,7 +221,7 @@ public:
         //    - $WM_PROJECT_DIR/etc/caseDicts/postProcessing
         //
         //  \return The path of the functionObject dictionary file if found
-        //  otherwise null
+        //  otherwise an empty path
         static fileName findDict(const word& funcName);
 
         //- Read the specified functionObject configuration dictionary parsing
@@ -264,6 +264,9 @@ public:
         //- Called at the end of Time::adjustDeltaT() if adjustTime is true
         bool adjustTimeStep();
 
+        //- Did any file get changed during execution?
+        bool filesModified() const;
+
         //- Update for changes of mesh
         void updateMesh(const mapPolyMesh& mpm);
 
diff --git a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
index 621479f615..df56087e8a 100644
--- a/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/regionFunctionObject/regionFunctionObject.H
@@ -114,7 +114,7 @@ protected:
         template<class ObjectType>
         ObjectType* lookupObjectRefPtr(const word& fieldName) const;
 
-        //- Store the given field in the (sub) objectRegistry under the given name
+        //- Store the field in the (sub) objectRegistry under the given name
         //  Note: sets the fieldName to tfield().name() if not already set
         template<class ObjectType>
         bool store
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
index 02b174d419..8e99aebe07 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.C
@@ -220,6 +220,17 @@ bool Foam::functionObjects::timeControl::read
 }
 
 
+bool Foam::functionObjects::timeControl::filesModified() const
+{
+    bool mod = false;
+    if (active())
+    {
+        mod = foPtr_->filesModified();
+    }
+    return mod;
+}
+
+
 void Foam::functionObjects::timeControl::updateMesh
 (
     const mapPolyMesh& mpm
diff --git a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
index 9108d12f52..aac5343c42 100644
--- a/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
+++ b/src/OpenFOAM/db/functionObjects/timeControl/timeControlFunctionObject.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -177,6 +177,9 @@ public:
             //- Called at the end of Time::adjustDeltaT() if adjustTime is true
             virtual bool adjustTimeStep();
 
+            //- Did any file get changed during execution?
+            virtual bool filesModified() const;
+
             //- Read and set the function object if its data have changed
             virtual bool read(const dictionary&);
 
diff --git a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
index 33f1c3754d..210114175f 100644
--- a/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
+++ b/src/OpenFOAM/db/functionObjects/writeFile/writeFile.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2012-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -92,8 +92,9 @@ Foam::autoPtr<Foam::OFstream> Foam::functionObjects::writeFile::createFile
 
     if (Pstream::master() && writeToFile_)
     {
-        const scalar timeNow = fileObr_.time().timeOutputValue();
-        const word startTimeName = Time::timeName(timeNow);
+        const scalar startTime = fileObr_.time().startTime().value();
+        const scalar userStartTime = fileObr_.time().timeToUserTime(startTime);
+        const word startTimeName = Time::timeName(userStartTime);
 
         fileName outputDir(baseFileDir()/prefix_/startTimeName);
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
index 166f7941fa..5823ee3f57 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,6 +45,27 @@ if (&(df1).mesh() != &(df2).mesh())                                 \
 }
 
 
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+template<class Type, class GeoMesh>
+void Foam::DimensionedField<Type, GeoMesh>::checkFieldSize() const
+{
+    const label fieldSize = this->size();
+    if (fieldSize)
+    {
+        const label meshSize = GeoMesh::size(this->mesh_);
+        if (fieldSize != meshSize)
+        {
+            FatalErrorInFunction
+                << "size of field = " << fieldSize
+                << " is not the same as the size of mesh = "
+                << meshSize
+                << abort(FatalError);
+        }
+    }
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 template<class Type, class GeoMesh>
@@ -61,14 +82,43 @@ DimensionedField<Type, GeoMesh>::DimensionedField
     mesh_(mesh),
     dimensions_(dims)
 {
-    if (field.size() && field.size() != GeoMesh::size(mesh))
-    {
-        FatalErrorInFunction
-            << "size of field = " << field.size()
-            << " is not the same as the size of mesh = "
-            << GeoMesh::size(mesh)
-            << abort(FatalError);
-    }
+    checkFieldSize();
+}
+
+
+template<class Type, class GeoMesh>
+DimensionedField<Type, GeoMesh>::DimensionedField
+(
+    const IOobject& io,
+    const Mesh& mesh,
+    const dimensionSet& dims,
+    const Xfer<Field<Type>>& field
+)
+:
+    regIOobject(io),
+    Field<Type>(field),
+    mesh_(mesh),
+    dimensions_(dims)
+{
+    checkFieldSize();
+}
+
+
+template<class Type, class GeoMesh>
+DimensionedField<Type, GeoMesh>::DimensionedField
+(
+    const IOobject& io,
+    const Mesh& mesh,
+    const dimensionSet& dims,
+    const Xfer<List<Type>>& field
+)
+:
+    regIOobject(io),
+    Field<Type>(field),
+    mesh_(mesh),
+    dimensions_(dims)
+{
+    checkFieldSize();
 }
 
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
index a302e54171..b37c63724f 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedField.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,14 +53,14 @@ template<class Type, class GeoMesh> class DimensionedField;
 
 template<class Type, class GeoMesh> Ostream& operator<<
 (
-    Ostream&,
-    const DimensionedField<Type, GeoMesh>&
+    Ostream& os,
+    const DimensionedField<Type, GeoMesh>& df
 );
 
 template<class Type, class GeoMesh> Ostream& operator<<
 (
-    Ostream&,
-    const tmp<DimensionedField<Type, GeoMesh>>&
+    Ostream& os,
+    const tmp<DimensionedField<Type, GeoMesh>>& tdf
 );
 
 
@@ -102,6 +102,9 @@ private:
 
     // Private Member Functions
 
+        //- Assert that non-zero field size == mesh size
+        void checkFieldSize() const;
+
         void readIfPresent(const word& fieldDictEntry = "value");
 
 
@@ -122,87 +125,105 @@ public:
         //- Construct from components
         DimensionedField
         (
-            const IOobject&,
+            const IOobject& io,
             const Mesh& mesh,
-            const dimensionSet&,
-            const Field<Type>&
+            const dimensionSet& dims,
+            const Field<Type>& field
+        );
+
+        //- Construct from components, transferring the initial field content
+        DimensionedField
+        (
+            const IOobject& io,
+            const Mesh& mesh,
+            const dimensionSet& dims,
+            const Xfer<Field<Type>>& field
+        );
+
+        //- Construct from components, transferring the initial field content
+        DimensionedField
+        (
+            const IOobject& io,
+            const Mesh& mesh,
+            const dimensionSet& dims,
+            const Xfer<List<Type>>& field
         );
 
         //- Construct from components
         //  Used for temporary fields which are initialised after construction
         DimensionedField
         (
-            const IOobject&,
+            const IOobject& io,
             const Mesh& mesh,
-            const dimensionSet&,
+            const dimensionSet& dims,
             const bool checkIOFlags = true
         );
 
         //- Construct from components
         DimensionedField
         (
-            const IOobject&,
+            const IOobject& io,
             const Mesh& mesh,
-            const dimensioned<Type>&,
+            const dimensioned<Type>& dt,
             const bool checkIOFlags = true
         );
 
         //- Construct from Istream
         DimensionedField
         (
-            const IOobject&,
+            const IOobject& io,
             const Mesh& mesh,
-            const word& fieldDictEntry="value"
+            const word& fieldDictEntry = "value"
         );
 
         //- Construct from dictionary
         DimensionedField
         (
-            const IOobject&,
+            const IOobject& io,
             const Mesh& mesh,
             const dictionary& fieldDict,
-            const word& fieldDictEntry="value"
+            const word& fieldDictEntry = "value"
         );
 
         //- Construct as copy
         DimensionedField
         (
-            const DimensionedField<Type, GeoMesh>&
+            const DimensionedField<Type, GeoMesh>& df
         );
 
         //- Construct as copy or re-use as specified.
         DimensionedField
         (
-            DimensionedField<Type, GeoMesh>&,
+            DimensionedField<Type, GeoMesh>& df,
             bool reuse
         );
 
         //- Construct by transferring the DimensionedField
         DimensionedField
         (
-            const Xfer<DimensionedField<Type, GeoMesh>>&
+            const Xfer<DimensionedField<Type, GeoMesh>>& df
         );
 
         //- Construct as copy of tmp<DimensionedField> deleting argument
         #ifndef NoConstructFromTmp
         DimensionedField
         (
-            const tmp<DimensionedField<Type, GeoMesh>>&
+            const tmp<DimensionedField<Type, GeoMesh>>& tdf
         );
         #endif
 
         //- Construct as copy resetting IO parameters
         DimensionedField
         (
-            const IOobject&,
-            const DimensionedField<Type, GeoMesh>&
+            const IOobject& io,
+            const DimensionedField<Type, GeoMesh>& df
         );
 
         //- Construct as copy resetting IO parameters and re-use as specified.
         DimensionedField
         (
-            const IOobject&,
-            DimensionedField<Type, GeoMesh>&,
+            const IOobject& io,
+            DimensionedField<Type, GeoMesh>& df,
             bool reuse
         );
 
@@ -210,14 +231,14 @@ public:
         DimensionedField
         (
             const word& newName,
-            const DimensionedField<Type, GeoMesh>&
+            const DimensionedField<Type, GeoMesh>& df
         );
 
         //- Construct as copy resetting name and re-use as specified.
         DimensionedField
         (
             const word& newName,
-            DimensionedField<Type, GeoMesh>&,
+            DimensionedField<Type, GeoMesh>& df,
             bool reuse
         );
 
@@ -225,7 +246,7 @@ public:
         DimensionedField
         (
             const word& newName,
-            const Xfer<DimensionedField<Type, GeoMesh>>&
+            const Xfer<DimensionedField<Type, GeoMesh>>& df
         );
 
         //- Construct as copy resetting name
@@ -233,7 +254,7 @@ public:
         DimensionedField
         (
             const word& newName,
-            const tmp<DimensionedField<Type, GeoMesh>>&
+            const tmp<DimensionedField<Type, GeoMesh>>& tdf
         );
         #endif
 
@@ -262,28 +283,30 @@ public:
         //- Return non-const access to dimensions
         inline dimensionSet& dimensions();
 
+        //- Return field
         inline const Field<Type>& field() const;
 
+        //- Return field
         inline Field<Type>& field();
 
         //- Return a component field of the field
         tmp<DimensionedField<cmptType, GeoMesh>> component
         (
-            const direction
+            const direction d
         ) const;
 
         //- Replace a component field of the field
         void replace
         (
-            const direction,
-            const DimensionedField<cmptType, GeoMesh>&
+            const direction d,
+            const DimensionedField<cmptType, GeoMesh>& df
         );
 
         //- Replace a component field of the field
         void replace
         (
-            const direction,
-            const tmp<DimensionedField<cmptType, GeoMesh>>&
+            const direction d,
+            const tmp<DimensionedField<cmptType, GeoMesh>>& tdf
         );
 
         //- Return the field transpose (only defined for second rank tensors)
@@ -295,60 +318,60 @@ public:
         //- Calculate and return weighted average
         dimensioned<Type> weightedAverage
         (
-            const DimensionedField<scalar, GeoMesh>&
+            const DimensionedField<scalar, GeoMesh>& weightField
         ) const;
 
         //- Calculate and return weighted average
         dimensioned<Type> weightedAverage
         (
-            const tmp<DimensionedField<scalar, GeoMesh>>&
+            const tmp<DimensionedField<scalar, GeoMesh>>& tweightField
         ) const;
 
 
         // Write
 
-            bool writeData(Ostream&, const word& fieldDictEntry) const;
+            bool writeData(Ostream& os, const word& fieldDictEntry) const;
 
-            bool writeData(Ostream&) const;
+            bool writeData(Ostream& os) const;
 
 
     // Member Operators
 
-        void operator=(const DimensionedField<Type, GeoMesh>&);
-        void operator=(const tmp<DimensionedField<Type, GeoMesh>>&);
-        void operator=(const dimensioned<Type>&);
+        void operator=(const DimensionedField<Type, GeoMesh>& df);
+        void operator=(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
+        void operator=(const dimensioned<Type>& dt);
 
-        void operator+=(const DimensionedField<Type, GeoMesh>&);
-        void operator+=(const tmp<DimensionedField<Type, GeoMesh>>&);
+        void operator+=(const DimensionedField<Type, GeoMesh>& df);
+        void operator+=(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
 
-        void operator-=(const DimensionedField<Type, GeoMesh>&);
-        void operator-=(const tmp<DimensionedField<Type, GeoMesh>>&);
+        void operator-=(const DimensionedField<Type, GeoMesh>& df);
+        void operator-=(const tmp<DimensionedField<Type, GeoMesh>>& tdf);
 
-        void operator*=(const DimensionedField<scalar, GeoMesh>&);
-        void operator*=(const tmp<DimensionedField<scalar, GeoMesh>>&);
+        void operator*=(const DimensionedField<scalar, GeoMesh>& df);
+        void operator*=(const tmp<DimensionedField<scalar, GeoMesh>>& tdf);
 
-        void operator/=(const DimensionedField<scalar, GeoMesh>&);
-        void operator/=(const tmp<DimensionedField<scalar, GeoMesh>>&);
+        void operator/=(const DimensionedField<scalar, GeoMesh>& df);
+        void operator/=(const tmp<DimensionedField<scalar, GeoMesh>>& tdf);
 
-        void operator+=(const dimensioned<Type>&);
-        void operator-=(const dimensioned<Type>&);
+        void operator+=(const dimensioned<Type>& dt);
+        void operator-=(const dimensioned<Type>& dt);
 
-        void operator*=(const dimensioned<scalar>&);
-        void operator/=(const dimensioned<scalar>&);
+        void operator*=(const dimensioned<scalar>& dt);
+        void operator/=(const dimensioned<scalar>& dt);
 
 
     // Ostream Operators
 
         friend Ostream& operator<< <Type, GeoMesh>
         (
-            Ostream&,
-            const DimensionedField<Type, GeoMesh>&
+            Ostream& os,
+            const DimensionedField<Type, GeoMesh>& df
         );
 
         friend Ostream& operator<< <Type, GeoMesh>
         (
-            Ostream&,
-            const tmp<DimensionedField<Type, GeoMesh>>&
+            Ostream& os,
+            const tmp<DimensionedField<Type, GeoMesh>>& tdf
         );
 };
 
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
index 444192f399..5932562ebf 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/DimensionedFieldFunctionsM.H
@@ -194,7 +194,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
+#define BINARY_TYPE_OPERATOR_SF(ReturnType, Type1, Type2, Op, OpName, OpFunc)  \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
@@ -225,7 +225,7 @@ tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
 );
 
 
-#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc) \
+#define BINARY_TYPE_OPERATOR_FS(ReturnType, Type1, Type2, Op, OpName, OpFunc)  \
                                                                                \
 TEMPLATE                                                                       \
 tmp<DimensionedField<ReturnType, GeoMesh>> operator Op                         \
diff --git a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
index e0e4282fb4..1f90a784ab 100644
--- a/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
+++ b/src/OpenFOAM/fields/DimensionedFields/DimensionedField/SubDimensionedField.H
@@ -105,7 +105,7 @@ public:
         //- Return a component field of the field
         inline tmp<DimensionedField<cmptType, GeoMesh>> component
         (
-            const direction
+            const direction d
         ) const;
 
         //- Return the field transpose (only defined for second rank tensors)
@@ -115,7 +115,7 @@ public:
     // Member operators
 
         //- Assignment
-        inline void operator=(const SubDimensionedField<Type, GeoMesh>&);
+        inline void operator=(const SubDimensionedField<Type, GeoMesh>& rhs);
 
         //- Allow cast to a const DimensionedField<Type, GeoMesh>&
         inline operator const DimensionedField<Type, GeoMesh>&() const;
diff --git a/src/OpenFOAM/fields/Fields/triadField/triadField.H b/src/OpenFOAM/fields/Fields/triadField/triadField.H
index 53ba1f37d3..bdddd47add 100644
--- a/src/OpenFOAM/fields/Fields/triadField/triadField.H
+++ b/src/OpenFOAM/fields/Fields/triadField/triadField.H
@@ -35,25 +35,12 @@ SourceFiles
 #ifndef triadField_H
 #define triadField_H
 
+#include "triadFieldFwd.H"
 #include "Field.H"
-#include "triad.H"
 
 #define TEMPLATE
 #include "FieldFunctionsM.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-typedef Field<triad> triadField;
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
 #include "undefFieldFunctionsM.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/fields/Fields/triadField/triadFieldFwd.H b/src/OpenFOAM/fields/Fields/triadField/triadFieldFwd.H
new file mode 100644
index 0000000000..74cf564c53
--- /dev/null
+++ b/src/OpenFOAM/fields/Fields/triadField/triadFieldFwd.H
@@ -0,0 +1,58 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Typedef
+    Foam::triadField
+
+Description
+    Forward declarations of the specialisation of Field\<T\> for triad.
+
+SourceFiles
+    triadField.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef triadFieldFwd_H
+#define triadFieldFwd_H
+
+#include "triad.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+template<class Type> class Field;
+typedef Field<triad> triadField;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/JobInfo/JobInfo.C b/src/OpenFOAM/global/JobInfo/JobInfo.C
index 7d17218841..bc0dbd147a 100644
--- a/src/OpenFOAM/global/JobInfo/JobInfo.C
+++ b/src/OpenFOAM/global/JobInfo/JobInfo.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,74 +28,14 @@ License
 #include "clock.H"
 #include "OFstream.H"
 #include "Pstream.H"
+#include "foamVersion.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 bool Foam::JobInfo::writeJobInfo(Foam::debug::infoSwitch("writeJobInfo", 0));
 Foam::JobInfo Foam::jobInfo;
 
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::JobInfo::JobInfo()
-:
-    runningJobPath_(),
-    finishedJobPath_(),
-    cpuTime_()
-{
-    name() = "JobInfo";
-
-    if (writeJobInfo && Pstream::master())
-    {
-        string baseDir = getEnv("FOAM_JOB_DIR");
-        string jobFile = hostName() + '.' + Foam::name(pid());
-
-        fileName runningDir(baseDir/"runningJobs");
-        fileName finishedDir(baseDir/"finishedJobs");
-
-        runningJobPath_  = runningDir/jobFile;
-        finishedJobPath_ = finishedDir/jobFile;
-
-        if (baseDir.empty())
-        {
-            FatalErrorInFunction
-                << "Cannot get JobInfo directory $FOAM_JOB_DIR"
-                << Foam::exit(FatalError);
-        }
-
-        if (!isDir(runningDir) && !mkDir(runningDir))
-        {
-            FatalErrorInFunction
-                << "Cannot make JobInfo directory " << runningDir
-                << Foam::exit(FatalError);
-        }
-
-        if (!isDir(finishedDir) && !mkDir(finishedDir))
-        {
-            FatalErrorInFunction
-                << "Cannot make JobInfo directory " << finishedDir
-                << Foam::exit(FatalError);
-        }
-    }
-
-    constructed = true;
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::JobInfo::~JobInfo()
-{
-    if (writeJobInfo && constructed && Pstream::master())
-    {
-        mv(runningJobPath_, finishedJobPath_);
-    }
-
-    constructed = false;
-}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 bool Foam::JobInfo::write(Ostream& os) const
 {
@@ -118,21 +58,6 @@ bool Foam::JobInfo::write(Ostream& os) const
 }
 
 
-void Foam::JobInfo::write() const
-{
-    if (writeJobInfo && Pstream::master())
-    {
-        if (!write(OFstream(runningJobPath_)()))
-        {
-            FatalErrorInFunction
-                << "Failed to write to JobInfo file "
-                << runningJobPath_
-                << Foam::exit(FatalError);
-        }
-    }
-}
-
-
 void Foam::JobInfo::end(const word& terminationType)
 {
     if (writeJobInfo && constructed && Pstream::master())
@@ -146,14 +71,87 @@ void Foam::JobInfo::end(const word& terminationType)
             add("termination", terminationType);
         }
 
-        rm(runningJobPath_);
-        write(OFstream(finishedJobPath_)());
+        Foam::rm(runningDir_/jobFileName_);
+        write(OFstream(finishedDir_/jobFileName_)());
     }
 
     constructed = false;
 }
 
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::JobInfo::JobInfo()
+:
+    jobFileName_(),
+    runningDir_(),
+    finishedDir_(),
+    cpuTime_()
+{
+    name() = "JobInfo";
+
+    if (writeJobInfo && Pstream::master())
+    {
+        string jobDir = getEnv("FOAM_JOB_DIR");
+        if (jobDir.empty())
+        {
+            // Fallback: ~/.OpenFOAM/jobControl
+            jobDir = home()/WM_USER_RESOURCE_DIRNAME/"jobControl";
+        }
+
+        jobFileName_ = hostName() + '.' + Foam::name(pid());
+        runningDir_  = jobDir/"runningJobs";
+        finishedDir_ = jobDir/"finishedJobs";
+
+        if (!isDir(jobDir) && !mkDir(jobDir))
+        {
+            FatalErrorInFunction
+                << "No JobInfo directory:  FOAM_JOB_DIR=" << jobDir
+                << Foam::exit(FatalError);
+        }
+        if (!isDir(runningDir_) && !mkDir(runningDir_))
+        {
+            FatalErrorInFunction
+                << "No JobInfo directory:  " << runningDir_
+                << Foam::exit(FatalError);
+        }
+        if (!isDir(finishedDir_) && !mkDir(finishedDir_))
+        {
+            FatalErrorInFunction
+                << "No JobInfo directory:  " << finishedDir_
+                << Foam::exit(FatalError);
+        }
+    }
+
+    constructed = true;
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::JobInfo::~JobInfo()
+{
+    signalEnd();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::JobInfo::write() const
+{
+    if (writeJobInfo && constructed && Pstream::master())
+    {
+        const fileName output = runningDir_/jobFileName_;
+        if (!write(OFstream(output)()))
+        {
+            FatalErrorInFunction
+                << "Failed to write to JobInfo file " << output
+                << Foam::exit(FatalError);
+        }
+    }
+}
+
+
 void Foam::JobInfo::end()
 {
     end("normal");
@@ -176,9 +174,8 @@ void Foam::JobInfo::signalEnd() const
 {
     if (writeJobInfo && constructed && Pstream::master())
     {
-        mv(runningJobPath_, finishedJobPath_);
+        Foam::mv(runningDir_/jobFileName_, finishedDir_/jobFileName_);
     }
-
     constructed = false;
 }
 
diff --git a/src/OpenFOAM/global/JobInfo/JobInfo.H b/src/OpenFOAM/global/JobInfo/JobInfo.H
index 5549af6273..f2b02e7023 100644
--- a/src/OpenFOAM/global/JobInfo/JobInfo.H
+++ b/src/OpenFOAM/global/JobInfo/JobInfo.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -31,6 +31,8 @@ Description
       - $FOAM_JOB_DIR/runningJobs
       - $FOAM_JOB_DIR/finishedJobs
 
+    If FOAM_JOB_DIR is unset, defaults to ~/.OpenFOAM/jobControl
+
 SourceFiles
     JobInfo.C
 
@@ -57,21 +59,28 @@ class JobInfo
     public dictionary
 {
     // Private data
-        fileName runningJobPath_;
-        fileName finishedJobPath_;
+
+        //- The name of the job file
+        string   jobFileName_;
+        fileName runningDir_;
+        fileName finishedDir_;
         cpuTime  cpuTime_;
 
     // Private Member Functions
 
-        bool write(Ostream&) const;
+        bool write(Ostream& os) const;
         void end(const word& terminationType);
 
 
 public:
 
+    //- Global value for constructed job info
     static bool constructed;
+
+    //- Global value for writeJobInfo enabled
     static bool writeJobInfo;
 
+
     // Constructors
 
         //- Construct null
@@ -79,22 +88,26 @@ public:
 
 
     //- Destructor
+    //  Update job info and relocate the file from running to finished.
     ~JobInfo();
 
 
     // Member Functions
 
-        // Write
+        //- Write the job info to its file in the runningJobs directory
+        void write() const;
 
-            void write() const;
+        //- End with "termination=normal"
+        void end();
 
-            void end();
+        //- End with "termination=exit"
+        void exit();
 
-            void exit();
+        //- End with "termination=abort"
+        void abort();
 
-            void abort();
-
-            void signalEnd() const;
+        //- Update job info and relocate the file from running to finished.
+        void signalEnd() const;
 };
 
 
diff --git a/src/OpenFOAM/global/argList/argList.C b/src/OpenFOAM/global/argList/argList.C
index e4f62ca59b..6873c7c157 100644
--- a/src/OpenFOAM/global/argList/argList.C
+++ b/src/OpenFOAM/global/argList/argList.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,7 +42,7 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-bool Foam::argList::bannerEnabled = true;
+bool Foam::argList::bannerEnabled_ = true;
 Foam::SLList<Foam::string>    Foam::argList::validArgs;
 Foam::HashTable<Foam::string> Foam::argList::validOptions;
 Foam::HashTable<Foam::string> Foam::argList::validParOptions;
@@ -154,7 +154,13 @@ void Foam::argList::removeOption(const word& opt)
 
 void Foam::argList::noBanner()
 {
-    bannerEnabled = false;
+    bannerEnabled_ = false;
+}
+
+
+bool Foam::argList::bannerEnabled()
+{
+    return bannerEnabled_;
 }
 
 
@@ -173,6 +179,12 @@ void Foam::argList::noFunctionObjects(bool addWithOption)
 }
 
 
+void Foam::argList::noJobInfo()
+{
+    JobInfo::writeJobInfo = false;
+}
+
+
 void Foam::argList::noParallel()
 {
     removeOption("parallel");
@@ -298,17 +310,17 @@ bool Foam::argList::postProcess(int argc, char *argv[])
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-// Convert argv -> args_
-// Transform sequences with "(" ... ")" into string lists in the process
 bool Foam::argList::regroupArgv(int& argc, char**& argv)
 {
-    int nArgs = 0;
-    int listDepth = 0;
+    int nArgs = 1;
+    unsigned listDepth = 0;
     string tmpString;
 
-    // Note: we also re-write directly into args_
+    // Note: we rewrite directly into args_
     // and use a second pass to sort out args/options
-    for (int argI = 0; argI < argc; ++argI)
+
+    args_[0] = fileName(argv[0]);
+    for (int argI = 1; argI < argc; ++argI)
     {
         if (strcmp(argv[argI], "(") == 0)
         {
@@ -321,7 +333,7 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
             {
                 --listDepth;
                 tmpString += ")";
-                if (listDepth == 0)
+                if (!listDepth)
                 {
                     args_[nArgs++] = tmpString;
                     tmpString.clear();
@@ -347,11 +359,21 @@ bool Foam::argList::regroupArgv(int& argc, char**& argv)
 
     if (tmpString.size())
     {
+        // Group(s) not closed, but flush anything still pending
         args_[nArgs++] = tmpString;
     }
 
     args_.setSize(nArgs);
 
+    std::string::size_type len = (nArgs-1); // Spaces between args
+    forAll(args_, argi)
+    {
+        len += args_[argi].size();
+    }
+
+    // Length needed for regrouped command-line
+    argListStr_.reserve(len);
+
     return nArgs < argc;
 }
 
@@ -391,6 +413,8 @@ void Foam::argList::getRootCase()
     globalCase_ = casePath.name();
     case_       = globalCase_;
 
+    // The name of the executable, unless already present in the environment
+    setEnv("FOAM_EXECUTABLE", executable_, false);
 
     // Set the case and case-name as an environment variable
     if (rootPath_.isAbsolute())
@@ -423,11 +447,12 @@ Foam::argList::argList
 )
 :
     args_(argc),
-    options_(argc)
+    options_(argc),
+    distributed_(false)
 {
     // Check if this run is a parallel run by searching for any parallel option
     // If found call runPar which might filter argv
-    for (int argI = 0; argI < argc; ++argI)
+    for (int argI = 1; argI < argc; ++argI)
     {
         if (argv[argI][0] == '-')
         {
@@ -442,17 +467,11 @@ Foam::argList::argList
     }
 
     // Convert argv -> args_ and capture ( ... ) lists
-    // for normal arguments and for options
     regroupArgv(argc, argv);
+    argListStr_ += args_[0];
 
-    // Get executable name
-    args_[0]    = fileName(argv[0]);
-    executable_ = fileName(argv[0]).name();
-
-    // Check arguments and options, we already have argv[0]
+    // Check arguments and options, argv[0] was already handled
     int nArgs = 1;
-    argListStr_ = args_[0];
-
     for (int argI = 1; argI < args_.size(); ++argI)
     {
         argListStr_ += ' ';
@@ -512,6 +531,9 @@ Foam::argList::argList
 
     args_.setSize(nArgs);
 
+    // Set executable name
+    executable_ = fileName(args_[0]).name();
+
     parse(checkArgs, checkOpts, initialise);
 }
 
@@ -589,7 +611,7 @@ void Foam::argList::parse
         const string timeString = clock::clockTime();
 
         // Print the banner once only for parallel runs
-        if (Pstream::master() && bannerEnabled)
+        if (Pstream::master() && bannerEnabled_)
         {
             IOobject::writeBanner(Info, true)
                 << "Build  : " << Foam::FOAMbuild << nl
@@ -663,6 +685,7 @@ void Foam::argList::parse
             label dictNProcs = -1;
             if (options_.found("roots"))
             {
+                distributed_ = true;
                 source = "-roots";
                 IStringStream is(options_["roots"]);
                 roots = readList<fileName>(is);
@@ -696,6 +719,7 @@ void Foam::argList::parse
 
                 if (decompDict.lookupOrDefault("distributed", false))
                 {
+                    distributed_ = true;
                     decompDict.lookup("roots") >> roots;
                 }
             }
@@ -754,7 +778,7 @@ void Foam::argList::parse
                 }
 
                 // Distribute the master's argument list (with new root)
-                bool hadCaseOpt = options_.found("case");
+                const bool hadCaseOpt = options_.found("case");
                 for
                 (
                     int slave = Pstream::firstSlave();
@@ -765,7 +789,7 @@ void Foam::argList::parse
                     options_.set("case", roots[slave-1]/globalCase_);
 
                     OPstream toSlave(Pstream::commsTypes::scheduled, slave);
-                    toSlave << args_ << options_;
+                    toSlave << args_ << options_ << roots.size();
                 }
                 options_.erase("case");
 
@@ -812,7 +836,7 @@ void Foam::argList::parse
                 )
                 {
                     OPstream toSlave(Pstream::commsTypes::scheduled, slave);
-                    toSlave << args_ << options_;
+                    toSlave << args_ << options_ << roots.size();
                 }
             }
         }
@@ -824,7 +848,7 @@ void Foam::argList::parse
                 Pstream::commsTypes::scheduled,
                 Pstream::masterNo()
             );
-            fromMaster >> args_ >> options_;
+            fromMaster >> args_ >> options_ >> distributed_;
 
             // Establish rootPath_/globalCase_/case_ for slave
             getRootCase();
@@ -890,7 +914,7 @@ void Foam::argList::parse
     }
 
 
-    if (Pstream::master() && bannerEnabled)
+    if (Pstream::master() && bannerEnabled_)
     {
         Info<< "Case   : " << (rootPath_/globalCase_).c_str() << nl
             << "nProcs : " << nProcs << endl;
@@ -929,12 +953,12 @@ void Foam::argList::parse
 
         // Switch on signal trapping. We have to wait until after Pstream::init
         // since this sets up its own ones.
-        sigFpe::set(bannerEnabled);
-        sigInt::set(bannerEnabled);
-        sigQuit::set(bannerEnabled);
-        sigSegv::set(bannerEnabled);
+        sigFpe::set(bannerEnabled_);
+        sigInt::set(bannerEnabled_);
+        sigQuit::set(bannerEnabled_);
+        sigSegv::set(bannerEnabled_);
 
-        if (bannerEnabled)
+        if (Pstream::master() && bannerEnabled_)
         {
             Info<< "fileModificationChecking : "
                 << "Monitoring run-time modified files using "
@@ -957,23 +981,19 @@ void Foam::argList::parse
                 Info<< " (fileModificationSkew "
                     << regIOobject::fileModificationSkew << ")";
             }
-            Info<< endl;
+            Info<< nl;
 
             Info<< "allowSystemOperations : ";
             if (dynamicCode::allowSystemOperations)
             {
-                Info<< "Allowing user-supplied system call operations" << endl;
+                Info<< "Allowing";
             }
             else
             {
-                Info<< "Disallowing user-supplied system call operations"
-                    << endl;
+                Info<< "Disallowing";
             }
-        }
-
-        if (Pstream::master() && bannerEnabled)
-        {
-            Info<< endl;
+            Info<< " user-supplied system call operations" << nl
+                << endl;
             IOobject::writeDivider(Info);
         }
     }
diff --git a/src/OpenFOAM/global/argList/argList.H b/src/OpenFOAM/global/argList/argList.H
index 81612f2857..09c6777261 100644
--- a/src/OpenFOAM/global/argList/argList.H
+++ b/src/OpenFOAM/global/argList/argList.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -42,6 +42,8 @@ Description
     Default command-line options:
       - \par -case \<dir\>
         Select a case directory instead of the current working directory
+      - \par -decomposeParDict \<file\>
+        Read decomposePar dictionary from specified location
       - \par -parallel
         Specify case as a parallel job
       - \par -doc
@@ -51,10 +53,25 @@ Description
       - \par -help
         Print the usage
 
-    The environment variable \b FOAM_CASE is set to the path of the
-    global case (same for serial and parallel jobs).
-    The environment variable \b FOAM_CASENAME is set to the name of the
-    global case.
+    Additionally, the \b -noFunctionObjects and \b -postProcess options
+    may be present for some solvers or utilities.
+
+    Environment variables set by argList or by Time:
+      - \par FOAM_CASE
+        The path of the global case.
+        It is the same for serial and parallel jobs.
+      - \par FOAM_CASENAME
+        The name of the global case.
+      - \par FOAM_EXECUTABLE
+        If not already present in the calling environment,
+        it is set to the \a name portion of the calling executable.
+      - \par FOAM_APPLICATION
+        If not already present in the calling environment,
+        it is set to the value of the \c application entry
+        (from \c controlDict) if that entry is present.
+
+    The value of the \b FOAM_APPLICATION may be inconsistent if the value of
+    the \c application entry is adjusted during runtime.
 
 Note
     - The document browser used is defined by the \b FOAM_DOC_BROWSER
@@ -98,7 +115,9 @@ namespace Foam
 class argList
 {
     // Private data
-        static bool bannerEnabled;
+
+        //- Track enabled/disabled banner state
+        static bool bannerEnabled_;
 
         //- Switch on/off parallel mode. Has to be first to be constructed
         //  so destructor is done last.
@@ -109,6 +128,7 @@ class argList
 
         word executable_;
         fileName rootPath_;
+        bool distributed_;
         fileName globalCase_;
         fileName case_;
         string argListStr_;
@@ -128,10 +148,12 @@ class argList
         //   * cwd
         //
         // Also export FOAM_CASE and FOAM_CASENAME environment variables
-        // so they can be used immediately (eg, in decomposeParDict)
+        // so they can be used immediately (eg, in decomposeParDict), as well
+        // as the FOAM_EXECUTABLE environment.
         void getRootCase();
 
-        //- Transcribe argv into internal args_
+        //- Transcribe argv into internal args_.
+        //  Transform sequences with "(" ... ")" into string lists
         //  return true if any "(" ... ")" sequences were captured
         bool regroupArgv(int& argc, char**& argv);
 
@@ -221,6 +243,10 @@ public:
             //- Return root path
             inline const fileName& rootPath() const;
 
+            //- Return distributed flag (i.e. are rootPaths different on
+            //  different machines)
+            inline bool distributed() const;
+
             //- Return case name (parallel run) or global case (serial run)
             inline const fileName& caseName() const;
 
@@ -348,10 +374,16 @@ public:
             //- Disable emitting the banner information
             static void noBanner();
 
+            //- Banner status (enabled/disabled)
+            static bool bannerEnabled();
+
             //- Remove the 'noFunctionObjects' option,
             //  optionally adding a 'withFunctionObjects' option instead
             static void noFunctionObjects(bool addWithOption = false);
 
+            //- Suppress JobInfo, overriding controlDict setting
+            static void noJobInfo();
+
             //- Remove the parallel options
             static void noParallel();
 
diff --git a/src/OpenFOAM/global/argList/argListI.H b/src/OpenFOAM/global/argList/argListI.H
index 47ad29a58e..28caff6acb 100644
--- a/src/OpenFOAM/global/argList/argListI.H
+++ b/src/OpenFOAM/global/argList/argListI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -39,6 +39,12 @@ inline const Foam::fileName& Foam::argList::rootPath() const
 }
 
 
+inline bool Foam::argList::distributed() const
+{
+    return distributed_;
+}
+
+
 inline const Foam::fileName& Foam::argList::caseName() const
 {
     return case_;
diff --git a/src/OpenFOAM/global/etcFiles/etcFiles.C b/src/OpenFOAM/global/etcFiles/etcFiles.C
index f93f3c6ef5..5271b4de48 100644
--- a/src/OpenFOAM/global/etcFiles/etcFiles.C
+++ b/src/OpenFOAM/global/etcFiles/etcFiles.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,229 +27,234 @@ License
 #include "OSspecific.H"
 #include "foamVersion.H"
 
+// * * * * * * * * * * * * * * Static Functions  * * * * * * * * * * * * * * //
+
+//
+// These could be exposed too (if required), but are fairly special purpose.
+//
+//! \cond fileScope
+//
+// Assign 'queried' parameter to the user resource directory.
+// Return true if this directory exists.
+//
+// Corresponds to foamEtcFile -mode=u
+// Looks for
+//   - ~/.OpenFOAM
+static inline bool userResourceDir(Foam::fileName& queried)
+{
+    queried = Foam::home()/WM_USER_RESOURCE_DIRNAME;
+    return Foam::isDir(queried);
+}
+
+
+// Assign 'queried' parameter to the group resource directory.
+// Return true if this directory exists.
+//
+// Corresponds to foamEtcFile -mode=g
+// Looks for
+//   - $WM_PROJECT_SITE
+//   - $WM_PROJECT_INST_DIR/site
+static inline bool groupResourceDir(Foam::fileName& queried)
+{
+    queried = Foam::getEnv("WM_PROJECT_SITE");
+    if (queried.size())
+    {
+        return Foam::isDir(queried);
+    }
+
+    // Fallback (when WM_PROJECT_SITE is unset)
+    queried = Foam::getEnv("WM_PROJECT_INST_DIR")/"site";
+    return (queried.size() > 5 && Foam::isDir(queried));
+}
+
+
+// Assign 'queried' parameter to the OpenFOAM etc/ resource directory.
+// Return true if it exists.
+//
+// Corresponds to foamEtcFile -mode=o
+// Looks for
+//   - $WM_PROJECT_DIR/etc
+static inline bool projectResourceDir(Foam::fileName& queried)
+{
+    queried = Foam::getEnv("WM_PROJECT_DIR")/"etc";
+    return (queried.size() > 4 && Foam::isDir(queried));
+}
+
+//! \endcond
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::fileNameList Foam::findEtcDirs(const fileName& local)
+Foam::fileNameList Foam::findEtcDirs
+(
+    const fileName& name,
+    const bool findFirst
+)
 {
-    fileNameList dirs;
+    fileNameList results;
 
-    // Search for user directories in
-    // * ~/.OpenFOAM/VERSION
-    // * ~/.OpenFOAM
-    //
-    fileName searchDir = home()/".OpenFOAM";
-    if (isDir(searchDir))
+    do
     {
-        fileName fullName = searchDir/FOAMversion/local;
-        if (isDir(fullName))
-        {
-            dirs.append(fullName);
-        }
+        fileName dir, candidate;
 
-        fullName = searchDir/local;
-        if (isDir(fullName))
+        // User resource directories
+        if (userResourceDir(dir))
         {
-            dirs.append(fullName);
-        }
-    }
-
-    // Search for group (site) directories in
-    // * $WM_PROJECT_SITE/VERSION
-    // * $WM_PROJECT_SITE
-    //
-    searchDir = getEnv("WM_PROJECT_SITE");
-    if (searchDir.size())
-    {
-        if (isDir(searchDir))
-        {
-            fileName fullName = searchDir/FOAMversion/local;
-            if (isDir(fullName))
+            candidate = dir/FOAMversion/name;
+            if (isDir(candidate))
             {
-                dirs.append(fullName);
+                results.append(candidate);
+                if (findFirst)
+                {
+                    break;
+                }
             }
 
-            fullName = searchDir/local;
-            if (isDir(fullName))
+            candidate = dir/name;
+            if (isDir(candidate))
             {
-                dirs.append(fullName);
+                results.append(candidate);
+                if (findFirst)
+                {
+                    break;
+                }
+            }
+        }
+
+        // Group resource directories
+        if (groupResourceDir(dir))
+        {
+            candidate = dir/FOAMversion/name;
+            if (isDir(candidate))
+            {
+                results.append(candidate);
+                if (findFirst)
+                {
+                    break;
+                }
+            }
+
+            candidate = dir/name;
+            if (isDir(candidate))
+            {
+                results.append(candidate);
+                if (findFirst)
+                {
+                    break;
+                }
+            }
+        }
+
+        // Other (project) resource directory
+        if (projectResourceDir(dir))
+        {
+            candidate = dir/name;
+            if (isDir(dir) && isDir(candidate))
+            {
+                results.append(candidate);
             }
         }
     }
-    else
-    {
-        // Or search for group (site) files in
-        // * $WM_PROJECT_INST_DIR/site/VERSION
-        // * $WM_PROJECT_INST_DIR/site
-        //
-        searchDir = getEnv("WM_PROJECT_INST_DIR");
-        if (isDir(searchDir))
-        {
-            fileName fullName = searchDir/"site"/FOAMversion/local;
-            if (isDir(fullName))
-            {
-                dirs.append(fullName);
-            }
+    while (false);  // Run exactly once
 
-            fullName = searchDir/"site"/local;
-            if (isDir(fullName))
-            {
-                dirs.append(fullName);
-            }
-        }
-    }
-
-    // Search for other (shipped) files in
-    // * $WM_PROJECT_DIR/etc
-    //
-    searchDir = getEnv("WM_PROJECT_DIR");
-    if (isDir(searchDir))
-    {
-        fileName fullName = searchDir/"etc"/local;
-        if (isDir(fullName))
-        {
-            dirs.append(fullName);
-        }
-    }
-
-    return dirs;
+    return results;
 }
 
 
 Foam::fileNameList Foam::findEtcFiles
 (
     const fileName& name,
-    bool mandatory,
-    bool findFirst
+    const bool mandatory,
+    const bool findFirst
 )
 {
     fileNameList results;
 
-    // Search for user files in
-    // * ~/.OpenFOAM/VERSION
-    // * ~/.OpenFOAM
-    //
-    fileName searchDir = home()/".OpenFOAM";
-    if (isDir(searchDir))
+    do
     {
-        fileName fullName = searchDir/FOAMversion/name;
-        if (isFile(fullName))
-        {
-            results.append(fullName);
-            if (findFirst)
-            {
-                return results;
-            }
-        }
+        fileName dir, candidate;
 
-        fullName = searchDir/name;
-        if (isFile(fullName))
+        // User resource directories
+        if (userResourceDir(dir))
         {
-            results.append(fullName);
-            if (findFirst)
+            candidate = dir/FOAMversion/name;
+            if (isFile(candidate))
             {
-                return results;
-            }
-        }
-    }
-
-    // Search for group (site) files in
-    // * $WM_PROJECT_SITE/VERSION
-    // * $WM_PROJECT_SITE
-    //
-    searchDir = getEnv("WM_PROJECT_SITE");
-    if (searchDir.size())
-    {
-        if (isDir(searchDir))
-        {
-            fileName fullName = searchDir/FOAMversion/name;
-            if (isFile(fullName))
-            {
-                results.append(fullName);
+                results.append(candidate);
                 if (findFirst)
                 {
-                    return results;
+                    break;
                 }
             }
 
-            fullName = searchDir/name;
-            if (isFile(fullName))
+            candidate = dir/name;
+            if (isFile(candidate))
             {
-                results.append(fullName);
+                results.append(candidate);
                 if (findFirst)
                 {
-                    return results;
+                    break;
                 }
             }
         }
-    }
-    else
-    {
-        // Or search for group (site) files in
-        // * $WM_PROJECT_INST_DIR/site/VERSION
-        // * $WM_PROJECT_INST_DIR/site
-        //
-        searchDir = getEnv("WM_PROJECT_INST_DIR");
-        if (isDir(searchDir))
+
+        // Group resource directories
+        if (groupResourceDir(dir))
         {
-            fileName fullName = searchDir/"site"/FOAMversion/name;
-            if (isFile(fullName))
+            candidate = dir/FOAMversion/name;
+            if (isFile(candidate))
             {
-                results.append(fullName);
+                results.append(candidate);
                 if (findFirst)
                 {
-                    return results;
+                    break;
                 }
             }
 
-            fullName = searchDir/"site"/name;
-            if (isFile(fullName))
+            candidate = dir/name;
+            if (isFile(candidate))
             {
-                results.append(fullName);
+                results.append(candidate);
                 if (findFirst)
                 {
-                    return results;
+                    break;
                 }
             }
         }
-    }
 
-    // Search for other (shipped) files in
-    // * $WM_PROJECT_DIR/etc
-    //
-    searchDir = getEnv("WM_PROJECT_DIR");
-    if (isDir(searchDir))
-    {
-        fileName fullName = searchDir/"etc"/name;
-        if (isFile(fullName))
+        // Other (project) resource directory
+        if (projectResourceDir(dir))
         {
-            results.append(fullName);
-            if (findFirst)
+            candidate = dir/name;
+            if (isDir(dir) && isFile(candidate))
             {
-                return results;
+                results.append(candidate);
             }
         }
     }
+    while (false);  // Run exactly once
 
-    // Not found
-    if (results.empty())
+    // No name?  It cannot be a file!
+    if (name.empty())
     {
-        // Abort if the file is mandatory, otherwise return null
-        if (mandatory)
-        {
-            std::cerr
-                << "--> FOAM FATAL ERROR in Foam::findEtcFiles() :"
-                   " could not find mandatory file\n    '"
-                << name.c_str() << "'\n\n" << std::endl;
-            ::exit(1);
-        }
+        results.clear();
+    }
+
+    if (mandatory && results.empty())
+    {
+        // Abort if file is mandatory but not found
+        std::cerr
+            << "--> FOAM FATAL ERROR in Foam::findEtcFiles()"
+               " :  could not find mandatory file\n    '"
+            << name.c_str() << "'\n\n" << std::endl;
+        ::exit(1);
     }
 
-    // Return list of matching paths or empty list if none found
     return results;
 }
 
 
-Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
+Foam::fileName Foam::findEtcFile(const fileName& name, const bool mandatory)
 {
     fileNameList results(findEtcFiles(name, mandatory, true));
 
@@ -257,10 +262,9 @@ Foam::fileName Foam::findEtcFile(const fileName& name, bool mandatory)
     {
         return results[0];
     }
-    else
-    {
-        return fileName();
-    }
+
+    // Return null-constructed fileName rather than fileName::null
+    return fileName();
 }
 
 
diff --git a/src/OpenFOAM/global/etcFiles/etcFiles.H b/src/OpenFOAM/global/etcFiles/etcFiles.H
index 5b064d4909..5e3532148c 100644
--- a/src/OpenFOAM/global/etcFiles/etcFiles.H
+++ b/src/OpenFOAM/global/etcFiles/etcFiles.H
@@ -44,7 +44,7 @@ namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//- Search for directories from user/group/shipped directories.
+//- Search for directories from user/group/other directories.
 //  The search scheme allows for version-specific and
 //  version-independent files using the following hierarchy:
 //  - \b user settings:
@@ -56,14 +56,19 @@ namespace Foam
 //  - \b group (site) settings (when $WM_PROJECT_SITE is not set):
 //    - $WM_PROJECT_INST_DIR/site/\<VERSION\>
 //    - $WM_PROJECT_INST_DIR/site/
-//  - \b other (shipped) settings:
+//  - \b other (project) settings:
 //    - $WM_PROJECT_DIR/etc/
 //
 //  \return The list of full paths of all the matching directories or
 //  an empty list if the name cannot be found.
-fileNameList findEtcDirs(const fileName& local = fileName::null);
+//  Optionally stop search after the first directory has been found.
+fileNameList findEtcDirs
+(
+    const fileName& name = fileName::null,
+    const bool findFirst = false
+);
 
-//- Search for files from user/group/shipped directories.
+//- Search for files from user/group/other directories.
 //  The search scheme allows for version-specific and
 //  version-independent files using the following hierarchy:
 //  - \b user settings:
@@ -75,7 +80,7 @@ fileNameList findEtcDirs(const fileName& local = fileName::null);
 //  - \b group (site) settings (when $WM_PROJECT_SITE is not set):
 //    - $WM_PROJECT_INST_DIR/site/\<VERSION\>
 //    - $WM_PROJECT_INST_DIR/site/
-//  - \b other (shipped) settings:
+//  - \b other (project) settings:
 //    - $WM_PROJECT_DIR/etc/
 //
 //  \return The list of full paths of all the matching files or
@@ -84,16 +89,16 @@ fileNameList findEtcDirs(const fileName& local = fileName::null);
 //  Optionally stop search after the first file has been found.
 fileNameList findEtcFiles
 (
-    const fileName&,
-    bool mandatory=false,
-    bool findFirst=false
+    const fileName& name,
+    const bool mandatory = false,
+    const bool findFirst = false
 );
 
-//- Search for a file using findEtcFiles.
+//- Search for a single file using findEtcFiles.
 //  \return The full path name of the first file found in the
 //  search hierarchy or an empty fileName if the name cannot be found.
-//  Optionally abort if the file cannot be found.
-fileName findEtcFile(const fileName&, bool mandatory=false);
+//  Optionally abort if the file cannot be found but is mandatory.
+fileName findEtcFile(const fileName& name, const bool mandatory=false);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/global/foamVersion.H b/src/OpenFOAM/global/foamVersion.H
index 021ca03ec0..bd3386e786 100644
--- a/src/OpenFOAM/global/foamVersion.H
+++ b/src/OpenFOAM/global/foamVersion.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,6 +48,9 @@ SourceFiles
 #ifndef foamVersion_H
 #define foamVersion_H
 
+// The directory name for user-resources (located in the HOME directory)
+#define WM_USER_RESOURCE_DIRNAME  ".OpenFOAM"
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
diff --git a/src/OpenFOAM/global/profiling/profiling.C b/src/OpenFOAM/global/profiling/profiling.C
index 10c61852ad..62e331e166 100644
--- a/src/OpenFOAM/global/profiling/profiling.C
+++ b/src/OpenFOAM/global/profiling/profiling.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2009-2016 Bernhard Gschaider
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -23,48 +23,79 @@ License
 
 \*---------------------------------------------------------------------------*/
 
+#include "argList.H"
 #include "profiling.H"
+#include "profilingInformation.H"
 #include "profilingSysInfo.H"
 #include "cpuInfo.H"
 #include "memInfo.H"
-#include "OSspecific.H"
-#include "IOstreams.H"
-#include "dictionary.H"
 #include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+int Foam::profiling::allowed
+(
+    Foam::debug::infoSwitch("allowProfiling", 1)
+);
+
 Foam::profiling* Foam::profiling::pool_(0);
 
-Foam::label Foam::profiling::Information::nextId_(0);
+// * * * * * * * * * * * * Protected Member Functions  * * * * * * * * * * * //
+
+Foam::profilingInformation* Foam::profiling::find
+(
+    const string& descr,
+    const label parentId
+)
+{
+    StorageContainer::iterator iter = hash_.find(Key(descr, parentId));
+    return (iter.found() ? iter() : 0);
+}
+
+
+Foam::profilingInformation* Foam::profiling::store(profilingInformation *info)
+{
+    // Profile information lookup is qualified by parent id
+    hash_.insert(Key(info->description(), info->parent().id()), info);
+    return info;
+}
+
+
+void Foam::profiling::push(profilingInformation *info, clockTime& timer)
+{
+    stack_.push(info);
+    timers_.set(info->id(), &timer);
+    info->push();                       // mark as on stack
+}
+
+
+Foam::profilingInformation* Foam::profiling::pop()
+{
+    profilingInformation *info = stack_.pop();
+    timers_.erase(info->id());
+    info->pop();                        // mark as off stack
+
+    return info;
+}
 
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-Foam::label Foam::profiling::Information::getNextId()
-{
-    return nextId_++;
-}
-
-
-void Foam::profiling::Information::raiseID(label maxVal)
-{
-    if (nextId_ < maxVal)
-    {
-        nextId_ = maxVal;
-    }
-}
-
-
 bool Foam::profiling::active()
 {
-    return pool_;
+    return allowed && pool_;
+}
+
+
+void Foam::profiling::disable()
+{
+    allowed = 0;
 }
 
 
 bool Foam::profiling::print(Ostream& os)
 {
-    if (pool_)
+    if (active())
     {
         return pool_->writeData(os);
     }
@@ -77,7 +108,7 @@ bool Foam::profiling::print(Ostream& os)
 
 bool Foam::profiling::writeNow()
 {
-    if (pool_)
+    if (active())
     {
         return pool_->write();
     }
@@ -94,21 +125,24 @@ void Foam::profiling::initialize
     const Time& owner
 )
 {
-    if (!pool_)
+    if (allowed && !pool_)
     {
         pool_ = new profiling(ioObj, owner);
 
-        Information *info = pool_->store
+        profilingInformation *info = pool_->store
         (
-            new Information()
+            new profilingInformation()
         );
 
         pool_->push(info, pool_->clockTime_);
-        Info<< "profiling initialized" << nl;
+        if (argList::bannerEnabled())
+        {
+            Info<< "profiling initialized" << nl;
+        }
     }
 
-    // silently ignore multiple initialization
-    // eg, decomposePar use multiple simultaneous Times
+    // silently ignore multiple initializations
+    // eg, decomposePar uses multiple simultaneous Times
 }
 
 
@@ -119,21 +153,24 @@ void Foam::profiling::initialize
     const Time& owner
 )
 {
-    if (!pool_)
+    if (allowed && !pool_)
     {
         pool_ = new profiling(dict, ioObj, owner);
 
-        Information *info = pool_->store
+        profilingInformation *info = pool_->store
         (
-            new Information()
+            new profilingInformation()
         );
 
         pool_->push(info, pool_->clockTime_);
-        Info<< "profiling initialized" << nl;
+        if (argList::bannerEnabled())
+        {
+            Info<< "profiling initialized" << nl;
+        }
     }
 
-    // silently ignore multiple initialization
-    // eg, decomposePar use multiple simultaneous Times
+    // silently ignore multiple initializations
+    // eg, decomposePar uses multiple simultaneous Times
 }
 
 
@@ -147,23 +184,22 @@ void Foam::profiling::stop(const Time& owner)
 }
 
 
-Foam::profiling::Information* Foam::profiling::New
+Foam::profilingInformation* Foam::profiling::New
 (
-    const string& name,
+    const string& descr,
     clockTime& timer
 )
 {
-    Information *info = 0;
+    profilingInformation *info = 0;
 
-    if (pool_)
+    if (active())
     {
-        info = pool_->find(name);
+        profilingInformation *parent = pool_->stack_.top();
+
+        info = pool_->find(descr, parent->id());
         if (!info)
         {
-            info = pool_->store
-            (
-                new Information(pool_->stack_.top(), name)
-            );
+            info = pool_->store(new profilingInformation(descr, parent));
         }
 
         pool_->push(info, timer);
@@ -182,11 +218,11 @@ Foam::profiling::Information* Foam::profiling::New
 }
 
 
-void Foam::profiling::unstack(const Information *info)
+void Foam::profiling::unstack(const profilingInformation *info)
 {
-    if (pool_ && info)
+    if (active() && info)
     {
-        Information *top = pool_->pop();
+        profilingInformation *top = pool_->pop();
 
         if (info->id() != top->id())
         {
@@ -217,7 +253,7 @@ Foam::profiling::profiling
     hash_(),
     stack_(),
     timers_(),
-    sysInfo_(new sysInfo()),
+    sysInfo_(new profilingSysInfo()),
     cpuInfo_(new cpuInfo()),
     memInfo_(new memInfo())
 {}
@@ -239,7 +275,7 @@ Foam::profiling::profiling
     sysInfo_
     (
         dict.lookupOrDefault<Switch>("sysInfo", true)
-      ? new sysInfo() : 0
+      ? new profilingSysInfo() : 0
     ),
     cpuInfo_
     (
@@ -254,50 +290,6 @@ Foam::profiling::profiling
 {}
 
 
-Foam::profiling::Information::Information()
-:
-    id_(getNextId()),
-    description_("application::main"),
-    parent_(this),
-    calls_(0),
-    totalTime_(0),
-    childTime_(0),
-    maxMem_(0),
-    onStack_(false)
-{}
-
-
-Foam::profiling::Information::Information
-(
-    Information *parent,
-    const string& descr
-)
-:
-    id_(getNextId()),
-    description_(descr),
-    parent_(parent),
-    calls_(0),
-    totalTime_(0),
-    childTime_(0),
-    maxMem_(0),
-    onStack_(false)
-{}
-
-
-Foam::profiling::Trigger::Trigger(const char* name)
-:
-    clock_(),
-    ptr_(profiling::New(name, clock_))
-{}
-
-
-Foam::profiling::Trigger::Trigger(const string& name)
-:
-    clock_(),
-    ptr_(profiling::New(name, clock_))
-{}
-
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::profiling::~profiling()
@@ -309,21 +301,11 @@ Foam::profiling::~profiling()
     if (pool_ == this)
     {
         pool_ = 0;
-        Information::nextId_ = 0;
+        profilingInformation::nextId_ = 0;
     }
 }
 
 
-Foam::profiling::Information::~Information()
-{}
-
-
-Foam::profiling::Trigger::~Trigger()
-{
-    stop();
-}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 const Foam::Time& Foam::profiling::owner() const
@@ -337,25 +319,6 @@ Foam::label Foam::profiling::size() const
 }
 
 
-Foam::profiling::Information* Foam::profiling::find(const string& name)
-{
-    StorageContainer::iterator iter = hash_.find(name);
-    return (iter != hash_.end() ? iter() : 0);
-}
-
-
-void Foam::profiling::Information::update(const scalar& elapsed)
-{
-    ++calls_;
-    totalTime_ += elapsed;
-
-    if (id_ != parent().id())
-    {
-        parent().childTime_ += elapsed;
-    }
-}
-
-
 bool Foam::profiling::writeData(Ostream& os) const
 {
     os.beginBlock("profiling");
@@ -370,7 +333,7 @@ bool Foam::profiling::writeData(Ostream& os) const
         scalar oldElapsed = 0;
         forAllConstIter(StackContainer, stack_, iter)
         {
-            const Information *info = *iter;
+            const profilingInformation *info = *iter;
             scalar elapsed = timers_[info->id()]->elapsedTime();
 
             if (nTrigger++)
@@ -391,7 +354,7 @@ bool Foam::profiling::writeData(Ostream& os) const
 
         forAllConstIter(StorageContainer, hash_, iter)
         {
-            const Information *info = iter();
+            const profilingInformation *info = iter();
 
             if (!info->onStack())
             {
@@ -458,106 +421,4 @@ bool Foam::profiling::writeObject
 }
 
 
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-Foam::profiling::Information* Foam::profiling::store(Information *info)
-{
-    hash_.insert(info->description(), info);
-    return info;
-}
-
-
-void Foam::profiling::push(Information *info, clockTime& timer)
-{
-    stack_.push(info);
-    timers_.set(info->id(), &timer);
-    info->push();                       // mark as on stack
-}
-
-
-Foam::profiling::Information* Foam::profiling::pop()
-{
-    Information *info = stack_.pop();
-    timers_.erase(info->id());
-    info->pop();                        // mark as off stack
-
-    return info;
-}
-
-
-bool Foam::profiling::Trigger::running() const
-{
-    return ptr_;
-}
-
-
-void Foam::profiling::Trigger::stop()
-{
-    if (ptr_)
-    {
-        ptr_->update(clock_.elapsedTime());
-        profiling::unstack(ptr_);
-        // pointer is managed by pool storage -> thus no delete here
-    }
-    ptr_ = 0;
-}
-
-
-void Foam::profiling::Information::push() const
-{
-    onStack_ = true;
-}
-
-
-void Foam::profiling::Information::pop() const
-{
-    onStack_ = false;
-}
-
-
-Foam::Ostream& Foam::profiling::Information::write
-(
-    Ostream& os,
-    const bool offset,
-    const scalar& elapsedTime,
-    const scalar& childTimes
-) const
-{
-    // write in dictionary format
-
-    os.beginBlock(word("trigger" + Foam::name(id_)));
-
-    os.writeEntry("id",             id_);
-    if (id_ != parent().id())
-    {
-        os.writeEntry("parentId",   parent().id());
-    }
-    os.writeEntry("description",    description());
-    os.writeEntry("calls",          calls()     + (offset ? 1 : 0));
-    os.writeEntry("totalTime",      totalTime() + elapsedTime);
-    os.writeEntry("childTime",      childTime() + childTimes);
-    if (maxMem_)
-    {
-        os.writeEntry("maxMem",     maxMem_);
-    }
-    os.writeEntry("onStack",        Switch(onStack()));
-
-    os.endBlock();
-
-    return os;
-}
-
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-Foam::Ostream& Foam::operator<<
-(
-    Ostream& os,
-    const profiling::Information& info
-)
-{
-    return info.write(os);
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/profiling/profiling.H b/src/OpenFOAM/global/profiling/profiling.H
index 0bb29a7f42..03a014f48b 100644
--- a/src/OpenFOAM/global/profiling/profiling.H
+++ b/src/OpenFOAM/global/profiling/profiling.H
@@ -52,6 +52,7 @@ SourceFiles
 #ifndef profiling_H
 #define profiling_H
 
+#include "profilingTrigger.H"
 #include "HashPtrTable.H"
 #include "LIFOStack.H"
 #include "Map.H"
@@ -65,9 +66,9 @@ namespace Foam
 
 // Forward declaration of classes
 class Ostream;
-class dictionary;
 class cpuInfo;
 class memInfo;
+class profilingSysInfo;
 
 /*---------------------------------------------------------------------------*\
                           Class profiling Declaration
@@ -79,14 +80,50 @@ class profiling
 {
 public:
 
-    // Forward declarations of components
+    // Public typedefs
 
-        class Information;
-        class Trigger;
-        class sysInfo;
+        typedef profilingInformation Information;
+        typedef profilingTrigger Trigger;
+
+    // Static data members
+
+        //- Flag if profiling is allowed
+        static int allowed;
 
 private:
 
+    // Private classes, typedefs
+
+        typedef profilingSysInfo sysInfo;
+
+        //- Profile information lookup is qualified by parent id
+        typedef Tuple2<string, label> Key;
+
+        //- Hashing for information lookup
+        class HashKey
+        :
+            public Hash<Key>
+        {
+        public:
+
+            HashKey()
+            {}
+
+            //- Hash qualified by the parent id to avoid collisions
+            unsigned operator()(const Key& key) const
+            {
+                return
+                (
+                    Hash<string>()(key.first())
+                  + Hash<label>()(key.second())
+                );
+            }
+        };
+
+        typedef HashPtrTable<Information, Key, HashKey> StorageContainer;
+        typedef LIFOStack<Information*> StackContainer;
+
+
     // Private Static Data Members
 
         //- Only one global pool object is possible
@@ -95,10 +132,6 @@ private:
 
     // Private Data Members
 
-        typedef HashPtrTable<Information, string> StorageContainer;
-        typedef LIFOStack<Information*> StackContainer;
-
-
         //- The owner of the profiling
         const Time& owner_;
 
@@ -137,16 +170,22 @@ protected:
 
     // Friendship
 
+        friend class profilingTrigger;
         friend class Time;
 
 
     // Constructors
 
         //- Construct IO object, everything enabled
-        profiling(const IOobject&, const Time&);
+        profiling(const IOobject& io, const Time& owner);
 
         //- Construct IO object with finer control over behaviour
-        profiling(const dictionary&, const IOobject&, const Time&);
+        profiling
+        (
+            const dictionary& dict,
+            const IOobject& io,
+            const Time& owner
+        );
 
 
     //- Destructor
@@ -155,49 +194,66 @@ protected:
 
     // Protected Member Functions
 
-        //- Find profiling information element or null on failure
-        Information* find(const string& name);
+        //- Find named profiling information element with specified parent.
+        //  Return nullptr on failure.
+        profilingInformation* find(const string& descr, const label parentId);
 
         //- Add to hashed storage,
         //  returns pointer to newly stored element for chaining
-        Information* store(Information*);
+        profilingInformation* store(profilingInformation* info);
 
         //- Add to stack and set timer lookup (based on Id)
-        void push(Information*, clockTime& timer);
+        void push(profilingInformation* info, clockTime& timer);
 
         //- Remove from stack and remove timer lookup (based on Id).
         //  Returns pointer to profiling information element
-        Information* pop();
+        profilingInformation* pop();
 
 
     // Static control elements
 
         //- Singleton to initialize profiling pool, everything enabled
-        static void initialize(const IOobject&, const Time&);
+        static void initialize
+        (
+            const IOobject& ioObj,
+            const Time& owner
+        );
 
         //- Singleton to initialize profiling pool with finer control
-        static void initialize(const dictionary&, const IOobject&, const Time&);
+        static void initialize
+        (
+            const dictionary& dict,
+            const IOobject& ioObj,
+            const Time& owner
+        );
 
         //- Stop profiling, cleanup pool if possible
-        static void stop(const Time&);
+        static void stop(const Time& owner);
 
         //- Existing or new element on pool, add to stack.
         //  Returns null if profiling has not been initialized
-        static Information* New(const string& name, clockTime& timer);
+        static profilingInformation* New
+        (
+            const string& descr,
+            clockTime& timer
+        );
 
         //- Remove the information from the top of the stack
-        static void unstack(const Information*);
+        static void unstack(const profilingInformation* info);
 
 public:
 
     // Static Member Functions
 
-        //- True if profiling is active
+        //- True if profiling is allowed and is active
         static bool active();
 
+        //- Disallow profiling by forcing the InfoSwitch off.
+        static void disable();
+
         //- Print profiling information to specified output
         //  Forwards to writeData member of top-level object
-        static bool print(Ostream&);
+        static bool print(Ostream& os);
 
         //- Write profiling information now
         static bool writeNow();
@@ -209,10 +265,10 @@ public:
         const Time& owner() const;
 
         //- The size of the current stack
-        Foam::label size() const;
+        label size() const;
 
         //- writeData member function required by regIOobject
-        virtual bool writeData(Ostream&) const;
+        virtual bool writeData(Ostream& os) const;
 
         //- Write as uncompressed ASCII, using given format
         virtual bool writeObject
@@ -224,274 +280,12 @@ public:
 
 };
 
-
-// Forward declaration of friend functions and operators
-Ostream& operator<<(Ostream& os, const profiling::Information& info);
-
-
-/*---------------------------------------------------------------------------*\
-                   Class profiling::Information Declaration
-\*---------------------------------------------------------------------------*/
-
-class profiling::Information
-{
-    // Private Static Data Members
-
-        //- Counter to generate the ids
-        static label nextId_;
-
-        //- get a new ID and update the counter
-        static label getNextId();
-
-        //- raise the next possible ID (to avoid ID-clashes during reading)
-        static void raiseID(label maxVal);
-
-
-    // Private Data Members
-
-        //- Unique id to identify it
-        const label id_;
-
-        //- What this timer does
-        const string description_;
-
-        //- Pointer to the parent object (or self for top-level)
-        Information* parent_;
-
-        //- Nr of times this was called
-        long calls_;
-
-        //- Total time spent
-        scalar totalTime_;
-
-        //- Time spent in children
-        scalar childTime_;
-
-        //- Max memory usage on call.
-        //  Only valid when the calling profiling has memInfo active.
-        mutable int maxMem_;
-
-        //- Is this information currently on the stack?
-        mutable bool onStack_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        Information(const Information&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const Information&) = delete;
-
-
-protected:
-
-    // Friendship
-
-        friend class profiling;
-
-
-    // Constructors
-
-        //- Construct null - only the master-element
-        Information();
-
-
-    // Member Functions
-
-        //- Mark as being on the stack
-        void push() const;
-
-        //- Mark as being off the stack
-        void pop() const;
-
-
-        //- Write the profiling times, optionally with additional values
-        //  Use dictionary format.
-        Ostream& write
-        (
-            Ostream& os,
-            const bool offset = false,
-            const scalar& elapsedTime = 0,
-            const scalar& childTime = 0
-        ) const;
-
-public:
-
-
-    // Constructors
-
-        //- Construct from components
-        Information(Information* parent, const string& descr);
-
-
-    //- Destructor
-    ~Information();
-
-
-    // Member Functions
-
-    // Access
-
-        inline label id() const
-        {
-            return id_;
-        }
-
-
-        inline const string& description() const
-        {
-            return description_;
-        }
-
-
-        inline Information& parent() const
-        {
-            return *parent_;
-        }
-
-
-        inline label calls() const
-        {
-            return calls_;
-        }
-
-
-        inline const scalar& totalTime() const
-        {
-            return totalTime_;
-        }
-
-
-        inline const scalar& childTime() const
-        {
-            return childTime_;
-        }
-
-
-        inline int maxMem() const
-        {
-            return maxMem_;
-        }
-
-
-        inline bool onStack() const
-        {
-            return onStack_;
-        }
-
-
-    // Edit
-
-        //- Update it with a new timing information
-        void update(const scalar& elapsedTime);
-
-
-    // IOstream Operators
-
-        friend Ostream& operator<<(Ostream& os, const Information& info);
-
-};
-
-
-/*---------------------------------------------------------------------------*\
-                      Class profiling::Trigger Declaration
-\*---------------------------------------------------------------------------*/
-
-class profiling::Trigger
-{
-    // Private Data Members
-
-        //- The timer for the profiling information
-        clockTime clock_;
-
-        //- The profiling information
-        Information *ptr_;
-
-
-    // Private Member Functions
-
-        //- Disallow default bitwise copy construct
-        Trigger(const Trigger&) = delete;
-
-        //- Disallow default bitwise assignment
-        void operator=(const Trigger&) = delete;
-
-
-public:
-
-    // Constructors
-
-        //- Construct profiling with given description.
-        //  Descriptions beginning with 'application::' are reserved for
-        //  internal use.
-        Trigger(const char* name);
-
-        //- Construct profiling with given description.
-        //  Descriptions beginning with 'application::' are reserved for
-        //  internal use.
-        Trigger(const string& name);
-
-
-    //- Destructor
-    ~Trigger();
-
-
-    // Member Functions
-
-    // Access
-
-        //- True if the triggered profiling is active
-        bool running() const;
-
-
-    // Edit
-
-        //- Stop triggered profiling
-        void stop();
-
-};
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-// Macros
-
-//- Define profiling with specified name and description string
-//  This is required if the description contains space, colons etc.
-//  \sa addProfiling0
-//  \sa endProfiling
-#define addProfiling(name,descr)                                              \
-    ::Foam::profiling::Trigger  profilingTriggerFor##name(descr)
-
-//- Define profiling with specified name and description correspond to the name
-//  \sa addProfiling
-//  \sa endProfiling
-#define addProfiling0(name)                                                    \
-    ::Foam::Profiling::Trigger  profilingTriggerFor##name(#name)
-
-//- Define profiling with specified name and description correspond to the
-//  compiler-defined function name string:
-//  \sa addProfiling
-//  \sa endProfiling
-#ifdef __GNUC__
-    #define addProfilingInFunction(name)                                       \
-    ::Foam::profiling::Trigger  profilingTriggerFor##name(__PRETTY_FUNCTION__)
-#else
-    #define addProfilingInFunction(name)                                       \
-    ::Foam::profiling::Trigger  profilingTriggerFor##name(__func__)
-#endif
-
-//- Remove profiling with specified name
-//  \sa addProfiling
-//  \sa addProfiling0
-#define endProfiling(name)      profilingTriggerFor##name.stop()
-
-
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/global/profiling/profilingInformation.C b/src/OpenFOAM/global/profiling/profilingInformation.C
new file mode 100644
index 0000000000..937d5a01db
--- /dev/null
+++ b/src/OpenFOAM/global/profiling/profilingInformation.C
@@ -0,0 +1,163 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2016 Bernhard Gschaider
+     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "profilingInformation.H"
+#include "Switch.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+Foam::label Foam::profilingInformation::nextId_(0);
+
+
+// * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
+
+Foam::label Foam::profilingInformation::getNextId()
+{
+    return nextId_++;
+}
+
+
+void Foam::profilingInformation::raiseId(label maxVal)
+{
+    if (nextId_ < maxVal)
+    {
+        nextId_ = maxVal;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::profilingInformation::profilingInformation()
+:
+    id_(getNextId()),
+    description_("application::main"),
+    parent_(this),
+    calls_(0),
+    totalTime_(0),
+    childTime_(0),
+    maxMem_(0),
+    onStack_(false)
+{}
+
+
+Foam::profilingInformation::profilingInformation
+(
+    const string& descr,
+    profilingInformation *parent
+)
+:
+    id_(getNextId()),
+    description_(descr),
+    parent_(parent),
+    calls_(0),
+    totalTime_(0),
+    childTime_(0),
+    maxMem_(0),
+    onStack_(false)
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::profilingInformation::~profilingInformation()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::profilingInformation::update(const scalar elapsed)
+{
+    ++calls_;
+    totalTime_ += elapsed;
+
+    if (id_ != parent().id())
+    {
+        parent().childTime_ += elapsed;
+    }
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::profilingInformation::push() const
+{
+    onStack_ = true;
+}
+
+
+void Foam::profilingInformation::pop() const
+{
+    onStack_ = false;
+}
+
+
+Foam::Ostream& Foam::profilingInformation::write
+(
+    Ostream& os,
+    const bool offset,
+    const scalar elapsedTime,
+    const scalar childTimes
+) const
+{
+    // write in dictionary format
+
+    os.beginBlock(word("trigger" + Foam::name(id_)));
+
+    os.writeEntry("id",             id_);
+    if (id_ != parent().id())
+    {
+        os.writeEntry("parentId",   parent().id());
+    }
+    os.writeEntry("description",    description());
+    os.writeEntry("calls",          calls()     + (offset ? 1 : 0));
+    os.writeEntry("totalTime",      totalTime() + elapsedTime);
+    os.writeEntry("childTime",      childTime() + childTimes);
+    if (maxMem_)
+    {
+        os.writeEntry("maxMem",     maxMem_);
+    }
+    os.writeEntry("onStack",        Switch(onStack()));
+
+    os.endBlock();
+
+    return os;
+}
+
+
+// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<
+(
+    Ostream& os,
+    const profilingInformation& info
+)
+{
+    return info.write(os);
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/profiling/profilingInformation.H b/src/OpenFOAM/global/profiling/profilingInformation.H
new file mode 100644
index 0000000000..7aa395d80a
--- /dev/null
+++ b/src/OpenFOAM/global/profiling/profilingInformation.H
@@ -0,0 +1,236 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2016 Bernhard Gschaider
+     \\/     M anipulation  | Copyright (C) 2016-2107 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::profilingInformation
+
+Description
+    Code profiling information in terms of time spent, number of calls etc.
+
+SourceFiles
+    profilingInformation.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef profilingInformation_H
+#define profilingInformation_H
+
+#include "label.H"
+#include "scalar.H"
+#include "string.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class profilingInformation;
+class Ostream;
+
+// Forward declaration of friend functions and operators
+Ostream& operator<<(Ostream& os, const profilingInformation& info);
+
+
+/*---------------------------------------------------------------------------*\
+                    Class profilingInformation Declaration
+\*---------------------------------------------------------------------------*/
+
+class profilingInformation
+{
+    // Private Static Data Members
+
+        //- Counter to generate the ids
+        static label nextId_;
+
+        //- Get a new ID and update the counter
+        static label getNextId();
+
+        //- Raise the next possible ID (to avoid ID-clashes during reading)
+        static void raiseId(label maxVal);
+
+
+    // Private Data Members
+
+        //- Unique id to identify it
+        const label id_;
+
+        //- What this timer does
+        const string description_;
+
+        //- Pointer to the parent object (or self for top-level)
+        profilingInformation* parent_;
+
+        //- Nr of times this was called
+        long calls_;
+
+        //- Total time spent
+        scalar totalTime_;
+
+        //- Time spent in children
+        scalar childTime_;
+
+        //- Max memory usage on call.
+        //  Only valid when the calling profiling has memInfo active.
+        mutable int maxMem_;
+
+        //- Is this information currently on the stack?
+        mutable bool onStack_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        profilingInformation(const profilingInformation&) = delete;
+
+        //- Disallow default bitwise assignment
+        void operator=(const profilingInformation&) = delete;
+
+
+protected:
+
+    // Friendship
+
+        friend class profiling;
+
+
+    // Constructors
+
+        //- Construct null - only the master-element
+        profilingInformation();
+
+
+    // Member Functions
+
+        //- Mark as being on the stack
+        void push() const;
+
+        //- Mark as being off the stack
+        void pop() const;
+
+
+        //- Write the profiling times, optionally with additional values
+        //  Use dictionary format.
+        Ostream& write
+        (
+            Ostream& os,
+            const bool offset = false,
+            const scalar elapsedTime = 0,
+            const scalar childTime = 0
+        ) const;
+
+
+public:
+
+    // Constructors
+
+        //- Construct from components
+        profilingInformation
+        (
+            const string& descr,
+            profilingInformation* parent
+        );
+
+
+    //- Destructor
+    ~profilingInformation();
+
+
+    // Member Functions
+
+      // Access
+
+        inline label id() const
+        {
+            return id_;
+        }
+
+
+        inline const string& description() const
+        {
+            return description_;
+        }
+
+
+        inline profilingInformation& parent() const
+        {
+            return *parent_;
+        }
+
+
+        inline label calls() const
+        {
+            return calls_;
+        }
+
+
+        inline scalar totalTime() const
+        {
+            return totalTime_;
+        }
+
+
+        inline scalar childTime() const
+        {
+            return childTime_;
+        }
+
+
+        inline int maxMem() const
+        {
+            return maxMem_;
+        }
+
+
+        inline bool onStack() const
+        {
+            return onStack_;
+        }
+
+
+      // Edit
+
+        //- Update it with a new timing information
+        void update(const scalar elapsedTime);
+
+
+    // IOstream Operators
+
+        friend Ostream& operator<<
+        (
+            Ostream& os,
+            const profilingInformation& info
+        );
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/profiling/profilingSysInfo.C b/src/OpenFOAM/global/profiling/profilingSysInfo.C
index 51b0601736..8ba947b20c 100644
--- a/src/OpenFOAM/global/profiling/profilingSysInfo.C
+++ b/src/OpenFOAM/global/profiling/profilingSysInfo.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -24,18 +24,23 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "profilingSysInfo.H"
-#include "demandDrivenData.H"
 #include "foamVersion.H"
+#include "clock.H"
+#include "Ostream.H"
+#include "OSspecific.H"
+
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
 // file-scope function
 inline static void printEnv
 (
-    Foam::Ostream& os, const Foam::word& key, const Foam::word& envName
+    Foam::Ostream& os,
+    const Foam::word& key,
+    const std::string& envName
 )
 {
-    const std::string value = getEnv(envName);
+    const std::string value = Foam::getEnv(envName);
     if (!value.empty())
     {
         os.writeEntry(key, value);
@@ -45,26 +50,25 @@ inline static void printEnv
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::profiling::sysInfo::sysInfo()
+Foam::profilingSysInfo::profilingSysInfo()
 {}
 
 
-
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-Foam::profiling::sysInfo::~sysInfo()
+Foam::profilingSysInfo::~profilingSysInfo()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::profiling::sysInfo::write
+Foam::Ostream& Foam::profilingSysInfo::write
 (
     Ostream& os
 ) const
 {
-    os.writeEntry("host",       hostName(false)); // short name
-    os.writeEntry("date",       clock::dateTime());
+    os.writeEntry("host",       Foam::hostName(false)); // short name
+    os.writeEntry("date",       Foam::clock::dateTime());
 
     // compile-time information
     os.writeEntry("version",    std::string(FOAMversion));
diff --git a/src/OpenFOAM/global/profiling/profilingSysInfo.H b/src/OpenFOAM/global/profiling/profilingSysInfo.H
index b2e84f888f..e13b953383 100644
--- a/src/OpenFOAM/global/profiling/profilingSysInfo.H
+++ b/src/OpenFOAM/global/profiling/profilingSysInfo.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,10 +22,10 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Class
-    Foam::profiling::sysInfo
+    Foam::profilingSysInfo
 
 Description
-    General system information
+    General system information useful for profiling
 
 SourceFiles
     profilingSysInfo.C
@@ -35,8 +35,6 @@ SourceFiles
 #ifndef profilingSysInfo_H
 #define profilingSysInfo_H
 
-#include "profiling.H"
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
@@ -44,39 +42,34 @@ namespace Foam
 
 // Forward declaration of classes
 class Ostream;
+class profilingSysInfo;
 
 /*---------------------------------------------------------------------------*\
-                     Class profiling::sysInfo Declaration
+                      Class profilingSysInfo Declaration
 \*---------------------------------------------------------------------------*/
 
-class profiling::sysInfo
+class profilingSysInfo
 {
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        sysInfo(const sysInfo&) = delete;
+        profilingSysInfo(const profilingSysInfo&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const sysInfo&) = delete;
+        void operator=(const profilingSysInfo&) = delete;
 
 
-protected:
-
-    // Friendship
-
-        friend class profiling;
-
 public:
 
 
     // Constructors
 
         //- Construct from components
-        sysInfo();
+        profilingSysInfo();
 
 
     //- Destructor
-    ~sysInfo();
+    ~profilingSysInfo();
 
 
     // Member Functions
@@ -84,7 +77,7 @@ public:
         //- Update it with a new timing information
         void update();
 
-        //- Write the profiling sys-info, use dictionary format.
+        //- Write the profiling system-info, use dictionary format.
         Ostream& write(Ostream& os) const;
 };
 
diff --git a/src/OpenFOAM/global/profiling/profilingTrigger.C b/src/OpenFOAM/global/profiling/profilingTrigger.C
new file mode 100644
index 0000000000..6eac94c05a
--- /dev/null
+++ b/src/OpenFOAM/global/profiling/profilingTrigger.C
@@ -0,0 +1,75 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2016 Bernhard Gschaider
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "profiling.H"
+#include "profilingInformation.H"
+#include "profilingTrigger.H"
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::profilingTrigger::profilingTrigger(const char* name)
+:
+    clock_(),
+    ptr_(profiling::New(name, clock_))
+{}
+
+
+Foam::profilingTrigger::profilingTrigger(const string& name)
+:
+    clock_(),
+    ptr_(profiling::New(name, clock_))
+{}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::profilingTrigger::~profilingTrigger()
+{
+    stop();
+}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+bool Foam::profilingTrigger::running() const
+{
+    return ptr_;
+}
+
+
+void Foam::profilingTrigger::stop()
+{
+    if (ptr_)
+    {
+        ptr_->update(clock_.elapsedTime());
+        profiling::unstack(ptr_);
+        // pointer is managed by pool storage -> thus no delete here
+    }
+    ptr_ = 0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/global/profiling/profilingTrigger.H b/src/OpenFOAM/global/profiling/profilingTrigger.H
new file mode 100644
index 0000000000..f459f46970
--- /dev/null
+++ b/src/OpenFOAM/global/profiling/profilingTrigger.H
@@ -0,0 +1,149 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2009-2016 Bernhard Gschaider
+     \\/     M anipulation  | Copyright (C) 2016-2107 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::profilingTrigger
+
+Description
+    Triggers for starting/stopping code profiling.
+
+SourceFiles
+    profilingTrigger.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef profilingTrigger_H
+#define profilingTrigger_H
+
+#include "clockTime.H"
+#include "string.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class profilingInformation;
+
+/*---------------------------------------------------------------------------*\
+                      Class profilingTrigger Declaration
+\*---------------------------------------------------------------------------*/
+
+class profilingTrigger
+{
+    // Private Data Members
+
+        //- The timer for the profiling information
+        clockTime clock_;
+
+        //- The profiling information
+        profilingInformation *ptr_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        profilingTrigger(const profilingTrigger&) = delete;
+
+        //- Disallow default bitwise assignment
+        void operator=(const profilingTrigger&) = delete;
+
+
+public:
+
+    // Constructors
+
+        //- Construct profiling with given description.
+        //  Descriptions beginning with 'application::' are reserved for
+        //  internal use.
+        profilingTrigger(const char* name);
+
+        //- Construct profiling with given description.
+        //  Descriptions beginning with 'application::' are reserved for
+        //  internal use.
+        profilingTrigger(const string& name);
+
+
+    //- Destructor
+    ~profilingTrigger();
+
+
+    // Member Functions
+
+      // Access
+
+        //- True if the triggered profiling is active
+        bool running() const;
+
+
+      // Edit
+
+        //- Stop triggered profiling
+        void stop();
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// Macros
+
+//- Define profiling with specified name and description string
+//  This is required if the description contains space, colons etc.
+//  \sa addProfiling0
+//  \sa endProfiling
+#define addProfiling(name,descr)                                               \
+    ::Foam::profilingTrigger  profilingTriggerFor##name(descr)
+
+//- Define profiling with specified name and description correspond to the name
+//  \sa addProfiling
+//  \sa endProfiling
+#define addProfiling0(name)                                                    \
+    ::Foam::profilingTrigger  profilingTriggerFor##name(#name)
+
+//- Define profiling with specified name and description correspond to the
+//  compiler-defined function name string:
+//  \sa addProfiling
+//  \sa endProfiling
+#ifdef __GNUC__
+    #define addProfilingInFunction(name)                                       \
+    ::Foam::profilingTrigger  profilingTriggerFor##name(__PRETTY_FUNCTION__)
+#else
+    #define addProfilingInFunction(name)                                       \
+    ::Foam::profilingTrigger  profilingTriggerFor##name(__func__)
+#endif
+
+//- Remove profiling with specified name
+//  \sa addProfiling
+//  \sa addProfiling0
+#define endProfiling(name)    profilingTriggerFor##name.stop()
+
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/include/OSspecific.H b/src/OpenFOAM/include/OSspecific.H
index 3c76a14193..6dee7af27b 100644
--- a/src/OpenFOAM/include/OSspecific.H
+++ b/src/OpenFOAM/include/OSspecific.H
@@ -57,14 +57,16 @@ pid_t ppid();
 //- Return the group PID of this process
 pid_t pgid();
 
-//- Return true if environment variable of given name is defined
+//- True if environment variable of given name is defined.
+//  Using an empty name is a no-op and always returns false.
 bool env(const std::string& envName);
 
-//- Return environment variable of given name
-//  Return string() if the environment is undefined
+//- Get environment value for given envName.
+//  Return string() if the environment is undefined or envName is empty.
 string getEnv(const std::string& envName);
 
-//- Set an environment variable
+//- Set an environment variable, return true on success.
+//  Using an empty name is a no-op and always returns false.
 bool setEnv(const word& name, const std::string& value, const bool overwrite);
 
 //- Return the system's host name, as per hostname(1)
@@ -89,69 +91,84 @@ fileName home(const std::string& userName);
 //- Return current working directory path name
 fileName cwd();
 
-//- Change the current directory to the one given and return true,
-//  else return false
+//- Change current directory to the one specified and return true on success.
+//  Using an empty name is a no-op and always returns false.
 bool chDir(const fileName& dir);
 
 //- Make a directory and return an error if it could not be created
-//  and does not already exist
-bool mkDir(const fileName&, mode_t=0777);
+//  and does not already exist.
+//  Using an empty pathName is a no-op and always returns false.
+bool mkDir(const fileName& pathName, mode_t mode=0777);
 
-//- Set the file mode
-bool chMod(const fileName&, const mode_t);
+//- Set the file/directory mode, return true on success.
+//  Using an empty name is a no-op and always returns false.
+bool chMod(const fileName& name, const mode_t mode);
 
-//- Return the file mode
-mode_t mode(const fileName&, const bool followLink=true);
+//- Return the file mode, normally following symbolic links
+//  Using an empty name is a no-op and always returns 0.
+mode_t mode(const fileName& name, const bool followLink=true);
 
-//- Return the file type: DIRECTORY or FILE
-fileName::Type type(const fileName&, const bool followLink=true);
+//- Return the file type: DIRECTORY or FILE, normally following symbolic links
+//  Using an empty name is a no-op and always returns UNDEFINED.
+fileName::Type type(const fileName& name, const bool followLink=true);
 
 //- Does the name exist (as DIRECTORY or FILE) in the file system?
 //  Optionally enable/disable check for gzip file.
+//  Using an empty name is a no-op and always returns false.
 bool exists
 (
-    const fileName&,
+    const fileName& name,
     const bool checkGzip=true,
     const bool followLink=true
 );
 
 //- Does the name exist as a DIRECTORY in the file system?
-bool isDir(const fileName&, const bool followLink=true);
+//  Using an empty name is a no-op and always returns false.
+bool isDir(const fileName& name, const bool followLink=true);
 
 //- Does the name exist as a FILE in the file system?
 //  Optionally enable/disable check for gzip file.
+//  Using an empty name is a no-op and always returns false.
 bool isFile
 (
-    const fileName&,
+    const fileName& name,
     const bool checkGzip=true,
     const bool followLink=true
 );
 
-//- Return size of file
-off_t fileSize(const fileName&, const bool followLink=true);
+//- Return size of file or -1 on failure (normally follows symbolic links).
+//  Using an empty name is a no-op and always returns -1.
+off_t fileSize(const fileName& name, const bool followLink=true);
+
+//- Return time of last file modification (normally follows symbolic links).
+//  Using an empty name is a no-op and always returns 0.
+time_t lastModified(const fileName& name, const bool followLink=true);
 
 //- Return time of last file modification
-time_t lastModified(const fileName&, const bool followLink=true);
+//  Using an empty name is a no-op and always returns 0.
+double highResLastModified(const fileName& name);
 
-//- Return time of last file modification
-double highResLastModified(const fileName&);
-
-//- Read a directory and return the entries as a string list
+//- Read a directory and return the entries as a fileName List.
+//  Using an empty directory name returns an empty list.
 fileNameList readDir
 (
-    const fileName&,
-    const fileName::Type=fileName::FILE,
+    const fileName& directory,
+    const fileName::Type type=fileName::FILE,
     const bool filtergz=true,
     const bool followLink=true
 );
 
-//- Copy, recursively if necessary, the source to the destination
+//- Copy the source to the destination (recursively if necessary).
+//  An empty source name is a no-op and always returns false.
 bool cp(const fileName& src, const fileName& dst, const bool followLink=true);
 
 //- Create a softlink. dst should not exist. Returns true if successful.
+//  An empty source or destination name is a no-op that always returns false,
+//  but also produces a warning.
 bool ln(const fileName& src, const fileName& dst);
 
-//- Rename src to dst
+//- Rename src to dst.
+//  An empty source or destination name is a no-op that always returns false.
 bool mv
 (
     const fileName& src,
@@ -161,19 +178,23 @@ bool mv
 
 //- Rename to a corresponding backup file
 //  If the backup file already exists, attempt with "01" .. "99" suffix
-bool mvBak(const fileName&, const std::string& ext = "bak");
+//  An empty name or extension is a no-op that always returns false.
+bool mvBak(const fileName& src, const std::string& ext = "bak");
 
-//- Remove a file, returning true if successful otherwise false
-bool rm(const fileName&);
+//- Remove a file (or its gz equivalent), returning true if successful.
+//  An empty name is a no-op that always returns false.
+bool rm(const fileName& file);
 
-//- Remove a dirctory and its contents
-bool rmDir(const fileName&);
+//- Remove a dirctory and its contents (optionally silencing warnings)
+//  An empty directory name is a no-op that always returns false,
+//  but also produces a warning.
+bool rmDir(const fileName& directory, const bool silent=false);
 
 //- Sleep for the specified number of seconds
-unsigned int sleep(const unsigned int);
+unsigned int sleep(const unsigned int sec);
 
 //- Close file descriptor
-void fdClose(const int);
+void fdClose(const int fd);
 
 //- Check if machine is up by pinging given port
 bool ping(const std::string& destName, const label port, const label timeOut);
@@ -184,23 +205,29 @@ bool ping(const std::string& host, const label timeOut=10);
 //- Execute the specified command via the shell.
 //  Uses vfork/execl internally.
 //  Where possible, use the list version instead.
+//
+//  Treats an empty command as a successful no-op.
 int system(const std::string& command);
 
 //- Execute the specified command with arguments.
 //  Uses vfork/execvp internally
+//
+//  Treats an empty command as a successful no-op.
 int system(const UList<string>& command);
 
-//- Open a shared library. Return handle to library. Print error message
-//  if library cannot be loaded (check = true)
+//- Open a shared library and return handle to library.
+//  Print error message if library cannot be loaded (suppress with check=true)
 void* dlOpen(const fileName& lib, const bool check = true);
 
 //- Close a dlopened library using handle. Return true if successful
-bool dlClose(void*);
+bool dlClose(void* handle);
 
 //- Lookup a symbol in a dlopened library using handle to library
 void* dlSym(void* handle, const std::string& symbol);
 
-//- Report if symbol in a dlopened library could be found
+//- Report if symbol in a dlopened library could be found.
+//  Using a null handle or an empty symbol name is a no-op and always
+//  returns false.
 bool dlSymFound(void* handle, const std::string& symbol);
 
 //- Return all loaded libraries
@@ -218,6 +245,18 @@ label osRandomInteger();
 //- Return random double precision (uniform distribution between 0 and 1)
 scalar osRandomDouble();
 
+//- Return the size of the buffer for re-entrant random number generator
+label osRandomBufferSize();
+
+//- Seed random number generator.
+void osRandomSeed(const label seed, List<char>& buffer);
+
+//- Return random integer (uniform distribution between 0 and 2^31)
+label osRandomInteger(List<char>& buffer);
+
+//- Return random double precision (uniform distribution between 0 and 1)
+scalar osRandomDouble(List<char>& buffer);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/include/stdFoam.H b/src/OpenFOAM/include/stdFoam.H
new file mode 100644
index 0000000000..59b0d9f704
--- /dev/null
+++ b/src/OpenFOAM/include/stdFoam.H
@@ -0,0 +1,212 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Namespace
+    stdFoam
+
+Description
+    Includes some global templates and macros used by OpenFOAM.
+
+    Some of the templates are defined here correspond to useful
+    std templates that are part of future C++ standards, or that
+    are in a state of change. Defining them here provides some additional
+    control over which definition are used within the OpenFOAM code-base.
+
+SeeAlso
+    - http://en.cppreference.com/w/cpp/iterator/end
+    - http://en.cppreference.com/w/cpp/iterator/begin
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef StdFoam_H
+#define StdFoam_H
+
+#include <initializer_list>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace stdFoam
+{
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Return iterator to the beginning of the container \a c or array.
+//  Definition as per std::begin C++17
+template<class C>
+constexpr auto begin(C& c) -> decltype(c.begin())
+{
+    return c.begin();
+}
+
+//- Return const_iterator to the beginning of the container \a c or array.
+//  Definition as per std::begin C++17
+template<class C>
+constexpr auto begin(const C& c) -> decltype(c.begin())
+{
+    return c.begin();
+}
+
+//- Return const_iterator to the beginning of the container \a c or array.
+//  Definition as per std::cbegin C++17
+template<class C>
+constexpr auto cbegin(const C& c) -> decltype(c.begin())
+{
+    return c.begin();
+}
+
+//- Return iterator to the end of the container \a c or array.
+//  Definition as per std::end C++17
+template<class C>
+constexpr auto end(C& c) -> decltype(c.end())
+{
+    return c.end();
+}
+
+//- Return const_iterator to the end of the container \a c or array.
+//  Definition as per std::end C++17
+template<class C>
+constexpr auto end(const C& c) -> decltype(c.end())
+{
+    return c.end();
+}
+
+//- Return const_iterator to the end of the container \a c or array.
+//  Definition as per std::cend C++17
+template<class C>
+constexpr auto cend(const C& c) -> decltype(c.end())
+{
+    return c.end();
+}
+
+
+} // End namespace stdFoam
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+//- Iterate across all elements in the \a container object of type
+//  \a Container.
+//  \par Usage
+//  \code
+//  forAllIters(container, iter)
+//  {
+//      statements;
+//  }
+//  \endcode
+//  \sa forAllConstIters, forAllIter, forAllConstIters
+#define forAllIters(container,it)                                              \
+    for                                                                        \
+    (                                                                          \
+        auto it = stdFoam::begin(container);                                   \
+        it != stdFoam::end(container);                                         \
+        ++it                                                                   \
+    )
+
+
+//- Iterate across all elements of the \a container object with const access.
+//  \par Usage
+//  \code
+//  forAllConstIters(container, iter)
+//  {
+//      statements;
+//  }
+//  \endcode
+//  \sa forAllIters, forAllIter, forAllConstIter
+#define forAllConstIters(container,cit)                                        \
+    for                                                                        \
+    (                                                                          \
+        auto cit = stdFoam::cbegin(container);                                 \
+        cit != stdFoam::cend(container);                                       \
+        ++cit                                                                  \
+    )
+
+
+//- Loop across all elements in \a list
+// \par Usage
+// \code
+// forAll(anyList, i)
+// {
+//      statements;
+// }
+// \endcode
+// \sa forAllReverse
+#define forAll(list, i) \
+    for (Foam::label i=0; i<(list).size(); ++i)
+
+
+//- Reverse loop across all elements in \a list
+//  \par Usage
+//  \code
+//  forAllReverse(anyList, i)
+//  {
+//       statements;
+//  }
+//  \endcode
+//  \sa forAll
+#define forAllReverse(list, i) \
+    for (Foam::label i=(list).size()-1; i>=0; --i)
+
+
+//- Iterate across all elements in the \a container object
+//  of type \a Container.
+//  \par Usage
+//  \code
+//  forAllIter(ContainerType, container, iter)
+//  {
+//      statements;
+//  }
+//  \endcode
+//  \sa forAllConstIter
+#define forAllIter(Container,container,iter)                                   \
+    for                                                                        \
+    (                                                                          \
+        Container::iterator iter = (container).begin();                        \
+        iter != (container).end();                                             \
+        ++iter                                                                 \
+    )
+
+
+//- Iterate across all elements in the \a container object
+//  of type \a Container with const access.
+//  \par Usage
+//  \code
+//  forAllConstIter(ContainerType, container, iter)
+//  {
+//      statements;
+//  }
+//  \endcode
+//  \sa forAllIter
+#define forAllConstIter(Container,container,iter)                              \
+    for                                                                        \
+    (                                                                          \
+        Container::const_iterator iter = (container).cbegin();                 \
+        iter != (container).cend();                                            \
+        ++iter                                                                 \
+    )
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
index ad97c6ffaa..4ef5055cfb 100644
--- a/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
+++ b/src/OpenFOAM/matrices/lduMatrix/lduMatrix/lduMatrix.H
@@ -59,7 +59,7 @@ SourceFiles
 #include "runTimeSelectionTables.H"
 #include "solverPerformance.H"
 #include "InfoProxy.H"
-#include "profiling.H"
+#include "profilingTrigger.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -122,7 +122,7 @@ public:
             //- Convergence tolerance relative to the initial
             scalar relTol_;
 
-            profiling::Trigger profiling_;
+            profilingTrigger profiling_;
 
         // Protected Member Functions
 
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
index 7f884c205b..7986505c7e 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/cyclicGAMGInterface/cyclicGAMGInterface.C
@@ -25,8 +25,7 @@ License
 
 #include "cyclicGAMGInterface.H"
 #include "addToRunTimeSelectionTable.H"
-#include "labelPair.H"
-#include "HashTable.H"
+#include "labelPairHashes.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -96,10 +95,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
     );
 
     // From coarse cell pair to coarse face
-    HashTable<label, labelPair, labelPair::Hash<>> cellsToCoarseFace
-    (
-        2*localRestrictAddressing.size()
-    );
+    labelPairLookup cellsToCoarseFace(2*localRestrictAddressing.size());
 
     forAll(localRestrictAddressing, ffi)
     {
@@ -126,8 +122,7 @@ Foam::cyclicGAMGInterface::cyclicGAMGInterface
             );
         }
 
-        HashTable<label, labelPair, labelPair::Hash<>>::const_iterator fnd =
-            cellsToCoarseFace.find(cellPair);
+        labelPairLookup::const_iterator fnd = cellsToCoarseFace.find(cellPair);
 
         if (fnd == cellsToCoarseFace.end())
         {
diff --git a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
index f68e1a853b..0c47042ef8 100644
--- a/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
+++ b/src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/interfaces/processorGAMGInterface/processorGAMGInterface.C
@@ -25,8 +25,7 @@ License
 
 #include "processorGAMGInterface.H"
 #include "addToRunTimeSelectionTable.H"
-#include "HashTable.H"
-#include "labelPair.H"
+#include "labelPairHashes.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -84,10 +83,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
     );
 
     // From coarse cell pair to coarse face
-    HashTable<label, labelPair, labelPair::Hash<>> cellsToCoarseFace
-    (
-        2*localRestrictAddressing.size()
-    );
+    labelPairLookup cellsToCoarseFace(2*localRestrictAddressing.size());
 
     forAll(localRestrictAddressing, ffi)
     {
@@ -114,8 +110,7 @@ Foam::processorGAMGInterface::processorGAMGInterface
             );
         }
 
-        HashTable<label, labelPair, labelPair::Hash<>>::const_iterator fnd =
-            cellsToCoarseFace.find(cellPair);
+        labelPairLookup::const_iterator fnd = cellsToCoarseFace.find(cellPair);
 
         if (fnd == cellsToCoarseFace.end())
         {
diff --git a/src/OpenFOAM/memory/Xfer/Xfer.H b/src/OpenFOAM/memory/Xfer/Xfer.H
index 0c5e8e8cff..615712d610 100644
--- a/src/OpenFOAM/memory/Xfer/Xfer.H
+++ b/src/OpenFOAM/memory/Xfer/Xfer.H
@@ -93,20 +93,23 @@ class Xfer
 
 public:
 
+    typedef T Type;
+
+
     // Constructors
 
         //- Store object pointer and manage its deletion
         //  Can also be used later to transfer by assignment
-        inline explicit Xfer(T* = 0);
+        inline explicit Xfer(T* p = 0);
 
         //- Construct by copying or by transferring the parameter contents
-        inline explicit Xfer(T&, bool allowTransfer=false);
+        inline explicit Xfer(T& t, bool allowTransfer=false);
 
         //- Construct by copying the parameter contents
-        inline explicit Xfer(const T&);
+        inline explicit Xfer(const T& t);
 
         //- Construct by transferring the contents
-        inline Xfer(const Xfer<T>&);
+        inline Xfer(const Xfer<T>& t);
 
 
     //- Destructor
@@ -122,10 +125,10 @@ public:
     // Member Operators
 
         //- Transfer the contents into the object
-        inline void operator=(T&);
+        inline void operator=(T& t);
 
         //- Transfer the contents into the object
-        inline void operator=(const Xfer<T>&);
+        inline void operator=(const Xfer<T>& t);
 
         //- Reference to the underlying datatype
         inline T& operator()() const;
diff --git a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
index bf01fe7be9..9b7fc8a548 100644
--- a/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
+++ b/src/OpenFOAM/meshes/Identifiers/patch/coupleGroupIdentifier.C
@@ -46,10 +46,10 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
             << exit(FatalError);
     }
 
-    HashTable<labelList, word>::const_iterator fnd =
+    HashTable<labelList>::const_iterator fnd =
         pbm.groupPatchIDs().find(name());
 
-    if (fnd == pbm.groupPatchIDs().end())
+    if (!fnd.found())
     {
         if (&mesh == &thisPatch.boundaryMesh().mesh())
         {
@@ -65,7 +65,7 @@ Foam::label Foam::coupleGroupIdentifier::findOtherPatchID
     }
 
     // Mesh has patch group
-    const labelList& patchIDs = fnd();
+    const labelList& patchIDs = fnd.object();
 
     if (&mesh == &thisPatch.boundaryMesh().mesh())
     {
diff --git a/src/OpenFOAM/meshes/boundBox/boundBox.H b/src/OpenFOAM/meshes/boundBox/boundBox.H
index 4a8351ad84..dc85f279f0 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBox.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBox.H
@@ -50,11 +50,8 @@ namespace Foam
 class boundBox;
 template<class T> class tmp;
 
-bool operator==(const boundBox&, const boundBox&);
-bool operator!=(const boundBox&, const boundBox&);
-
-Istream& operator>>(Istream&, boundBox&);
-Ostream& operator<<(Ostream&, const boundBox&);
+Istream& operator>>(Istream& is, boundBox& bb);
+Ostream& operator<<(Ostream& os, const boundBox& bb);
 
 
 /*---------------------------------------------------------------------------*\
@@ -289,12 +286,6 @@ public:
         inline void operator+=(const boundBox& bb);
 
 
-    // Friend Operators
-
-        inline friend bool operator==(const boundBox& a, const boundBox& b);
-        inline friend bool operator!=(const boundBox& a, const boundBox& b);
-
-
     // IOstream operator
 
         friend Istream& operator>>(Istream& is, boundBox& bb);
@@ -306,6 +297,11 @@ public:
 template<>
 inline bool contiguous<boundBox>() {return contiguous<point>();}
 
+// Global Operators
+
+inline bool operator==(const boundBox& a, const boundBox& b);
+inline bool operator!=(const boundBox& a, const boundBox& b);
+
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/src/OpenFOAM/meshes/boundBox/boundBoxI.H b/src/OpenFOAM/meshes/boundBox/boundBoxI.H
index c6e668e41d..03be3b7305 100644
--- a/src/OpenFOAM/meshes/boundBox/boundBoxI.H
+++ b/src/OpenFOAM/meshes/boundBox/boundBoxI.H
@@ -268,11 +268,11 @@ inline void Foam::boundBox::operator+=(const boundBox& bb)
 }
 
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * * //
 
 inline bool Foam::operator==(const boundBox& a, const boundBox& b)
 {
-    return (a.min_ == b.min_) && (a.max_ == b.max_);
+    return (a.min() == b.min()) && (a.max() == b.max());
 }
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.C b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
index 9eaa7294a9..9aa39881ea 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.C
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.C
@@ -101,10 +101,10 @@ Foam::labelList Foam::cell::labels(const faceUList& f) const
 Foam::pointField Foam::cell::points
 (
     const faceUList& f,
-    const pointField& meshPoints
+    const UList<point>& meshPoints
 ) const
 {
-    labelList pointLabels = labels(f);
+    const labelList pointLabels = labels(f);
 
     pointField p(pointLabels.size());
 
@@ -171,7 +171,7 @@ Foam::edgeList Foam::cell::edges(const faceUList& f) const
 
 Foam::point Foam::cell::centre
 (
-    const pointField& p,
+    const UList<point>& p,
     const faceUList& f
 ) const
 {
@@ -237,7 +237,7 @@ Foam::point Foam::cell::centre
 
 Foam::scalar Foam::cell::mag
 (
-    const pointField& p,
+    const UList<point>& p,
     const faceUList& f
 ) const
 {
@@ -290,7 +290,7 @@ bool Foam::operator==(const cell& a, const cell& b)
 
     forAll(b, bI)
     {
-        label curLabel = b[bI];
+        const label curLabel = b[bI];
 
         bool found = false;
 
@@ -310,15 +310,16 @@ bool Foam::operator==(const cell& a, const cell& b)
         }
     }
 
-    // check if all faces on a were marked
-    bool result = true;
-
+    // Any faces missed?
     forAll(fnd, aI)
     {
-        result = (result && fnd[aI]);
+        if (!fnd[aI])
+        {
+            return false;
+        }
     }
 
-    return result;
+    return true;
 }
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cell.H b/src/OpenFOAM/meshes/meshShapes/cell/cell.H
index 855529b67e..9c95a3bcb4 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cell.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cell.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,8 @@ Description
 
 SourceFiles
     cellI.H
+    cell.C
+    oppositeCellFace.C
 
 \*---------------------------------------------------------------------------*/
 
@@ -46,8 +48,8 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 class cell;
-bool operator==(const cell&, const cell&);
-inline bool operator!=(const cell&, const cell&);
+bool operator==(const cell& a, const cell& b);
+inline bool operator!=(const cell& a, const cell& b);
 
 
 /*---------------------------------------------------------------------------*\
@@ -72,16 +74,16 @@ public:
         inline cell();
 
         //- Construct given size
-        explicit inline cell(label);
+        explicit inline cell(const label sz);
 
         //- Construct from list of labels
-        explicit inline cell(const labelUList&);
+        explicit inline cell(const labelUList& lst);
 
-        //- Construct by transferring the parameter contents
-        explicit inline cell(const Xfer<labelList>&);
+        //- Construct by transferring list of labels
+        explicit inline cell(const Xfer<labelList>& lst);
 
         //- Construct from Istream
-        inline cell(Istream&);
+        inline cell(Istream& is);
 
 
     // Member Functions
@@ -89,14 +91,18 @@ public:
         //- Return number of faces
         inline label nFaces() const;
 
-        //- Return labels of cell vertices
-        labelList labels(const faceUList&) const;
+        //- Return unordered list of cell vertices given the list of faces
+        labelList labels(const faceUList& f) const;
 
-        //- Return the cell vertices
-        pointField points(const faceUList&, const pointField&) const;
+        //- Return the cell vertices given the list of faces and mesh points
+        pointField points
+        (
+            const faceUList& f,
+            const UList<point>& meshPoints
+        ) const;
 
         //- Return cell edges
-        edgeList edges(const faceUList&) const;
+        edgeList edges(const faceUList& f) const;
 
         //- Return index of opposite face
         label opposingFaceLabel
@@ -122,16 +128,16 @@ public:
         // future.
 
         //- Returns cell centre
-        point centre(const pointField&, const faceUList&) const;
+        point centre(const UList<point>& p, const faceUList& f) const;
 
         //- Returns cell volume
-        scalar mag(const pointField&, const faceUList&) const;
+        scalar mag(const UList<point>& p, const faceUList& f) const;
 
 
     // Friend Operators
 
-        friend bool operator==(const cell&, const cell&);
-        friend bool operator!=(const cell&, const cell&);
+        friend bool operator==(const cell& a, const cell& b);
+        friend bool operator!=(const cell& a, const cell& b);
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cell/cellI.H b/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
index 742301f849..82878d2278 100644
--- a/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cell/cellI.H
@@ -21,25 +21,20 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// Construct null
 inline Foam::cell::cell()
 {}
 
 
-// Construct given size
-inline Foam::cell::cell(label s)
+inline Foam::cell::cell(const label sz)
 :
-    labelList(s, -1)
+    labelList(sz, -1)
 {}
 
 
-// Construct from components
 inline Foam::cell::cell(const labelUList& lst)
 :
     labelList(lst)
@@ -52,7 +47,6 @@ inline Foam::cell::cell(const Xfer<labelList>& lst)
 {}
 
 
-// Construct from Istream
 inline Foam::cell::cell(Istream& is)
 :
     labelList(is)
@@ -61,7 +55,6 @@ inline Foam::cell::cell(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-// Number of faces
 inline Foam::label Foam::cell::nFaces() const
 {
     return size();
@@ -70,7 +63,8 @@ inline Foam::label Foam::cell::nFaces() const
 
 inline bool Foam::operator!=(const cell& a, const cell& b)
 {
-    return (!(a == b));
+    return !(a == b);
 }
 
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
index a25c393310..309ff4a971 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.C
@@ -31,7 +31,7 @@ License
 Foam::vector Foam::cellModel::centre
 (
     const labelList& pointLabels,
-    const pointField& points
+    const UList<point>& points
 ) const
 {
     // Estimate centre of cell
@@ -88,7 +88,7 @@ Foam::vector Foam::cellModel::centre
 Foam::scalar Foam::cellModel::mag
 (
     const labelList& pointLabels,
-    const pointField& points
+    const UList<point>& points
 ) const
 {
     // Estimate centre of cell
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
index b78d05f040..4a450b5a6a 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModel.H
@@ -53,13 +53,13 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 class cellModel;
-inline bool operator==(const cellModel&, const cellModel&);
-inline bool operator!=(const cellModel&, const cellModel&);
-Ostream& operator<<(Ostream&, const cellModel&);
+inline bool operator==(const cellModel& m1, const cellModel& m2);
+inline bool operator!=(const cellModel& m1, const cellModel& m2);
+Ostream& operator<<(Ostream& os, const cellModel& c);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class cellModel Declaration
+                          Class cellModel Declaration
 \*---------------------------------------------------------------------------*/
 
 class cellModel
@@ -87,7 +87,7 @@ public:
     // Constructors
 
         //- Construct from Istream
-        cellModel(Istream&);
+        cellModel(Istream& is);
 
         //- Return a new cellModel on free-store created from Istream
         static autoPtr<cellModel> New(Istream& is)
@@ -122,27 +122,27 @@ public:
             inline label nFaces() const;
 
             //- Return list of edges
-            inline edgeList edges(const labelList& pointLabels) const;
+            inline edgeList edges(const UList<label>& pointLabels) const;
 
             //- Return a raw list of model faces
             inline const faceList& modelFaces() const;
 
             //- Return list of faces
-            inline faceList faces(const labelList& pointLabels) const;
+            inline faceList faces(const UList<label>& pointLabels) const;
 
 
         //- Vector centroid
         vector centre
         (
             const labelList& pointLabels,
-            const pointField& points
+            const UList<point>& points
         ) const;
 
         //- Cell volume
         scalar mag
         (
             const labelList& pointLabels,
-            const pointField& points
+            const UList<point>& points
         ) const;
 
         //- Return info proxy.
@@ -163,15 +163,15 @@ public:
     // Friend operators
 
         //- Equality operator: true => ptr to models are equal !
-        friend bool operator==(const cellModel&, const cellModel&);
+        friend bool operator==(const cellModel& m1, const cellModel& m2);
 
         //- Inequality operator: true => ptr to models are not equal !
-        friend bool operator!=(const cellModel&, const cellModel&);
+        friend bool operator!=(const cellModel& m1, const cellModel& m2);
 
 
     // Ostream operator
 
-        friend Ostream& operator<<(Ostream&, const cellModel&);
+        friend Ostream& operator<<(Ostream& os, const cellModel& c);
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
index 91511797d8..0e7509c684 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellModel/cellModelI.H
@@ -21,45 +21,38 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
-Description
-
 \*---------------------------------------------------------------------------*/
 
 #include "error.H"
 #include "cellModel.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline const word& cellModel::name() const
+inline const Foam::word& Foam::cellModel::name() const
 {
     return name_;
 }
 
 
-inline label cellModel::index() const
+inline Foam::label Foam::cellModel::index() const
 {
     return index_;
 }
 
 
-inline label cellModel::nPoints() const
+inline Foam::label Foam::cellModel::nPoints() const
 {
     return nPoints_;
 }
 
 
-inline label cellModel::nEdges() const
+inline Foam::label Foam::cellModel::nEdges() const
 {
     return edges_.size();
 }
 
 
-inline label cellModel::nFaces() const
+inline Foam::label Foam::cellModel::nFaces() const
 {
     return faces_.size();
 }
@@ -67,7 +60,10 @@ inline label cellModel::nFaces() const
 
 //  Return the faces of a cellModel by untangling the geometry
 //  supplied in terms of the face labels
-inline edgeList cellModel::edges(const labelList& pointLabels) const
+inline Foam::edgeList Foam::cellModel::edges
+(
+    const UList<label>& pointLabels
+) const
 {
     edgeList e(edges_.size());
 
@@ -86,15 +82,18 @@ inline edgeList cellModel::edges(const labelList& pointLabels) const
 }
 
 
-// Return a raw list of model faces
-inline const faceList& cellModel::modelFaces() const
+inline const Foam::faceList& Foam::cellModel::modelFaces() const
 {
     return faces_;
 }
 
+
 //  Return the faces of a cellModel by untangling the geometry
 //  supplied in terms of the face labels
-inline faceList cellModel::faces(const labelList& pointLabels) const
+inline Foam::faceList Foam::cellModel::faces
+(
+    const UList<label>& pointLabels
+) const
 {
     faceList f(faces_.size());
 
@@ -120,20 +119,16 @@ inline faceList cellModel::faces(const labelList& pointLabels) const
 // * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
 
 // Equality operator: true => ptr to models are equal !
-inline bool operator==(const cellModel& m1, const cellModel& m2)
+inline bool Foam::operator==(const cellModel& m1, const cellModel& m2)
 {
     return (&m1 == &m2);
 }
 
 // Inequality operator: true => ptr to models are not equal !
-inline bool operator!=(const cellModel& m1, const cellModel& m2)
+inline bool Foam::operator!=(const cellModel& m1, const cellModel& m2)
 {
     return (&m1 != &m2);
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
index 653da9c46d..c4905813bf 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShape.H
@@ -58,9 +58,9 @@ class cell;
 // Forward declaration of friend functions and operators
 
 class cellShape;
-bool operator==(const cellShape&, const cellShape&);
-Istream& operator>>(Istream&, cellShape&);
-Ostream& operator<<(Ostream&, const cellShape&);
+bool operator==(const cellShape& a, const cellShape& b);
+Istream& operator>>(Istream& is, cellShape& s);
+Ostream& operator<<(Ostream& os, const cellShape& s);
 
 
 /*---------------------------------------------------------------------------*\
@@ -110,19 +110,23 @@ public:
     // Member Functions
 
         //- Return the points corresponding to this cellShape
-        inline pointField points(const pointField& meshPoints) const;
+        inline pointField points(const UList<point>& meshPoints) const;
 
         //- Model reference
         inline const cellModel& model() const;
 
         //- Mesh face labels of this cell (in order of model)
-        inline labelList meshFaces(const faceList& allFaces, const cell&) const;
+        inline labelList meshFaces
+        (
+            const faceList& allFaces,
+            const cell& cFaces
+        ) const;
 
         //- Mesh edge labels of this cell (in order of model)
         inline labelList meshEdges
         (
             const edgeList& allEdges,
-            const labelList&
+            const labelList& cEdges
         ) const;
 
         //- Faces of this cell
@@ -144,7 +148,7 @@ public:
         inline label nPoints() const;
 
         //- Centroid of the cell
-        inline point centre(const pointField&) const;
+        inline point centre(const UList<point>& points) const;
 
         //- Return info proxy.
         //  Used to print token information to a stream
@@ -154,7 +158,7 @@ public:
         }
 
         //- Scalar magnitude
-        inline scalar mag(const pointField&) const;
+        inline scalar mag(const UList<point>& points) const;
 
         //- Collapse shape to correct one after removing duplicate vertices
         void collapse();
@@ -162,13 +166,13 @@ public:
 
     // Friend Operators
 
-        friend bool operator==(const cellShape&, const cellShape&);
+        friend bool operator==(const cellShape& a, const cellShape& b);
 
 
     // IOstream operators
 
-        friend Istream& operator>>(Istream&, cellShape&);
-        friend Ostream& operator<<(Ostream&, const cellShape&);
+        friend Istream& operator>>(Istream& is, cellShape& s);
+        friend Ostream& operator<<(Ostream& os, const cellShape& s);
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H
index 42055e04c9..2560c5ee8c 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeI.H
@@ -85,7 +85,7 @@ inline Foam::autoPtr<Foam::cellShape> Foam::cellShape::clone() const
 
 inline Foam::pointField Foam::cellShape::points
 (
-    const pointField& meshPoints
+    const UList<point>& meshPoints
 ) const
 {
     // There are as many points as there labels for them
@@ -256,13 +256,13 @@ inline Foam::label Foam::cellShape::nPoints() const
 }
 
 
-inline Foam::point Foam::cellShape::centre(const pointField& points) const
+inline Foam::point Foam::cellShape::centre(const UList<point>& points) const
 {
     return m->centre(*this, points);
 }
 
 
-inline Foam::scalar Foam::cellShape::mag(const pointField& points) const
+inline Foam::scalar Foam::cellShape::mag(const UList<point>& points) const
 {
     return m->mag(*this, points);
 }
diff --git a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
index d6ecb1723b..b52c8e2152 100644
--- a/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
+++ b/src/OpenFOAM/meshes/meshShapes/cellShape/cellShapeIO.C
@@ -92,7 +92,7 @@ Foam::Istream& Foam::operator>>(Istream& is, cellShape& s)
 }
 
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const cellShape & s)
+Foam::Ostream& Foam::operator<<(Ostream& os, const cellShape& s)
 {
     // Write beginning of record
     os << token::BEGIN_LIST;
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H b/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
index 971202495c..0078ca544f 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/EdgeMap.H
@@ -25,7 +25,9 @@ Class
     Foam::EdgeMap
 
 Description
-    Map from edge (expressed as its endpoints) to value
+    Map from edge (expressed as its endpoints) to value.
+    For easier forward declaration it is currently implemented as a
+    separate class rather than a template alias.
 
 \*---------------------------------------------------------------------------*/
 
@@ -49,28 +51,11 @@ class EdgeMap
 :
     public HashTable<T, edge, Hash<edge>>
 {
-
 public:
 
-    // Constructors
+    //- Inherit constructors from HashTable
+    using HashTable<T, edge, Hash<edge>>::HashTable;
 
-        //- Construct given initial map size
-        EdgeMap(const label size = 128)
-        :
-            HashTable<T, edge, Hash<edge>>(size)
-        {}
-
-        //- Construct from Istream
-        EdgeMap(Istream& is)
-        :
-            HashTable<T, edge, Hash<edge>>(is)
-        {}
-
-        //- Construct as copy
-        EdgeMap(const EdgeMap<T>& map)
-        :
-            HashTable<T, edge, Hash<edge>>(map)
-        {}
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edge.H b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
index e1c314d1f2..aecb9a9c2e 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edge.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edge.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,6 +28,14 @@ Description
     An edge is a list of two point labels. The functionality it provides
     supports the discretisation on a 2-D flat mesh.
 
+    The edge is implemented as a FixedList of labels.
+    As well as geometrically relevant methods, it also provides methods
+    similar to HashSet for additional convenience.
+    Valid point labels are always non-negative (since they correspond to
+    addressing within the mesh). The value '-1' is used to tag invalid
+    point labels that correspond conceptually to open 'slots', which
+    can be filled with a HashSet-like functionality.
+
 SourceFiles
     edgeI.H
 
@@ -37,6 +45,7 @@ SourceFiles
 #define edge_H
 
 #include "FixedList.H"
+#include "labelPair.H"
 #include "pointField.H"
 #include "linePointRef.H"
 
@@ -45,21 +54,32 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of friend functions and operators
-
-class edge;
-inline bool operator==(const edge& a, const edge& b);
-inline bool operator!=(const edge& a, const edge& b);
-
-
 /*---------------------------------------------------------------------------*\
-                           Class edge Declaration
+                            Class edge Declaration
 \*---------------------------------------------------------------------------*/
 
 class edge
 :
     public FixedList<label, 2>
 {
+    // Private Member Functions
+
+        //- Insert values, using begin/end iterators.
+        template<class InputIter>
+        inline label insertMultiple
+        (
+            const InputIter begIter,
+            const InputIter endIter
+        );
+
+        //- Remove values, using begin/end iterators.
+        template<class InputIter>
+        inline label eraseMultiple
+        (
+            const InputIter begIter,
+            const InputIter endIter
+        );
+
 
 public:
 
@@ -70,21 +90,32 @@ public:
 
     // Constructors
 
-        //- Null constructor for lists
+        //- Construct null with invalid point labels (-1)
         inline edge();
 
         //- Construct from components
-        inline edge(const label a, const label b);
+        inline edge(const label from, const label to);
+
+        //- Construct, optionally sorted with start less-than end
+        inline edge(const label from, const label to, const bool doSort);
+
+        //- Construct from two labels
+        inline edge(const labelPair& pair);
 
         //- Construct from FixedList
-        inline edge(const FixedList<label, 2>&);
+        inline edge(const FixedList<label, 2>& lst);
+
+        //- Construct, optionally sorted with start less-than end
+        inline edge(const FixedList<label, 2>& lst, const bool doSort);
 
         //- Construct from Istream
-        inline edge(Istream&);
+        inline edge(Istream& is);
 
 
     // Member Functions
 
+      // Access
+
         //- Return start vertex label
         inline label start() const;
 
@@ -97,45 +128,161 @@ public:
         //- Return end vertex label
         inline label& end();
 
-        //- Given one vertex, return the other
-        inline label otherVertex(const label a) const;
-
-        //- Return common vertex
-        inline label commonVertex(const edge& a) const;
-
-        //- Flip the edge in-place.
-        inline void flip();
-
-        //- Return reverse edge
+        //- Return reverse edge as copy.
+        //  No special handling of negative point labels.
         inline edge reverseEdge() const;
 
-        //- Return centre (centroid)
-        inline point centre(const pointField&) const;
+
+     // Queries
+
+        //- Return the smallest point label used by the edge
+        //  No special handling of negative point labels.
+        inline label minVertex() const;
+
+        //- Return the largest point label used by the edge
+        //  No special handling of negative point labels.
+        inline label maxVertex() const;
+
+        //- True if start() is less-than end()
+        //  No special handling of negative point labels.
+        inline bool sorted() const;
+
+        //- Return true if point label is found in edge.
+        //  Always false for a negative label.
+        inline bool found(const label pointLabel) const;
+
+        //- Return local index (0,1) of point label in edge -1 on failure
+        //  Always return -1 for a negative label.
+        inline label which(const label pointLabel) const;
+
+        //- Do the edges share a common vertex index?
+        //  Negative point labels never connect.
+        inline bool connects(const edge& other) const;
+
+        //- Return vertex common with otherEdge or -1 on failure
+        //  Negative point labels are never considered common between edges.
+        inline label commonVertex(const edge& other) const;
+
+        //- Given one vertex index, return the other one.
+        //  No special treatment for negative point labels.
+        inline label otherVertex(const label index) const;
+
+
+     // Editing
+
+        //- 'Collapse' edge by marking duplicate point labels as '-1',
+        //  the lower vertex is retained.
+        //  Return the effective size after collapsing.
+        inline label collapse();
+
+        //- Flip the edge in-place.
+        //  No special handling of negative point labels.
+        inline void flip();
+
+        //- Sort so that start() is less-than end()
+        //  No special handling of negative point labels.
+        inline void sort();
+
+
+     // Hash-like functions
+
+        //- Return the number of unique, valid (non -1) point labels.
+        //  Similar to a HashTable::size().
+        inline label count() const;
+
+        //- Return true if edge has no valid point labels.
+        inline bool empty() const;
+
+        //- 'Clears' edge by setting both ends to invalid point labels.
+        inline void clear();
+
+        //- Fill any open slot with the index if it did not previously exist.
+        //  Returns true on success. A negative label never inserts.
+        //  Similar to a HashTable::insert().
+        inline bool insert(const label index);
+
+        //- Fill open slots with the indices if they did not previously exist.
+        //  Returns true on success. Negative labels never insert.
+        //  Return the number of slots filled.
+        //  Similar to a HashTable::insert().
+        inline label insert(const UList<label>& lst);
+
+        //- Fill open slots with the indices if they did not previously exist.
+        //  Returns true on success. Negative labels never insert.
+        //  Return the number of slots filled.
+        //  Similar to a HashTable::insert().
+        template<unsigned AnySize>
+        inline label insert(const FixedList<label, AnySize>& lst);
+
+        //- Fill open slots with the indices if they did not previously exist.
+        //  Returns true on success. Negative labels never insert.
+        //  Return the number of slots filled.
+        //  Similar to a HashTable::insert().
+        inline label insert(std::initializer_list<label> lst);
+
+        //- Remove an existing index from the edge and set its location to '-1'.
+        //  Returns the number of changes. A negative label never removes.
+        //  Similar to a HashTable::erase().
+        inline label erase(const label index);
+
+        //- Remove existing indices from the edge and set locations to '-1'.
+        //  Returns the number of changes.
+        inline label erase(const UList<label>& lst);
+
+        //- Remove existing indices from the edge and set locations to '-1'.
+        //  Returns the number of changes.
+        template<unsigned AnySize>
+        inline label erase(const FixedList<label, AnySize>& lst);
+
+        //- Remove existing indices from the edge and set locations to '-1'.
+        //  Returns the number of changes.
+        inline label erase(std::initializer_list<label> lst);
+
+
+     // Geometric functions
+
+        //- Return centre point (centroid) of the edge.
+        //  No special handling of negative point labels.
+        inline point centre(const UList<point>& pts) const;
 
         //- Return the vector (end - start)
-        inline vector vec(const pointField&) const;
+        //  No special handling of negative point labels.
+        inline vector vec(const UList<point>& pts) const;
 
-        //- Return scalar magnitude
-        inline scalar mag(const pointField&) const;
+        //- Return the unit vector (end - start)
+        //  No special handling of negative point labels.
+        inline vector unitVec(const UList<point>& pts) const;
+
+        //- Return scalar magnitude of the edge.
+        //  No special handling of negative point labels.
+        inline scalar mag(const UList<point>& pts) const;
 
         //- Return edge line
-        inline linePointRef line(const pointField&) const;
+        //  No special handling of negative point labels.
+        inline linePointRef line(const UList<point>& pts) const;
+
+
+     // Comparison
 
         //- Compare edges
         //  Returns:
         //  -  0: different
-        //  - +1: identical
-        //  - -1: same edge, but different orientation
-        static inline int compare(const edge&, const edge&);
+        //  - +1: identical values and order used
+        //  - -1: identical values, but in different order
+        static inline int compare(const edge& a, const edge& b);
 
-
-    // Friend Operators
-
-        friend bool operator==(const edge& a, const edge& b);
-        friend bool operator!=(const edge& a, const edge& b);
 };
 
 
+// Global Operators
+
+//- Compare edges for equal content, ignoring orientation
+inline bool operator==(const edge& a, const edge& b);
+
+//- Compare edges for non-equal content, ignoring orientation
+inline bool operator!=(const edge& a, const edge& b);
+
+
 //- Hash specialization for hashing edges - a commutative hash value.
 //  Hash incrementally.
 template<>
diff --git a/src/meshTools/triSurface/containers/labelPairLookup.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeHashes.H
similarity index 72%
rename from src/meshTools/triSurface/containers/labelPairLookup.H
rename to src/OpenFOAM/meshes/meshShapes/edge/edgeHashes.H
index 7725255a9f..1ddfe8ca68 100644
--- a/src/meshTools/triSurface/containers/labelPairLookup.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeHashes.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -22,34 +22,32 @@ License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
 Typedef
-    Foam::labelPairLookup
+    Foam::edgeHashSet
 
 Description
-    A HashTable for two labels to another label.
-    Used for e.g. for face1, face2 to shared edge.
-
-Note
-    The hash table is based on a FixedList and not edge, since an edge
-    hashes commutatively!
+    A HashSet for an edge.
+    The hashing on an edge is commutative.
 
 \*---------------------------------------------------------------------------*/
 
-#ifndef labelPairLookup_H
-#define labelPairLookup_H
+#ifndef edgeHashes_H
+#define edgeHashes_H
 
-#include "FixedList.H"
-#include "HashTable.H"
+#include "HashSet.H"
+#include "edge.H"
+#include "EdgeMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
-    typedef HashTable
-    <
-       label,
-       FixedList<label, 2>,
-       FixedList<label, 2>::Hash<>
-    > labelPairLookup;
+    // Alternative:
+    // template<class T>
+    // using EdgeMap = HashTable<T, edge, Hash<edge>>;
+
+    //- A HashSet with edge for its key.
+    typedef HashSet<edge, Hash<edge>> edgeHashSet;
+
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
index 8e967880fe..e4ca81e938 100644
--- a/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
+++ b/src/OpenFOAM/meshes/meshShapes/edge/edgeI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,11 +28,6 @@ License
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
-
-// return
-//  -  0: different
-//  - +1: identical
-//  - -1: same edge, but different orientation
 inline int Foam::edge::compare(const edge& a, const edge& b)
 {
     if (a[0] == b[0] && a[1] == b[1])
@@ -50,23 +45,122 @@ inline int Foam::edge::compare(const edge& a, const edge& b)
 }
 
 
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-inline Foam::edge::edge()
-{}
-
-
-inline Foam::edge::edge(const label a, const label b)
+template<class InputIter>
+inline Foam::label Foam::edge::insertMultiple
+(
+    const InputIter begIter,
+    const InputIter endIter
+)
 {
-    start() = a;
-    end() = b;
+    // Available slots.
+    // Don't use count() since it has special treatment for duplicates
+    const int maxChange = (start() < 0 ? 1 : 0) + (end() < 0 ? 1 : 0);
+
+    int changed = 0;
+    if (maxChange)
+    {
+        for (InputIter iter = begIter; iter != endIter; ++iter)
+        {
+            if (insert(*iter))
+            {
+                if (++changed >= maxChange)
+                {
+                    break;
+                }
+            }
+        }
+    }
+
+    return changed;
 }
 
 
-inline Foam::edge::edge(const FixedList<label, 2>& a)
+template<class InputIter>
+inline Foam::label Foam::edge::eraseMultiple
+(
+    const InputIter begIter,
+    const InputIter endIter
+)
 {
-    start() = a[0];
-    end() = a[1];
+    // Occupied slots.
+    // Don't use count() since it has special treatment for duplicates
+    const int maxChange = (start() >= 0 ? 1 : 0) + (end() >= 0 ? 1 : 0);
+
+    int changed = 0;
+    if (maxChange)
+    {
+        for (InputIter iter = begIter; iter != endIter; ++iter)
+        {
+            changed += erase(*iter);
+            if (changed >= maxChange)
+            {
+                break;
+            }
+        }
+    }
+
+    return changed;
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+inline Foam::edge::edge()
+:
+    FixedList<label, 2>(-1)
+{}
+
+
+inline Foam::edge::edge(const label from, const label to)
+{
+    start() = from;
+    end()   = to;
+}
+
+
+inline Foam::edge::edge(const label from, const label to, const bool doSort)
+{
+    if (doSort && from > to)
+    {
+        start() = to;
+        end()   = from;
+    }
+    else
+    {
+        start() = from;
+        end()   = to;
+    }
+}
+
+
+inline Foam::edge::edge(const labelPair& pair)
+{
+    start() = pair.first();
+    end()   = pair.second();
+}
+
+
+inline Foam::edge::edge(const FixedList<label, 2>& lst)
+{
+    start() = lst[0];
+    end()   = lst[1];
+}
+
+
+inline Foam::edge::edge(const FixedList<label, 2>& lst, const bool doSort)
+{
+    if (doSort && lst[0] > lst[1])
+    {
+        start() = lst[1];
+        end()   = lst[0];
+    }
+    else
+    {
+        start() = lst[0];
+        end()   = lst[1];
+    }
 }
 
 
@@ -100,13 +194,74 @@ inline Foam::label& Foam::edge::end()
 }
 
 
-inline Foam::label Foam::edge::otherVertex(const label a) const
+inline Foam::label Foam::edge::minVertex() const
 {
-    if (a == start())
+    return (start() < end() ? start() : end());
+}
+
+
+inline Foam::label Foam::edge::maxVertex() const
+{
+    return (start() > end() ? start() : end());
+}
+
+
+inline bool Foam::edge::found(const label pointLabel) const
+{
+    // -1: always false
+    return (pointLabel >= 0 && (pointLabel == start() || pointLabel == end()));
+}
+
+
+inline Foam::label Foam::edge::which(const label pointLabel) const
+{
+    // -1: always false
+    if (pointLabel >= 0)
+    {
+        if (pointLabel == start())
+        {
+            return 0;
+        }
+        if (pointLabel == end())
+        {
+            return 1;
+        }
+    }
+    return -1;
+}
+
+
+inline bool Foam::edge::connects(const edge& other) const
+{
+    return (other.found(start()) || other.found(end()));
+}
+
+
+inline Foam::label Foam::edge::commonVertex(const edge& other) const
+{
+    if (other.found(start()))
+    {
+        return start();
+    }
+    else if (other.found(end()))
     {
         return end();
     }
-    else if (a == end())
+    else
+    {
+        // No shared vertex.
+        return -1;
+    }
+}
+
+
+inline Foam::label Foam::edge::otherVertex(const label index) const
+{
+    if (index == start())
+    {
+        return end();
+    }
+    else if (index == end())
     {
         return start();
     }
@@ -118,20 +273,38 @@ inline Foam::label Foam::edge::otherVertex(const label a) const
 }
 
 
-inline Foam::label Foam::edge::commonVertex(const edge& a) const
+inline Foam::label Foam::edge::collapse()
 {
-    if (start() == a.start() || start() == a.end())
+    // Cannot resize FixedList, so mark duplicates with '-1'
+    // (the lower vertex is retained)
+    // catch any '-1' (eg, if called multiple times)
+
+    label n = 2;
+    if (start() == end() || end() < 0)
     {
-        return start();
+        end() = -1;
+        --n;
     }
-    else if (end() == a.start() || end() == a.end())
+    if (start() < 0)
     {
-        return end();
+        --n;
     }
-    else
+
+    return n;
+}
+
+
+inline bool Foam::edge::sorted() const
+{
+    return (start() < end());
+}
+
+
+inline void Foam::edge::sort()
+{
+    if (start() > end())
     {
-        // No shared vertex.
-        return -1;
+        flip();
     }
 }
 
@@ -148,31 +321,202 @@ inline Foam::edge Foam::edge::reverseEdge() const
 }
 
 
-inline Foam::point Foam::edge::centre(const pointField& p) const
+inline void Foam::edge::clear()
 {
-    return 0.5*(p[start()] + p[end()]);
+    start() = -1;
+    end()   = -1;
 }
 
 
-inline Foam::vector Foam::edge::vec(const pointField& p) const
+inline Foam::label Foam::edge::count() const
 {
-    return p[end()] - p[start()];
+    label n = 2;
+    if (start() == end() || end() < 0)
+    {
+        --n;
+    }
+    if (start() < 0)
+    {
+        --n;
+    }
+
+    return n;
 }
 
 
-inline Foam::scalar Foam::edge::mag(const pointField& p) const
+inline bool Foam::edge::empty() const
 {
-    return ::Foam::mag(vec(p));
+    return (start() < 0 && end() < 0);
 }
 
 
-inline Foam::linePointRef Foam::edge::line(const pointField& p) const
+inline bool Foam::edge::insert(const label index)
 {
-    return linePointRef(p[start()], p[end()]);
+    if (index < 0)
+    {
+        // Cannot insert invalid point labels (use direct assignment for that)
+        return false;
+    }
+
+    if (start() < 0)
+    {
+        // Store at [0], if not duplicate of [1]
+        if (index != end())
+        {
+            start() = index;
+            return true;
+        }
+    }
+    else if (end() < 0)
+    {
+        // Store at [1], if not duplicate of [0]
+        if (index != start())
+        {
+            end() = index;
+            return true;
+        }
+    }
+
+    return false;
 }
 
 
-// * * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * //
+inline Foam::label Foam::edge::insert(const UList<label>& lst)
+{
+    return insertMultiple(lst.begin(), lst.end());
+}
+
+
+template<unsigned AnySize>
+inline Foam::label Foam::edge::insert(const FixedList<label, AnySize>& lst)
+{
+    return insertMultiple(lst.begin(), lst.end());
+}
+
+
+inline Foam::label Foam::edge::insert(std::initializer_list<label> lst)
+{
+    return insertMultiple(lst.begin(), lst.end());
+}
+
+
+inline Foam::label Foam::edge::erase(const label index)
+{
+    if (index < 0)
+    {
+        // Can never remove invalid point labels!
+        return 0;
+    }
+
+    label n = 0;
+    if (index == start())
+    {
+        start() = -1;
+        ++n;
+    }
+
+    // Automatically handle duplicates, which should not have been there anyhow
+    if (index == end())
+    {
+        end() = -1;
+        ++n;
+    }
+
+    return n;
+}
+
+
+inline Foam::label Foam::edge::erase(const UList<label>& lst)
+{
+    return eraseMultiple(lst.begin(), lst.end());
+}
+
+
+template<unsigned AnySize>
+inline Foam::label Foam::edge::erase(const FixedList<label, AnySize>& lst)
+{
+    return eraseMultiple(lst.begin(), lst.end());
+}
+
+
+inline Foam::label Foam::edge::erase(std::initializer_list<label> lst)
+{
+    return eraseMultiple(lst.begin(), lst.end());
+}
+
+
+// Geometric
+
+inline Foam::point Foam::edge::centre(const UList<point>& pts) const
+{
+    #ifdef FULLDEBUG
+    if (start() < 0 || end() < 0)
+    {
+        FatalErrorInFunction
+            << "negative point index on edge " << *this
+            << abort(FatalError);
+    }
+    #endif
+
+    return 0.5*(pts[start()] + pts[end()]);
+}
+
+
+inline Foam::vector Foam::edge::vec(const UList<point>& pts) const
+{
+    #ifdef FULLDEBUG
+    if (start() < 0 || end() < 0)
+    {
+        FatalErrorInFunction
+            << "negative point index on edge " << *this
+            << abort(FatalError);
+    }
+    #endif
+
+    return pts[end()] - pts[start()];
+}
+
+
+inline Foam::vector Foam::edge::unitVec(const UList<point>& pts) const
+{
+    #ifdef FULLDEBUG
+    if (start() < 0 || end() < 0)
+    {
+        FatalErrorInFunction
+            << "negative point index on edge " << *this
+            << abort(FatalError);
+    }
+    #endif
+
+    Foam::vector v = pts[end()] - pts[start()];
+    v /= ::Foam::mag(v) + VSMALL;
+
+    return v;
+}
+
+
+inline Foam::scalar Foam::edge::mag(const UList<point>& pts) const
+{
+    return ::Foam::mag(vec(pts));
+}
+
+
+inline Foam::linePointRef Foam::edge::line(const UList<point>& pts) const
+{
+    #ifdef FULLDEBUG
+    if (start() < 0 || end() < 0)
+    {
+        FatalErrorInFunction
+            << "negative point index on edge " << *this
+            << abort(FatalError);
+    }
+    #endif
+
+    return linePointRef(pts[start()], pts[end()]);
+}
+
+
+// * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * * //
 
 inline bool Foam::operator==(const edge& a, const edge& b)
 {
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.C b/src/OpenFOAM/meshes/meshShapes/face/face.C
index b1ed2f65df..9900b4e6f3 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.C
@@ -38,7 +38,7 @@ const char* const Foam::face::typeName = "face";
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
 Foam::tmp<Foam::vectorField>
-Foam::face::calcEdges(const pointField& points) const
+Foam::face::calcEdges(const UList<point>& points) const
 {
     tmp<vectorField> tedges(new vectorField(size()));
     vectorField& edges = tedges.ref();
@@ -76,7 +76,7 @@ Foam::scalar Foam::face::edgeCos
 
 Foam::label Foam::face::mostConcaveAngle
 (
-    const pointField& points,
+    const UList<point>& points,
     const vectorField& edges,
     scalar& maxAngle
 ) const
@@ -124,7 +124,7 @@ Foam::label Foam::face::mostConcaveAngle
 Foam::label Foam::face::split
 (
     const face::splitMode mode,
-    const pointField& points,
+    const UList<point>& points,
     label& triI,
     label& quadI,
     faceList& triFaces,
@@ -399,8 +399,8 @@ int Foam::face::compare(const face& a, const face& b)
 
 bool Foam::face::sameVertices(const face& a, const face& b)
 {
-    label sizeA = a.size();
-    label sizeB = b.size();
+    const label sizeA = a.size();
+    const label sizeB = b.size();
 
     // Trivial reject: faces are different size
     if (sizeA != sizeB)
@@ -410,14 +410,7 @@ bool Foam::face::sameVertices(const face& a, const face& b)
     // Check faces with a single vertex
     else if (sizeA == 1)
     {
-        if (a[0] == b[0])
-        {
-            return true;
-        }
-        else
-        {
-            return false;
-        }
+        return (a[0] == b[0]);
     }
 
     forAll(a, i)
@@ -461,7 +454,7 @@ Foam::label Foam::face::collapse()
 
         if (operator[](ci) != operator[](0))
         {
-            ci++;
+            ++ci;
         }
 
         setSize(ci);
@@ -485,7 +478,7 @@ void Foam::face::flip()
 }
 
 
-Foam::point Foam::face::centre(const pointField& points) const
+Foam::point Foam::face::centre(const UList<point>& points) const
 {
     // Calculate the centre by breaking the face into triangles and
     // area-weighted averaging their centres
@@ -549,7 +542,7 @@ Foam::point Foam::face::centre(const pointField& points) const
 }
 
 
-Foam::vector Foam::face::normal(const pointField& p) const
+Foam::vector Foam::face::normal(const UList<point>& p) const
 {
     const label nPoints = size();
 
@@ -645,8 +638,8 @@ Foam::label Foam::face::which(const label globalIndex) const
 
 Foam::scalar Foam::face::sweptVol
 (
-    const pointField& oldPoints,
-    const pointField& newPoints
+    const UList<point>& oldPoints,
+    const UList<point>& newPoints
 ) const
 {
     // This Optimization causes a small discrepancy between the swept-volume of
@@ -724,7 +717,7 @@ Foam::scalar Foam::face::sweptVol
 
 Foam::tensor Foam::face::inertia
 (
-    const pointField& p,
+    const UList<point>& p,
     const point& refPt,
     scalar density
 ) const
@@ -819,7 +812,7 @@ int Foam::face::edgeDirection(const edge& e) const
 }
 
 
-Foam::label Foam::face::nTriangles(const pointField&) const
+Foam::label Foam::face::nTriangles(const UList<point>&) const
 {
     return nTriangles();
 }
@@ -827,7 +820,7 @@ Foam::label Foam::face::nTriangles(const pointField&) const
 
 Foam::label Foam::face::triangles
 (
-    const pointField& points,
+    const UList<point>& points,
     label& triI,
     faceList& triFaces
 ) const
@@ -841,7 +834,7 @@ Foam::label Foam::face::triangles
 
 Foam::label Foam::face::nTrianglesQuads
 (
-    const pointField& points,
+    const UList<point>& points,
     label& triI,
     label& quadI
 ) const
@@ -855,7 +848,7 @@ Foam::label Foam::face::nTrianglesQuads
 
 Foam::label Foam::face::trianglesQuads
 (
-    const pointField& points,
+    const UList<point>& points,
     label& triI,
     label& quadI,
     faceList& triFaces,
@@ -866,9 +859,9 @@ Foam::label Foam::face::trianglesQuads
 }
 
 
-Foam::label Foam::longestEdge(const face& f, const pointField& pts)
+Foam::label Foam::face::longestEdge(const UList<point>& pts) const
 {
-    const edgeList& eds = f.edges();
+    const edgeList& eds = this->edges();
 
     label longestEdgeI = -1;
     scalar longestEdgeLength = -SMALL;
@@ -888,4 +881,10 @@ Foam::label Foam::longestEdge(const face& f, const pointField& pts)
 }
 
 
+Foam::label Foam::longestEdge(const face& f, const UList<point>& pts)
+{
+    return f.longestEdge(pts);
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/face/face.H b/src/OpenFOAM/meshes/meshShapes/face/face.H
index 62ae47b3d0..822e3c4f9a 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/face.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/face.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -65,9 +65,7 @@ class triFace;
 template<class T, unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 class DynamicList;
 
-inline bool operator==(const face& a, const face& b);
-inline bool operator!=(const face& a, const face& b);
-inline Istream& operator>>(Istream&, face&);
+inline Istream& operator>>(Istream& is, face& f);
 
 /*---------------------------------------------------------------------------*\
                            Class face Declaration
@@ -88,7 +86,7 @@ class face
         //- Construct list of edge vectors for face
         tmp<vectorField> calcEdges
         (
-            const pointField& points
+            const UList<point>& points
         ) const;
 
         //- Cos between neighbouring edges
@@ -101,7 +99,7 @@ class face
         //- Find index of largest internal angle on face
         label mostConcaveAngle
         (
-            const pointField& points,
+            const UList<point>& points,
             const vectorField& edges,
             scalar& edgeCos
         ) const;
@@ -121,7 +119,7 @@ class face
         label split
         (
             const splitMode mode,
-            const pointField& points,
+            const UList<point>& points,
             label& triI,
             label& quadI,
             faceList& triFaces,
@@ -149,23 +147,23 @@ public:
         //- Construct null
         inline face();
 
-        //- Construct given size
-        explicit inline face(label);
+        //- Construct given size, with invalid point labels (-1)
+        explicit inline face(const label sz);
 
         //- Construct from list of labels
-        explicit inline face(const labelUList&);
+        explicit inline face(const labelUList& lst);
 
         //- Construct from an initializer list of labels
-        explicit inline face(std::initializer_list<label>);
+        explicit inline face(std::initializer_list<label> lst);
 
         //- Construct by transferring the parameter contents
-        explicit inline face(const Xfer<labelList>&);
+        explicit inline face(const Xfer<labelList>& lst);
 
         //- Copy construct from triFace
-        face(const triFace&);
+        face(const triFace& f);
 
         //- Construct from Istream
-        inline face(Istream&);
+        inline face(Istream& is);
 
 
     // Member Functions
@@ -179,20 +177,24 @@ public:
         void flip();
 
         //- Return the points corresponding to this face
-        inline pointField points(const pointField&) const;
+        inline pointField points(const UList<point>& points) const;
 
         //- Centre point of face
-        point centre(const pointField&) const;
+        point centre(const UList<point>& points) const;
 
         //- Calculate average value at centroid of face
         template<class Type>
-        Type average(const pointField&, const Field<Type>&) const;
+        Type average
+        (
+            const UList<point>& meshPoints,
+            const Field<Type>& fld
+        ) const;
 
         //- Magnitude of face area
-        inline scalar mag(const pointField&) const;
+        inline scalar mag(const UList<point>& p) const;
 
         //- Vector normal; magnitude is equal to area of face
-        vector normal(const pointField&) const;
+        vector normal(const UList<point>& p) const;
 
         //- Return face with reverse direction
         //  The starting points of the original and reverse face are identical.
@@ -200,7 +202,10 @@ public:
 
         //- Navigation through face vertices
 
-            //- Which vertex on face (face index given a global index)
+            //- Return true if the global point label is found in face.
+            inline bool found(const label globalIndex) const;
+
+            //- Which local vertex on face given a global index.
             //  returns -1 if not found
             label which(const label globalIndex) const;
 
@@ -214,15 +219,15 @@ public:
         //- Return the volume swept out by the face when its points move
         scalar sweptVol
         (
-            const pointField& oldPoints,
-            const pointField& newPoints
+            const UList<point>& oldPoints,
+            const UList<point>& newPoints
         ) const;
 
         //- Return the inertia tensor, with optional reference
         //  point and density specification
         tensor inertia
         (
-            const pointField&,
+            const UList<point>& p,
             const point& refPt = vector::zero,
             scalar density = 1.0
         ) const;
@@ -243,7 +248,7 @@ public:
         (
             const point& p,
             const vector& n,
-            const pointField&,
+            const UList<point>& meshPoints,
             const intersection::algorithm alg = intersection::FULL_RAY,
             const intersection::direction dir = intersection::VECTOR
         ) const;
@@ -256,7 +261,7 @@ public:
             const point& p,
             const vector& q,
             const point& ctr,
-            const pointField&,
+            const UList<point>& meshPoints,
             const intersection::algorithm alg,
             const scalar tol = 0.0
         ) const;
@@ -265,7 +270,7 @@ public:
         pointHit nearestPoint
         (
             const point& p,
-            const pointField&
+            const UList<point>& meshPoints
         ) const;
 
         //- Return nearest point to face and classify it:
@@ -277,7 +282,7 @@ public:
         pointHit nearestPointClassify
         (
             const point& p,
-            const pointField&,
+            const UList<point>& meshPoints,
             label& nearType,
             label& nearLabel
         ) const;
@@ -287,13 +292,13 @@ public:
         (
             const point& p,
             const vector& n,
-            const pointField&
+            const UList<point>& meshPoints
         ) const;
 
         //- Return area in contact, given the displacement in vertices
         scalar areaInContact
         (
-            const pointField&,
+            const UList<point>& meshPoints,
             const scalarField& v
         ) const;
 
@@ -312,7 +317,10 @@ public:
         //  -  0: edge not found on the face
         //  - +1: forward (counter-clockwise) on the face
         //  - -1: reverse (clockwise) on the face
-        int edgeDirection(const edge&) const;
+        int edgeDirection(const edge& e) const;
+
+        //- Find the longest edge on a face.
+        label longestEdge(const UList<point>& pts) const;
 
         // Face splitting utilities
 
@@ -320,7 +328,7 @@ public:
             inline label nTriangles() const;
 
             //- Number of triangles after splitting
-            label nTriangles(const pointField& points) const;
+            label nTriangles(const UList<point>& unused) const;
 
             //- Split into triangles using existing points.
             //  Result in triFaces[triI..triI+nTri].
@@ -328,7 +336,7 @@ public:
             //  Returns number of faces created.
             label triangles
             (
-                const pointField& points,
+                const UList<point>& points,
                 label& triI,
                 faceList& triFaces
             ) const;
@@ -339,7 +347,7 @@ public:
             template<unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
             label triangles
             (
-                const pointField& points,
+                const UList<point>& points,
                 DynamicList<face, SizeInc, SizeMult, SizeDiv>& triFaces
             ) const;
 
@@ -347,7 +355,7 @@ public:
             //  Returns the sum of both
             label nTrianglesQuads
             (
-                const pointField& points,
+                const UList<point>& points,
                 label& nTris,
                 label& nQuads
             ) const;
@@ -358,7 +366,7 @@ public:
             //  Returns number of new faces created.
             label trianglesQuads
             (
-                const pointField& points,
+                const UList<point>& points,
                 label& triI,
                 label& quadI,
                 faceList& triFaces,
@@ -369,21 +377,15 @@ public:
         //   0: different
         //  +1: identical
         //  -1: same face, but different orientation
-        static int compare(const face&, const face&);
+        static int compare(const face& a, const face& b);
 
         //- Return true if the faces have the same vertices
-        static bool sameVertices(const face&, const face&);
-
-
-    // Friend Operators
-
-        friend bool operator==(const face& a, const face& b);
-        friend bool operator!=(const face& a, const face& b);
+        static bool sameVertices(const face& a, const face& b);
 
 
     // Istream Operator
 
-        friend Istream& operator>>(Istream&, face&);
+        friend Istream& operator>>(Istream& is, face& f);
 };
 
 
@@ -411,10 +413,16 @@ public:
 };
 
 
+// Global operators
+inline bool operator==(const face& a, const face& b);
+inline bool operator!=(const face& a, const face& b);
+
+
 // Global functions
 
 //- Find the longest edge on a face. Face point labels index into pts.
-label longestEdge(const face& f, const pointField& pts);
+//  \deprecated use class method instead (APR-2017)
+label longestEdge(const face& f, const UList<point>& pts);
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
index b49ad74fe1..a19df70a26 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceAreaInContact.C
@@ -31,7 +31,7 @@ License
 
 Foam::scalar Foam::face::areaInContact
 (
-    const pointField& meshPoints,
+    const UList<point>& meshPoints,
     const scalarField& v
 ) const
 {
@@ -90,7 +90,7 @@ Foam::scalar Foam::face::areaInContact
     // Dimension new point list to max possible size
     const labelList& faceLabels = *this;
 
-    pointField newFacePoints(2*size());
+    List<point> newFacePoints(2*size());
     label nNewFacePoints = 0;
 
     for (label vI = 0; vI < size() - 1; vI++)
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceContactSphere.C b/src/OpenFOAM/meshes/meshShapes/face/faceContactSphere.C
index 4f2b109cce..6a5c982840 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceContactSphere.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceContactSphere.C
@@ -34,7 +34,7 @@ Foam::scalar Foam::face::contactSphereDiameter
 (
     const point& p,
     const vector& n,
-    const pointField& meshPoints
+    const UList<point>& meshPoints
 ) const
 {
     scalar magN = Foam::mag(n);
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceI.H b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
index 0dc5e035a6..ce807528c6 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,9 +45,9 @@ inline Foam::face::face()
 {}
 
 
-inline Foam::face::face(label s)
+inline Foam::face::face(const label sz)
 :
-    labelList(s, -1)
+    labelList(sz, -1)
 {}
 
 
@@ -77,7 +77,10 @@ inline Foam::face::face(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline Foam::pointField Foam::face::points(const pointField& meshPoints) const
+inline Foam::pointField Foam::face::points
+(
+    const UList<point>& meshPoints
+) const
 {
     // There are as many points as there are labels for them
     pointField p(size());
@@ -94,7 +97,7 @@ inline Foam::pointField Foam::face::points(const pointField& meshPoints) const
 }
 
 
-inline Foam::scalar Foam::face::mag(const pointField& p) const
+inline Foam::scalar Foam::face::mag(const UList<point>& p) const
 {
     return ::Foam::mag(normal(p));
 }
@@ -113,33 +116,37 @@ inline Foam::edge Foam::face::faceEdge(const label n) const
 }
 
 
-// Next vertex on face
+inline bool Foam::face::found(const label globalIndex) const
+{
+    return which(globalIndex) != -1;
+}
+
+
 inline Foam::label Foam::face::nextLabel(const label i) const
 {
     return operator[](fcIndex(i));
 }
 
 
-// Previous vertex on face
 inline Foam::label Foam::face::prevLabel(const label i) const
 {
     return operator[](rcIndex(i));
 }
 
-// Number of triangles directly known from number of vertices
+
 inline Foam::label Foam::face::nTriangles() const
 {
     return size() - 2;
 }
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+
+// * * * * * * * * * * * * * * * Global Operators   * * * * * * * * * * * * * //
 
 inline bool Foam::operator==(const face& a, const face& b)
 {
     return face::compare(a,b) != 0;
 }
 
-
 inline bool Foam::operator!=(const face& a, const face& b)
 {
     return face::compare(a,b) == 0;
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C b/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
index eb730e70b2..1b250c401a 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceIntersection.C
@@ -34,7 +34,7 @@ Foam::pointHit Foam::face::ray
 (
     const point& p,
     const vector& n,
-    const pointField& meshPoints,
+    const UList<point>& meshPoints,
     const intersection::algorithm alg,
     const intersection::direction dir
 ) const
@@ -62,7 +62,6 @@ Foam::pointHit Foam::face::ray
     point ctr = Foam::average(points(meshPoints));
 
     scalar nearestHitDist = GREAT;
-
     scalar nearestMissDist = GREAT;
     bool eligible = false;
 
@@ -71,7 +70,7 @@ Foam::pointHit Foam::face::ray
 
     const labelList& f = *this;
 
-    label nPoints = size();
+    const label nPoints = size();
 
     point nextPoint = ctr;
 
@@ -142,7 +141,7 @@ Foam::pointHit Foam::face::intersection
     const point& p,
     const vector& q,
     const point& ctr,
-    const pointField& meshPoints,
+    const UList<point>& meshPoints,
     const intersection::algorithm alg,
     const scalar tol
 ) const
@@ -198,7 +197,7 @@ Foam::pointHit Foam::face::intersection
 Foam::pointHit Foam::face::nearestPoint
 (
     const point& p,
-    const pointField& meshPoints
+    const UList<point>& meshPoints
 ) const
 {
     // Dummy labels
@@ -212,7 +211,7 @@ Foam::pointHit Foam::face::nearestPoint
 Foam::pointHit Foam::face::nearestPointClassify
 (
     const point& p,
-    const pointField& meshPoints,
+    const UList<point>& meshPoints,
     label& nearType,
     label& nearLabel
 ) const
@@ -237,7 +236,7 @@ Foam::pointHit Foam::face::nearestPointClassify
     nearType = -1;
     nearLabel = -1;
 
-    label nPoints = f.size();
+    const label nPoints = f.size();
 
     point nextPoint = ctr;
 
diff --git a/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C b/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
index 6220d253cd..112a5703fb 100644
--- a/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
+++ b/src/OpenFOAM/meshes/meshShapes/face/faceTemplates.C
@@ -31,7 +31,7 @@ License
 template<unsigned SizeInc, unsigned SizeMult, unsigned SizeDiv>
 Foam::label Foam::face::triangles
 (
-    const pointField& points,
+    const UList<point>& points,
     DynamicList<face, SizeInc, SizeMult, SizeDiv>& triFaces
 ) const
 {
@@ -49,7 +49,7 @@ Foam::label Foam::face::triangles
 template<class Type>
 Type Foam::face::average
 (
-    const pointField& meshPoints,
+    const UList<point>& meshPoints,
     const Field<Type>& fld
 ) const
 {
diff --git a/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H b/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H
index 0e0c72af77..861be7665a 100644
--- a/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H
+++ b/src/OpenFOAM/meshes/meshShapes/labelledTri/labelledTriI.H
@@ -162,8 +162,7 @@ inline Foam::Ostream& Foam::operator<<(Ostream& os, const labelledTri& t)
     }
 
     // Check state of Ostream
-    os.check("Ostream& operator<<(Ostream&, const labelledTri&)");
-
+    os.check(FUNCTION_NAME);
 
     return os;
 }
diff --git a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H
index d2f8d2a7e5..18f1459f4e 100644
--- a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H
+++ b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCell.H
@@ -78,10 +78,10 @@ public:
         );
 
         //- Construct from FixedList
-        inline tetCell(const FixedList<label, 4>&);
+        inline tetCell(const FixedList<label, 4>& lst);
 
         //- Construct from Istream
-        inline tetCell(Istream&);
+        inline tetCell(Istream& is);
 
 
     // Member Functions
@@ -111,7 +111,7 @@ public:
             cellShape tetCellShape() const;
 
             //- Return the tetrahedron
-            inline tetPointRef tet(const pointField&) const;
+            inline tetPointRef tet(const UList<point>& points) const;
 };
 
 
diff --git a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
index 6606934f75..b1024a1696 100644
--- a/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
+++ b/src/OpenFOAM/meshes/meshShapes/tetCell/tetCellI.H
@@ -71,7 +71,7 @@ inline Foam::triFace Foam::tetCell::face(const label facei) const
     static const label c[] = {3, 2, 3, 1};
 
     #ifdef FULLDEBUG
-    if (facei >= 4)
+    if (facei < 0 || facei >= 4)
     {
         FatalErrorInFunction
             << "index out of range 0 -> 3. facei = " << facei
@@ -96,7 +96,7 @@ inline Foam::label Foam::tetCell::edgeFace(const label edgeI) const
     static const label edgeFaces[6] = {2, 3, 1, 0, 0, 1};
 
     #ifdef FULLDEBUG
-    if (edgeI >= 6)
+    if (edgeI < 0 || edgeI >= 6)
     {
         FatalErrorInFunction
             << "edge index out of range 0 -> 5. edgeI = " << edgeI
@@ -127,14 +127,14 @@ inline Foam::label Foam::tetCell::edgeAdjacentFace
     };
 
     #ifdef FULLDEBUG
-    if (facei >= 4)
+    if (facei < 0 || facei >= 4)
     {
         FatalErrorInFunction
             << "face index out of range 0 -> 3. facei = " << facei
             << abort(FatalError);
     }
 
-    if (edgeI >= 6)
+    if (edgeI < 0 || edgeI >= 6)
     {
         FatalErrorInFunction
             << "edge index out of range 0 -> 5. edgeI = " << edgeI
@@ -155,7 +155,7 @@ inline Foam::edge Foam::tetCell::tetEdge(const label edgeI) const
     static const label end[] = {1, 2, 3, 1, 2, 2};
 
     #ifdef FULLDEBUG
-    if (edgeI >= 6)
+    if (edgeI < 0 || edgeI >= 6)
     {
         FatalErrorInFunction
             << "index out of range 0 -> 5. edgeI = " << edgeI
@@ -167,7 +167,7 @@ inline Foam::edge Foam::tetCell::tetEdge(const label edgeI) const
 }
 
 
-inline Foam::tetPointRef Foam::tetCell::tet(const pointField& points) const
+inline Foam::tetPointRef Foam::tetCell::tet(const UList<point>& points) const
 {
     return tetPointRef
     (
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceI.H b/src/OpenFOAM/meshes/meshShapes/traits/faceTraits.H
similarity index 51%
rename from src/surfMesh/MeshedSurface/MeshedSurfaceI.H
rename to src/OpenFOAM/meshes/meshShapes/traits/faceTraits.H
index a7415f7b4b..523233a569 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/traits/faceTraits.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -21,83 +21,53 @@ License
     You should have received a copy of the GNU General Public License
     along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
 
+Class
+    Foam::faceTraits
+
+Description
+    Traits class for faces
+
 \*---------------------------------------------------------------------------*/
 
+#ifndef faceTraits_H
+#define faceTraits_H
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
-// A triFace surface only handles triangulated faces
-template<>
-inline bool MeshedSurface<triFace>::isTri()
+// Forward declarations
+class triFace;
+class labelledTri;
+
+/*---------------------------------------------------------------------------*\
+                         Class faceTraits Declaration
+\*---------------------------------------------------------------------------*/
+
+template<class FaceType>
+class faceTraits
 {
-    return true;
-}
+public:
+
+    //- Face-type only handles triangles. Not true in general.
+    inline static bool isTri()  { return false; }
+};
 
 
-// A labelledTri surface only handles triangulated faces
 template<>
-inline bool MeshedSurface<labelledTri>::isTri()
-{
-    return true;
-}
+inline bool faceTraits<triFace>::isTri()        { return true; }
 
-
-// Number of triangles for a triFace surface
 template<>
-inline label MeshedSurface<triFace>::nTriangles() const
-{
-    return ParentType::size();
-}
-
-// Number of triangles for a labelledTri surface
-template<>
-inline label MeshedSurface<labelledTri>::nTriangles() const
-{
-    return ParentType::size();
-}
-
-
-// Inplace triangulation of triFace surface = no-op
-template<>
-inline label MeshedSurface<triFace>::triangulate()
-{
-    return 0;
-}
-
-// Inplace triangulation of labelledTri surface = no-op
-template<>
-inline label MeshedSurface<labelledTri>::triangulate()
-{
-    return 0;
-}
-
-// Inplace triangulation of triFace surface (with face map) = no-op
-template<>
-inline label MeshedSurface<triFace>::triangulate(List<label>& faceMap)
-{
-    if (notNull(faceMap))
-    {
-        faceMap.clear();
-    }
-    return 0;
-}
-
-// Inplace triangulation of labelledTri surface (with face map) = no-op
-template<>
-inline label MeshedSurface<labelledTri>::triangulate(List<label>& faceMap)
-{
-    if (notNull(faceMap))
-    {
-        faceMap.clear();
-    }
-    return 0;
-}
+inline bool faceTraits<labelledTri>::isTri()    { return true; }
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
index 0b2d5170ad..301b845d11 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFace.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -58,8 +58,8 @@ namespace Foam
 class face;
 class triFace;
 
-inline bool operator==(const triFace&, const triFace&);
-inline bool operator!=(const triFace&, const triFace&);
+inline bool operator==(const triFace& a, const triFace& b);
+inline bool operator!=(const triFace& a, const triFace& b);
 
 
 /*---------------------------------------------------------------------------*\
@@ -87,19 +87,21 @@ public:
         );
 
         //- Construct from a list of 3 labels.
-        explicit inline triFace(const labelUList&);
+        explicit inline triFace(const labelUList& lst);
 
         //- Construct from an initializer list of 3 labels
-        explicit inline triFace(std::initializer_list<label>);
+        explicit inline triFace(std::initializer_list<label> lst);
 
         //- Construct from Istream
-        inline triFace(Istream&);
+        inline triFace(Istream& is);
 
 
     // Member Functions
 
-        //- Collapse face by removing duplicate point labels
-        //  return the collapsed size, set collapsed point labels to -1
+        //- 'Collapse' face by marking duplicate point labels.
+        //  Duplicates point labels are marked with '-1'
+        //  (the lower vertex is retained).
+        //  Return the collapsed size.
         inline label collapse();
 
         //- Flip the face in-place.
@@ -107,26 +109,26 @@ public:
         inline void flip();
 
         //- Return the points corresponding to this face
-        inline pointField points(const pointField&) const;
+        inline pointField points(const UList<point>& points) const;
 
         //- Return triangle as a face
         inline face triFaceFace() const;
 
         //- Return the triangle
-        inline triPointRef tri(const pointField&) const;
+        inline triPointRef tri(const UList<point>& points) const;
 
         //- Return centre (centroid)
-        inline point centre(const pointField&) const;
+        inline point centre(const UList<point>& points) const;
 
         //- Calculate average value at centroid of face
         template<class Type>
-        Type average(const pointField&, const Field<Type>&) const;
+        Type average(const UList<point>& unused, const Field<Type>& fld) const;
 
         //- Magnitude of face area
-        inline scalar mag(const pointField&) const;
+        inline scalar mag(const UList<point>& points) const;
 
         //- Vector normal; magnitude is equal to area of face
-        inline vector normal(const pointField&) const;
+        inline vector normal(const UList<point>& points) const;
 
         //- Number of triangles after splitting
         inline label nTriangles() const;
@@ -135,29 +137,35 @@ public:
         //  The starting points of the original and reverse face are identical.
         inline triFace reverseFace() const;
 
-        //- Return swept-volume
+        //- Return true if the global point label is found in face.
+        bool found(const label globalIndex) const;
+
+        //- Which local index (0,1,2) on face given a global index.
+        //  returns -1 if not found
+        label which(const label globalIndex) const;
+
+        //- Return swept-volume from old-points to new-points
         inline scalar sweptVol
         (
-            const pointField& oldPoints,
-            const pointField& newPoints
+            const UList<point>& opts,
+            const UList<point>& npts
         ) const;
 
         //- Return the inertia tensor, with optional reference
         //  point and density specification
         inline tensor inertia
         (
-            const pointField&,
+            const UList<point>& points,
             const point& refPt = vector::zero,
             scalar density = 1.0
         ) const;
 
-        //- Return point intersection with a ray starting at p,
-        //  with direction q.
+        //- Return point intersection with a ray starting at p, in direction q.
         inline pointHit ray
         (
             const point& p,
             const vector& q,
-            const pointField& points,
+            const UList<point>& points,
             const intersection::algorithm = intersection::FULL_RAY,
             const intersection::direction dir = intersection::VECTOR
         ) const;
@@ -167,7 +175,7 @@ public:
         (
             const point& p,
             const vector& q,
-            const pointField& points,
+            const UList<point>& points,
             const intersection::algorithm alg,
             const scalar tol = 0.0
         ) const;
@@ -177,7 +185,7 @@ public:
             const point& p,
             const vector& q,
             const point& ctr,
-            const pointField& points,
+            const UList<point>& points,
             const intersection::algorithm alg,
             const scalar tol = 0.0
         ) const;
@@ -186,7 +194,7 @@ public:
         inline pointHit nearestPoint
         (
             const point& p,
-            const pointField& points
+            const UList<point>& points
         ) const;
 
 
@@ -199,7 +207,7 @@ public:
         inline pointHit nearestPointClassify
         (
             const point& p,
-            const pointField& points,
+            const UList<point>& points,
             label& nearType,
             label& nearLabel
         ) const;
@@ -219,22 +227,25 @@ public:
         //  - +1: forward (counter-clockwise) on the face
         //  - -1: reverse (clockwise) on the face
         //  -  0: edge not found on the face
-        inline int edgeDirection(const edge&) const;
+        inline int edgeDirection(const edge& e) const;
 
         //- Compare triFaces
         //  Returns:
         //  -  0: different
         //  - +1: identical
         //  - -1: same face, but different orientation
-        static inline int compare(const triFace&, const triFace&);
+        static inline int compare(const triFace& a, const triFace& b);
 
-    // Friend Operators
-
-        inline friend bool operator==(const triFace&, const triFace&);
-        inline friend bool operator!=(const triFace&, const triFace&);
 };
 
 
+template<>
+inline bool contiguous<triFace>()  {return true;}
+
+inline bool operator==(const triFace& a, const triFace& b);
+inline bool operator!=(const triFace& a, const triFace& b);
+
+
 //- Hash specialization for hashing triFace - a commutative hash value.
 //  Hash incrementally.
 template<>
@@ -259,10 +270,6 @@ inline unsigned Hash<triFace>::operator()(const triFace& t) const
 }
 
 
-template<>
-inline bool contiguous<triFace>()  {return true;}
-
-
 //- Hash specialization to offset faces in ListListOps::combineOffset
 template<>
 class offsetOp<triFace>
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
index 8d8bcaba99..ae2545a7aa 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceI.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2013 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -102,9 +102,9 @@ inline Foam::triFace::triFace(Istream& is)
 
 inline Foam::label Foam::triFace::collapse()
 {
-    // we cannot resize a FixedList, so mark duplicates with '-1'
+    // Cannot resize FixedList, so mark duplicates with '-1'
     // (the lower vertex is retained)
-    // catch any '-1' (eg, if called twice)
+    // catch any '-1' (eg, if called multiple times)
 
     label n = 3;
     if (operator[](0) == operator[](1) || operator[](1) == -1)
@@ -133,7 +133,7 @@ inline void Foam::triFace::flip()
 }
 
 
-inline Foam::pointField Foam::triFace::points(const pointField& points) const
+inline Foam::pointField Foam::triFace::points(const UList<point>& points) const
 {
     pointField p(3);
 
@@ -157,7 +157,7 @@ inline Foam::face Foam::triFace::triFaceFace() const
 }
 
 
-inline Foam::triPointRef Foam::triFace::tri(const pointField& points) const
+inline Foam::triPointRef Foam::triFace::tri(const UList<point>& points) const
 {
     return triPointRef
     (
@@ -168,7 +168,7 @@ inline Foam::triPointRef Foam::triFace::tri(const pointField& points) const
 }
 
 
-inline Foam::point Foam::triFace::centre(const pointField& points) const
+inline Foam::point Foam::triFace::centre(const UList<point>& points) const
 {
     return (1.0/3.0)*
     (
@@ -179,14 +179,14 @@ inline Foam::point Foam::triFace::centre(const pointField& points) const
 }
 
 
-inline Foam::scalar Foam::triFace::mag(const pointField& points) const
+inline Foam::scalar Foam::triFace::mag(const UList<point>& points) const
 {
     return ::Foam::mag(normal(points));
 }
 
 
 // could also delegate to triPointRef(...).normal()
-inline Foam::vector Foam::triFace::normal(const pointField& points) const
+inline Foam::vector Foam::triFace::normal(const UList<point>& points) const
 {
     return 0.5*
     (
@@ -209,10 +209,25 @@ inline Foam::triFace Foam::triFace::reverseFace() const
 }
 
 
+inline bool Foam::triFace::found(const label globalIndex) const
+{
+    return which(globalIndex) != -1;
+}
+
+
+inline Foam::label Foam::triFace::which(const label globalIndex) const
+{
+    if (operator[](0) == globalIndex) return 0;
+    if (operator[](1) == globalIndex) return 1;
+    if (operator[](2) == globalIndex) return 2;
+    return -1;
+}
+
+
 inline Foam::scalar Foam::triFace::sweptVol
 (
-    const pointField& opts,
-    const pointField& npts
+    const UList<point>& opts,
+    const UList<point>& npts
 ) const
 {
     return (1.0/6.0)*
@@ -244,7 +259,7 @@ inline Foam::scalar Foam::triFace::sweptVol
 
 Foam::tensor Foam::triFace::inertia
 (
-    const pointField& points,
+    const UList<point>& points,
     const point& refPt,
     scalar density
 ) const
@@ -258,7 +273,7 @@ inline Foam::pointHit Foam::triFace::ray
 (
     const point& p,
     const vector& q,
-    const pointField& points,
+    const UList<point>& points,
     const intersection::algorithm alg,
     const intersection::direction dir
 ) const
@@ -272,7 +287,7 @@ inline Foam::pointHit Foam::triFace::intersection
 (
     const point& p,
     const vector& q,
-    const pointField& points,
+    const UList<point>& points,
     const intersection::algorithm alg,
     const scalar tol
 ) const
@@ -286,7 +301,7 @@ inline Foam::pointHit Foam::triFace::intersection
     const point& p,
     const vector& q,
     const point& ctr,
-    const pointField& points,
+    const UList<point>& points,
     const intersection::algorithm alg,
     const scalar tol
 ) const
@@ -298,7 +313,7 @@ inline Foam::pointHit Foam::triFace::intersection
 inline Foam::pointHit Foam::triFace::nearestPoint
 (
     const point& p,
-    const pointField& points
+    const UList<point>& points
 ) const
 {
     return this->tri(points).nearestPoint(p);
@@ -308,7 +323,7 @@ inline Foam::pointHit Foam::triFace::nearestPoint
 inline Foam::pointHit Foam::triFace::nearestPointClassify
 (
     const point& p,
-    const pointField& points,
+    const UList<point>& points,
     label& nearType,
     label& nearLabel
 ) const
@@ -377,7 +392,7 @@ inline int Foam::triFace::edgeDirection(const edge& e) const
 }
 
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 inline bool Foam::operator==(const triFace& a, const triFace& b)
 {
diff --git a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceTemplates.C b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceTemplates.C
index 28d5039643..437d2e3227 100644
--- a/src/OpenFOAM/meshes/meshShapes/triFace/triFaceTemplates.C
+++ b/src/OpenFOAM/meshes/meshShapes/triFace/triFaceTemplates.C
@@ -30,7 +30,7 @@ License
 template<class Type>
 Type Foam::triFace::average
 (
-    const pointField& meshPoints,
+    const UList<point>&,
     const Field<Type>& fld
 ) const
 {
diff --git a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
index 815e601a8e..ac970965c8 100644
--- a/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
+++ b/src/OpenFOAM/meshes/polyMesh/mapPolyMesh/mapDistribute/mapDistributeBase.C
@@ -25,7 +25,7 @@ License
 
 #include "mapDistributeBase.H"
 #include "commSchedule.H"
-#include "HashSet.H"
+#include "labelPairHashes.H"
 #include "globalIndex.H"
 #include "ListOps.H"
 
@@ -50,7 +50,7 @@ Foam::List<Foam::labelPair> Foam::mapDistributeBase::schedule
     List<labelPair> allComms;
 
     {
-        HashSet<labelPair, labelPair::Hash<>> commsSet(Pstream::nProcs());
+        labelPairHashSet commsSet(Pstream::nProcs());
 
         // Find what communication is required
         forAll(subMap, proci)
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
index 34104c4da1..dfebcf0d30 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.C
@@ -32,6 +32,7 @@ License
 #include "lduSchedule.H"
 #include "globalMeshData.H"
 #include "stringListOps.H"
+#include "EdgeMap.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -287,7 +288,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
 
         // From mesh edge (expressed as a point pair so as not to construct
         // point addressing) to patch + relative edge index.
-        HashTable<labelPair, edge, Hash<edge>> pointsToEdge(nEdgePairs);
+        EdgeMap<labelPair> pointsToEdge(nEdgePairs);
 
         forAll(*this, patchi)
         {
@@ -308,10 +309,9 @@ Foam::polyBoundaryMesh::neighbourEdges() const
                 // Edge in mesh points.
                 edge meshEdge(pp.meshPoints()[e[0]], pp.meshPoints()[e[1]]);
 
-                HashTable<labelPair, edge, Hash<edge>>::iterator fnd =
-                    pointsToEdge.find(meshEdge);
+                EdgeMap<labelPair>::iterator fnd = pointsToEdge.find(meshEdge);
 
-                if (fnd == pointsToEdge.end())
+                if (!fnd.found())
                 {
                     // First occurrence of mesh edge. Store patch and my
                     // local index.
@@ -328,7 +328,7 @@ Foam::polyBoundaryMesh::neighbourEdges() const
                 else
                 {
                     // Second occurrence. Store.
-                    const labelPair& edgeInfo = fnd();
+                    const labelPair& edgeInfo = fnd.object();
 
                     neighbourEdges[patchi][edgei - pp.nInternalEdges()] =
                         edgeInfo;
@@ -413,13 +413,13 @@ const Foam::labelList& Foam::polyBoundaryMesh::patchID() const
 }
 
 
-const Foam::HashTable<Foam::labelList, Foam::word>&
+const Foam::HashTable<Foam::labelList>&
 Foam::polyBoundaryMesh::groupPatchIDs() const
 {
     if (!groupPatchIDsPtr_.valid())
     {
-        groupPatchIDsPtr_.reset(new HashTable<labelList, word>(10));
-        HashTable<labelList, word>& groupPatchIDs = groupPatchIDsPtr_();
+        groupPatchIDsPtr_.reset(new HashTable<labelList>(10));
+        HashTable<labelList>& groupPatchIDs = groupPatchIDsPtr_();
 
         const polyBoundaryMesh& bm = *this;
 
@@ -431,7 +431,7 @@ Foam::polyBoundaryMesh::groupPatchIDs() const
             {
                 const word& name = groups[i];
 
-                HashTable<labelList, word>::iterator iter = groupPatchIDs.find
+                HashTable<labelList>::iterator iter = groupPatchIDs.find
                 (
                     name
                 );
@@ -612,10 +612,10 @@ Foam::labelList Foam::polyBoundaryMesh::findIndices
 
             if (usePatchGroups && groupPatchIDs().size())
             {
-                const HashTable<labelList, word>::const_iterator iter =
+                const HashTable<labelList>::const_iterator iter =
                     groupPatchIDs().find(key);
 
-                if (iter != groupPatchIDs().end())
+                if (iter.found())
                 {
                     labelHashSet indexSet(indices);
 
@@ -815,14 +815,8 @@ void Foam::polyBoundaryMesh::matchGroups
     // Current set of unmatched patches
     nonGroupPatches = labelHashSet(patchIDs);
 
-    const HashTable<labelList, word>& groupPatchIDs = this->groupPatchIDs();
-    for
-    (
-        HashTable<labelList,word>::const_iterator iter =
-            groupPatchIDs.begin();
-        iter != groupPatchIDs.end();
-        ++iter
-    )
+    const HashTable<labelList>& groupPatchIDs = this->groupPatchIDs();
+    forAllConstIters(groupPatchIDs, iter)
     {
         // Store currently unmatched patches so we can restore
         labelHashSet oldNonGroupPatches(nonGroupPatches);
diff --git a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
index 114fc23168..6193b98f45 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
+++ b/src/OpenFOAM/meshes/polyMesh/polyBoundaryMesh/polyBoundaryMesh.H
@@ -70,7 +70,7 @@ class polyBoundaryMesh
 
         mutable autoPtr<labelList> patchIDPtr_;
 
-        mutable autoPtr<HashTable<labelList, word>> groupPatchIDsPtr_;
+        mutable autoPtr<HashTable<labelList>> groupPatchIDsPtr_;
 
         //- Edges of neighbouring patches
         mutable autoPtr<List<labelPairList>> neighbourEdgesPtr_;
@@ -183,8 +183,8 @@ public:
         //- Per boundary face label the patch index
         const labelList& patchID() const;
 
-        //- Per patch group the patch indices
-        const HashTable<labelList, word>& groupPatchIDs() const;
+        //- The patch indices per patch group
+        const HashTable<labelList>& groupPatchIDs() const;
 
         //- Set/add group with patches
         void setGroup(const word& groupName, const labelList& patchIDs);
diff --git a/src/OpenFOAM/meshes/primitiveShapes/line/line.H b/src/OpenFOAM/meshes/primitiveShapes/line/line.H
index 74bc680134..778a843ba7 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/line/line.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/line/line.H
@@ -98,10 +98,10 @@ public:
 
         // Access
 
-            //- Return first vertex
+            //- Return first point
             inline PointRef start() const;
 
-            //- Return second vertex
+            //- Return second point
             inline PointRef end() const;
 
 
@@ -113,9 +113,12 @@ public:
             //- Return scalar magnitude
             inline scalar mag() const;
 
-            //- Return start-end vector
+            //- Return start-to-end vector
             inline Point vec() const;
 
+            //- Return the unit vector (start-to-end)
+            inline Point unitVec() const;
+
             //- Return nearest distance to line from a given point
             //  If the nearest point is on the line, return a hit
             PointHit<Point> nearestDist(const Point& p) const;
diff --git a/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H b/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H
index 2dfca1e1c2..c4757716cf 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/line/lineI.H
@@ -90,6 +90,16 @@ inline Point Foam::line<Point, PointRef>::vec() const
 }
 
 
+template<class Point, class PointRef>
+inline Point Foam::line<Point, PointRef>::unitVec() const
+{
+    Point v = b_ - a_;
+    v /= ::Foam::mag(v) + VSMALL;
+
+    return v;
+}
+
+
 template<class Point, class PointRef>
 Foam::PointHit<Point> Foam::line<Point, PointRef>::nearestDist
 (
diff --git a/src/OpenFOAM/meshes/primitiveShapes/objectHit/objectHit.H b/src/OpenFOAM/meshes/primitiveShapes/objectHit/objectHit.H
index a7a716eb7f..dd8a081b6d 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/objectHit/objectHit.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/objectHit/objectHit.H
@@ -84,31 +84,18 @@ public:
     // Member Functions
 
         //- Is there a hit
-        bool hit() const
+        inline bool hit() const
         {
             return hit_;
         }
 
         //- Return hit object
-        label hitObject() const
+        inline label hitObject() const
         {
             return hitObject_;
         }
 
 
-    // Friend Operators
-
-        inline friend bool operator==(const objectHit& a, const objectHit& b)
-        {
-            return (a.hit_ == b.hit_) && (a.hitObject_ == b.hitObject_);
-        }
-
-        inline friend bool operator!=(const objectHit& a, const objectHit& b)
-        {
-            return !(a == b);
-        }
-
-
     // Ostream operator
 
         inline friend Ostream& operator<<(Ostream& os, const objectHit& obj)
@@ -118,6 +105,20 @@ public:
 };
 
 
+// Global Operators
+
+inline bool operator==(const objectHit& a, const objectHit& b)
+{
+    return a.hit() == b.hit() && a.hitObject() == b.hitObject();
+}
+
+
+inline bool operator!=(const objectHit& a, const objectHit& b)
+{
+    return !(a == b);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
index 99539ee2c6..05ef84af2c 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
+++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -424,6 +424,34 @@ Foam::point Foam::plane::planePlaneIntersect
 }
 
 
+Foam::point Foam::plane::somePointInPlane(const scalar dist) const
+{
+    // ax + by + cz + d = 0
+    const FixedList<scalar, 4> coeff(planeCoeffs());
+
+    // Perturb the base-point
+    point p = refPoint() + point::uniform(dist);
+
+    if (Foam::mag(coeff[2]) < SMALL)
+    {
+        if (Foam::mag(coeff[1]) < SMALL)
+        {
+            p[0] = -1.0*(coeff[1]*p[1] + coeff[2]*p[2] + coeff[3])/coeff[0];
+        }
+        else
+        {
+            p[1] = -1.0*(coeff[0]*p[0] + coeff[2]*p[2] + coeff[3])/coeff[1];
+        }
+    }
+    else
+    {
+        p[2] = -1.0*(coeff[0]*p[0] + coeff[1]*p[1] + coeff[3])/coeff[2];
+    }
+
+    return p;
+}
+
+
 Foam::plane::side Foam::plane::sideOfPlane(const point& p) const
 {
     const scalar angle((p - point_) & normal_);
@@ -459,21 +487,14 @@ void Foam::plane::writeDict(Ostream& os) const
     os.endBlock() << flush;
 }
 
-
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * //
 
 bool Foam::operator==(const plane& a, const plane& b)
 {
-    if (a.point_ == b.point_ && a.normal_ == b.normal_)
-    {
-        return true;
-    }
-    else
-    {
-        return false;
-    }
+    return (a.refPoint() == b.refPoint() && a.normal() == b.normal());
 }
 
+
 bool Foam::operator!=(const plane& a, const plane& b)
 {
     return !(a == b);
@@ -482,9 +503,9 @@ bool Foam::operator!=(const plane& a, const plane& b)
 
 // * * * * * * * * * * * * * * * Friend Functions  * * * * * * * * * * * * * //
 
-Foam::Ostream& Foam::operator<<(Ostream& os, const plane& a)
+Foam::Ostream& Foam::operator<<(Ostream& os, const plane& pln)
 {
-    os  << a.normal_ << token::SPACE << a.point_;
+    os  << pln.normal_ << token::SPACE << pln.point_;
 
     return os;
 }
diff --git a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.H b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.H
index 958d17d32d..91973a5d6b 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/plane/plane.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/plane/plane.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,7 +25,7 @@ Class
     Foam::plane
 
 Description
-    Geometric class that creates a 2D plane and can return the intersection
+    Geometric class that creates a 3D plane and can return the intersection
     point between a line and the plane.
 
 SourceFiles
@@ -49,13 +49,11 @@ namespace Foam
 // Forward declaration of friend functions and operators
 
 class plane;
-bool operator==(const plane&, const plane&);
-bool operator!=(const plane&, const plane&);
-Ostream& operator<<(Ostream&, const plane&);
+Ostream& operator<<(Ostream& os, const plane& pln);
 
 
 /*---------------------------------------------------------------------------*\
-                           Class plane Declaration
+                            Class plane Declaration
 \*---------------------------------------------------------------------------*/
 
 class plane
@@ -160,7 +158,7 @@ public:
         //- Return plane normal
         const vector& normal() const;
 
-        //- Return or return plane base point
+        //- Return plane base point
         const point& refPoint() const;
 
         //- Return coefficients for the
@@ -193,10 +191,18 @@ public:
 
         //- Return the cutting line between this plane and another.
         //  Returned as direction vector and point line goes through.
-        ray planeIntersect(const plane&) const;
+        ray planeIntersect(const plane& plane2) const;
 
         //- Return the cutting point between this plane and two other planes
-        point planePlaneIntersect(const plane&, const plane&) const;
+        point planePlaneIntersect
+        (
+            const plane& plane2,
+            const plane& plane3
+        )
+        const;
+
+        //- Return a point somewhere on the plane, a distance from the base
+        point somePointInPlane(const scalar dist = 1e-3) const;
 
         //- Return the side of the plane that the point is on.
         //  If the point is on the plane, then returns NORMAL.
@@ -206,22 +212,23 @@ public:
         point mirror(const point& p) const;
 
         //- Write to dictionary
-        void writeDict(Ostream&) const;
-
-
-    // friend Operators
-
-        friend bool operator==(const plane&, const plane&);
-        friend bool operator!=(const plane&, const plane&);
+        void writeDict(Ostream& os) const;
 
 
     // IOstream Operators
 
         //- Write plane properties
-        friend Ostream& operator<<(Ostream&, const plane&);
+        friend Ostream& operator<<(Ostream& os, const plane& pln);
+
 };
 
 
+// Global Operators
+
+bool operator==(const plane& a, const plane& b);
+bool operator!=(const plane& a, const plane& b);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramid.H b/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramid.H
index 344e587e38..5cd286d536 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramid.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramid.H
@@ -50,15 +50,15 @@ class pyramid;
 template<class Point, class PointRef, class polygonRef>
 inline Istream& operator>>
 (
-    Istream&,
-    pyramid<Point, PointRef, polygonRef>&
+    Istream& is,
+    pyramid<Point, PointRef, polygonRef>& p
 );
 
 template<class Point, class PointRef, class polygonRef>
 inline Ostream& operator<<
 (
-    Ostream&,
-    const pyramid<Point, PointRef, polygonRef>&
+    Ostream& os,
+    const pyramid<Point, PointRef, polygonRef>& p
 );
 
 
@@ -83,7 +83,7 @@ public:
         inline pyramid(polygonRef base, const Point& apex);
 
         //- Construct from Istream
-        inline pyramid(Istream&);
+        inline pyramid(Istream& is);
 
 
     // Member functions
@@ -100,27 +100,27 @@ public:
         // Properties
 
             //- Return centre (centroid)
-            inline Point centre(const pointField& points) const;
+            inline Point centre(const UList<point>& points) const;
 
             //- Return height vector
-            inline vector height(const pointField& points) const;
+            inline vector height(const UList<point>& points) const;
 
             //- Return scalar magnitude - returns volume of pyramid
-            inline scalar mag(const pointField& points) const;
+            inline scalar mag(const UList<point>& points) const;
 
 
     // IOstream operators
 
         friend Istream& operator>> <Point, PointRef, polygonRef>
         (
-            Istream&,
-            pyramid&
+            Istream& is,
+            pyramid& p
         );
 
         friend Ostream& operator<< <Point, PointRef, polygonRef>
         (
-            Ostream&,
-            const pyramid&
+            Ostream& os,
+            const pyramid& p
         );
 };
 
diff --git a/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramidI.H b/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramidI.H
index e473f8b9ad..636990dcc6 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramidI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/pyramid/pyramidI.H
@@ -67,7 +67,7 @@ inline polygonRef Foam::pyramid<Point, PointRef, polygonRef>::base() const
 template<class Point, class PointRef, class polygonRef>
 inline Point Foam::pyramid<Point, PointRef, polygonRef>::centre
 (
-    const pointField& points
+    const UList<point>& points
 ) const
 {
     return (3.0/4.0)*base_.centre(points) + (1.0/4.0)*apex_;
@@ -77,7 +77,7 @@ inline Point Foam::pyramid<Point, PointRef, polygonRef>::centre
 template<class Point, class PointRef, class polygonRef>
 inline Foam::vector Foam::pyramid<Point, PointRef, polygonRef>::height
 (
-    const pointField& points
+    const UList<point>& points
 ) const
 {
     // Height = apex - baseCentroid
@@ -88,7 +88,7 @@ inline Foam::vector Foam::pyramid<Point, PointRef, polygonRef>::height
 template<class Point, class PointRef, class polygonRef>
 inline Foam::scalar Foam::pyramid<Point, PointRef, polygonRef>::mag
 (
-    const pointField& points
+    const UList<point>& points
 ) const
 {
     return (1.0/3.0)*(base_.normal(points)&(height(points)));
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
index badea19542..2369e77ca8 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedron.H
@@ -42,7 +42,6 @@ SourceFiles
 #include "point.H"
 #include "primitiveFieldsFwd.H"
 #include "pointHit.H"
-#include "cachedRandom.H"
 #include "Random.H"
 #include "FixedList.H"
 #include "UList.H"
@@ -239,10 +238,6 @@ public:
             //  uniform distribution
             inline Point randomPoint(Random& rndGen) const;
 
-            //- Return a random point in the tetrahedron from a
-            //  uniform distribution
-            inline Point randomPoint(cachedRandom& rndGen) const;
-
             //- Calculate the barycentric coordinates of the given
             //  point, in the same order as a, b, c, d.  Returns the
             //  determinant of the solution.
diff --git a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
index 2c14d16121..d95f42dc1e 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/tetrahedron/tetrahedronI.H
@@ -249,42 +249,6 @@ inline Point Foam::tetrahedron<Point, PointRef>::randomPoint
     // Adapted from
     // http://vcg.isti.cnr.it/activities/geometryegraphics/pointintetraedro.html
 
-    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;
-    }
-
-    return (1 - s - t - u)*a_ + s*b_ + t*c_ + u*d_;
-}
-
-
-template<class Point, class PointRef>
-inline Point Foam::tetrahedron<Point, PointRef>::randomPoint
-(
-    cachedRandom& rndGen
-) const
-{
-    // Adapted from
-    // http://vcg.isti.cnr.it/activities/geometryegraphics/pointintetraedro.html
-
     scalar s = rndGen.sample01<scalar>();
     scalar t = rndGen.sample01<scalar>();
     scalar u = rndGen.sample01<scalar>();
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
index d689fa0b1e..b97483ca27 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangle.H
@@ -40,7 +40,6 @@ SourceFiles
 #include "tensor.H"
 #include "pointHit.H"
 #include "Random.H"
-#include "cachedRandom.H"
 #include "FixedList.H"
 #include "UList.H"
 #include "linePointRef.H"
@@ -173,18 +172,18 @@ public:
         inline triangle(const Point& a, const Point& b, const Point& c);
 
         //- Construct from three points
-        inline triangle(const FixedList<Point, 3>&);
+        inline triangle(const FixedList<Point, 3>& tri);
 
         //- Construct from three points in the list of points
         //  The indices could be from triFace etc.
         inline triangle
         (
-            const UList<Point>&,
+            const UList<Point>& points,
             const FixedList<label, 3>& indices
         );
 
         //- Construct from Istream
-        inline triangle(Istream&);
+        inline triangle(Istream& is);
 
 
     // Member Functions
@@ -238,10 +237,6 @@ public:
             //  distribution
             inline Point randomPoint(Random& rndGen) const;
 
-            //- Return a random point on the triangle from a uniform
-            //  distribution
-            inline Point randomPoint(cachedRandom& rndGen) const;
-
             //- Calculate the barycentric coordinates of the given
             //  point, in the same order as a, b, c.  Returns the
             //  determinant of the solution.
diff --git a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
index eee54fd92c..605e10589b 100644
--- a/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
+++ b/src/OpenFOAM/meshes/primitiveShapes/triangle/triangleI.H
@@ -249,25 +249,6 @@ inline Point Foam::triangle<Point, PointRef>::randomPoint(Random& rndGen) const
     // from "Graphics Gems", Academic Press, 1990
     // http://tog.acm.org/GraphicsGems/gems/TriPoints.c
 
-    scalar s = rndGen.scalar01();
-
-    scalar t = sqrt(rndGen.scalar01());
-
-    return (1 - t)*a_ + (1 - s)*t*b_ + s*t*c_;
-}
-
-
-template<class Point, class PointRef>
-inline Point Foam::triangle<Point, PointRef>::randomPoint
-(
-    cachedRandom& rndGen
-) const
-{
-    // Generating Random Points in Triangles
-    // by Greg Turk
-    // from "Graphics Gems", Academic Press, 1990
-    // http://tog.acm.org/GraphicsGems/gems/TriPoints.c
-
     scalar s = rndGen.sample01<scalar>();
 
     scalar t = sqrt(rndGen.sample01<scalar>());
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
index 462c318755..072e765110 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.C
@@ -555,24 +555,6 @@ Foam::label Foam::treeBoundBox::distanceCmp
 }
 
 
-// * * * * * * * * * * * * * * * Friend Operators  * * * * * * * * * * * * * //
-
-bool Foam::operator==(const treeBoundBox& a, const treeBoundBox& b)
-{
-    return operator==
-    (
-        static_cast<const boundBox&>(a),
-        static_cast<const boundBox&>(b)
-    );
-}
-
-
-bool Foam::operator!=(const treeBoundBox& a, const treeBoundBox& b)
-{
-    return !(a == b);
-}
-
-
 // * * * * * * * * * * * * * * * Ostream Operator  * * * * * * * * * * * * * //
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const treeBoundBox& bb)
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
index edc42983df..adcac28e03 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBox.H
@@ -77,10 +77,6 @@ class Random;
 // Forward declaration of friend functions and operators
 
 class treeBoundBox;
-
-bool operator==(const treeBoundBox& a, const treeBoundBox& b);
-bool operator!=(const treeBoundBox& a, const treeBoundBox& b);
-
 Istream& operator>>(Istream& is, treeBoundBox& bb);
 Ostream& operator<<(Ostream& os, const treeBoundBox& bb);
 
@@ -335,17 +331,11 @@ public:
             label distanceCmp(const point& pt, const treeBoundBox& other) const;
 
             //- Return slightly wider bounding box
-            //  Extends all dimensions with s*span*Random::scalar01()
+            //  Extends all dimensions with s*span*Random::sample01<scalar>()
             //  and guarantees in any direction s*mag(span) minimum width
             inline treeBoundBox extend(Random& rndGen, const scalar s) const;
 
 
-    // Friend Operators
-
-        friend bool operator==(const treeBoundBox& a, const treeBoundBox& b);
-        friend bool operator!=(const treeBoundBox& a, const treeBoundBox& b);
-
-
     // IOstream operator
 
         friend Istream& operator>>(Istream& is, treeBoundBox& bb);
@@ -358,6 +348,12 @@ template<>
 inline bool contiguous<treeBoundBox>() {return contiguous<boundBox>();}
 
 
+// Global Operators
+
+inline bool operator==(const treeBoundBox& a, const treeBoundBox& b);
+inline bool operator!=(const treeBoundBox& a, const treeBoundBox& b);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
index 4b073fd975..ea6cc3328a 100644
--- a/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
+++ b/src/OpenFOAM/meshes/treeBoundBox/treeBoundBoxI.H
@@ -336,11 +336,24 @@ inline Foam::treeBoundBox Foam::treeBoundBox::extend
         newSpan[dir] = Foam::max(newSpan[dir], minSpan);
     }
 
-    bb.min() -= cmptMultiply(s * rndGen.vector01(), newSpan);
-    bb.max() += cmptMultiply(s * rndGen.vector01(), newSpan);
+    bb.min() -= cmptMultiply(s*rndGen.sample01<vector>(), newSpan);
+    bb.max() += cmptMultiply(s*rndGen.sample01<vector>(), newSpan);
 
     return bb;
 }
 
 
+// * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * * //
+
+inline bool Foam::operator==(const treeBoundBox& a, const treeBoundBox& b)
+{
+    return static_cast<const boundBox&>(a) == static_cast<const boundBox&>(b);
+}
+
+
+inline bool Foam::operator!=(const treeBoundBox& a, const treeBoundBox& b)
+{
+    return !(a == b);
+}
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Pair/Pair.H b/src/OpenFOAM/primitives/Pair/Pair.H
index 1a9ab62fc8..a78397a358 100644
--- a/src/OpenFOAM/primitives/Pair/Pair.H
+++ b/src/OpenFOAM/primitives/Pair/Pair.H
@@ -70,9 +70,9 @@ public:
         }
 
         //- Construct from FixedList
-        inline Pair(const FixedList<Type, 2>& fl)
+        inline Pair(const FixedList<Type, 2>& lst)
         :
-            FixedList<Type, 2>(fl)
+            FixedList<Type, 2>(lst)
         {}
 
         //- Construct from Istream
@@ -134,18 +134,20 @@ public:
         }
 
 
+     // Comparison
+
         //- Compare Pairs
-        //  Returning:
+        //  Returns:
         //  -  0: different
-        //  - +1: identical
-        //  - -1: same pair, but reversed order
+        //  - +1: identical values and order used
+        //  - -1: identical values, but in reversed order
         static inline int compare(const Pair<Type>& a, const Pair<Type>& b)
         {
-            if (a == b)
+            if (a[0] == b[0] && a[1] == b[1])
             {
                 return 1;
             }
-            else if (a == reverse(b))
+            else if (a[0] == b[1] && a[1] == b[0])
             {
                 return -1;
             }
@@ -157,6 +159,8 @@ public:
 };
 
 
+// * * * * * * * * * * * * * * Global Operators  * * * * * * * * * * * * * * //
+
 template<class Type>
 Pair<Type> reverse(const Pair<Type>& p)
 {
@@ -167,14 +171,14 @@ Pair<Type> reverse(const Pair<Type>& p)
 template<class Type>
 bool operator==(const Pair<Type>& a, const Pair<Type>& b)
 {
-    return (a.first() == b.first() && a.second() == b.second());
+    return Pair<Type>::compare(a,b) != 0;
 }
 
 
 template<class Type>
 bool operator!=(const Pair<Type>& a, const Pair<Type>& b)
 {
-    return !(a == b);
+    return Pair<Type>::compare(a,b) == 0;
 }
 
 
diff --git a/src/OpenFOAM/primitives/Pair/labelPair.H b/src/OpenFOAM/primitives/Pair/labelPair.H
index 5b75fb503e..0e798e7b15 100644
--- a/src/OpenFOAM/primitives/Pair/labelPair.H
+++ b/src/OpenFOAM/primitives/Pair/labelPair.H
@@ -25,7 +25,13 @@ Typedef
     Foam::labelPair
 
 Description
-    Label pair
+    A pair of labels.
+
+Typedef
+    Foam::labelPairPair
+
+Description
+    A pair of labelPairs.
 
 Typedef
     Foam::labelPairList
@@ -33,20 +39,28 @@ Typedef
 Description
     List of labelPairs
 
+Typedef
+    Foam::labelPairUList
+
+Description
+    UList of labelPairs
+
 \*---------------------------------------------------------------------------*/
 
 #ifndef labelPair_H
 #define labelPair_H
 
-#include "Pair.H"
 #include "List.H"
+#include "Pair.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
     typedef Pair<label> labelPair;
+    typedef Pair<labelPair> labelPairPair;
     typedef List<labelPair> labelPairList;
+    typedef UList<labelPair> labelPairUList;
 }
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/OpenFOAM/primitives/Pair/labelPairHashes.H b/src/OpenFOAM/primitives/Pair/labelPairHashes.H
new file mode 100644
index 0000000000..df8c95993e
--- /dev/null
+++ b/src/OpenFOAM/primitives/Pair/labelPairHashes.H
@@ -0,0 +1,71 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Alias
+    Foam::LabelPairMap
+
+Description
+    A HashTable to objects of type \<T\> with a labelPair key.
+    The hashing is based on labelPair (FixedList) and is thus non-commutative.
+    For commutative hashing, an EdgeMap can be used.
+
+Typedef
+    Foam::labelPairHashSet
+
+Description
+    A HashSet for a labelPair.
+    The hashing is based on labelPair (FixedList) and is thus non-commutative.
+
+Typedef
+    Foam::labelPairLookup
+
+Description
+    This is a Map of a labelPair to a label.
+    Used for e.g. for face1, face2 to shared edge.
+    The hashing is based on labelPair (FixedList) and is thus non-commutative.
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef labelPairHashes_H
+#define labelPairHashes_H
+
+#include "HashSet.H"
+#include "labelPair.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+    template<class T>
+    using LabelPairMap = HashTable<T, labelPair, labelPair::Hash<>>;
+
+    typedef HashSet<labelPair, labelPair::Hash<>> labelPairHashSet;
+
+    typedef HashTable<label, labelPair, labelPair::Hash<>> labelPairLookup;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/Tuple2/Tuple2.H b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
index 6b556af0fa..c19b645ddf 100644
--- a/src/OpenFOAM/primitives/Tuple2/Tuple2.H
+++ b/src/OpenFOAM/primitives/Tuple2/Tuple2.H
@@ -25,7 +25,9 @@ Class
     Foam::Tuple2
 
 Description
-    A 2-tuple for storing two objects of different types.
+    A 2-tuple for storing two objects of dissimilar types.
+    The container is similar in purpose to std::pair, but does not expose
+    its members directly.
 
 See also
     Foam::Pair for storing two objects of identical types.
@@ -48,10 +50,10 @@ template<class Type1, class Type2>
 class Tuple2;
 
 template<class Type1, class Type2>
-inline Istream& operator>>(Istream&, Tuple2<Type1, Type2>&);
+inline Istream& operator>>(Istream& is, Tuple2<Type1, Type2>& t2);
 
 template<class Type1, class Type2>
-inline Ostream& operator<<(Ostream&, const Tuple2<Type1, Type2>&);
+inline Ostream& operator<<(Ostream& os, const Tuple2<Type1, Type2>& t2);
 
 
 /*---------------------------------------------------------------------------*\
@@ -66,12 +68,20 @@ class Tuple2
         Type1 f_;
         Type2 s_;
 
-
 public:
 
+    // Typedefs (cf. std::pair)
+
+        //- Type of member first, the first template parameter (Type1)
+        typedef Type1 first_type;
+
+        //- Type of member second, the second template parameter (Type2)
+        typedef Type2 second_type;
+
+
     // Constructors
 
-        //- Null constructor for lists
+        //- Null constructor for lists and hashes
         inline Tuple2()
         {}
 
@@ -164,6 +174,59 @@ inline bool operator!=
 }
 
 
+template<class Type1, class Type2>
+inline bool operator<
+(
+    const Tuple2<Type1, Type2>& a,
+    const Tuple2<Type1, Type2>& b
+)
+{
+    return
+    (
+        a.first() < b.first()
+     ||
+        (
+            !(b.first() < a.first())
+         && a.second() < b.second()
+        )
+    );
+}
+
+
+
+template<class Type1, class Type2>
+inline bool operator<=
+(
+    const Tuple2<Type1, Type2>& a,
+    const Tuple2<Type1, Type2>& b
+)
+{
+    return !(b < a);
+}
+
+
+template<class Type1, class Type2>
+inline bool operator>
+(
+    const Tuple2<Type1, Type2>& a,
+    const Tuple2<Type1, Type2>& b
+)
+{
+    return (b < a);
+}
+
+
+template<class Type1, class Type2>
+inline bool operator>=
+(
+    const Tuple2<Type1, Type2>& a,
+    const Tuple2<Type1, Type2>& b
+)
+{
+    return !(a < b);
+}
+
+
 template<class Type1, class Type2>
 inline Istream& operator>>(Istream& is, Tuple2<Type1, Type2>& t2)
 {
diff --git a/src/OpenFOAM/primitives/nullObject/nullObject.H b/src/OpenFOAM/primitives/nullObject/nullObject.H
index 71217836c1..e0ab12029e 100644
--- a/src/OpenFOAM/primitives/nullObject/nullObject.H
+++ b/src/OpenFOAM/primitives/nullObject/nullObject.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2014-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,7 +25,9 @@ Class
     Foam::nullObject
 
 Description
-    Singleton null-object class and instance
+    Singleton null-object class and instance.
+    It occupies enough space to reinterpret its content as a class with
+    a null pointer for its content.
 
 SourceFiles
     nullObjectI.H
@@ -47,20 +49,41 @@ namespace Foam
 
 class NullObject
 {
+    //- Ensure it occupies enough space to reinterpret_cast to a class
+    //  having some member data
+    const union
+    {
+        void* ptr;
+        unsigned long val;
+    } null;
+
     //- Private constructor
     NullObject()
+    :
+        null{nullptr}
     {}
 
     //- Disallow default bitwise copy construct
-    NullObject(const NullObject&);
+    NullObject(const NullObject&) = delete;
 
     //- Disallow default bitwise assignment
-    void operator=(const NullObject&);
+    void operator=(const NullObject&) = delete;
 
 public:
-
     //- The unique null object
     static const NullObject nullObject;
+
+    //- A nullptr pointer content
+    inline const void* pointer() const
+    {
+        return null.ptr;
+    }
+
+    //- A zero value content
+    inline unsigned long value() const
+    {
+        return null.val;
+    }
 };
 
 
diff --git a/src/OpenFOAM/primitives/random/Random/Random.C b/src/OpenFOAM/primitives/random/Random/Random.C
index 3fa14012c1..c17f5c2668 100644
--- a/src/OpenFOAM/primitives/random/Random/Random.C
+++ b/src/OpenFOAM/primitives/random/Random/Random.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,173 +25,237 @@ License
 
 #include "Random.H"
 #include "OSspecific.H"
+#include "PstreamReduceOps.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * private Member Functions  * * * * * * * * * * * //
 
-#if INT_MAX    != 2147483647
-#    error "INT_MAX    != 2147483647"
-#    error "The random number generator may not work!"
-#endif
+Foam::scalar Foam::Random::scalar01()
+{
+    return osRandomDouble(buffer_);
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::Random::Random(const label seed)
+:
+    buffer_(osRandomBufferSize()),
+    seed_(seed),
+    hasGaussSample_(false),
+    gaussSample_(0)
+{
+    // Initialise the random number generator
+    osRandomSeed(seed_, buffer_);
+}
+
+
+Foam::Random::Random(const Random& r, const bool reset)
+:
+    buffer_(r.buffer_),
+    seed_(r.seed_),
+    hasGaussSample_(r.hasGaussSample_),
+    gaussSample_(r.gaussSample_)
+{
+    if (reset)
+    {
+        hasGaussSample_ = false;
+        gaussSample_ = 0;
+
+        // Re-initialise the samples
+        osRandomSeed(seed_, buffer_);
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::Random::~Random()
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-Foam::Random::Random(const label seed)
+void Foam::Random::reset(const label seed)
 {
-    if (seed > 1)
-    {
-        Seed = seed;
-    }
-    else
-    {
-        Seed = 1;
-    }
-
-    osRandomSeed(Seed);
+    seed_ = seed;
+    osRandomSeed(seed_, buffer_);
 }
 
 
 int Foam::Random::bit()
 {
-    if (osRandomInteger() > INT_MAX/2)
+    return osRandomInteger(buffer_) & 1;
+}
+
+
+template<>
+Foam::scalar Foam::Random::sample01()
+{
+    return scalar01();
+}
+
+
+template<>
+Foam::label Foam::Random::sample01()
+{
+    return round(scalar01());
+}
+
+
+template<>
+Foam::scalar Foam::Random::GaussNormal()
+{
+    if (hasGaussSample_)
     {
-        return 1;
+        hasGaussSample_ = false;
+        return gaussSample_;
     }
     else
     {
-        return 0;
-    }
-}
-
-
-Foam::scalar Foam::Random::scalar01()
-{
-    return osRandomDouble();
-}
-
-
-Foam::vector Foam::Random::vector01()
-{
-    vector rndVec;
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        rndVec.component(cmpt) = scalar01();
-    }
-
-    return rndVec;
-}
-
-
-Foam::sphericalTensor Foam::Random::sphericalTensor01()
-{
-    sphericalTensor rndTen;
-    rndTen.ii() = scalar01();
-
-    return rndTen;
-}
-
-
-Foam::symmTensor Foam::Random::symmTensor01()
-{
-    symmTensor rndTen;
-    for (direction cmpt=0; cmpt<symmTensor::nComponents; cmpt++)
-    {
-        rndTen.component(cmpt) = scalar01();
-    }
-
-    return rndTen;
-}
-
-
-Foam::tensor Foam::Random::tensor01()
-{
-    tensor rndTen;
-    for (direction cmpt=0; cmpt<tensor::nComponents; cmpt++)
-    {
-        rndTen.component(cmpt) = scalar01();
-    }
-
-    return rndTen;
-}
-
-
-Foam::label Foam::Random::integer(const label lower, const label upper)
-{
-    return lower + (osRandomInteger() % (upper+1-lower));
-}
-
-
-Foam::vector Foam::Random::position(const vector& start, const vector& end)
-{
-    vector rndVec(start);
-
-    for (direction cmpt=0; cmpt<vector::nComponents; cmpt++)
-    {
-        rndVec.component(cmpt) +=
-            scalar01()*(end.component(cmpt) - start.component(cmpt));
-    }
-
-    return rndVec;
-}
-
-
-void Foam::Random::randomise(scalar& s)
-{
-     s = scalar01();
-}
-
-
-void Foam::Random::randomise(vector& v)
-{
-    v = vector01();
-}
-
-
-void Foam::Random::randomise(sphericalTensor& st)
-{
-    st = sphericalTensor01();
-}
-
-
-void Foam::Random::randomise(symmTensor& st)
-{
-    st = symmTensor01();
-}
-
-
-void Foam::Random::randomise(tensor& t)
-{
-    t = tensor01();
-}
-
-
-Foam::scalar Foam::Random::GaussNormal()
-{
-    static int iset = 0;
-    static scalar gset;
-    scalar fac, rsq, v1, v2;
-
-    if (iset == 0)
-    {
+        scalar rsq, v1, v2;
         do
         {
-            v1 = 2.0*scalar01() - 1.0;
-            v2 = 2.0*scalar01() - 1.0;
+            v1 = 2*scalar01() - 1;
+            v2 = 2*scalar01() - 1;
             rsq = sqr(v1) + sqr(v2);
-        } while (rsq >= 1.0 || rsq == 0.0);
+        } while (rsq >= 1 || rsq == 0);
 
-        fac = sqrt(-2.0*log(rsq)/rsq);
-        gset = v1*fac;
-        iset = 1;
+        scalar fac = sqrt(-2*log(rsq)/rsq);
+
+        gaussSample_ = v1*fac;
+        hasGaussSample_ = true;
 
         return v2*fac;
     }
-    else
-    {
-        iset = 0;
+}
 
-        return gset;
+
+template<>
+Foam::label Foam::Random::GaussNormal()
+{
+    return round(GaussNormal<scalar>());
+}
+
+
+template<>
+Foam::scalar Foam::Random::position
+(
+    const scalar& start,
+    const scalar& end
+)
+{
+    return start + scalar01()*(end - start);
+}
+
+
+template<>
+Foam::label Foam::Random::position(const label& start, const label& end)
+{
+    return start + round(scalar01()*(end - start));
+}
+
+
+template<>
+Foam::scalar Foam::Random::globalSample01()
+{
+    scalar value = -GREAT;
+
+    if (Pstream::master())
+    {
+        value = scalar01();
     }
+
+    Pstream::scatter(value);
+
+    return value;
+}
+
+
+template<>
+Foam::label Foam::Random::globalSample01()
+{
+    scalar value = -GREAT;
+
+    if (Pstream::master())
+    {
+        value = scalar01();
+    }
+
+    Pstream::scatter(value);
+
+    return round(value);
+}
+
+
+template<>
+Foam::scalar Foam::Random::globalGaussNormal()
+{
+    scalar value = -GREAT;
+
+    if (Pstream::master())
+    {
+        value = GaussNormal<scalar>();
+    }
+
+    Pstream::scatter(value);
+
+    return value;
+}
+
+
+template<>
+Foam::label Foam::Random::globalGaussNormal()
+{
+    scalar value = -GREAT;
+
+    if (Pstream::master())
+    {
+        value = GaussNormal<scalar>();
+    }
+
+    Pstream::scatter(value);
+
+    return round(value);
+}
+
+
+template<>
+Foam::scalar Foam::Random::globalPosition
+(
+    const scalar& start,
+    const scalar& end
+)
+{
+    scalar value = -GREAT;
+
+    if (Pstream::master())
+    {
+        value = scalar01()*(end - start);
+    }
+
+    Pstream::scatter(value);
+
+    return start + value;
+}
+
+
+template<>
+Foam::label Foam::Random::globalPosition
+(
+    const label& start,
+    const label& end
+)
+{
+    label value = labelMin;
+
+    if (Pstream::master())
+    {
+        value = round(scalar01()*(end - start));
+    }
+
+    Pstream::scatter(value);
+
+    return start + value;
 }
 
 
diff --git a/src/OpenFOAM/primitives/random/Random/Random.H b/src/OpenFOAM/primitives/random/Random/Random.H
index 1dd109a235..fb348fdafa 100644
--- a/src/OpenFOAM/primitives/random/Random/Random.H
+++ b/src/OpenFOAM/primitives/random/Random/Random.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,24 +25,29 @@ Class
     Foam::Random
 
 Description
-    Simple random number generator.
+    Random number generator.
+
 
 SourceFiles
+    RandomI.H
     Random.C
+    RandomTemplates.C
 
 \*---------------------------------------------------------------------------*/
 
 #ifndef Random_H
 #define Random_H
 
-#include "vector.H"
-#include "tensor.H"
+#include "List.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 namespace Foam
 {
 
+// Forward declaration of classes
+class Random;
+
 /*---------------------------------------------------------------------------*\
                            Class Random Declaration
 \*---------------------------------------------------------------------------*/
@@ -51,60 +56,165 @@ class Random
 {
     // Private data
 
-        label Seed;
+        //- Buffer used by re-entrant random number generator
+        List<char> buffer_;
+
+        //- Initial random number seed
+        label seed_;
+
+        //- Indicator, which tells if there is a stored gaussian sample
+        bool hasGaussSample_;
+
+        //- Stored sample value
+        scalar gaussSample_;
+
+
+    // Private Member Functions
+
+        //- Returns the current sample
+        scalar scalar01();
 
 
 public:
 
-
     // Constructors
 
-        //- Construct given seed
-        Random(const label);
+        //- Construct given seed and sample count
+        Random(const label seed = 123456);
+
+        //- Copy constructor with optional reset of sampleI
+        Random(const Random& r, const bool reset = false);
+
+
+    // Destructor
+    ~Random();
 
 
     // Member functions
 
-        int bit();
+        // Access
 
-        //- Scalar [0..1] (so including 0,1)
-        scalar scalar01();
+            //- Return const access to the initial random number seed
+            inline label seed() const;
 
-        //- Vector with every component scalar01
-        vector vector01();
+            //- Reset the random number generator seed
+            void reset(const label seed);
 
-        //- sphericalTensor with every component scalar01
-        sphericalTensor sphericalTensor01();
 
-        //- symmTensor with every component scalar01
-        symmTensor symmTensor01();
+        // Evaluation
 
-        //- Tensor with every component scalar01
-        tensor tensor01();
+            // Random numbers
 
-        //- Label [lower..upper]
-        label integer(const label lower, const label upper);
+                //- Return a random bit
+                int bit();
 
-        vector position(const vector&, const vector&);
+                //- Return a sample whose components lie in the range 0-1
+                template<class Type>
+                Type sample01();
 
-        void randomise(scalar&);
-        void randomise(vector&);
-        void randomise(sphericalTensor&);
-        void randomise(symmTensor&);
-        void randomise(tensor&);
+                //- Return a sample whose components are normally distributed
+                //  with zero mean and unity variance N(0, 1)
+                template<class Type>
+                Type GaussNormal();
 
-        //- Return a normal Gaussian randon number
-        //  with zero mean and unity variance N(0, 1)
-        scalar GaussNormal();
+                //- Return a sample between start and end
+                template<class Type>
+                Type position(const Type& start, const Type& end);
+
+                //- Randomise value in the range 0-1
+                template<class Type>
+                void randomise01(Type& value);
+
+                //- Shuffle the values in the list
+                template<class Type>
+                void shuffle(UList<Type>& values);
+
+
+            // Global random numbers - consistent across all processors
+
+                //- Return a sample whose components lie in the range 0-1
+                template<class Type>
+                Type globalSample01();
+
+                //- Return a sample whose components are normally distributed
+                //  with zero mean and unity variance N(0, 1)
+                template<class Type>
+                Type globalGaussNormal();
+
+                //- Return a sample between start and end
+                template<class Type>
+                Type globalPosition(const Type& start, const Type& end);
+
+                //- Randomise value in the range 0-1
+                template<class Type>
+                void globalRandomise01(Type& value);
 };
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// Template specialisations
+
+template<>
+scalar Random::sample01<scalar>();
+
+template<>
+label Random::sample01<label>();
+
+template<>
+scalar Random::GaussNormal<scalar>();
+
+template<>
+label Random::GaussNormal<label>();
+
+template<>
+scalar Random::position<scalar>
+(
+    const scalar& start,
+    const scalar& end
+);
+
+template<>
+label Random::position<label>(const label& start, const label& end);
+
+template<>
+scalar Random::globalSample01<scalar>();
+
+template<>
+label Random::globalSample01<label>();
+
+template<>
+scalar Random::globalGaussNormal<scalar>();
+
+template<>
+label Random::globalGaussNormal<label>();
+
+template<>
+scalar Random::globalPosition<scalar>
+(
+    const scalar& start,
+    const scalar& end
+);
+
+template<>
+label Random::globalPosition<label>(const label& start, const label& end);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
+#include "RandomI.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "RandomTemplates.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
 #endif
 
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomI.H b/src/OpenFOAM/primitives/random/Random/RandomI.H
similarity index 80%
rename from src/OpenFOAM/primitives/random/cachedRandom/cachedRandomI.H
rename to src/OpenFOAM/primitives/random/Random/RandomI.H
index 8d23cbcede..ef5734dd63 100644
--- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomI.H
+++ b/src/OpenFOAM/primitives/random/Random/RandomI.H
@@ -23,32 +23,14 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "cachedRandom.H"
+#include "Random.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-inline Foam::label Foam::cachedRandom::seed() const
+inline Foam::label Foam::Random::seed() const
 {
     return seed_;
 }
 
 
-inline const Foam::scalarList& Foam::cachedRandom::samples() const
-{
-    return samples_;
-}
-
-
-inline Foam::label Foam::cachedRandom::sampleI() const
-{
-    return sampleI_;
-}
-
-
-inline Foam::label& Foam::cachedRandom::sampleI()
-{
-    return sampleI_;
-}
-
-
 // ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C b/src/OpenFOAM/primitives/random/Random/RandomTemplates.C
similarity index 86%
rename from src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C
rename to src/OpenFOAM/primitives/random/Random/RandomTemplates.C
index 66612e765b..461c46e242 100644
--- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandomTemplates.C
+++ b/src/OpenFOAM/primitives/random/Random/RandomTemplates.C
@@ -23,13 +23,13 @@ License
 
 \*---------------------------------------------------------------------------*/
 
-#include "cachedRandom.H"
+#include "Random.H"
 #include "Pstream.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>
-Type Foam::cachedRandom::sample01()
+Type Foam::Random::sample01()
 {
     Type value;
     for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
@@ -42,7 +42,7 @@ Type Foam::cachedRandom::sample01()
 
 
 template<class Type>
-Type Foam::cachedRandom::GaussNormal()
+Type Foam::Random::GaussNormal()
 {
     Type value;
     for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
@@ -55,7 +55,7 @@ Type Foam::cachedRandom::GaussNormal()
 
 
 template<class Type>
-Type Foam::cachedRandom::position(const Type& start, const Type& end)
+Type Foam::Random::position(const Type& start, const Type& end)
 {
     Type value(start);
     for (direction cmpt=0; cmpt<pTraits<Type>::nComponents; cmpt++)
@@ -69,14 +69,14 @@ Type Foam::cachedRandom::position(const Type& start, const Type& end)
 
 
 template<class Type>
-void Foam::cachedRandom::randomise01(Type& value)
+void Foam::Random::randomise01(Type& value)
 {
     value = sample01<Type>();
 }
 
 
 template<class Type>
-void Foam::cachedRandom::shuffle(UList<Type>& values)
+void Foam::Random::shuffle(UList<Type>& values)
 {
     const label nSample = values.size();
     label posI = nSample - 1;
@@ -93,7 +93,7 @@ void Foam::cachedRandom::shuffle(UList<Type>& values)
 
 
 template<class Type>
-Type Foam::cachedRandom::globalSample01()
+Type Foam::Random::globalSample01()
 {
     Type value = -GREAT*pTraits<Type>::one;
 
@@ -109,7 +109,7 @@ Type Foam::cachedRandom::globalSample01()
 
 
 template<class Type>
-Type Foam::cachedRandom::globalGaussNormal()
+Type Foam::Random::globalGaussNormal()
 {
     Type value = -GREAT*pTraits<Type>::one;
 
@@ -125,7 +125,7 @@ Type Foam::cachedRandom::globalGaussNormal()
 
 
 template<class Type>
-Type Foam::cachedRandom::globalPosition(const Type& start, const Type& end)
+Type Foam::Random::globalPosition(const Type& start, const Type& end)
 {
     Type value = -GREAT*pTraits<Type>::one;
 
@@ -141,7 +141,7 @@ Type Foam::cachedRandom::globalPosition(const Type& start, const Type& end)
 
 
 template<class Type>
-void Foam::cachedRandom::globalRandomise01(Type& value)
+void Foam::Random::globalRandomise01(Type& value)
 {
     value = -GREAT*pTraits<Type>::one;
 
diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C
deleted file mode 100644
index e2fec45161..0000000000
--- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.C
+++ /dev/null
@@ -1,299 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-\*---------------------------------------------------------------------------*/
-
-#include "cachedRandom.H"
-#include "OSspecific.H"
-#include "PstreamReduceOps.H"
-
-// * * * * * * * * * * * * * private Member Functions  * * * * * * * * * * * //
-
-Foam::scalar Foam::cachedRandom::scalar01()
-{
-    if (sampleI_ < 0)
-    {
-        return osRandomDouble();
-    }
-
-    if (sampleI_ == samples_.size() - 1)
-    {
-        scalar s = samples_[sampleI_];
-        sampleI_ = 0;
-        return s;
-    }
-    else
-    {
-        scalar s = samples_[sampleI_];
-        sampleI_++;
-        return s;
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
-
-Foam::cachedRandom::cachedRandom(const label seed, const label count)
-:
-    seed_(1),
-    samples_(0),
-    sampleI_(-1),
-    hasGaussSample_(false),
-    gaussSample_(0)
-{
-    if (seed > 1)
-    {
-        seed_ = seed;
-    }
-
-    // Initialise samples
-    osRandomSeed(seed_);
-
-    // Samples will be cached if count > 0
-    if (count > 0)
-    {
-        samples_.setSize(count);
-        forAll(samples_, i)
-        {
-            samples_[i] = osRandomDouble();
-        }
-
-        sampleI_ = 0;
-    }
-}
-
-
-Foam::cachedRandom::cachedRandom(const cachedRandom& cr, const bool reset)
-:
-    seed_(cr.seed_),
-    samples_(cr.samples_),
-    sampleI_(cr.sampleI_),
-    hasGaussSample_(cr.hasGaussSample_),
-    gaussSample_(cr.gaussSample_)
-{
-    //if (sampleI_ == -1)
-    //{
-    //    WarningInFunction
-    //        << "Copy constructor called, but samples not being cached. "
-    //        << "This may lead to non-repeatable behaviour" << endl;
-    //
-    //}
-
-    if (reset)
-    {
-        hasGaussSample_ = false;
-        gaussSample_ = 0;
-
-        if (samples_.size())
-        {
-            sampleI_ = 0;
-        }
-        else
-        {
-            // Re-initialise the samples
-            osRandomSeed(seed_);
-        }
-    }
-}
-
-
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-Foam::cachedRandom::~cachedRandom()
-{}
-
-
-// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
-
-template<>
-Foam::scalar Foam::cachedRandom::sample01()
-{
-    return scalar01();
-}
-
-
-template<>
-Foam::label Foam::cachedRandom::sample01()
-{
-    return round(scalar01());
-}
-
-
-template<>
-Foam::scalar Foam::cachedRandom::GaussNormal()
-{
-    if (hasGaussSample_)
-    {
-        hasGaussSample_ = false;
-        return gaussSample_;
-    }
-    else
-    {
-        scalar rsq, v1, v2;
-        do
-        {
-            v1 = 2*scalar01() - 1;
-            v2 = 2*scalar01() - 1;
-            rsq = sqr(v1) + sqr(v2);
-        } while (rsq >= 1 || rsq == 0);
-
-        scalar fac = sqrt(-2*log(rsq)/rsq);
-
-        gaussSample_ = v1*fac;
-        hasGaussSample_ = true;
-
-        return v2*fac;
-    }
-}
-
-
-template<>
-Foam::label Foam::cachedRandom::GaussNormal()
-{
-    return round(GaussNormal<scalar>());
-}
-
-
-template<>
-Foam::scalar Foam::cachedRandom::position
-(
-    const scalar& start,
-    const scalar& end
-)
-{
-    return start + scalar01()*(end - start);
-}
-
-
-template<>
-Foam::label Foam::cachedRandom::position(const label& start, const label& end)
-{
-    return start + round(scalar01()*(end - start));
-}
-
-
-template<>
-Foam::scalar Foam::cachedRandom::globalSample01()
-{
-    scalar value = -GREAT;
-
-    if (Pstream::master())
-    {
-        value = scalar01();
-    }
-
-    Pstream::scatter(value);
-
-    return value;
-}
-
-
-template<>
-Foam::label Foam::cachedRandom::globalSample01()
-{
-    scalar value = -GREAT;
-
-    if (Pstream::master())
-    {
-        value = scalar01();
-    }
-
-    Pstream::scatter(value);
-
-    return round(value);
-}
-
-
-template<>
-Foam::scalar Foam::cachedRandom::globalGaussNormal()
-{
-    scalar value = -GREAT;
-
-    if (Pstream::master())
-    {
-        value = GaussNormal<scalar>();
-    }
-
-    Pstream::scatter(value);
-
-    return value;
-}
-
-
-template<>
-Foam::label Foam::cachedRandom::globalGaussNormal()
-{
-    scalar value = -GREAT;
-
-    if (Pstream::master())
-    {
-        value = GaussNormal<scalar>();
-    }
-
-    Pstream::scatter(value);
-
-    return round(value);
-}
-
-
-template<>
-Foam::scalar Foam::cachedRandom::globalPosition
-(
-    const scalar& start,
-    const scalar& end
-)
-{
-    scalar value = -GREAT;
-
-    if (Pstream::master())
-    {
-        value = scalar01()*(end - start);
-    }
-
-    Pstream::scatter(value);
-
-    return start + value;
-}
-
-
-template<>
-Foam::label Foam::cachedRandom::globalPosition
-(
-    const label& start,
-    const label& end
-)
-{
-    label value = labelMin;
-
-    if (Pstream::master())
-    {
-        value = round(scalar01()*(end - start));
-    }
-
-    Pstream::scatter(value);
-
-    return start + value;
-}
-
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H b/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H
deleted file mode 100644
index a42034284a..0000000000
--- a/src/OpenFOAM/primitives/random/cachedRandom/cachedRandom.H
+++ /dev/null
@@ -1,238 +0,0 @@
-/*---------------------------------------------------------------------------*\
-  =========                 |
-  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
-   \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
--------------------------------------------------------------------------------
-License
-    This file is part of OpenFOAM.
-
-    OpenFOAM is free software: you can redistribute it and/or modify it
-    under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
-    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-    for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
-
-Class
-    Foam::cachedRandom
-
-Description
-    Random number generator.
-
-    Pre-computes and caches samples on construction, so that when sample01()
-    is called, the function simply returns the next (pre-computed) sample. On
-    reaching the last sample, the sample sequence is repeated.
-
-    Constructed using a seed and sample count. If the supplied count is
-    negative, no caching is performed, and a new sample is generated on each
-    call to sample01().
-
-    Note: the copy constructor cannot be used if count = -1.
-
-SourceFiles
-    cachedRandomI.H
-    cachedRandom.C
-    cachedRandomTemplates.C
-
-\*---------------------------------------------------------------------------*/
-
-#ifndef cachedRandom_H
-#define cachedRandom_H
-
-#include "scalarList.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
-// Forward declaration of classes
-class cachedRandom;
-
-/*---------------------------------------------------------------------------*\
-                       Class cachedRandom Declaration
-\*---------------------------------------------------------------------------*/
-
-class cachedRandom
-{
-    // Private data
-
-        //- Initial random number seed
-        label seed_;
-
-        //- List of scalar samples
-        scalarList samples_;
-
-        //- Current sample marker
-        label sampleI_;
-
-        //- Indicator, which tells if there is a stored gaussian sample
-        bool hasGaussSample_;
-
-        //- Stored sample value
-        scalar gaussSample_;
-
-
-    // Private Member Functions
-
-        //- Returns the current sample
-        scalar scalar01();
-
-
-public:
-
-    // Constructors
-
-        //- Construct given seed and sample count
-        cachedRandom(const label seed, const label count);
-
-        //- Copy constructor with optional reset of sampleI
-        cachedRandom(const cachedRandom& cr, const bool reset = false);
-
-
-    // Destructor
-    ~cachedRandom();
-
-
-    // Member functions
-
-        // Access
-
-            //- Return const access to the initial random number seed
-            inline label seed() const;
-
-            //- Return const access to the list of samples
-            inline const scalarList& samples() const;
-
-            //- Return the current sample marker
-            inline label sampleI() const;
-
-
-        // Manipulation
-
-            //- Return non-const access to the sample marker
-            inline label& sampleI();
-
-
-        // Evaluation
-
-            // Random numbers
-
-                //- Return a sample whose components lie in the range 0-1
-                template<class Type>
-                Type sample01();
-
-                //- Return a sample whose components are normally distributed
-                //  with zero mean and unity variance N(0, 1)
-                template<class Type>
-                Type GaussNormal();
-
-                //- Return a sample between start and end
-                template<class Type>
-                Type position(const Type& start, const Type& end);
-
-                //- Randomise value in the range 0-1
-                template<class Type>
-                void randomise01(Type& value);
-
-                //- Shuffle the values in the list
-                template<class Type>
-                void shuffle(UList<Type>& values);
-
-
-            // Global random numbers - consistent across all processors
-
-                //- Return a sample whose components lie in the range 0-1
-                template<class Type>
-                Type globalSample01();
-
-                //- Return a sample whose components are normally distributed
-                //  with zero mean and unity variance N(0, 1)
-                template<class Type>
-                Type globalGaussNormal();
-
-                //- Return a sample between start and end
-                template<class Type>
-                Type globalPosition(const Type& start, const Type& end);
-
-                //- Randomise value in the range 0-1
-                template<class Type>
-                void globalRandomise01(Type& value);
-};
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-// Template specialisations
-
-template<>
-scalar cachedRandom::sample01<scalar>();
-
-template<>
-label cachedRandom::sample01<label>();
-
-template<>
-scalar cachedRandom::GaussNormal<scalar>();
-
-template<>
-label cachedRandom::GaussNormal<label>();
-
-template<>
-scalar cachedRandom::position<scalar>
-(
-    const scalar& start,
-    const scalar& end
-);
-
-template<>
-label cachedRandom::position<label>(const label& start, const label& end);
-
-template<>
-scalar cachedRandom::globalSample01<scalar>();
-
-template<>
-label cachedRandom::globalSample01<label>();
-
-template<>
-scalar cachedRandom::globalGaussNormal<scalar>();
-
-template<>
-label cachedRandom::globalGaussNormal<label>();
-
-template<>
-scalar cachedRandom::globalPosition<scalar>
-(
-    const scalar& start,
-    const scalar& end
-);
-
-template<>
-label cachedRandom::globalPosition<label>(const label& start, const label& end);
-
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#include "cachedRandomI.H"
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#ifdef NoRepository
-#   include "cachedRandomTemplates.C"
-#endif
-
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-#endif
-
-// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
index 2bf9810f6c..38349e92b2 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.C
@@ -29,7 +29,12 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-int Foam::labelRange::debug(::Foam::debug::debugSwitch("labelRange", 0));
+namespace Foam
+{
+int labelRange::debug(debug::debugSwitch("labelRange", 0));
+}
+
+const Foam::labelRange Foam::labelRange::null;
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -49,11 +54,17 @@ void Foam::labelRange::adjust()
 {
     if (start_ < 0)
     {
-        size_ += start_;
+        if (size_ <= 0)
+        {
+            size_ = 0;
+        }
+        else
+        {
+            size_ += start_;
+        }
         start_ = 0;
     }
-
-    if (size_ < 0)
+    else if (size_ < 0)
     {
         size_ = 0;
     }
@@ -62,22 +73,21 @@ void Foam::labelRange::adjust()
 
 bool Foam::labelRange::overlaps(const labelRange& range, bool touches) const
 {
-    const label final = touches ? 1 : 0;
+    const label extra = touches ? 1 : 0;
 
     return
     (
-        this->size()
-     && range.size()
+        this->size() && range.size()
      &&
         (
             (
                 range.first() >= this->first()
-             && range.first() <= this->last() + final
+             && range.first() <= this->last() + extra
             )
          ||
             (
                 this->first() >= range.first()
-             && this->first() <= range.last() + final
+             && this->first() <= range.last() + extra
             )
         )
     );
@@ -91,35 +101,78 @@ Foam::labelRange Foam::labelRange::join(const labelRange& range) const
     {
         return *this;
     }
-    else if (!range.size_)
+    else if (!range.size())
     {
         return range;
     }
 
     const label lower = Foam::min(this->first(), range.first());
     const label upper = Foam::max(this->last(),  range.last());
-    const label sz = upper - lower + 1;
+    const label total = upper+1 - lower;
+    // last = start+size-1
+    // size = last+1-start
 
-    return labelRange(lower, sz);
+    return labelRange(lower, total);
 }
 
 
-// * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
-
-void Foam::labelRange::operator+=(const labelRange& rhs)
+Foam::labelRange Foam::labelRange::subset(const labelRange& range) const
 {
-    if (!size_)
-    {
-        // trivial case
-        operator=(rhs);
-    }
-    else if (rhs.size_)
-    {
-        const label lower = Foam::min(this->first(), rhs.first());
-        const label upper = Foam::max(this->last(),  rhs.last());
+    const label lower = Foam::max(this->first(), range.first());
+    const label upper = Foam::min(this->last(),  range.last());
+    const label total = upper+1 - lower;
+    // last = start+size-1
+    // size = last+1-start
 
-        start_ = lower;
-        size_  = upper - lower + 1;
+    if (total > 0)
+    {
+        return labelRange(lower, total);
+    }
+    else
+    {
+        return labelRange();
+    }
+}
+
+
+Foam::labelRange Foam::labelRange::subset
+(
+    const label start,
+    const label size
+) const
+{
+    const label lower = Foam::max(this->start(), start);
+    const label upper = Foam::min(this->last(),  start+Foam::max(0,size-1));
+    const label total = upper+1 - lower;
+    // last = start+size-1
+    // size = last+1-start
+
+    if (total > 0)
+    {
+        return labelRange(lower, total);
+    }
+    else
+    {
+        return labelRange();
+    }
+}
+
+
+Foam::labelRange Foam::labelRange::subset0(const label size) const
+{
+    const label lower = Foam::max(this->start(), 0);
+    const label upper = Foam::min(this->last(),  Foam::max(0,size-1));
+    const label total = upper+1 - lower;
+    // last = start+size-1
+    // size = last+1-start
+
+    if (total > 0)
+    {
+        return labelRange(lower, total);
+    }
+    else
+    {
+        return labelRange();
     }
 }
 
@@ -148,7 +201,7 @@ Foam::Ostream& Foam::operator<<(Ostream& os, const labelRange& range)
 {
     // Write ASCII only for now
     os  << token::BEGIN_LIST
-        << range.start_ << token::SPACE << range.size_
+        << range.start() << token::SPACE << range.size()
         << token::END_LIST;
 
     os.check("operator<<(Ostream&, const labelRange&)");
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
index 3fa69c4ff3..dc3483c109 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRange.H
@@ -25,7 +25,7 @@ Class
     Foam::labelRange
 
 Description
-    A range of labels.
+    A range of labels defined by a start and a size.
 
 SourceFiles
     labelRange.C
@@ -35,6 +35,7 @@ SourceFiles
 #define labelRange_H
 
 #include "label.H"
+#include <iterator>
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,31 +64,33 @@ class labelRange
 
 public:
 
-    static int debug;
+    // Static Data Members
+
+        static int debug;
+
+        //- An empty range with start=0, size=0.
+        static const labelRange null;
 
 
-    // Public classes
+    // STL type definitions similar to what UList has
 
-        //- Less function class for sorting labelRange
-        class less
-        {
-        public:
+        //- Type of values the range contains
+        typedef label value_type;
 
-            bool operator()(const labelRange& a, const labelRange& b)
-            {
-                return a.operator<(b);
-            }
-        };
+        //- The type that can represent the size of the range
+        typedef label size_type;
+
+        // Forward declaration
+        class const_iterator;
 
 
     // Constructors
 
-        //- Construct an empty range with zero as start and size.
+        //- An empty range with zero for start/size.
         inline labelRange();
 
-        //- Construct a range from start and size.
+        //- Construct a range from start/size, enforcing non-negative size.
         //  Optionally adjust the start to avoid any negative indices.
-        //  Always reduce a negative size to zero.
         inline labelRange
         (
             const label start,
@@ -99,14 +102,29 @@ public:
         labelRange(Istream& is);
 
 
+    // Static Member Functions
+
+        //- An identity range with range[i] == i.
+        inline static labelRange identity(const label len);
+
+
     // Member Functions
 
-        //- Alias for setSize(const label)
-        inline void resize(const label n);
+        //- Adjust start position
+        inline void setStart(const label i);
 
         //- Adjust size
         inline void setSize(const label n);
 
+        //- Alias for setSize()
+        inline void resize(const label n);
+
+        //- Decrease the size by 1, but never below 0.
+        inline void decrement();
+
+        //- Increase the size by 1.
+        inline void increment();
+
         //- Reset to zero start and zero size
         inline void clear();
 
@@ -116,21 +134,29 @@ public:
         //- Adjust the start to avoid any negative indices
         void adjust();
 
-        //- Is the range valid (non-empty)?
+        //- Is the range non-empty?
         inline bool valid() const;
 
-        //- Return the effective size of the range
+        //- The (inclusive) lower value of the range
+        inline label start() const;
+
+        //- The effective size of the range
         inline label size() const;
 
-        //- The (inclusive) lower value of the range
+        //- The (inclusive) lower value of the range - same as start
         inline label first() const;
 
         //- The (inclusive) upper value of the range
         inline label last() const;
 
-        //- Reset start and size.
+        //- The value before the start of the range
+        inline label before() const;
+
+        //- The value after the last element in the range
+        inline label after() const;
+
+        //- Reset start and size, enforcing non-negative size.
         //  Optionally adjust the start to avoid any negative indices.
-        //  Always reduce a negative size to zero.
         //  Return true if the updated range valid (non-empty).
         inline bool reset
         (
@@ -139,8 +165,8 @@ public:
             const bool adjustStart = false
         );
 
-        //- Return true if the value is within the range
-        inline bool contains(const label value) const;
+        //- Return true if the value is located the range
+        inline bool found(const label value) const;
 
         //- Return true if the ranges overlap.
         //  Optional test for ranges that also just touch each other
@@ -150,73 +176,88 @@ public:
         //  A prior overlaps() check can be used to avoid squashing gaps.
         labelRange join(const labelRange& range) const;
 
+        //- Calculate the intersection of the range with another.
+        //  If there is no intersection, it returns an empty range with zero
+        //  for start/size.
+        labelRange subset(const labelRange& range) const;
+
+        //- Calculate the intersection with the given start/size range.
+        //  If there is no intersection, it returns an empty range with zero
+        //  for start/size.
+        labelRange subset(const label start, const label size) const;
+
+        //- Calculate the intersection with the given 0/size range.
+        //  If there is no intersection, it returns an empty range with zero
+        //  for start/size.
+        labelRange subset0(const label size) const;
+
 
     // Member Operators
 
-        //- Return element in range, no bounds checking
-        inline label operator[](const label i) const;
+        //- Return element in the range, no bounds checking
+        inline label operator[](const label localIndex) const;
 
-        //- Comparison function for sorting, compares the start.
-        //  If the start values are equal, also compares the size.
-        inline bool operator<(const labelRange& rhs) const;
+        //- Return const_iterator to element in the range
+        inline const_iterator operator()(const label localIndex) const;
 
-        //- Join ranges, squashing any gaps in between
-        //  A prior overlaps() check can be used to avoid squashing gaps.
-        void operator+=(const labelRange& rhs);
+        //- Increase the size by 1.
+        inline label operator++();
+        inline label operator++(int);
 
-        inline bool operator==(const labelRange& rhs) const;
-        inline bool operator!=(const labelRange& rhs) const;
+        //- Decrease the size by 1, but never below 0.
+        inline label operator--();
+        inline label operator--(int);
 
 
     // STL iterator
 
-        //- An STL const_iterator
+        //- Forward iterator with const access
         class const_iterator
+        :
+            public std::iterator
+            <
+                std::input_iterator_tag,
+                label,
+                label,
+                const label*,
+                const label&
+            >
         {
-            friend class labelRange;
-
-            // Private data
-
-                //- Reference to the range for which this is an iterator
-                const labelRange& range_;
-
-                //- Current index
-                label index_;
-
-
-            // Constructors
-
-                //- Construct from range at 'begin' or 'end' position
-                inline const_iterator
-                (
-                    const labelRange& range,
-                    const bool endIter = false
-                );
+            //- The current (global) value
+            label value_;
 
         public:
 
-            // Member operators
+          // Constructors
 
-                inline bool operator==(const const_iterator& iter) const;
-                inline bool operator!=(const const_iterator& iter) const;
+            //- Construct from range at given local index.
+            //  A negative index is invalid and corresponds to the 'end'
+            inline const_iterator(const labelRange* range, const label i=0);
 
-                inline label operator*() const;
-                inline label operator()() const;
+          // Member operators
 
-                inline const_iterator& operator++();
-                inline const_iterator operator++(int);
+            //- Return the current (global) value
+            inline label operator*() const;
+
+            inline const_iterator& operator++();
+            inline const_iterator operator++(int);
+
+            inline bool operator==(const const_iterator& iter) const;
+            inline bool operator!=(const const_iterator& iter) const;
         };
 
 
         //- A const_iterator set to the beginning of the range
+        //  The value returned is guaranteed to be the same as start()
+        inline const_iterator begin() const;
+
+        //- A const_iterator set to the beginning of the range
+        //  The value returned is guaranteed to be the same as start()
         inline const_iterator cbegin() const;
 
         //- A const_iterator set to beyond the end of the range
         inline const const_iterator cend() const;
 
-        //- A const_iterator set to the beginning of the range
-        inline const_iterator begin() const;
-
         //- A const_iterator set to beyond the end of the range
         inline const const_iterator end() const;
 
@@ -229,6 +270,51 @@ public:
 };
 
 
+// Global Operators
+
+inline bool operator==(const labelRange& a, const labelRange& b)
+{
+    return (a.first() == b.first() && a.size() == b.size());
+}
+
+inline bool operator!=(const labelRange& a, const labelRange& b)
+{
+    return !(a == b);
+}
+
+
+//- Comparison function for sorting, compares the start.
+//  If the start values are equal, also compares the size.
+inline bool operator<(const labelRange& a, const labelRange& b)
+{
+    return
+    (
+        a.first() < b.first()
+     ||
+        (
+            !(b.first() < a.first())
+         && a.size() < b.size()
+        )
+    );
+}
+
+inline bool operator<=(const labelRange& a, const labelRange& b)
+{
+    return !(b < a);
+}
+
+
+inline bool operator>(const labelRange& a, const labelRange& b)
+{
+    return (b < a);
+}
+
+inline bool operator>=(const labelRange& a, const labelRange& b)
+{
+    return !(a < b);
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H
index 927a6f57a0..dc0e90ae85 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRangeI.H
@@ -60,49 +60,28 @@ inline Foam::labelRange::labelRange
 
 inline Foam::labelRange::const_iterator::const_iterator
 (
-    const labelRange& range,
-    const bool endIter
+    const labelRange* range,
+    const label i
 )
 :
-   range_(range),
-   index_(endIter ? range_.size() : 0)
+    value_
+    (
+        range->start()
+      + ((i < 0 || i > range->size()) ? range->size() : i)
+    )
 {}
 
 
-inline bool Foam::labelRange::const_iterator::operator==
-(
-    const const_iterator& iter
-) const
-{
-    return (this->index_ == iter.index_);
-}
-
-
-inline bool Foam::labelRange::const_iterator::operator!=
-(
-    const const_iterator& iter
-) const
-{
-    return (this->index_ != iter.index_);
-}
-
-
 inline Foam::label Foam::labelRange::const_iterator::operator*() const
 {
-    return range_[index_];
-}
-
-
-inline Foam::label Foam::labelRange::const_iterator::operator()() const
-{
-    return range_[index_];
+    return value_;
 }
 
 
 inline Foam::labelRange::const_iterator&
 Foam::labelRange::const_iterator::operator++()
 {
-    ++index_;
+    ++value_;
     return *this;
 }
 
@@ -111,51 +90,90 @@ inline Foam::labelRange::const_iterator
 Foam::labelRange::const_iterator::operator++(int)
 {
     const_iterator old = *this;
-    ++index_;
+    ++value_;
     return old;
 }
 
 
-inline Foam::labelRange::const_iterator Foam::labelRange::cbegin() const
+inline bool Foam::labelRange::const_iterator::operator==
+(
+    const const_iterator& iter
+) const
 {
-    return const_iterator(*this);
+    return (this->value_ == iter.value_);
 }
 
 
-inline const Foam::labelRange::const_iterator Foam::labelRange::cend() const
+inline bool Foam::labelRange::const_iterator::operator!=
+(
+    const const_iterator& iter
+) const
 {
-    return const_iterator(*this, true);
+    return (this->value_ != iter.value_);
 }
 
 
 inline Foam::labelRange::const_iterator Foam::labelRange::begin() const
 {
-    return const_iterator(*this);
+    return const_iterator(this, 0);
+}
+
+
+inline Foam::labelRange::const_iterator Foam::labelRange::cbegin() const
+{
+    return const_iterator(this, 0);
 }
 
 
 inline const Foam::labelRange::const_iterator Foam::labelRange::end() const
 {
-    return const_iterator(*this, true);
+    return const_iterator(this, -1);
+}
+
+
+inline const Foam::labelRange::const_iterator Foam::labelRange::cend() const
+{
+    return const_iterator(this, -1);
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+inline Foam::labelRange Foam::labelRange::identity(const label len)
+{
+    return labelRange(0, len);
+}
+
+
+inline void Foam::labelRange::setStart(const label i)
+{
+    start_ = i;
+}
+
+
+inline void Foam::labelRange::setSize(const label n)
+{
+    size_ = n;
+    if (size_ < 0) size_ = 0;
+}
+
+
 inline void Foam::labelRange::resize(const label n)
 {
     setSize(n);
 }
 
 
-inline void Foam::labelRange::setSize(const label n)
+inline void Foam::labelRange::decrement()
 {
-    size_ = n;
+    --size_;
+    if (size_ < 0) size_ = 0;
+}
 
-    if (size_ < 0)
-    {
-        size_ = 0;
-    }
+
+inline void Foam::labelRange::increment()
+{
+    ++size_;
 }
 
 
@@ -183,6 +201,12 @@ inline Foam::label Foam::labelRange::size() const
 }
 
 
+inline Foam::label Foam::labelRange::start() const
+{
+    return start_;
+}
+
+
 inline Foam::label Foam::labelRange::first() const
 {
     return start_;
@@ -195,6 +219,18 @@ inline Foam::label Foam::labelRange::last() const
 }
 
 
+inline Foam::label Foam::labelRange::before() const
+{
+    return start_ - 1;
+}
+
+
+inline Foam::label Foam::labelRange::after() const
+{
+    return start_ + size_;
+}
+
+
 inline bool Foam::labelRange::reset
 (
     const label start,
@@ -220,39 +256,51 @@ inline bool Foam::labelRange::reset
 }
 
 
-inline bool Foam::labelRange::contains(const label value) const
+inline bool Foam::labelRange::found(const label value) const
 {
-    return value >= this->first() && value <= this->last();
+    return (value >= this->first() && value <= this->last());
 }
 
 
 // * * * * * * * * * * * * * * * Member Operators  * * * * * * * * * * * * * //
 
-inline Foam::label Foam::labelRange::operator[](const label i) const
+inline Foam::label Foam::labelRange::operator[](const label localIndex) const
 {
-    return start_ + i;
+    return start_ + localIndex;
 }
 
 
-inline bool Foam::labelRange::operator<(const labelRange& rhs) const
+inline Foam::labelRange::const_iterator
+Foam::labelRange::operator()(const label localIndex) const
 {
-    return
-    (
-        this->first() < rhs.first()
-     || (this->first() == rhs.first() && this->size() < rhs.size())
-    );
+    return const_iterator(this, localIndex);
 }
 
 
-inline bool Foam::labelRange::operator==(const labelRange& rhs) const
+inline Foam::label Foam::labelRange::operator++()
 {
-    return start_ == rhs.start_ && size_ == rhs.size_;
+    return ++size_;
 }
 
 
-inline bool Foam::labelRange::operator!=(const labelRange& rhs) const
+inline Foam::label Foam::labelRange::operator++(int)
 {
-    return !(operator==(rhs));
+    return size_++;
+}
+
+
+inline Foam::label Foam::labelRange::operator--()
+{
+    decrement();
+    return size_;
+}
+
+
+inline Foam::label Foam::labelRange::operator--(int)
+{
+    const label old = size_;
+    decrement();
+    return old;
 }
 
 
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C b/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C
index d9edff0e47..e1a2258f45 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.C
@@ -44,7 +44,7 @@ void Foam::labelRanges::insertBefore
             << *this << endl;
     }
 
-    ParentType::setSize(nElem+1);
+    StorageContainer::setSize(nElem+1);
 
     if (labelRange::debug)
     {
@@ -58,7 +58,7 @@ void Foam::labelRanges::insertBefore
             Info<<"copy from " << (i) << " to " << (i+1) << nl;
         }
 
-        ParentType::operator[](i+1) = ParentType::operator[](i);
+        StorageContainer::operator[](i+1) = StorageContainer::operator[](i);
     }
 
     // finally insert the range
@@ -66,7 +66,7 @@ void Foam::labelRanges::insertBefore
     {
         Info<< "finally insert the range at " << insert << nl;
     }
-    ParentType::operator[](insert) = range;
+    StorageContainer::operator[](insert) = range;
 }
 
 
@@ -76,18 +76,19 @@ void Foam::labelRanges::purgeEmpty()
     label nElem = 0;
     forAll(*this, elemI)
     {
-        if (!ParentType::operator[](elemI).empty())
+        if (!StorageContainer::operator[](elemI).empty())
         {
             if (nElem != elemI)
             {
-                ParentType::operator[](nElem) = ParentType::operator[](elemI);
+                StorageContainer::operator[](nElem) =
+                    StorageContainer::operator[](elemI);
             }
             ++nElem;
         }
     }
 
     // truncate
-    this->ParentType::setSize(nElem);
+    this->StorageContainer::setSize(nElem);
 }
 
 
@@ -134,20 +135,20 @@ bool Foam::labelRanges::add(const labelRange& range)
     // find the correct place for insertion
     forAll(*this, elemI)
     {
-        labelRange& currRange = ParentType::operator[](elemI);
+        labelRange& currRange = StorageContainer::operator[](elemI);
 
         if (currRange.overlaps(range, true))
         {
             // absorb into the existing (adjacent/overlapping) range
-            currRange += range;
+            currRange.join(range);
 
             // might connect with the next following range(s)
             for (; elemI < this->size()-1; ++elemI)
             {
-                labelRange& nextRange = ParentType::operator[](elemI+1);
+                labelRange& nextRange = StorageContainer::operator[](elemI+1);
                 if (currRange.overlaps(nextRange, true))
                 {
-                    currRange += nextRange;
+                    currRange.join(nextRange);
                     nextRange.clear();
                 }
                 else
@@ -187,7 +188,7 @@ bool Foam::labelRanges::remove(const labelRange& range)
 
     forAll(*this, elemI)
     {
-        labelRange& currRange = ParentType::operator[](elemI);
+        labelRange& currRange = StorageContainer::operator[](elemI);
 
         if (range.first() > currRange.first())
         {
@@ -290,14 +291,14 @@ bool Foam::labelRanges::remove(const labelRange& range)
 
 Foam::Istream& Foam::operator>>(Istream& is, labelRanges& ranges)
 {
-    is  >> static_cast<labelRanges::ParentType&>(ranges);
+    is  >> static_cast<labelRanges::StorageContainer&>(ranges);
     return is;
 }
 
 
 Foam::Ostream& Foam::operator<<(Ostream& os, const labelRanges& ranges)
 {
-    os  << static_cast<const labelRanges::ParentType&>(ranges);
+    os  << static_cast<const labelRanges::StorageContainer&>(ranges);
     return os;
 }
 
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.H
index 134acb0482..4a7019cbb9 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRanges.H
@@ -62,7 +62,7 @@ class labelRanges
 {
     // Private typedefs for convenience
 
-        typedef DynamicList<labelRange> ParentType;
+        typedef DynamicList<labelRange> StorageContainer;
 
 
     // Private Member Functions
@@ -99,8 +99,8 @@ public:
         //- Return true if the list is empty
         using DynamicList<labelRange>::empty;
 
-        //- Return true if the value is within any of the ranges
-        inline bool contains(const label value) const;
+        //- Return true if the value is found any of the sub-ranges
+        inline bool found(const label value) const;
 
         //- Add the range to the list
         bool add(const labelRange& range);
@@ -116,38 +116,35 @@ public:
         {
             friend class labelRanges;
 
-            // Private data
+          // Private data
 
-                //- Reference to the list for which this is an iterator
-                const labelRanges& list_;
+            //- Reference to the list for which this is an iterator
+            const labelRanges* list_;
 
-                //- Current list index
-                label index_;
+            //- Current list-index
+            label index_;
 
-                //- Index of current element at listIndex
-                label subIndex_;
+            //- Index of current element at list-index
+            label subIndex_;
 
-            // Constructors
+          // Constructors
 
-                //- Construct from ranges at 'begin' or 'end' position
-                inline const_iterator
-                (
-                    const labelRanges& lst,
-                    const bool endIter = false
-                );
+            //- Construct from ranges at given index.
+            //  A negative index signals the 'end' position
+            inline const_iterator(const labelRanges* lst, const label i);
 
         public:
 
-            // Member operators
+          // Member operators
 
-                inline bool operator==(const const_iterator& iter) const;
-                inline bool operator!=(const const_iterator& iter) const;
+            inline bool operator==(const const_iterator& iter) const;
+            inline bool operator!=(const const_iterator& iter) const;
 
-                inline label operator*();
-                inline label operator()();
+            //- Return the current label
+            inline label operator*();
 
-                inline const_iterator& operator++();
-                inline const_iterator operator++(int);
+            inline const_iterator& operator++();
+            inline const_iterator operator++(int);
         };
 
 
diff --git a/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H b/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H
index 9ccad0e300..55a1f00df7 100644
--- a/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H
+++ b/src/OpenFOAM/primitives/ranges/labelRange/labelRangesI.H
@@ -28,13 +28,13 @@ License
 
 inline Foam::labelRanges::labelRanges()
 :
-    ParentType()
+    StorageContainer()
 {}
 
 
 inline Foam::labelRanges::labelRanges(const label nElem)
 :
-    ParentType(nElem)
+    StorageContainer(nElem)
 {}
 
 
@@ -42,12 +42,12 @@ inline Foam::labelRanges::labelRanges(const label nElem)
 
 inline Foam::labelRanges::const_iterator::const_iterator
 (
-    const labelRanges& lst,
-    const bool endIter
+    const labelRanges* lst,
+    const label i
 )
 :
     list_(lst),
-    index_(endIter ? lst.size() : 0),
+    index_(i < 0 ? lst->size() : i),
     subIndex_(0)
 {}
 
@@ -76,20 +76,14 @@ inline bool Foam::labelRanges::const_iterator::operator!=
 
 inline Foam::label Foam::labelRanges::const_iterator::operator*()
 {
-    return list_[index_][subIndex_];
-}
-
-
-inline Foam::label Foam::labelRanges::const_iterator::operator()()
-{
-    return list_[index_][subIndex_];
+    return list_->operator[](index_)[subIndex_];
 }
 
 
 inline Foam::labelRanges::const_iterator&
 Foam::labelRanges::const_iterator::operator++()
 {
-    if (++subIndex_ >= list_[index_].size())
+    if (++subIndex_ >= list_->operator[](index_).size())
     {
         // Next sub-list
         ++index_;
@@ -111,35 +105,35 @@ Foam::labelRanges::const_iterator::operator++(int)
 
 inline Foam::labelRanges::const_iterator Foam::labelRanges::cbegin() const
 {
-    return const_iterator(*this);
+    return const_iterator(this, 0);
 }
 
 
 inline const Foam::labelRanges::const_iterator Foam::labelRanges::cend() const
 {
-    return const_iterator(*this, true);
+    return const_iterator(this, -1);
 }
 
 
 inline Foam::labelRanges::const_iterator Foam::labelRanges::begin() const
 {
-    return const_iterator(*this);
+    return const_iterator(this, 0);
 }
 
 
 inline const Foam::labelRanges::const_iterator Foam::labelRanges::end() const
 {
-    return const_iterator(*this, true);
+    return const_iterator(this, -1);
 }
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-inline bool Foam::labelRanges::contains(const label value) const
+inline bool Foam::labelRanges::found(const label value) const
 {
     forAll(*this, i)
     {
-        if (this->ParentType::operator[](i).contains(value))
+        if (StorageContainer::operator[](i).found(value))
         {
             return true;
         }
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.C b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.C
index 2022071101..83a946bf77 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.C
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.C
@@ -28,7 +28,10 @@ License
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-int Foam::scalarRange::debug(::Foam::debug::debugSwitch("scalarRange", 0));
+namespace Foam
+{
+int scalarRange::debug(debug::debugSwitch("scalarRange", 0));
+}
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -47,11 +50,9 @@ Foam::scalarRange::scalarRange(const scalar lower, const scalar upper)
     value_(lower),
     value2_(upper)
 {
-    // mark invalid range as empty
     if (lower > upper)
     {
-        type_ = EMPTY;
-        value_ = value2_ = 0;
+        clear();  // Mark invalid range as empty
     }
 }
 
@@ -73,6 +74,14 @@ Foam::scalarRange::scalarRange(Istream& is)
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void Foam::scalarRange::clear()
+{
+    type_   = scalarRange::EMPTY;
+    value_  = 0;
+    value2_ = 0;
+}
+
+
 bool Foam::scalarRange::empty() const
 {
     return type_ == EMPTY;
@@ -210,15 +219,14 @@ Foam::Istream& Foam::operator>>(Istream& is, scalarRange& range)
     // a number is now required
     if (!toks[nTok-1].isNumber())
     {
-        is.setBad();
-        range.type_ = scalarRange::EMPTY;
-        range.value_ = range.value2_ = 0;
+        range.clear();  // Mark invalid range as empty
         Info<< "rejected ill-formed or empty range:";
         for (label i=0; i<nTok; ++i)
         {
             Info<< " " << toks[i];
         }
         Info<< endl;
+        is.setBad();
         return is;
     }
 
@@ -245,15 +253,14 @@ Foam::Istream& Foam::operator>>(Istream& is, scalarRange& range)
     {
         if (range.type_ == scalarRange::UPPER)
         {
-            is.setBad();
-            range.type_ = scalarRange::EMPTY;
-            range.value_ = range.value2_ = 0;
+            range.clear();  // Mark invalid range as empty
             Info<< "rejected ill-formed range:";
             for (label i=0; i<nTok; ++i)
             {
                 Info<< " " << toks[i];
             }
             Info<< endl;
+            is.setBad();
             return is;
         }
 
@@ -308,16 +315,15 @@ Foam::Istream& Foam::operator>>(Istream& is, scalarRange& range)
         )
     )
     {
-        is.setBad();
-        range.type_ = scalarRange::EMPTY;
-        range.value_ = range.value2_ = 0;
-
+        range.clear();  // Mark invalid range as empty
         Info<< "rejected ill-formed range:";
         for (label i=0; i<nTok; ++i)
         {
             Info<< " " << toks[i];
         }
         Info<< endl;
+        is.setBad();
+        return is;
     }
 
     return is;
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
index 7b5a62a806..71d855e766 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRange.H
@@ -52,8 +52,8 @@ class Ostream;
 
 // Forward declaration of friend functions and operators
 class scalarRange;
-Istream& operator>>(Istream&, scalarRange&);
-Ostream& operator<<(Ostream&, const scalarRange&);
+Istream& operator>>(Istream& is, scalarRange& range);
+Ostream& operator<<(Ostream& os, const scalarRange& range);
 
 
 /*---------------------------------------------------------------------------*\
@@ -73,7 +73,7 @@ class scalarRange
     };
 
 
-    // Private data
+    // Private Member Data
 
         enum rangeType type_;
         scalar value_;
@@ -96,11 +96,14 @@ public:
         //- Construct from Istream.
         //  Since commas can be used as list delimiters,
         //  leading and trailing commas are ignored.
-        scalarRange(Istream&);
+        scalarRange(Istream& is);
 
 
     // Member Functions
 
+        //- Reset to an empty range.
+        void clear();
+
         //- Is the range empty?
         bool empty() const;
 
@@ -121,19 +124,19 @@ public:
         scalar upper() const;
 
         //- Return true if the value is within the range
-        bool selected(const scalar) const;
+        bool selected(const scalar value) const;
 
 
     // Member Operators
 
-        bool operator==(const scalarRange&) const;
-        bool operator!=(const scalarRange&) const;
+        bool operator==(const scalarRange& range) const;
+        bool operator!=(const scalarRange& range) const;
 
 
     // IOstream Operators
 
-        friend Istream& operator>>(Istream&, scalarRange&);
-        friend Ostream& operator<<(Ostream&, const scalarRange&);
+        friend Istream& operator>>(Istream& is, scalarRange& range);
+        friend Ostream& operator<<(Ostream& os, const scalarRange& range);
 };
 
 
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.C b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.C
index 819e615934..429efdca0a 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.C
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.C
@@ -72,7 +72,7 @@ bool Foam::scalarRanges::selected(const scalar value) const
 
 Foam::List<bool> Foam::scalarRanges::selected
 (
-    const List<scalar>& values
+    const UList<scalar>& values
 ) const
 {
     List<bool> lst(values.size(), false);
diff --git a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H
index 99f9e5e01b..f82312b612 100644
--- a/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H
+++ b/src/OpenFOAM/primitives/ranges/scalarRange/scalarRanges.H
@@ -55,27 +55,28 @@ public:
 
     // Constructors
 
-        //- Construct Null
+        //- Construct null
         scalarRanges();
 
         //- Construct from Istream.
         //  The list items are comma-delimited.
-        scalarRanges(Istream&);
+        scalarRanges(Istream& is);
+
 
     // Member Functions
 
         //- Return true if the given value is within the ranges
-        bool selected(const scalar) const;
+        bool selected(const scalar value) const;
 
         //- Return the set of selected entries in the given list
         //  that are within the ranges
-        List<bool> selected(const List<scalar>&) const;
+        List<bool> selected(const UList<scalar>& values) const;
 
         //- Select a list of values that are within the ranges
-        List<scalar> select(const List<scalar>&) const;
+        List<scalar> select(const List<scalar>& values) const;
 
         //- Select a list of values that are within the ranges
-        void inplaceSelect(List<scalar>&) const;
+        void inplaceSelect(List<scalar>& values) const;
 };
 
 
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
index 733d012b92..9ecab0f382 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordList.H
@@ -62,7 +62,7 @@ class hashedWordList
     // Private data
 
         //- Hash of words/indices
-        mutable HashTable<label,word> indices_;
+        mutable HashTable<label> indices_;
 
 
     // Private Member Functions
@@ -141,7 +141,7 @@ public:
         inline bool contains(const word& name) const;
 
         //- Return the hash of words/indices for inspection
-        inline const HashTable<label,word>& lookup() const;
+        inline const HashTable<label>& lookup() const;
 
         //- Transfer the contents of the argument List into this list
         //  and annul the argument list,
diff --git a/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H b/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
index b011b26ecd..80f8d28be0 100644
--- a/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
+++ b/src/OpenFOAM/primitives/strings/lists/hashedWordListI.H
@@ -134,7 +134,7 @@ inline void Foam::hashedWordList::append
 }
 
 
-inline const Foam::HashTable<Foam::label,Foam::word>&
+inline const Foam::HashTable<Foam::label>&
 Foam::hashedWordList::lookup() const
 {
     return indices_;
diff --git a/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H b/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H
index 2bba686964..1f5785d3e4 100644
--- a/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H
+++ b/src/OpenFOAM/primitives/strings/lists/wordReListMatcher.H
@@ -68,28 +68,28 @@ public:
 
     // Member Functions
 
-        // Access
+      // Access
 
-            inline label size() const;
-            inline bool  empty() const;
+        inline label size() const;
+        inline bool  empty() const;
 
-            //- Return underlying list of wordRe
-            inline const UList<wordRe>& operator()() const;
+        //- Return underlying list of wordRe
+        inline const UList<wordRe>& operator()() const;
 
 
-        // Searching
+     // Searching
 
-            //- Return true if string matches any of the regular expressions
-            //  Smart match as regular expression or as a string.
-            //  Optionally specify a literal match only.
-            inline bool match(const string&, bool literalMatch=false) const;
+       //- Return true if string matches any of the regular expressions
+       //  Smart match as regular expression or as a string.
+       //  Optionally specify a literal match only.
+       inline bool match(const std::string&, bool literalMatch=false) const;
 
 
-        // Helpers
+     // Helpers
 
-            //- Return a wordReList with duplicate words filtered out.
-            //  No filtering is done on regular expressions.
-            static wordReList uniq(const UList<wordRe>& input);
+       //- Return a wordReList with duplicate words filtered out.
+       //  No filtering is done on regular expressions.
+       static wordReList uniq(const UList<wordRe>& input);
 
 };
 
diff --git a/src/OpenFOAM/primitives/strings/lists/wordReListMatcherI.H b/src/OpenFOAM/primitives/strings/lists/wordReListMatcherI.H
index 9c484297df..d4b3c7dce2 100644
--- a/src/OpenFOAM/primitives/strings/lists/wordReListMatcherI.H
+++ b/src/OpenFOAM/primitives/strings/lists/wordReListMatcherI.H
@@ -58,14 +58,14 @@ Foam::wordReListMatcher::operator()() const
 
 inline bool Foam::wordReListMatcher::match
 (
-    const string& str,
+    const std::string& text,
     bool literalMatch
 ) const
 {
-    const label nElem = reList_.size();
-    for (label elemI = 0; elemI < nElem; ++elemI)
+    const label n = reList_.size();
+    for (label i = 0; i < n; ++i)
     {
-        if (reList_[elemI].match(str, literalMatch))
+        if (reList_[i].match(text, literalMatch))
         {
             return true;
         }
diff --git a/src/OpenFOAM/primitives/strings/string/string.H b/src/OpenFOAM/primitives/strings/string/string.H
index 7010427059..b1129c7c3a 100644
--- a/src/OpenFOAM/primitives/strings/string/string.H
+++ b/src/OpenFOAM/primitives/strings/string/string.H
@@ -63,9 +63,9 @@ class Ostream;
 
 // Forward declaration of friend functions and operators
 class string;
-Istream& operator>>(Istream&, string&);
-Ostream& operator<<(Ostream&, const string&);
-Ostream& operator<<(Ostream&, const std::string&);
+Istream& operator>>(Istream& is, string& s);
+Ostream& operator<<(Ostream& os, const string& s);
+Ostream& operator<<(Ostream& os, const std::string& s);
 
 
 /*---------------------------------------------------------------------------*\
@@ -124,33 +124,33 @@ public:
         //- Count and return the number of a given character in the string
         size_type count(const char c) const;
 
-        //- Is this string type valid?
+        //- Does the string contain valid characters only?
         template<class String>
-        static inline bool valid(const string& str);
+        static inline bool valid(const std::string& str);
 
-        //- Does this string have particular meta-characters?
+        //- Does this string contain meta-characters?
         //  The meta characters can be optionally quoted.
         template<class String>
-        static inline bool meta(const string& str, const char quote = '\\');
+        static inline bool meta(const std::string& str, const char quote='\\');
 
         //- Strip invalid characters from the given string
         template<class String>
-        static inline bool stripInvalid(string& str);
+        static inline bool stripInvalid(std::string& str);
 
         //- Return a valid String from the given string
         template<class String>
-        static inline String validate(const string& str);
+        static inline String validate(const std::string& str);
 
         //- Return a String with quoted meta-characters from the given string
         template<class String>
         static inline string quotemeta
         (
-            const string& str,
+            const std::string& str,
             const char quote = '\\'
         );
 
         //- True when strings match literally
-        inline bool match(const std::string& str) const;
+        inline bool match(const std::string& text) const;
 
         //- Avoid masking the normal std::string replace
         using std::string::replace;
diff --git a/src/OpenFOAM/primitives/strings/string/stringI.H b/src/OpenFOAM/primitives/strings/string/stringI.H
index 3dc2fe043f..ccd5d29616 100644
--- a/src/OpenFOAM/primitives/strings/string/stringI.H
+++ b/src/OpenFOAM/primitives/strings/string/stringI.H
@@ -61,7 +61,7 @@ inline Foam::string::string(const char c)
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class String>
-inline bool Foam::string::valid(const string& str)
+inline bool Foam::string::valid(const std::string& str)
 {
     for (const_iterator iter = str.begin(); iter != str.end(); ++iter)
     {
@@ -75,7 +75,7 @@ inline bool Foam::string::valid(const string& str)
 
 
 template<class String>
-inline bool Foam::string::stripInvalid(string& str)
+inline bool Foam::string::stripInvalid(std::string& str)
 {
     if (!valid<String>(str))
     {
@@ -85,11 +85,11 @@ inline bool Foam::string::stripInvalid(string& str)
         for
         (
             const_iterator iter1 = iter2;
-            iter1 != const_cast<const string&>(str).end();
+            iter1 != const_cast<const std::string&>(str).end();
             iter1++
         )
         {
-            char c = *iter1;
+            const char c = *iter1;
 
             if (String::valid(c))
             {
@@ -109,20 +109,21 @@ inline bool Foam::string::stripInvalid(string& str)
 
 
 template<class String>
-inline bool Foam::string::meta(const string& str, const char quote)
+inline bool Foam::string::meta(const std::string& str, const char quote)
 {
     int escaped = 0;
     for (const_iterator iter = str.begin(); iter != str.end(); ++iter)
     {
-        if (quote && *iter == quote)
+        const char c = *iter;
+        if (quote && c == quote)
         {
             escaped ^= 1;  // toggle state
         }
         else if (escaped)
         {
-            escaped = false;
+            escaped = 0;
         }
-        else if (String::meta(*iter))
+        else if (String::meta(c))
         {
             return true;
         }
@@ -133,7 +134,7 @@ inline bool Foam::string::meta(const string& str, const char quote)
 
 template<class String>
 inline Foam::string
-Foam::string::quotemeta(const string& str, const char quote)
+Foam::string::quotemeta(const std::string& str, const char quote)
 {
     if (!quote)
     {
@@ -146,7 +147,8 @@ Foam::string::quotemeta(const string& str, const char quote)
     int escaped = 0;
     for (const_iterator iter = str.begin(); iter != str.end(); ++iter)
     {
-        if (*iter == quote)
+        const char c = *iter;
+        if (c == quote)
         {
             escaped ^= 1;  // toggle state
         }
@@ -154,12 +156,12 @@ Foam::string::quotemeta(const string& str, const char quote)
         {
             escaped = 0;
         }
-        else if (String::meta(*iter))
+        else if (String::meta(c))
         {
             sQuoted += quote;
         }
 
-        sQuoted += *iter;
+        sQuoted += c;
     }
 
     sQuoted.resize(sQuoted.length());
@@ -169,17 +171,17 @@ Foam::string::quotemeta(const string& str, const char quote)
 
 
 template<class String>
-inline String Foam::string::validate(const string& str)
+inline String Foam::string::validate(const std::string& str)
 {
     string ss = str;
     stripInvalid<String>(ss);
     return ss;
 }
 
-inline bool Foam::string::match(const std::string& str) const
+inline bool Foam::string::match(const std::string& text) const
 {
     // check as string
-    return (str == *this);
+    return (text == *this);
 }
 
 
diff --git a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
index 9b7f73a4f2..6df273e138 100644
--- a/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
+++ b/src/OpenFOAM/primitives/strings/stringOps/stringOps.C
@@ -183,7 +183,7 @@ Foam::string& Foam::stringOps::inplaceExpand
                 HashTable<string, word, string::hash>::const_iterator fnd =
                     mapping.find(varName);
 
-                if (fnd != HashTable<string, word, string::hash>::end())
+                if (fnd.found())
                 {
                     if (altPos != string::npos && altType == '+')
                     {
diff --git a/src/conversion/fire/checkFireEdges.C b/src/conversion/fire/checkFireEdges.C
index 3969d1b62a..ae2f1b6c96 100644
--- a/src/conversion/fire/checkFireEdges.C
+++ b/src/conversion/fire/checkFireEdges.C
@@ -25,8 +25,7 @@ License
 
 #include "checkFireEdges.H"
 #include "polyMesh.H"
-#include "edge.H"
-#include "HashSet.H"
+#include "edgeHashes.H"
 #include "ListOps.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -69,7 +68,6 @@ Foam::label Foam::checkFireEdges
 {
     label nFailedEdges = 0;
     const bool fullCheck = true;
-    typedef HashSet<edge, Hash<edge>> edgeHashSet;
 
     Info<< "Checking edges according to AVL/FIRE on-the-fly methodology..."
         << endl;
diff --git a/src/dummyThirdParty/metisDecomp/Make/options b/src/dummyThirdParty/metisDecomp/Make/options
index 1dc3af297c..4acabef1b3 100644
--- a/src/dummyThirdParty/metisDecomp/Make/options
+++ b/src/dummyThirdParty/metisDecomp/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(FOAM_SRC)/parallel/decompose/metisDecomp/lnInclude
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/metisDecomp/lnInclude
 
 LIB_LIBS =
diff --git a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
index ffe80489d7..ea3ee98863 100644
--- a/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
+++ b/src/dummyThirdParty/metisDecomp/dummyMetisDecomp.C
@@ -34,7 +34,7 @@ static const char* notImplementedMessage =
 "Please install metis and make sure that libmetis.so is in your "
 "LD_LIBRARY_PATH.\n"
 "The metisDecomp library can then be built from "
-"$FOAM_SRC/parallel/decompose/metisDecomp and dynamically loading or linking"
+"src/parallel/decompose/metisDecomp and dynamically loading or linking"
 " this library will add metis as a decomposition method.\n"
 "Please be aware that there are license restrictions on using Metis.";
 
diff --git a/src/dummyThirdParty/ptscotchDecomp/Make/options b/src/dummyThirdParty/ptscotchDecomp/Make/options
index 3cb176ccf9..481166164b 100644
--- a/src/dummyThirdParty/ptscotchDecomp/Make/options
+++ b/src/dummyThirdParty/ptscotchDecomp/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(FOAM_SRC)/parallel/decompose/ptscotchDecomp/lnInclude
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/ptscotchDecomp/lnInclude
 
 LIB_LIBS =
diff --git a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
index 719e6b6d11..25287d72be 100644
--- a/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
+++ b/src/dummyThirdParty/ptscotchDecomp/dummyPtscotchDecomp.C
@@ -35,7 +35,7 @@ static const char* notImplementedMessage =
 "Please install ptscotch and make sure that libptscotch.so is in your "
 "LD_LIBRARY_PATH.\n"
 "The ptscotchDecomp library can then be built in "
-"$FOAM_SRC/parallel/decompose/ptscotchDecomp\n";
+"src/parallel/decompose/ptscotchDecomp\n";
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dummyThirdParty/scotchDecomp/Make/options b/src/dummyThirdParty/scotchDecomp/Make/options
index da7a7df7b6..f3429e59e5 100644
--- a/src/dummyThirdParty/scotchDecomp/Make/options
+++ b/src/dummyThirdParty/scotchDecomp/Make/options
@@ -1,5 +1,5 @@
 EXE_INC = \
-    -I$(FOAM_SRC)/parallel/decompose/decompositionMethods/lnInclude \
-    -I$(FOAM_SRC)/parallel/decompose/scotchDecomp/lnInclude
+    -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
+    -I$(LIB_SRC)/parallel/decompose/scotchDecomp/lnInclude
 
 LIB_LIBS =
diff --git a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
index 737196be16..f1088d487b 100644
--- a/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
+++ b/src/dummyThirdParty/scotchDecomp/dummyScotchDecomp.C
@@ -34,7 +34,7 @@ static const char* notImplementedMessage =
 "Please install scotch and make sure that libscotch.so is in your "
 "LD_LIBRARY_PATH.\n"
 "The scotchDecomp library can then be built in "
-"$FOAM_SRC/parallel/decompose/decompositionMethods/scotchDecomp\n";
+"src/parallel/decompose/decompositionMethods/scotchDecomp\n";
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
index 98ff3121d1..89245c0094 100644
--- a/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
+++ b/src/dynamicMesh/fvMeshDistribute/fvMeshDistribute.C
@@ -40,6 +40,7 @@ License
 #include "syncTools.H"
 #include "CompactListList.H"
 #include "fvMeshTools.H"
+#include "labelPairHashes.H"
 #include "ListOps.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
@@ -982,7 +983,7 @@ void Foam::fvMeshDistribute::findCouples
 {
     // Store domain neighbour as map so we can easily look for pair
     // with same face+proc.
-    HashTable<label, labelPair, labelPair::Hash<>> map(domainFace.size());
+    labelPairLookup map(domainFace.size());
 
     forAll(domainProc, bFacei)
     {
@@ -1009,8 +1010,7 @@ void Foam::fvMeshDistribute::findCouples
         {
             labelPair myData(sourceFace[bFacei], sourceProc[bFacei]);
 
-            HashTable<label, labelPair, labelPair::Hash<>>::const_iterator
-                iter = map.find(myData);
+            labelPairLookup::const_iterator iter = map.find(myData);
 
             if (iter != map.end())
             {
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
index 86932091f2..f7a105ae08 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.C
@@ -1384,6 +1384,23 @@ void Foam::fvMeshSubset::setLargeCellSubset
 }
 
 
+void Foam::fvMeshSubset::setLargeCellSubset
+(
+    const UList<label>& globalCellMap,
+    const label patchID,
+    const bool syncPar
+)
+{
+    labelList region(baseMesh().nCells(), 0);
+
+    for (auto cellId : globalCellMap)
+    {
+        region[cellId] = 1;
+    }
+    setLargeCellSubset(region, 1, patchID, syncPar);
+}
+
+
 void Foam::fvMeshSubset::setLargeCellSubset
 (
     const labelHashSet& globalCellMap,
diff --git a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
index 54c4141107..7d9c453b5e 100644
--- a/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
+++ b/src/dynamicMesh/fvMeshSubset/fvMeshSubset.H
@@ -177,6 +177,14 @@ public:
                 const bool syncCouples = true
             );
 
+            //- setLargeCellSubset but only marking certain cells
+            void setLargeCellSubset
+            (
+                const UList<label>& globalCellMap,
+                const label patchID = -1,
+                const bool syncPar = true
+            );
+
             //- setLargeCellSubset but with labelHashSet.
             void setLargeCellSubset
             (
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
index 0b2da048dd..8a0f2a1605 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.C
@@ -869,16 +869,9 @@ void Foam::boundaryCutter::updateMesh(const mapPolyMesh& morphMap)
 
     {
         // Create copy since we're deleting entries
-        HashTable<labelList, edge, Hash<edge>>
-            newEdgeAddedPoints(edgeAddedPoints_.size());
+        EdgeMap<labelList> newEdgeAddedPoints(edgeAddedPoints_.size());
 
-        for
-        (
-            HashTable<labelList, edge, Hash<edge>>::const_iterator iter =
-                edgeAddedPoints_.begin();
-            iter != edgeAddedPoints_.end();
-            ++iter
-        )
+        forAllConstIters(edgeAddedPoints_, iter)
         {
             const edge& e = iter.key();
 
@@ -888,7 +881,7 @@ void Foam::boundaryCutter::updateMesh(const mapPolyMesh& morphMap)
 
             if (newStart >= 0 && newEnd >= 0)
             {
-                const labelList& addedPoints = iter();
+                const labelList& addedPoints = iter.object();
 
                 labelList newAddedPoints(addedPoints.size());
                 label newI = 0;
diff --git a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
index 9088b04cf9..e3c75c5511 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/boundaryCutter/boundaryCutter.H
@@ -44,7 +44,7 @@ SourceFiles
 
 #include "Map.H"
 #include "labelList.H"
-#include "edge.H"
+#include "EdgeMap.H"
 #include "typeInfo.H"
 #include "labelPair.H"
 
@@ -71,7 +71,7 @@ class boundaryCutter
         const polyMesh& mesh_;
 
         //- Per edge sorted (start to end) list of points added.
-        HashTable<labelList, edge, Hash<edge>> edgeAddedPoints_;
+        EdgeMap<labelList> edgeAddedPoints_;
 
         //- Per face the mid point added.
         Map<label> faceAddedPoint_;
@@ -159,8 +159,7 @@ public:
         // Access
 
             //- Per edge a sorted list (start to end) of added points.
-            const HashTable<labelList, edge, Hash<edge>>& edgeAddedPoints()
-             const
+            const EdgeMap<labelList>& edgeAddedPoints() const
             {
                 return edgeAddedPoints_;
             }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
index 4ac1f6485a..d169c6e56a 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.C
@@ -479,13 +479,13 @@ Foam::face Foam::meshCutAndRemove::addEdgeCutsToFace(const label facei) const
         // Check if edge has been cut.
         label fp1 = f.fcIndex(fp);
 
-        HashTable<label, edge, Hash<edge>>::const_iterator fnd =
+        EdgeMap<label>::const_iterator fnd =
             addedPoints_.find(edge(f[fp], f[fp1]));
 
-        if (fnd != addedPoints_.end())
+        if (fnd.found())
         {
             // edge has been cut. Introduce new vertex.
-            newFace[newFp++] = fnd();
+            newFace[newFp++] = fnd.object();
         }
     }
 
@@ -541,12 +541,12 @@ Foam::face Foam::meshCutAndRemove::loopToFace
                 if (edgeI != -1)
                 {
                     // Existing edge. Insert split-edge point if any.
-                    HashTable<label, edge, Hash<edge>>::const_iterator fnd =
+                    EdgeMap<label>::const_iterator fnd =
                         addedPoints_.find(mesh().edges()[edgeI]);
 
-                    if (fnd != addedPoints_.end())
+                    if (fnd.found())
                     {
-                        newFace[newFacei++] = fnd();
+                        newFace[newFacei++] = fnd.object();
                     }
                 }
             }
@@ -1302,24 +1302,17 @@ void Foam::meshCutAndRemove::updateMesh(const mapPolyMesh& map)
     }
 
     {
-        HashTable<label, edge, Hash<edge>> newAddedPoints(addedPoints_.size());
+        EdgeMap<label> newAddedPoints(addedPoints_.size());
 
-        for
-        (
-            HashTable<label, edge, Hash<edge>>::const_iterator iter =
-                addedPoints_.begin();
-            iter != addedPoints_.end();
-            ++iter
-        )
+        forAllConstIters(addedPoints_, iter)
         {
             const edge& e = iter.key();
+            const label addedPointi = iter.object();
 
             label newStart = map.reversePointMap()[e.start()];
 
             label newEnd = map.reversePointMap()[e.end()];
 
-            label addedPointi = iter();
-
             label newAddedPointi = map.reversePointMap()[addedPointi];
 
             if ((newStart >= 0) && (newEnd >= 0) && (newAddedPointi >= 0))
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
index cbd569f146..a73123c5db 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutAndRemove/meshCutAndRemove.H
@@ -40,6 +40,7 @@ SourceFiles
 #include "labelList.H"
 #include "typeInfo.H"
 #include "Map.H"
+#include "EdgeMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -70,7 +71,7 @@ class meshCutAndRemove
 
         //- Points added in last setRefinement. Per split edge label of added
         //  point
-        HashTable<label, edge, Hash<edge>> addedPoints_;
+        EdgeMap<label> addedPoints_;
 
 
     // Private Static Functions
@@ -225,7 +226,7 @@ public:
             //- Points added. Per split edge label of added point.
             //  (note: fairly useless across topology changes since one of the
             //  points of the edge will probably disappear)
-            const HashTable<label, edge, Hash<edge>>& addedPoints() const
+            const EdgeMap<label>& addedPoints() const
             {
                 return addedPoints_;
             }
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
index 903e1c60a9..6486908275 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.C
@@ -424,13 +424,13 @@ Foam::face Foam::meshCutter::addEdgeCutsToFace(const label facei) const
         // Check if edge has been cut.
         label fp1 = f.fcIndex(fp);
 
-        HashTable<label, edge, Hash<edge>>::const_iterator fnd =
+        EdgeMap<label>::const_iterator fnd =
             addedPoints_.find(edge(f[fp], f[fp1]));
 
-        if (fnd != addedPoints_.end())
+        if (fnd.found())
         {
             // edge has been cut. Introduce new vertex.
-            newFace[newFp++] = fnd();
+            newFace[newFp++] = fnd.object();
         }
     }
 
@@ -483,12 +483,12 @@ Foam::face Foam::meshCutter::loopToFace
                 if (edgeI != -1)
                 {
                     // Existing edge. Insert split-edge point if any.
-                    HashTable<label, edge, Hash<edge>>::const_iterator fnd =
+                    EdgeMap<label>::const_iterator fnd =
                         addedPoints_.find(mesh().edges()[edgeI]);
 
-                    if (fnd != addedPoints_.end())
+                    if (fnd.found())
                     {
-                        newFace[newFacei++] = fnd();
+                        newFace[newFacei++] = fnd.object();
                     }
                 }
             }
@@ -1043,24 +1043,17 @@ void Foam::meshCutter::updateMesh(const mapPolyMesh& morphMap)
     }
 
     {
-        HashTable<label, edge, Hash<edge>> newAddedPoints(addedPoints_.size());
+        EdgeMap<label> newAddedPoints(addedPoints_.size());
 
-        for
-        (
-            HashTable<label, edge, Hash<edge>>::const_iterator iter =
-                addedPoints_.begin();
-            iter != addedPoints_.end();
-            ++iter
-        )
+        forAllConstIters(addedPoints_, iter)
         {
             const edge& e = iter.key();
+            const label addedPointi = iter.object();
 
             label newStart = morphMap.reversePointMap()[e.start()];
 
             label newEnd = morphMap.reversePointMap()[e.end()];
 
-            label addedPointi = iter();
-
             label newAddedPointi = morphMap.reversePointMap()[addedPointi];
 
             if ((newStart >= 0) && (newEnd >= 0) && (newAddedPointi >= 0))
diff --git a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
index b244e72367..b48d57d260 100644
--- a/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
+++ b/src/dynamicMesh/meshCut/meshModifiers/meshCutter/meshCutter.H
@@ -115,6 +115,7 @@ SourceFiles
 #include "labelList.H"
 #include "typeInfo.H"
 #include "Map.H"
+#include "EdgeMap.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -148,7 +149,7 @@ class meshCutter
 
         //- Points added in last setRefinement. Per split edge label of added
         //  point
-        HashTable<label, edge, Hash<edge>> addedPoints_;
+        EdgeMap<label> addedPoints_;
 
 
     // Private Static Functions
@@ -307,7 +308,7 @@ public:
             }
 
             //- Points added. Per split edge label of added point
-            const HashTable<label, edge, Hash<edge>>& addedPoints() const
+            const EdgeMap<label>& addedPoints() const
             {
                 return addedPoints_;
             }
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
index 9b354350c9..ee586e2969 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.C
@@ -90,6 +90,22 @@ void Foam::motionSmootherAlgo::checkFld(const pointScalarField& fld)
 }
 
 
+Foam::labelHashSet Foam::motionSmootherAlgo::getPoints
+(
+    const UList<label>& faceLabels
+) const
+{
+    labelHashSet usedPoints(mesh_.nPoints()/100);
+
+    for (auto faceId : faceLabels)
+    {
+        usedPoints.insert(mesh_.faces()[faceId]);
+    }
+
+    return usedPoints;
+}
+
+
 Foam::labelHashSet Foam::motionSmootherAlgo::getPoints
 (
     const labelHashSet& faceLabels
@@ -99,12 +115,7 @@ Foam::labelHashSet Foam::motionSmootherAlgo::getPoints
 
     forAllConstIter(labelHashSet, faceLabels, iter)
     {
-        const face& f = mesh_.faces()[iter.key()];
-
-        forAll(f, fp)
-        {
-            usedPoints.insert(f[fp]);
-        }
+        usedPoints.insert(mesh_.faces()[iter.key()]);
     }
 
     return usedPoints;
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
index fe223d73db..d1b53c3267 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
+++ b/src/dynamicMesh/motionSmoother/motionSmootherAlgo.H
@@ -209,7 +209,10 @@ class motionSmootherAlgo
         static void checkFld(const pointScalarField&);
 
         //- Get points used by given faces
-        labelHashSet getPoints(const labelHashSet&) const;
+        labelHashSet getPoints(const UList<label>& faceLabels) const;
+
+        //- Get points used by given faces
+        labelHashSet getPoints(const labelHashSet& faceLabels) const;
 
         //- Calculate per-edge weight
         tmp<scalarField> calcEdgeWeights(const pointField&) const;
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
index 9232458ffb..536f7296b2 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/addPatchCellLayer.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -495,13 +495,18 @@ void Foam::addPatchCellLayer::setFaceProps
 
         if (!found)
         {
-            FatalErrorInFunction
+            //FatalErrorInFunction
+            WarningInFunction
                 << "Problem: cannot find patch edge " << ppEdgeI
                 << " with mesh vertices " << patchEdge
                 << " at " << patchEdge.line(mesh.points())
-                << " is not in face " << faceI << " with mesh vertices "
+                << " in face " << faceI << " with mesh vertices "
                 << f
-                << exit(FatalError);
+                << " at " << pointField(mesh.points(), f)
+                << endl
+                << "Continuing with potentially incorrect faceZone orientation"
+                //<< exit(FatalError);
+                << endl;
         }
     }
 }
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
index 9933c780d4..83d29c214c 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.C
@@ -42,7 +42,7 @@ defineTypeNameAndDebug(edgeCollapser, 0);
 }
 
 
-Foam::HashSet<Foam::label> Foam::edgeCollapser::checkBadFaces
+Foam::labelHashSet Foam::edgeCollapser::checkBadFaces
 (
     const polyMesh& mesh,
     const dictionary& meshQualityDict
@@ -423,7 +423,7 @@ void Foam::edgeCollapser::faceCollapseAxisAndAspectRatio
 
     if (detJ < 1e-5)
     {
-        collapseAxis = f.edges()[longestEdge(f, pts)].vec(pts);
+        collapseAxis = f.edges()[f.longestEdge(pts)].vec(pts);
 
         // It is possible that all the points of a face are the same
         if (magSqr(collapseAxis) > VSMALL)
@@ -446,7 +446,7 @@ void Foam::edgeCollapser::faceCollapseAxisAndAspectRatio
             // Cannot necessarily determine linearly independent
             // eigenvectors, or any at all, use longest edge direction.
 
-            collapseAxis = f.edges()[longestEdge(f, pts)].vec(pts);
+            collapseAxis = f.edges()[f.longestEdge(pts)].vec(pts);
 
             collapseAxis /= mag(collapseAxis);
 
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
index 2d80b2fa35..4f5f6e7feb 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/edgeCollapser.H
@@ -263,7 +263,7 @@ public:
         // Check
 
             //- Calls motionSmoother::checkMesh and returns a set of bad faces
-            static HashSet<label> checkBadFaces
+            static labelHashSet checkBadFaces
             (
                 const polyMesh& mesh,
                 const dictionary& meshQualityDict
diff --git a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
index f1c248e467..e68fb0b4b4 100644
--- a/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
+++ b/src/dynamicMesh/polyTopoChange/polyTopoChange/hexRef8/hexRef8.C
@@ -36,6 +36,7 @@ License
 #include "faceSet.H"
 #include "cellSet.H"
 #include "pointSet.H"
+#include "labelPairHashes.H"
 #include "OFstream.H"
 #include "Time.H"
 #include "FaceCellWave.H"
@@ -4626,10 +4627,9 @@ void Foam::hexRef8::checkMesh() const
 
             if (pp.coupled())
             {
-                // Check how many faces between owner and neighbour. Should
-                // be only one.
-                HashTable<label, labelPair, labelPair::Hash<>>
-                    cellToFace(2*pp.size());
+                // Check how many faces between owner and neighbour.
+                // Should be only one.
+                labelPairLookup cellToFace(2*pp.size());
 
                 label facei = pp.start();
 
diff --git a/src/fileFormats/ensight/part/ensightCells.C b/src/fileFormats/ensight/part/ensightCells.C
index d08996ad85..3b1161ad98 100644
--- a/src/fileFormats/ensight/part/ensightCells.C
+++ b/src/fileFormats/ensight/part/ensightCells.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,24 +27,13 @@ License
 #include "error.H"
 #include "polyMesh.H"
 #include "cellModeller.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const Foam::label Foam::ensightCells::nTypes = 5;
 
-namespace Foam
-{
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::ensightCells::elemType,
-        5
-    >::names[] = { "tetra4", "pyramid5", "penta6", "hexa8", "nfaced" };
-}
-
-const Foam::NamedEnum<Foam::ensightCells::elemType, 5>
-    Foam::ensightCells::elemEnum;
+const char* Foam::ensightCells::elemNames[5] =
+    { "tetra4", "pyramid5", "penta6", "hexa8", "nfaced" };
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -63,9 +52,8 @@ void Foam::ensightCells::resizeAll()
     n = 0;
     forAll(sizes_, typei)
     {
-        deleteDemandDrivenData(lists_[typei]);
-
-        lists_[typei] = new SubList<label>(address_, sizes_[typei], n);
+        slices_[typei].setStart(n);
+        slices_[typei].setSize(sizes_[typei]);
 
         n += sizes_[typei];
     }
@@ -78,16 +66,10 @@ Foam::ensightCells::ensightCells(const label partIndex)
 :
     index_(partIndex),
     address_(),
-    sizes_(Zero),
-    lists_()
+    slices_(),
+    sizes_(Zero)
 {
-    // Ensure sub-lists are properly initialized to nullptr
-    forAll(lists_, typei)
-    {
-        lists_[typei] = nullptr;
-    }
-
-    resizeAll(); // adjust allocation
+    resizeAll(); // adjust allocation/sizing
 }
 
 
@@ -95,22 +77,16 @@ Foam::ensightCells::ensightCells(const ensightCells& obj)
 :
     index_(obj.index_),
     address_(obj.address_),
-    sizes_(),
-    lists_()
+    slices_(),
+    sizes_()
 {
-    // Ensure sub-lists are properly initialized to nullptr
-    forAll(lists_, typei)
-    {
-        lists_[typei] = nullptr;
-    }
-
-    // Total (reduced) sizes
+    // Save the total (reduced) sizes
     FixedList<label, 5> totSizes = obj.sizes_;
 
-    // Local sizes
+    // Need local sizes for the resize operation
     this->sizes_ = obj.sizes();
 
-    resizeAll(); // adjust allocation
+    resizeAll(); // adjust allocation/sizing
 
     // Restore total (reduced) sizes
     this->sizes_ = totSizes;
@@ -120,13 +96,7 @@ Foam::ensightCells::ensightCells(const ensightCells& obj)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::ensightCells::~ensightCells()
-{
-    forAll(lists_, typei)
-    {
-        deleteDemandDrivenData(lists_[typei]);
-    }
-    address_.clear();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -134,27 +104,15 @@ Foam::ensightCells::~ensightCells()
 Foam::FixedList<Foam::label, 5> Foam::ensightCells::sizes() const
 {
     FixedList<label, 5> count;
-    forAll(lists_, typei)
+    forAll(slices_, typei)
     {
-        count[typei] = lists_[typei]->size();
+        count[typei] = slices_[typei].size();
     }
 
     return count;
 }
 
 
-Foam::label Foam::ensightCells::offset(const enum elemType what) const
-{
-    label n = 0;
-    for (label typei = 0; typei < label(what); ++typei)
-    {
-        n += lists_[typei]->size();
-    }
-
-    return n;
-}
-
-
 Foam::label Foam::ensightCells::total() const
 {
     label n = 0;
@@ -175,9 +133,10 @@ void Foam::ensightCells::clear()
 
 void Foam::ensightCells::reduce()
 {
+    // No listCombineGather, listCombineScatter for FixedList
     forAll(sizes_, typei)
     {
-        sizes_[typei] = lists_[typei]->size();
+        sizes_[typei] = slices_[typei].size();
         Foam::reduce(sizes_[typei], sumOp<label>());
     }
 }
@@ -185,9 +144,13 @@ void Foam::ensightCells::reduce()
 
 void Foam::ensightCells::sort()
 {
-    forAll(lists_, typei)
+    forAll(slices_, typei)
     {
-        Foam::sort(*(lists_[typei]));
+        if (slices_[typei].size())
+        {
+            SubList<label> idLst(address_, slices_[typei]);
+            Foam::sort(idLst);
+        }
     }
 }
 
@@ -240,7 +203,7 @@ void Foam::ensightCells::classify
     }
 
     resizeAll();    // adjust allocation
-    sizes_ = Zero;  // reset sizes
+    sizes_ = Zero;  // reset sizes - use for local indexing here
 
     // Assign cell-id per shape type
     for (label listi = 0; listi < sz; ++listi)
@@ -267,7 +230,10 @@ void Foam::ensightCells::classify
         }
 
         // eg, the processor local cellId
-        lists_[what]->operator[](sizes_[what]++) = id;
+        UList<label> slice = address_[slices_[what]];
+
+        slice[sizes_[what]] = id;
+        sizes_[what]++;
     }
 }
 
diff --git a/src/fileFormats/ensight/part/ensightCells.H b/src/fileFormats/ensight/part/ensightCells.H
index 33bc98a2f4..cef7c4b2ed 100644
--- a/src/fileFormats/ensight/part/ensightCells.H
+++ b/src/fileFormats/ensight/part/ensightCells.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -35,8 +35,6 @@ Description
 
 #include "labelList.H"
 #include "FixedList.H"
-#include "SubList.H"
-#include "NamedEnum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -58,18 +56,18 @@ public:
         //- Addressable ensight element types
         enum elemType
         {
-            TETRA4,
-            PYRAMID5,
-            PENTA6,
-            HEXA8,
-            NFACED
+            TETRA4,     //!< "tetra4"
+            PYRAMID5,   //!< "pyramid5"
+            PENTA6,     //!< "penta6"
+            HEXA8,      //!< "hexa8"
+            NFACED      //!< "nfaced"
         };
 
         //- Number of element types (5)
         static const label nTypes;
 
-        //- The Ensight names for each element type
-        static const NamedEnum<elemType, 5> elemEnum;
+        //- The ensight element type names
+        static const char* elemNames[5];
 
 
     // Static Member Functions
@@ -86,17 +84,16 @@ private:
         //  The ensight part number is typically this value +1.
         label index_;
 
-        //- Linear list of ids, sub-sectioned per element type via SubLists
+        //- Linear list of ids, sub-sectioned per element type by sub-lists
         labelList address_;
 
+        //- Slices (sub-lists) of the address ids for each element type.
+        FixedList<labelRange, 5> slices_;
+
         //- List of global sizes for each element type.
         //  Used temporarily for local sizes when building the element lists.
         FixedList<label, 5> sizes_;
 
-        //- List of ids for each element type.
-        //  Managed via pointers, since a SubList cannot be relocated/resized.
-        FixedList<SubList<label>*, 5> lists_;
-
 
     // Private Member Functions
 
@@ -115,7 +112,7 @@ public:
         ensightCells(label partIndex = 0);
 
         //- Copy constructor. Needed for lists etc.
-        ensightCells(const ensightCells&);
+        ensightCells(const ensightCells& obj);
 
 
     //- Destructor
@@ -135,6 +132,9 @@ public:
         //- The processor local size of all elements.
         inline label size() const;
 
+        //- The processor local size of the specified element type.
+        inline label size(const enum elemType) const;
+
         //- The global number of the specified element type.
         //  This value is only meaningful after a reduce operation.
         inline label total(const enum elemType) const;
@@ -151,23 +151,23 @@ public:
         FixedList<label, 5> sizes() const;
 
         //- Processor local starting offset of element type.
-        label offset(const enum elemType what) const;
+        inline label offset(const enum elemType what) const;
 
         //- Return the (local) cell ids of the specified element type
-        inline const labelUList& cellIds(const enum elemType) const;
+        inline const labelUList cellIds(const enum elemType) const;
 
         //- Return the cell ids of all elements
         inline const labelUList& cellIds() const;
 
 
-    // Edit
+      // Edit
 
         //- Classify cell types and set the element lists.
         //  The optional indirect addressing can be used when classifying
         //  groups of cells (eg, from a cellZone etc).
         void classify
         (
-            const polyMesh&,
+            const polyMesh& mesh,
             const labelUList& addressing = labelUList::null()
         );
 
diff --git a/src/fileFormats/ensight/part/ensightCellsI.H b/src/fileFormats/ensight/part/ensightCellsI.H
index 88e0168322..ff03b8fdfd 100644
--- a/src/fileFormats/ensight/part/ensightCellsI.H
+++ b/src/fileFormats/ensight/part/ensightCellsI.H
@@ -29,7 +29,7 @@ License
 
 inline const char* Foam::ensightCells::key(const enum elemType what)
 {
-    return elemEnum[what];
+    return elemNames[what];
 }
 
 
@@ -63,20 +63,24 @@ inline Foam::label Foam::ensightCells::total(const enum elemType what) const
 }
 
 
-inline const Foam::labelUList& Foam::ensightCells::cellIds
+inline Foam::label Foam::ensightCells::size(const enum elemType what) const
+{
+    return slices_[what].size();
+}
+
+
+inline Foam::label Foam::ensightCells::offset(const enum elemType what) const
+{
+    return slices_[what].start();
+}
+
+
+inline const Foam::labelUList Foam::ensightCells::cellIds
 (
     const enum elemType what
 ) const
 {
-    if (!lists_[what])
-    {
-        FatalErrorInFunction
-            << "Accessing unallocated sublist for elem-type: "
-            << elemEnum[what]
-            << exit(FatalError);
-    }
-
-    return *(lists_[what]);
+    return address_[slices_[what]];
 }
 
 
diff --git a/src/fileFormats/ensight/part/ensightFaces.C b/src/fileFormats/ensight/part/ensightFaces.C
index 65117d3cd6..db64d85adb 100644
--- a/src/fileFormats/ensight/part/ensightFaces.C
+++ b/src/fileFormats/ensight/part/ensightFaces.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -27,24 +27,13 @@ License
 #include "error.H"
 #include "polyMesh.H"
 #include "ListOps.H"
-#include "demandDrivenData.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 const Foam::label Foam::ensightFaces::nTypes = 3;
 
-namespace Foam
-{
-    template<>
-    const char* Foam::NamedEnum
-    <
-        Foam::ensightFaces::elemType,
-        3
-    >::names[] = { "tria3", "quad4", "nsided" };
-}
-
-const Foam::NamedEnum<Foam::ensightFaces::elemType, 3>
-    Foam::ensightFaces::elemEnum;
+const char* Foam::ensightFaces::elemNames[3] =
+    { "tria3", "quad4", "nsided" };
 
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -99,9 +88,8 @@ void Foam::ensightFaces::resizeAll()
     n = 0;
     forAll(sizes_, typei)
     {
-        deleteDemandDrivenData(lists_[typei]);
-
-        lists_[typei] = new SubList<label>(address_, sizes_[typei], n);
+        slices_[typei].setStart(n);
+        slices_[typei].setSize(sizes_[typei]);
 
         n += sizes_[typei];
     }
@@ -118,16 +106,10 @@ Foam::ensightFaces::ensightFaces(label partIndex)
     index_(partIndex),
     address_(),
     flipMap_(),
-    sizes_(Zero),
-    lists_()
+    slices_(),
+    sizes_(Zero)
 {
-    // Ensure sub-lists are properly initialized to nullptr
-    forAll(lists_, typei)
-    {
-        lists_[typei] = nullptr;
-    }
-
-    resizeAll(); // adjust allocation
+    resizeAll(); // adjust allocation/sizing
 }
 
 
@@ -136,22 +118,16 @@ Foam::ensightFaces::ensightFaces(const ensightFaces& obj)
     index_(obj.index_),
     address_(obj.address_),
     flipMap_(obj.flipMap_),
-    sizes_(),
-    lists_()
+    slices_(),
+    sizes_()
 {
-    // Ensure sub-lists are properly initialized to nullptr
-    forAll(lists_, typei)
-    {
-        lists_[typei] = nullptr;
-    }
-
-    // Total (reduced) sizes
+    // Save the total (reduced) sizes
     FixedList<label, 3> totSizes = obj.sizes_;
 
-    // Local sizes
+    // Need local sizes for the resize operation
     this->sizes_ = obj.sizes();
 
-    resizeAll(); // adjust allocation
+    resizeAll(); // adjust allocation/sizing
 
     // Restore total (reduced) sizes
     this->sizes_ = totSizes;
@@ -161,14 +137,7 @@ Foam::ensightFaces::ensightFaces(const ensightFaces& obj)
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::ensightFaces::~ensightFaces()
-{
-    forAll(lists_, typei)
-    {
-        deleteDemandDrivenData(lists_[typei]);
-    }
-    address_.clear();
-    flipMap_.clear();
-}
+{}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
@@ -176,27 +145,15 @@ Foam::ensightFaces::~ensightFaces()
 Foam::FixedList<Foam::label, 3> Foam::ensightFaces::sizes() const
 {
     FixedList<label, 3> count;
-    forAll(lists_, typei)
+    forAll(slices_, typei)
     {
-        count[typei] = lists_[typei]->size();
+        count[typei] = slices_[typei].size();
     }
 
     return count;
 }
 
 
-Foam::label Foam::ensightFaces::offset(const enum elemType what) const
-{
-    label n = 0;
-    for (label typei = 0; typei < label(what); ++typei)
-    {
-        n += lists_[typei]->size();
-    }
-
-    return n;
-}
-
-
 Foam::label Foam::ensightFaces::total() const
 {
     label n = 0;
@@ -217,9 +174,10 @@ void Foam::ensightFaces::clear()
 
 void Foam::ensightFaces::reduce()
 {
+    // No listCombineGather, listCombineScatter for FixedList
     forAll(sizes_, typei)
     {
-        sizes_[typei] = lists_[typei]->size();
+        sizes_[typei] = slices_[typei].size();
         Foam::reduce(sizes_[typei], sumOp<label>());
     }
 }
@@ -229,20 +187,15 @@ void Foam::ensightFaces::sort()
 {
     if (flipMap_.size() == address_.size())
     {
-        // sort flip map too
-
+        // Must sort flip map as well
         labelList order;
-        label start = 0;
 
-        forAll(lists_, typei)
+        forAll(slices_, typei)
         {
-            SubList<label>& idLst = *(lists_[typei]);
-            const label sz = idLst.size();
-
-            if (sz)
+            if (slices_[typei].size())
             {
-                SubList<bool> flip(flipMap_, sz, start);
-                start += sz; // for next sub-list
+                SubList<label> idLst(address_, slices_[typei]);
+                SubList<bool>  flip(flipMap_, slices_[typei]);
 
                 Foam::sortedOrder(idLst, order);
 
@@ -254,11 +207,16 @@ void Foam::ensightFaces::sort()
     else
     {
         // no flip-maps, simpler to sort
-        forAll(lists_, typei)
+        forAll(slices_, typei)
         {
-            Foam::sort(*(lists_[typei]));
+            if (slices_[typei].size())
+            {
+                SubList<label> idLst(address_, slices_[typei]);
+                Foam::sort(idLst);
+            }
         }
-        flipMap_.clear();  // for safety
+
+        flipMap_.clear();  // for extra safety
     }
 }
 
@@ -278,7 +236,7 @@ void Foam::ensightFaces::classify(const faceList& faces)
     }
 
     resizeAll();    // adjust allocation
-    sizes_ = Zero;  // reset sizes
+    sizes_ = Zero;  // reset sizes - use for local indexing here
 
     // Assign face-id per shape type
     for (label listi = 0; listi < sz; ++listi)
@@ -318,7 +276,7 @@ void Foam::ensightFaces::classify
     }
 
     resizeAll();    // adjust allocation
-    sizes_ = Zero;  // reset sizes
+    sizes_ = Zero;  // reset sizes - use for local indexing here
 
     if (useFlip)
     {
@@ -330,11 +288,11 @@ void Foam::ensightFaces::classify
     for (label listi = 0; listi < sz; ++listi)
     {
         const label faceId = addressing[listi];
-        const bool flip = useFlip && flipMap[listi];
+        const bool  doFlip = useFlip && flipMap[listi];
 
         if (!exclude[faceId])
         {
-            add(faces[faceId], faceId, flip);
+            add(faces[faceId], faceId, doFlip);
         }
     }
 }
diff --git a/src/fileFormats/ensight/part/ensightFaces.H b/src/fileFormats/ensight/part/ensightFaces.H
index 844a03e9b3..bd7b3e8c40 100644
--- a/src/fileFormats/ensight/part/ensightFaces.H
+++ b/src/fileFormats/ensight/part/ensightFaces.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -37,7 +37,6 @@ Description
 #include "faceList.H"
 #include "FixedList.H"
 #include "PackedBoolList.H"
-#include "NamedEnum.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -57,16 +56,16 @@ public:
         //- Addressable ensight element types
         enum elemType
         {
-            TRIA3,
-            QUAD4,
-            NSIDED
+            TRIA3,      //!< "tria3"
+            QUAD4,      //!< "quad4"
+            NSIDED      //!< "nsided"
         };
 
         //- Number of element types (3)
         static const label nTypes;
 
-        //- The Ensight names for each element type
-        static const NamedEnum<elemType, 3> elemEnum;
+        //- The ensight element type names
+        static const char* elemNames[3];
 
 
     // Static Member Functions
@@ -83,28 +82,27 @@ private:
         //  The ensight part number is typically this value +1.
         label index_;
 
-        //- Linear list of ids, sub-sectioned per element type via SubLists
+        //- Linear list of ids, sub-sectioned per element type by sub-lists
         labelList address_;
 
         //- Linear list of face-flips
         boolList flipMap_;
 
+        //- Slices (sub-lists) of the address and flips for each element type.
+        FixedList<labelRange, 3> slices_;
+
         //- List of global sizes for each element type.
         //  Used temporarily for local sizes when building the element lists.
         FixedList<label, 3> sizes_;
 
-        //- SubLists of ids for each element type.
-        //  Managed via pointers, since a SubList cannot be relocated/resized.
-        FixedList<SubList<label>*, 3> lists_;
-
 
     // Private Member Functions
 
         //- Simple classifier
-        inline static elemType whatType(const face&);
+        inline static elemType whatType(const face& f);
 
         //- Low-level internal addition routine
-        inline void add(const face&, const label id, const bool flip = false);
+        inline void add(const face& f, const label id, const bool flip = false);
 
         //- Use temporarily stored sizes to redimension the element lists
         void resizeAll();
@@ -121,7 +119,7 @@ public:
         ensightFaces(label partIndex = 0);
 
         //- Copy constructor. Needed for lists etc.
-        ensightFaces(const ensightFaces&);
+        ensightFaces(const ensightFaces& obj);
 
 
     //- Destructor
@@ -141,14 +139,17 @@ public:
         //- The processor local size of all elements.
         inline label size() const;
 
-        //- The global number of the specified element type.
-        //  This value is only meaningful after a reduce operation.
-        inline label total(const enum elemType) const;
+        //- The processor local size of the specified element type.
+        inline label size(const enum elemType) const;
 
         //- The global number of all element types.
         //  This value is only meaningful after a reduce operation.
         label total() const;
 
+        //- The global number of the specified element type.
+        //  This value is only meaningful after a reduce operation.
+        inline label total(const enum elemType) const;
+
         //- The global numbers per element type.
         //  This value is only meaningful after a reduce operation.
         inline const FixedList<label, 3>& totals() const;
@@ -157,10 +158,10 @@ public:
         FixedList<label, 3> sizes() const;
 
         //- Processor local starting offset of element type.
-        label offset(const enum elemType what) const;
+        inline label offset(const enum elemType what) const;
 
         //- Return the (local) face ids of the specified element type
-        inline const labelUList& faceIds(const enum elemType) const;
+        inline const labelUList faceIds(const enum elemType) const;
 
         //- Return the processor local face ids of all elements
         inline const labelUList& faceIds() const;
diff --git a/src/fileFormats/ensight/part/ensightFacesI.H b/src/fileFormats/ensight/part/ensightFacesI.H
index 4b32a373db..78048c1c90 100644
--- a/src/fileFormats/ensight/part/ensightFacesI.H
+++ b/src/fileFormats/ensight/part/ensightFacesI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2016 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2016-2017 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -29,7 +29,7 @@ License
 
 inline const char* Foam::ensightFaces::key(const enum elemType what)
 {
-    return elemEnum[what];
+    return elemNames[what];
 }
 
 
@@ -63,20 +63,24 @@ inline Foam::label Foam::ensightFaces::total(const enum elemType what) const
 }
 
 
-inline const Foam::labelUList& Foam::ensightFaces::faceIds
+inline Foam::label Foam::ensightFaces::size(const enum elemType what) const
+{
+    return slices_[what].size();
+}
+
+
+inline Foam::label Foam::ensightFaces::offset(const enum elemType what) const
+{
+    return slices_[what].start();
+}
+
+
+inline const Foam::labelUList Foam::ensightFaces::faceIds
 (
     const enum elemType what
 ) const
 {
-    if (!lists_[what])
-    {
-        FatalErrorInFunction
-            << "Accessing unallocated sublist for elem-type: "
-            << elemEnum[what]
-            << exit(FatalError);
-    }
-
-    return *(lists_[what]);
+    return address_[slices_[what]];
 }
 
 
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
index ba76a2e601..5ba985a24e 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/timeVaryingMappedFixedValue/timeVaryingMappedFixedValueFvPatchField.C
@@ -416,7 +416,8 @@ void Foam::timeVaryingMappedFixedValueFvPatchField<Type>::checkTable()
             // Reread values and interpolate
             fileName valsFile
             (
-                this->db().time().caseConstant()
+                this->db().time().path()
+               /this->db().time().caseConstant()
                /"boundaryData"
                /this->patch().name()
                /sampleTimes_[endSampleTime_].name()
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.C
index b4a73f3b91..1883fac278 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.C
@@ -129,7 +129,7 @@ Foam::eddy::eddy
     const scalar x,
     const scalar sigmaX,
     const symmTensor& R,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     patchFaceI_(patchFaceI),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
index 5bd0feb0f1..be527caa2f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddy.H
@@ -41,7 +41,7 @@ SourceFiles
 #include "vector.H"
 #include "point.H"
 #include "tensor.H"
-#include "cachedRandom.H"
+#include "Random.H"
 #include "coordinateSystem.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -112,7 +112,7 @@ class eddy
         ) const;
 
         //- Return a number with zero mean and unit variance
-        inline scalar epsi(cachedRandom& rndGen) const;
+        inline scalar epsi(Random& rndGen) const;
 
 
 public:
@@ -133,7 +133,7 @@ public:
             const scalar x,             // distance from reference position
             const scalar sigmaX,        // length scale
             const symmTensor& R,        // Stress tensor
-            cachedRandom& rndGen
+            Random& rndGen
         );
 
         //- Construct copy
@@ -175,7 +175,7 @@ public:
             inline label dir1() const;
 
             //- Return random vector of -1 and 1's
-            inline vector epsilon(cachedRandom& rndGen) const;
+            inline vector epsilon(Random& rndGen) const;
 
 
         // Helper functions
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyI.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyI.H
index 82c579fcc5..91531bf13d 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyI.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/eddy/eddyI.H
@@ -29,7 +29,7 @@ using namespace Foam::constant;
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-Foam::scalar Foam::eddy::epsi(cachedRandom& rndGen) const
+Foam::scalar Foam::eddy::epsi(Random& rndGen) const
 {
     // Random number with zero mean and unit variance
     return rndGen.sample01<scalar>() > 0.5 ? 1 : -1;
@@ -84,7 +84,7 @@ inline Foam::scalar Foam::eddy::c1() const
 }
 
 
-Foam::vector Foam::eddy::epsilon(cachedRandom& rndGen) const
+Foam::vector Foam::eddy::epsilon(Random& rndGen) const
 {
     return vector(epsi(rndGen), epsi(rndGen), epsi(rndGen));
 }
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
index 280817df45..62957304cc 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.C
@@ -746,7 +746,7 @@ turbulentDFSEMInletFvPatchVectorField
     nCellPerEddy_(5),
     patchNormal_(vector::zero),
     v0_(0),
-    rndGen_(0, -1),
+    rndGen_(Pstream::myProcNo()),
     sigmax_(size(), 0),
     maxSigmaX_(0),
     nEddy_(0),
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H
index b1d0afe62a..d14d82266f 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentDFSEMInlet/turbulentDFSEMInletFvPatchVectorField.H
@@ -81,7 +81,7 @@ SourceFiles
 #define turbulentDFSEMInletFvPatchVectorField_H
 
 #include "fixedValueFvPatchFields.H"
-#include "cachedRandom.H"
+#include "Random.H"
 #include "eddy.H"
 #include "pointIndexHit.H"
 #include "instantList.H"
@@ -184,7 +184,7 @@ class turbulentDFSEMInletFvPatchVectorField
         scalar v0_;
 
         //- Random number generator
-        cachedRandom rndGen_;
+        Random rndGen_;
 
         //- Length scale per patch face
         scalarField sigmax_;
diff --git a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
index ec71541bd0..b457ecd85a 100644
--- a/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
+++ b/src/finiteVolume/fields/fvPatchFields/derived/turbulentInlet/turbulentInletFvPatchField.C
@@ -166,7 +166,7 @@ void Foam::turbulentInletFvPatchField<Type>::updateCoeffs()
 
         forAll(patchField, facei)
         {
-            ranGen_.randomise(randomField[facei]);
+            ranGen_.randomise01<Type>(randomField[facei]);
         }
 
         // Correction-factor to compensate for the loss of RMS fluctuation
diff --git a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
index 3cfbf96311..253d344a96 100644
--- a/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
+++ b/src/finiteVolume/fvMatrices/fvMatrix/fvMatrixSolve.C
@@ -59,7 +59,12 @@ Foam::SolverPerformance<Type> Foam::fvMatrix<Type>::solve
     const dictionary& solverControls
 )
 {
-    addProfiling(solve, "fvMatrix::solve." + psi_.name());
+    word regionName;
+    if (psi_.mesh().name() != polyMesh::defaultRegion)
+    {
+        regionName = psi_.mesh().name() + "::";
+    }
+    addProfiling(solve, "fvMatrix::solve." + regionName + psi_.name());
 
     if (debug)
     {
diff --git a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
index f0e1adadca..c5b1637478 100644
--- a/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
+++ b/src/finiteVolume/fvMatrices/fvScalarMatrix/fvScalarMatrix.C
@@ -60,7 +60,12 @@ Foam::fvMatrix<Foam::scalar>::solver
     const dictionary& solverControls
 )
 {
-    addProfiling(solve, "fvMatrix::solve." + psi_.name());
+    word regionName;
+    if (psi_.mesh().name() != polyMesh::defaultRegion)
+    {
+        regionName = psi_.mesh().name() + "::";
+    }
+    addProfiling(solve, "fvMatrix::solve." + regionName + psi_.name());
 
     if (debug)
     {
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C
index 617671bef4..c4c6432e11 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -77,6 +77,36 @@ Foam::autoPtr<Foam::patchDistMethod> Foam::patchDistMethod::New
 }
 
 
+
+Foam::autoPtr<Foam::patchDistMethod> Foam::patchDistMethod::New
+(
+    const dictionary& dict,
+    const fvMesh& mesh,
+    const labelHashSet& patchIDs,
+    const word& defaultPatchDistMethod
+)
+{
+    word patchDistMethodType = defaultPatchDistMethod;
+    dict.readIfPresent("method", patchDistMethodType);
+
+    Info<< "Selecting patchDistMethod " << patchDistMethodType << endl;
+    dictionaryConstructorTable::iterator cstrIter =
+        dictionaryConstructorTablePtr_->find(patchDistMethodType);
+
+    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    {
+        FatalErrorInFunction
+            << "Unknown patchDistMethodType type "
+            << patchDistMethodType << endl << endl
+            << "Valid patchDistMethod types are : " << endl
+            << dictionaryConstructorTablePtr_->sortedToc()
+            << exit(FatalError);
+    }
+
+    return cstrIter()(dict, mesh, patchIDs);
+}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::patchDistMethod::~patchDistMethod()
diff --git a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
index 6f23e3ae7e..573a1a4539 100644
--- a/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
+++ b/src/finiteVolume/fvMesh/wallDist/patchDistMethods/patchDistMethod/patchDistMethod.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -118,6 +118,14 @@ public:
             const labelHashSet& patchIDs
         );
 
+        static autoPtr<patchDistMethod> New
+        (
+            const dictionary& dict,
+            const fvMesh& mesh,
+            const labelHashSet& patchIDs,
+            const word& defaultPatchDistMethod
+        );
+
 
     //- Destructor
     virtual ~patchDistMethod();
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
index cab438a468..498daf1637 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -68,17 +68,28 @@ void Foam::wallDist::constructn() const
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-Foam::wallDist::wallDist(const fvMesh& mesh, const word& patchTypeName)
+Foam::wallDist::wallDist
+(
+    const fvMesh& mesh,
+    const labelHashSet& patchIDs,
+    const word& patchTypeName
+)
 :
     MeshObject<fvMesh, Foam::UpdateableMeshObject, wallDist>(mesh),
-    patchIDs_(mesh.boundaryMesh().findPatchIDs<wallPolyPatch>()),
+    patchIDs_(patchIDs),
     patchTypeName_(patchTypeName),
+    dict_
+    (
+        static_cast<const fvSchemes&>(mesh).subOrEmptyDict
+        (
+            patchTypeName_ & "Dist"
+        )
+    ),
     pdm_
     (
         patchDistMethod::New
         (
-            static_cast<const fvSchemes&>(mesh)
-           .subDict(patchTypeName_ & "Dist"),
+            dict_,
             mesh,
             patchIDs_
         )
@@ -95,17 +106,9 @@ Foam::wallDist::wallDist(const fvMesh& mesh, const word& patchTypeName)
         dimensionedScalar("y" & patchTypeName_, dimLength, SMALL),
         patchDistMethod::patchTypes<scalar>(mesh, patchIDs_)
     ),
-    nRequired_
-    (
-        static_cast<const fvSchemes&>(mesh).subDict(patchTypeName_ & "Dist")
-       .lookupOrDefault<Switch>("nRequired", false)
-    ),
+    nRequired_(dict_.lookupOrDefault<Switch>("nRequired", false)),
     n_(volVectorField::null()),
-    updateInterval_
-    (
-        static_cast<const fvSchemes&>(mesh).subDict(patchTypeName_ & "Dist")
-       .lookupOrDefault<label>("updateInterval", 1)
-    ),
+    updateInterval_(dict_.lookupOrDefault<label>("updateInterval", 1)),
     requireUpdate_(true)
 {
     if (nRequired_)
@@ -120,6 +123,7 @@ Foam::wallDist::wallDist(const fvMesh& mesh, const word& patchTypeName)
 Foam::wallDist::wallDist
 (
     const fvMesh& mesh,
+    const word& defaultPatchDistMethod,
     const labelHashSet& patchIDs,
     const word& patchTypeName
 )
@@ -127,14 +131,21 @@ Foam::wallDist::wallDist
     MeshObject<fvMesh, Foam::UpdateableMeshObject, wallDist>(mesh),
     patchIDs_(patchIDs),
     patchTypeName_(patchTypeName),
+    dict_
+    (
+        static_cast<const fvSchemes&>(mesh).subOrEmptyDict
+        (
+            patchTypeName_ & "Dist"
+        )
+    ),
     pdm_
     (
         patchDistMethod::New
         (
-            static_cast<const fvSchemes&>(mesh)
-           .subDict(patchTypeName_ & "Dist"),
+            dict_,
             mesh,
-            patchIDs_
+            patchIDs_,
+            defaultPatchDistMethod
         )
     ),
     y_
@@ -149,17 +160,9 @@ Foam::wallDist::wallDist
         dimensionedScalar("y" & patchTypeName_, dimLength, SMALL),
         patchDistMethod::patchTypes<scalar>(mesh, patchIDs_)
     ),
-    nRequired_
-    (
-        static_cast<const fvSchemes&>(mesh).subDict(patchTypeName_ & "Dist")
-       .lookupOrDefault<Switch>("nRequired", false)
-    ),
+    nRequired_(dict_.lookupOrDefault<Switch>("nRequired", false)),
     n_(volVectorField::null()),
-    updateInterval_
-    (
-        static_cast<const fvSchemes&>(mesh).subDict(patchTypeName_ & "Dist")
-       .lookupOrDefault<label>("updateInterval", 1)
-    ),
+    updateInterval_(dict_.lookupOrDefault<label>("updateInterval", 1)),
     requireUpdate_(true)
 {
     if (nRequired_)
@@ -171,6 +174,17 @@ Foam::wallDist::wallDist
 }
 
 
+Foam::wallDist::wallDist(const fvMesh& mesh, const word& patchTypeName)
+:
+    wallDist
+    (
+        mesh,
+        mesh.boundaryMesh().findPatchIDs<wallPolyPatch>(),
+        patchTypeName
+    )
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
 Foam::wallDist::~wallDist()
diff --git a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
index 5d0aa325fd..11a17c3d33 100644
--- a/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
+++ b/src/finiteVolume/fvMesh/wallDist/wallDist/wallDist.H
@@ -82,6 +82,9 @@ class wallDist
         //- Name for the patch set, e.g. "wall"
         const word patchTypeName_;
 
+        //- Construction dictionary
+        const dictionary dict_;
+
         //- Run-time selected method to generate the distance-to-wall field
         mutable autoPtr<patchDistMethod> pdm_;
 
@@ -121,13 +124,6 @@ public:
 
     // Constructors
 
-        //- Construct from mesh and optional patch type name
-        wallDist
-        (
-            const fvMesh& mesh,
-            const word& patchTypeName = "wall"
-        );
-
         //- Construct from mesh, patch IDs and optional patch type name
         wallDist
         (
@@ -136,6 +132,23 @@ public:
             const word& patchTypeName = "patch"
         );
 
+        //- Construct from mesh, patch IDs, default patch distance method
+        //  and optional patch type name
+        wallDist
+        (
+            const fvMesh& mesh,
+            const word& defaultPatchDistMethod,
+            const labelHashSet& patchIDs,
+            const word& patchTypeName = "patch"
+        );
+
+        //- Construct from mesh and optional patch type name
+        wallDist
+        (
+            const fvMesh& mesh,
+            const word& patchTypeName = "wall"
+        );
+
 
     //- Destructor
     virtual ~wallDist();
diff --git a/src/functionObjects/field/ddt2/ddt2.C b/src/functionObjects/field/ddt2/ddt2.C
index a387671658..08c23fd42f 100644
--- a/src/functionObjects/field/ddt2/ddt2.C
+++ b/src/functionObjects/field/ddt2/ddt2.C
@@ -178,7 +178,7 @@ bool Foam::functionObjects::ddt2::execute()
 {
     results_.clear();
 
-    wordHashSet candidates = subsetStrings(selectFields_, mesh_.names());
+    wordHashSet candidates(subsetStrings(selectFields_, mesh_.names()));
     DynamicList<word> missing(selectFields_.size());
     DynamicList<word> ignored(selectFields_.size());
 
diff --git a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H
index effb0904fc..580babf826 100644
--- a/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H
+++ b/src/functionObjects/field/extractEulerianParticles/extractEulerianParticles/extractEulerianParticles.H
@@ -71,7 +71,6 @@ SourceFiles
 #include "surfaceFieldsFwd.H"
 #include "vectorList.H"
 #include "globalIndex.H"
-#include "cachedRandom.H"
 #include "eulerianParticle.H"
 #include "IOdictionary.H"
 #include "injectedParticleCloud.H"
diff --git a/src/functionObjects/field/histogram/histogram.C b/src/functionObjects/field/histogram/histogram.C
index 064fb9dded..39c2649fab 100644
--- a/src/functionObjects/field/histogram/histogram.C
+++ b/src/functionObjects/field/histogram/histogram.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -45,23 +45,31 @@ void Foam::functionObjects::histogram::writeGraph
 (
     const coordSet& coords,
     const word& fieldName,
-    const scalarField& values
+    const scalarField& normalizedValues,
+    const scalarField& absoluteValues
 ) const
 {
-    const wordList fieldNames(1, fieldName);
-
     fileName outputPath = baseTimeDir();
     mkDir(outputPath);
     OFstream graphFile
     (
-        outputPath/formatterPtr_().getFileName(coords, fieldNames)
+        outputPath
+       /formatterPtr_().getFileName
+        (
+            coords,
+            wordList(1, fieldName)
+        )
     );
 
     Log << "    Writing histogram of " << fieldName
         << " to " << graphFile.name() << endl;
 
-    List<const scalarField*> yPtrs(1);
-    yPtrs[0] = &values;
+    wordList fieldNames(2);
+    fieldNames[0] = fieldName;
+    fieldNames[1] = fieldName + "Count";
+    List<const scalarField*> yPtrs(2);
+    yPtrs[0] = &normalizedValues;
+    yPtrs[1] = &absoluteValues;
     formatterPtr_().write(coords, fieldNames, yPtrs, graphFile);
 }
 
@@ -76,7 +84,9 @@ Foam::functionObjects::histogram::histogram
 )
 :
     fvMeshFunctionObject(name, runTime, dict),
-    writeFile(obr_, name)
+    writeFile(obr_, name),
+    max_(-GREAT),
+    min_(GREAT)
 {
     read(dict);
 }
@@ -96,8 +106,9 @@ bool Foam::functionObjects::histogram::read(const dictionary& dict)
     writeFile::read(dict);
 
     dict.lookup("field") >> fieldName_;
-    dict.lookup("max") >> max_;
-    min_ = dict.lookupOrDefault<scalar>("min", 0);
+
+    max_ = dict.lookupOrDefault<scalar>("max", -GREAT);
+    min_ = dict.lookupOrDefault<scalar>("min", GREAT);
     dict.lookup("nBins") >> nBins_;
 
     word format(dict.lookup("setFormat"));
@@ -149,38 +160,63 @@ bool Foam::functionObjects::histogram::write()
        : obr_.lookupObject<volScalarField>(fieldName_)
     );
 
+
+    scalar histMax = max_;
+    scalar histMin = min_;
+
+    if (max_ == -GREAT)
+    {
+        // Determine current min and max
+        histMax = max(field).value();
+
+        if (min_ == GREAT)
+        {
+            histMin = min(field).value();
+        }
+        Log << "    Determined histogram bounds from field"
+            << " min/max(" << fieldName_ << ") = "
+            << histMin << ' ' << histMax << endl;
+    }
+    else if (min_ == GREAT)
+    {
+        histMin = 0;
+    }
+
     // Calculate the mid-points of bins for the graph axis
     pointField xBin(nBins_);
-    const scalar delta = (max_- min_)/nBins_;
+    const scalar delta = (histMax- histMin)/nBins_;
 
-    scalar x = min_ + 0.5*delta;
+    scalar x = histMin + 0.5*delta;
     forAll(xBin, i)
     {
         xBin[i] = point(x, 0, 0);
         x += delta;
     }
 
-    scalarField data(nBins_, 0);
+    scalarField dataNormalized(nBins_, 0);
+    labelField dataCount(nBins_, 0);
     const scalarField& V = mesh_.V();
 
     forAll(field, celli)
     {
-        const label bini = (field[celli] - min_)/delta;
+        const label bini = (field[celli] - histMin)/delta;
         if (bini >= 0 && bini < nBins_)
         {
-            data[bini] += V[celli];
+            dataNormalized[bini] += V[celli];
+            dataCount[bini]++;
         }
     }
 
-    Pstream::listCombineGather(data, plusEqOp<scalar>());
+    Pstream::listCombineGather(dataNormalized, plusEqOp<scalar>());
+    Pstream::listCombineGather(dataCount, plusEqOp<label>());
 
     if (Pstream::master())
     {
-        const scalar sumData = sum(data);
+        const scalar sumData = sum(dataNormalized);
 
         if (sumData > SMALL)
         {
-            data /= sumData;
+            dataNormalized /= sumData;
 
             const coordSet coords
             (
@@ -190,7 +226,15 @@ bool Foam::functionObjects::histogram::write()
                 mag(xBin)
             );
 
-            writeGraph(coords, fieldName_, data);
+
+            // Convert count field from labelField to scalarField
+            scalarField count(dataCount.size());
+            forAll(count, i)
+            {
+                count[i] = 1.0*dataCount[i];
+            }
+
+            writeGraph(coords, fieldName_, dataNormalized, count);
         }
     }
 
diff --git a/src/functionObjects/field/histogram/histogram.H b/src/functionObjects/field/histogram/histogram.H
index 4dd2982a48..d6147cff1b 100644
--- a/src/functionObjects/field/histogram/histogram.H
+++ b/src/functionObjects/field/histogram/histogram.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -53,7 +53,7 @@ Usage
         type         | type name: histogram    | yes         |
         field        | Field to analyse        | yes         |
         nBins        | Number of bins for the histogram | yes|
-        max          | Maximum value sampled   | yes         |
+        max          | Maximum value sampled   | no          | field max
         min          | minimum value sampled   | no          | 0
         setFormat    | Output format           | yes         |
     \endtable
@@ -115,7 +115,8 @@ class histogram
         (
             const coordSet& coords,
             const word& valueName,
-            const scalarField& values
+            const scalarField& normalizedValues,
+            const scalarField& absoluteValues
         ) const;
 
         //- Disallow default bitwise copy construct
diff --git a/src/functionObjects/field/particleDistribution/particleDistribution.C b/src/functionObjects/field/particleDistribution/particleDistribution.C
index 71919b0933..b8cf35122b 100644
--- a/src/functionObjects/field/particleDistribution/particleDistribution.C
+++ b/src/functionObjects/field/particleDistribution/particleDistribution.C
@@ -61,7 +61,7 @@ Foam::functionObjects::particleDistribution::particleDistribution
     cloudName_("unknown-cloudName"),
     nameVsBinWidth_(),
     tagFieldName_("none"),
-    rndGen_(1234, -1),
+    rndGen_(),
     writerPtr_(nullptr)
 {
     read(dict);
diff --git a/src/functionObjects/field/particleDistribution/particleDistribution.H b/src/functionObjects/field/particleDistribution/particleDistribution.H
index fec579f193..4e7765e1b1 100644
--- a/src/functionObjects/field/particleDistribution/particleDistribution.H
+++ b/src/functionObjects/field/particleDistribution/particleDistribution.H
@@ -73,7 +73,7 @@ SourceFiles
 #include "fvMeshFunctionObject.H"
 #include "writeFile.H"
 #include "scalarField.H"
-#include "cachedRandom.H"
+#include "Random.H"
 #include "Tuple2.H"
 #include "writer.H"
 
@@ -107,7 +107,7 @@ protected:
         word tagFieldName_;
 
         //- Random number generator - used by distribution models
-        cachedRandom rndGen_;
+        Random rndGen_;
 
         //- Writer
         autoPtr<writer<scalar>> writerPtr_;
diff --git a/src/functionObjects/field/randomise/randomiseTemplates.C b/src/functionObjects/field/randomise/randomiseTemplates.C
index a466ef3551..f0c691eb39 100644
--- a/src/functionObjects/field/randomise/randomiseTemplates.C
+++ b/src/functionObjects/field/randomise/randomiseTemplates.C
@@ -47,7 +47,7 @@ bool Foam::functionObjects::randomise::calcRandomised()
         forAll(field, celli)
         {
             Type rndPert;
-            rand.randomise(rndPert);
+            rand.randomise01(rndPert);
             rndPert = 2.0*rndPert - pTraits<Type>::one;
             rndPert /= mag(rndPert);
             rfield[celli] += magPerturbation_*rndPert;
diff --git a/src/functionObjects/field/readFields/readFields.C b/src/functionObjects/field/readFields/readFields.C
index 2ac396999f..04fb569728 100644
--- a/src/functionObjects/field/readFields/readFields.C
+++ b/src/functionObjects/field/readFields/readFields.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -50,9 +50,15 @@ Foam::functionObjects::readFields::readFields
 )
 :
     fvMeshFunctionObject(name, runTime, dict),
-    fieldSet_()
+    fieldSet_(),
+    readOnStart_(true)
 {
     read(dict);
+
+    if (readOnStart_)
+    {
+        execute();
+    }
 }
 
 
@@ -69,6 +75,7 @@ bool Foam::functionObjects::readFields::read(const dictionary& dict)
     fvMeshFunctionObject::read(dict);
 
     dict.lookup("fields") >> fieldSet_;
+    dict.readIfPresent("readOnStart", readOnStart_);
 
     return true;
 }
diff --git a/src/functionObjects/field/readFields/readFields.H b/src/functionObjects/field/readFields/readFields.H
index f026063e9f..1dfb662d5d 100644
--- a/src/functionObjects/field/readFields/readFields.H
+++ b/src/functionObjects/field/readFields/readFields.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -48,6 +48,7 @@ Usage
         Property     | Description             | Required    | Default value
         type         | type name: readFields   | yes         |
         fields       | list of fields to read  |  no         |
+        readOnStart  | flag to start reading on start-up | no  | yes
         log          | Log to standard output  | no          | yes
     \endtable
 
@@ -88,6 +89,9 @@ protected:
         //- Fields to load
         wordList fieldSet_;
 
+        //- Flag to read on construction
+        bool readOnStart_;
+
 
     // Protected Member Functions
 
diff --git a/src/functionObjects/field/zeroGradient/zeroGradient.C b/src/functionObjects/field/zeroGradient/zeroGradient.C
index ff07607652..dedde1fe99 100644
--- a/src/functionObjects/field/zeroGradient/zeroGradient.C
+++ b/src/functionObjects/field/zeroGradient/zeroGradient.C
@@ -135,7 +135,7 @@ bool Foam::functionObjects::zeroGradient::execute()
 {
     results_.clear();
 
-    wordHashSet candidates = subsetStrings(selectFields_, mesh_.names());
+    wordHashSet candidates(subsetStrings(selectFields_, mesh_.names()));
     DynamicList<word> missing(selectFields_.size());
     DynamicList<word> ignored(selectFields_.size());
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt b/src/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt
index 3f23c20c3e..b5c3bf0815 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt
+++ b/src/functionObjects/graphics/runTimePostProcessing/CMakeLists-Common.txt
@@ -21,7 +21,6 @@ include_directories(
 
 link_directories(
     $ENV{FOAM_LIBBIN}
-    $ENV{FOAM_EXT_LIBBIN}
 )
 
 add_definitions(
diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.C b/src/functionObjects/graphics/runTimePostProcessing/scene.C
index ea987cff38..cd74326a16 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/scene.C
+++ b/src/functionObjects/graphics/runTimePostProcessing/scene.C
@@ -131,6 +131,21 @@ void Foam::functionObjects::runTimePostPro::scene::readColours
 }
 
 
+void Foam::functionObjects::runTimePostPro::scene::setActorVisibility
+(
+    vtkRenderer* renderer,
+    const bool visible
+) const
+{
+    vtkActorCollection *actors = renderer->GetActors();
+    for (int i = 0; i < actors->GetNumberOfItems(); ++i)
+    {
+        vtkActor *actor = vtkActor::SafeDownCast(actors->GetItemAsObject(i));
+        actor->SetVisibility(visible);
+    }
+}
+
+
 void Foam::functionObjects::runTimePostPro::scene::initialise
 (
     vtkRenderer* renderer,
@@ -239,9 +254,13 @@ void Foam::functionObjects::runTimePostPro::scene::setCamera
     //       to be done once on initialisation
     if (!clipBox_.empty())
     {
-        // Call ResetCamera() to fit clip box in view
+        setActorVisibility(renderer, false);
         clipBoxActor_->VisibilityOn();
+
+        // Call ResetCamera() to fit clip box in view
         renderer->ResetCamera();
+
+        setActorVisibility(renderer, true);
         clipBoxActor_->VisibilityOff();
     }
 
diff --git a/src/functionObjects/graphics/runTimePostProcessing/scene.H b/src/functionObjects/graphics/runTimePostProcessing/scene.H
index 549b430e39..127fcb6db6 100644
--- a/src/functionObjects/graphics/runTimePostProcessing/scene.H
+++ b/src/functionObjects/graphics/runTimePostProcessing/scene.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -105,6 +105,13 @@ class scene
         //- Read colour properties
         void readColours(const dictionary& dict);
 
+        //- Set visibility of all actors on/off
+        void setActorVisibility
+        (
+            vtkRenderer* renderer,
+            const bool visible
+        ) const;
+
         //- Disallow default bitwise copy construct
         scene(const scene&);
 
diff --git a/src/functionObjects/utilities/ensightWrite/ensightWrite.C b/src/functionObjects/utilities/ensightWrite/ensightWrite.C
index 02a17215a7..30b11ffc9e 100644
--- a/src/functionObjects/utilities/ensightWrite/ensightWrite.C
+++ b/src/functionObjects/utilities/ensightWrite/ensightWrite.C
@@ -246,7 +246,7 @@ bool Foam::functionObjects::ensightWrite::write()
         ensCase().setTime(t.value(), t.timeIndex());
     }
 
-    wordHashSet candidates = subsetStrings(selectFields_, mesh_.names());
+    wordHashSet candidates(subsetStrings(selectFields_, mesh_.names()));
     DynamicList<word> missing(selectFields_.size());
     DynamicList<word> ignored(selectFields_.size());
 
diff --git a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
index 18b233e64c..ed48e24fcf 100644
--- a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
+++ b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.C
@@ -48,11 +48,10 @@ namespace functionObjects
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
-void Foam::functionObjects::timeActivatedFileUpdate::updateFile
-(
-    const bool checkFiles
-)
+void Foam::functionObjects::timeActivatedFileUpdate::updateFile()
 {
+    modified_ = false;
+
     label i = lastIndex_;
     while
     (
@@ -68,19 +67,15 @@ void Foam::functionObjects::timeActivatedFileUpdate::updateFile
         Log << nl << type() << ": copying file" << nl << timeVsFile_[i].second()
             << nl << "to:" << nl << fileToUpdate_ << nl << endl;
 
-        fileName destFile(fileToUpdate_ + Foam::name(pid()));
-        cp(timeVsFile_[i].second(), destFile);
-        mv(destFile, fileToUpdate_);
-        lastIndex_ = i;
-
-        if (checkFiles)
+        if (Pstream::master() || time_.distributed())
         {
-            // Do an early check to avoid an additional iteration before
-            // any changes are picked up (see Time::run : does readModified
-            // before executing FOs). Note we have to protect the read
-            // constructor of *this from triggering this behaviour.
-            const_cast<Time&>(time_).Time::readModifiedObjects();
+            // Slaves do not copy if running non-distributed
+            fileName destFile(fileToUpdate_ + Foam::name(pid()));
+            cp(timeVsFile_[i].second(), destFile);
+            mv(destFile, fileToUpdate_);
         }
+        lastIndex_ = i;
+        modified_ = true;
     }
 }
 
@@ -98,7 +93,8 @@ Foam::functionObjects::timeActivatedFileUpdate::timeActivatedFileUpdate
     time_(runTime),
     fileToUpdate_("unknown-fileToUpdate"),
     timeVsFile_(),
-    lastIndex_(-1)
+    lastIndex_(-1),
+    modified_(false)
 {
     read(dict);
 }
@@ -142,8 +138,8 @@ bool Foam::functionObjects::timeActivatedFileUpdate::read
             << timeVsFile_[i].second() << endl;
     }
 
-    // Copy starting files. Avoid recursion by not checking for modified files.
-    updateFile(false);
+    // Copy starting files
+    updateFile();
 
     return true;
 }
@@ -151,7 +147,7 @@ bool Foam::functionObjects::timeActivatedFileUpdate::read
 
 bool Foam::functionObjects::timeActivatedFileUpdate::execute()
 {
-    updateFile(true);
+    updateFile();
 
     return true;
 }
@@ -163,4 +159,10 @@ bool Foam::functionObjects::timeActivatedFileUpdate::write()
 }
 
 
+bool Foam::functionObjects::timeActivatedFileUpdate::filesModified() const
+{
+    return modified_;
+}
+
+
 // ************************************************************************* //
diff --git a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
index 4e0981ee33..e6fbedcc82 100644
--- a/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
+++ b/src/functionObjects/utilities/timeActivatedFileUpdate/timeActivatedFileUpdate.H
@@ -106,11 +106,14 @@ class timeActivatedFileUpdate
         //- Index of last file copied
         label lastIndex_;
 
+        //- Has anything been copied?
+        bool modified_;
+
 
     // Private Member Functions
 
         //- Update file
-        void updateFile(const bool checkFiles);
+        void updateFile();
 
         //- Disallow default bitwise copy construct
         timeActivatedFileUpdate(const timeActivatedFileUpdate&);
@@ -150,6 +153,9 @@ public:
 
         //- Do nothing
         virtual bool write();
+
+        //- Did any file get changed during execution?
+        virtual bool filesModified() const;
 };
 
 
diff --git a/src/fvAgglomerationMethods/Allwmake b/src/fvAgglomerationMethods/Allwmake
index dcef4328c2..09f2dcf3c1 100755
--- a/src/fvAgglomerationMethods/Allwmake
+++ b/src/fvAgglomerationMethods/Allwmake
@@ -4,9 +4,83 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
-export ParMGridGen=$WM_THIRD_PARTY_DIR/ParMGridGen-1.0
+: ${FOAM_EXT_LIBBIN:=/usr/lib$WM_COMPILER_LIB_ARCH}  # Extra safety
+export FOAM_EXT_LIBBIN
 
-if [ -e "$FOAM_LIBBIN/libMGridGen.so" ]
+# Test for mgridgen.
+# - return 0 and export MGRIDGEN_ARCH_PATH on success
+hasMgridGen()
+{
+    local warning="==> skip mgridgen"
+
+    unset MGRIDGEN_ARCH_PATH MGRIDGEN_VERSION
+    settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/mgridgen) || {
+        # ignore silently# echo "$warning (no config.sh/mgridgen settings)"
+        return 1
+    }
+
+    . $settings
+    if [ -z "$MGRIDGEN_ARCH_PATH" -o "${MGRIDGEN_ARCH_PATH##*-}" = none ]
+    then
+        # ignore silently# echo "$warning (not available)"
+        return 1
+    fi
+
+    # Header
+    local header=$MGRIDGEN_ARCH_PATH/include/mgridgen.h
+    [ -f "$header" ] || {
+        # ignore silently# echo "$warning (no header)"
+        return 2  # file not found
+    }
+
+    # Library
+    [ -r $FOAM_EXT_LIBBIN/libMGridGen.so ] || \
+    [ -r $MGRIDGEN_ARCH_PATH/lib/libmgrid.a ] || \
+    [ -r $MGRIDGEN_ARCH_PATH/lib$WM_COMPILER_LIB_ARCH/libmgrid.a ] || \
+    [ "${MGRIDGEN_ARCH_PATH##*-}" = system ] || {
+        # ignore silently# echo "$warning (missing library)"
+        return 2
+    }
+
+    # Ensure consistent sizes with OpenFOAM and mgridgen header
+    # Extract typedef for idxtype, realtype
+    local label=$(sed -ne \
+        's/^.*typedef *\([^ ]*\) *idxtype.*/\1/ip' \
+        "$header")
+    local scalar=$(sed -ne \
+        's/^.*typedef *\([^ ]*\) *realtype.*/\1/ip' \
+        "$header")
+
+    : ${label:=unknown}
+    : ${scalar:=unknown}
+
+    case "$WM_LABEL_SIZE:$label" in
+    (32:int32_t | 32:int | 64:int64_t | 64:long)
+        export MGRIDGEN_ARCH_PATH
+        ;;
+
+    *)
+        echo "$warning (label='$WM_LABEL_SIZE', mgridgen.h has '$label')"
+        return 1
+        ;;
+    esac
+    case "$WM_PRECISION_OPTION:$scalar" in
+    (SP:float | DP:double)
+        export MGRIDGEN_ARCH_PATH
+        ;;
+
+    *)
+        echo "$warning (scalar='$WM_PRECISION_OPTION', mgridgen.h has '$scalar')"
+        return 1
+        ;;
+    esac
+
+    # OK
+    echo "mgridgen (label=$label, scalar=$scalar) - $MGRIDGEN_ARCH_PATH"
+
+}
+
+if hasMgridGen
 then
     wmake $targetType MGridGenGamgAgglomeration
 fi
diff --git a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
index a58b65fb79..8f7b5aedc6 100644
--- a/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
+++ b/src/fvAgglomerationMethods/MGridGenGamgAgglomeration/Make/options
@@ -1,15 +1,9 @@
-/* Needs ParMGridGen environment variable set. (see Allwmake script) */
-
-TYPE_REAL=
-#if defined(WM_SP)
-TYPE_REAL=-DTYPE_REAL
-#endif
-
 EXE_INC = \
     -I$(LIB_SRC)/finiteVolume/lnInclude \
-    -I$(ParMGridGen)/MGridGen/Lib/lnInclude \
-    -I$(ParMGridGen)/MGridGen/IMlib/lnInclude \
-    $(TYPE_REAL)
+    -I$(MGRIDGEN_ARCH_PATH)/include
 
 LIB_LIBS = \
-    -L$(FOAM_EXT_LIBBIN) -lMGridGen
+    -L$(FOAM_EXT_LIBBIN) \
+    -L$(MGRIDGEN_ARCH_PATH)/lib \
+    -L$(MGRIDGEN_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
+    -lmgrid
diff --git a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
index d628d09563..387bdbdbda 100644
--- a/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
+++ b/src/fvMotionSolver/motionDiffusivity/inverseDistance/inverseDistanceDiffusivity.C
@@ -30,6 +30,7 @@ License
 #include "surfaceInterpolate.H"
 #include "zeroGradientFvPatchFields.H"
 #include "wallDist.H"
+#include "meshWavePatchDistMethod.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -72,12 +73,13 @@ Foam::inverseDistanceDiffusivity::~inverseDistanceDiffusivity()
 void Foam::inverseDistanceDiffusivity::correct()
 {
     faceDiffusivity_ =
-        1.0
+        dimensionedScalar("one", dimLength, 1)
        /fvc::interpolate
         (
             wallDist::New
             (
                 mesh(),
+                patchDistMethods::meshWave::typeName,
                 mesh().boundaryMesh().patchSet(patchNames_)
             ).y()
         );
diff --git a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
index 6da1c1aa8e..fadaf872bc 100644
--- a/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
+++ b/src/lagrangian/DSMC/clouds/Templates/DSMCCloud/DSMCCloud.C
@@ -152,7 +152,7 @@ void Foam::DSMCCloud<ParcelType>::initialise
                 if
                 (
                     (particlesRequired - nParticlesToInsert)
-                  > rndGen_.scalar01()
+                  > rndGen_.sample01<scalar>()
                 )
                 {
                     nParticlesToInsert++;
@@ -282,7 +282,7 @@ void Foam::DSMCCloud<ParcelType>::collisions()
                 // subCell candidate selection procedure
 
                 // Select the first collision candidate
-                label candidateP = rndGen_.integer(0, nC - 1);
+                label candidateP = rndGen_.position<label>(0, nC - 1);
 
                 // Declare the second collision candidate
                 label candidateQ = -1;
@@ -298,7 +298,8 @@ void Foam::DSMCCloud<ParcelType>::collisions()
 
                     do
                     {
-                        candidateQ = subCellPs[rndGen_.integer(0, nSC - 1)];
+                        label i = rndGen_.position<label>(0, nSC - 1);
+                        candidateQ = subCellPs[i];
                     } while (candidateP == candidateQ);
                 }
                 else
@@ -309,7 +310,7 @@ void Foam::DSMCCloud<ParcelType>::collisions()
 
                     do
                     {
-                        candidateQ = rndGen_.integer(0, nC - 1);
+                        candidateQ = rndGen_.position<label>(0, nC - 1);
                     } while (candidateP == candidateQ);
                 }
 
@@ -317,15 +318,15 @@ void Foam::DSMCCloud<ParcelType>::collisions()
                 // uniform candidate selection procedure
 
                 // // Select the first collision candidate
-                // label candidateP = rndGen_.integer(0, nC-1);
+                // label candidateP = rndGen_.position<label>(0, nC-1);
 
                 // // Select a possible second collision candidate
-                // label candidateQ = rndGen_.integer(0, nC-1);
+                // label candidateQ = rndGen_.position<label>(0, nC-1);
 
                 // // If the same candidate is chosen, choose again
                 // while (candidateP == candidateQ)
                 // {
-                //     candidateQ = rndGen_.integer(0, nC-1);
+                //     candidateQ = rndGen_.position<label>(0, nC-1);
                 // }
 
                 // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -348,7 +349,7 @@ void Foam::DSMCCloud<ParcelType>::collisions()
                     sigmaTcRMax_[celli] = sigmaTcR;
                 }
 
-                if ((sigmaTcR/sigmaTcRMax) > rndGen_.scalar01())
+                if ((sigmaTcR/sigmaTcRMax) > rndGen_.sample01<scalar>())
                 {
                     binaryCollision().collide
                     (
@@ -648,7 +649,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
         mesh_
     ),
     constProps_(),
-    rndGen_(label(149382906) + 7183*Pstream::myProcNo()),
+    rndGen_(Pstream::myProcNo()),
     boundaryT_
     (
         volScalarField
@@ -711,7 +712,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
     // and 1.
     forAll(collisionSelectionRemainder_, i)
     {
-        collisionSelectionRemainder_[i] = rndGen_.scalar01();
+        collisionSelectionRemainder_[i] = rndGen_.sample01<scalar>();
     }
 
     if (readFields)
@@ -900,7 +901,7 @@ Foam::DSMCCloud<ParcelType>::DSMCCloud
         )
     ),
     constProps_(),
-    rndGen_(label(971501) + 1526*Pstream::myProcNo()),
+    rndGen_(Pstream::myProcNo()),
     boundaryT_
     (
         volScalarField
@@ -1039,12 +1040,7 @@ Foam::vector Foam::DSMCCloud<ParcelType>::equipartitionLinearVelocity
 {
     return
         sqrt(physicoChemical::k.value()*temperature/mass)
-       *vector
-        (
-            rndGen_.GaussNormal(),
-            rndGen_.GaussNormal(),
-            rndGen_.GaussNormal()
-        );
+       *rndGen_.GaussNormal<vector>();
 }
 
 
@@ -1064,7 +1060,9 @@ Foam::scalar Foam::DSMCCloud<ParcelType>::equipartitionInternalEnergy
     else if (iDof < 2.0 + SMALL && iDof > 2.0 - SMALL)
     {
         // Special case for iDof = 2, i.e. diatomics;
-        Ei = -log(rndGen_.scalar01())*physicoChemical::k.value()*temperature;
+        Ei =
+           -log(rndGen_.sample01<scalar>())
+           *physicoChemical::k.value()*temperature;
     }
     else
     {
@@ -1074,9 +1072,9 @@ Foam::scalar Foam::DSMCCloud<ParcelType>::equipartitionInternalEnergy
 
         do
         {
-            energyRatio = 10*rndGen_.scalar01();
+            energyRatio = 10*rndGen_.sample01<scalar>();
             P = pow((energyRatio/a), a)*exp(a - energyRatio);
-        } while (P < rndGen_.scalar01());
+        } while (P < rndGen_.sample01<scalar>());
 
         Ei = energyRatio*physicoChemical::k.value()*temperature;
     }
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
index 9139e09be3..d81ce400f6 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/LarsenBorgnakkeVariableHardSphere/LarsenBorgnakkeVariableHardSphere.C
@@ -39,14 +39,14 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio
 {
     CloudType& cloud(this->owner());
 
-    Random& rndGen(cloud.rndGen());
+    Random& rndGen = cloud.rndGen();
 
     scalar ChiAMinusOne = ChiA - 1;
     scalar ChiBMinusOne = ChiB - 1;
 
     if (ChiAMinusOne < SMALL && ChiBMinusOne < SMALL)
     {
-        return rndGen.scalar01();
+        return rndGen.sample01<scalar>();
     }
 
     scalar energyRatio;
@@ -56,7 +56,7 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio
     {
         P = 0;
 
-        energyRatio = rndGen.scalar01();
+        energyRatio = rndGen.sample01<scalar>();
 
         if (ChiAMinusOne < SMALL)
         {
@@ -81,7 +81,7 @@ Foam::scalar Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::energyRatio
                     ChiBMinusOne
                 );
         }
-    } while (P < rndGen.scalar01());
+    } while (P < rndGen.sample01<scalar>());
 
     return energyRatio;
 }
@@ -186,7 +186,7 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
     scalar& EiP = pP.Ei();
     scalar& EiQ = pQ.Ei();
 
-    Random& rndGen(cloud.rndGen());
+    Random& rndGen = cloud.rndGen();
 
     scalar inverseCollisionNumber = 1/relaxationCollisionNumber_;
 
@@ -217,13 +217,14 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
 
     if (iDofP > 0)
     {
-        if (inverseCollisionNumber > rndGen.scalar01())
+        if (inverseCollisionNumber > rndGen.sample01<scalar>())
         {
             availableEnergy += preCollisionEiP;
 
             if (iDofP == 2)
             {
-                scalar energyRatio = 1.0 - pow(rndGen.scalar01(), (1.0/ChiB));
+                scalar energyRatio =
+                    1.0 - pow(rndGen.sample01<scalar>(), (1.0/ChiB));
                 EiP = energyRatio*availableEnergy;
             }
             else
@@ -238,13 +239,13 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
 
     if (iDofQ > 0)
     {
-        if (inverseCollisionNumber > rndGen.scalar01())
+        if (inverseCollisionNumber > rndGen.sample01<scalar>())
         {
             availableEnergy += preCollisionEiQ;
 
             if (iDofQ == 2)
             {
-                scalar energyRatio = 1.0 - pow(rndGen.scalar01(), (1.0/ChiB));
+                scalar energyRatio = 1.0 - pow(rndGen.sample01<scalar>(), (1.0/ChiB));
                 EiQ = energyRatio*availableEnergy;
             }
             else
@@ -261,9 +262,9 @@ void Foam::LarsenBorgnakkeVariableHardSphere<CloudType>::collide
     scalar cR = sqrt(2.0*availableEnergy/mR);
 
     // Variable Hard Sphere collision part
-    scalar cosTheta = 2.0*rndGen.scalar01() - 1.0;
+    scalar cosTheta = 2.0*rndGen.sample01<scalar>() - 1.0;
     scalar sinTheta = sqrt(1.0 - cosTheta*cosTheta);
-    scalar phi = twoPi*rndGen.scalar01();
+    scalar phi = twoPi*rndGen.sample01<scalar>();
 
     vector postCollisionRelU =
         cR
diff --git a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
index 19d1ed61d8..3f20bd3bf9 100644
--- a/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
+++ b/src/lagrangian/DSMC/submodels/BinaryCollisionModel/VariableHardSphere/VariableHardSphere.C
@@ -121,7 +121,7 @@ void Foam::VariableHardSphere<CloudType>::collide
     vector& UP = pP.U();
     vector& UQ = pQ.U();
 
-    Random& rndGen(cloud.rndGen());
+    Random& rndGen = cloud.rndGen();
 
     scalar mP = cloud.constProps(typeIdP).mass();
 
@@ -131,11 +131,11 @@ void Foam::VariableHardSphere<CloudType>::collide
 
     scalar cR = mag(UP - UQ);
 
-    scalar cosTheta = 2.0*rndGen.scalar01() - 1.0;
+    scalar cosTheta = 2.0*rndGen.sample01<scalar>() - 1.0;
 
     scalar sinTheta = sqrt(1.0 - cosTheta*cosTheta);
 
-    scalar phi = twoPi*rndGen.scalar01();
+    scalar phi = twoPi*rndGen.sample01<scalar>();
 
     vector postCollisionRelU =
         cR
diff --git a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
index 314bd25977..4ed53b5cf6 100644
--- a/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
+++ b/src/lagrangian/DSMC/submodels/InflowBoundaryModel/FreeStream/FreeStream.C
@@ -147,7 +147,7 @@ void Foam::FreeStream<CloudType>::inflow()
 
     const scalar deltaT = mesh.time().deltaTValue();
 
-    Random& rndGen(cloud.rndGen());
+    Random& rndGen = cloud.rndGen();
 
     scalar sqrtPi = sqrt(pi);
 
@@ -291,7 +291,7 @@ void Foam::FreeStream<CloudType>::inflow()
 
                 // Add another particle with a probability proportional to the
                 // remainder of taking the integer part of faceAccumulator
-                if ((faceAccumulator - nI) > rndGen.scalar01())
+                if ((faceAccumulator - nI) > rndGen.sample01<scalar>())
                 {
                     nI++;
                 }
@@ -307,7 +307,7 @@ void Foam::FreeStream<CloudType>::inflow()
                     // Choose a triangle to insert on, based on their relative
                     // area
 
-                    scalar triSelection = rndGen.scalar01();
+                    scalar triSelection = rndGen.sample01<scalar>();
 
                     // Selected triangle
                     label selectedTriI = -1;
@@ -371,7 +371,7 @@ void Foam::FreeStream<CloudType>::inflow()
                     do
                     {
                         uNormalThermal =
-                            randomScaling*(2.0*rndGen.scalar01() - 1);
+                            randomScaling*(2.0*rndGen.sample01<scalar>() - 1);
 
                         uNormal = uNormalThermal + sCosTheta;
 
@@ -385,13 +385,13 @@ void Foam::FreeStream<CloudType>::inflow()
                                *exp(uNormProbCoeffB - sqr(uNormalThermal));
                         }
 
-                    } while (P < rndGen.scalar01());
+                    } while (P < rndGen.sample01<scalar>());
 
                     vector U =
                         sqrt(physicoChemical::k.value()*faceTemperature/mass)
                        *(
-                            rndGen.GaussNormal()*t1
-                          + rndGen.GaussNormal()*t2
+                            rndGen.GaussNormal<scalar>()*t1
+                          + rndGen.GaussNormal<scalar>()*t2
                         )
                       + (t1 & faceVelocity)*t1
                       + (t2 & faceVelocity)*t2
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
index 3bc25401ed..9f4ff92bde 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/MaxwellianThermal/MaxwellianThermal.C
@@ -78,19 +78,18 @@ void Foam::MaxwellianThermal<CloudType>::correct
 
     CloudType& cloud(this->owner());
 
-    Random& rndGen(cloud.rndGen());
+    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())
+            U.x()*(0.8 + 0.2*rndGen.sample01<scalar>()),
+            U.y()*(0.8 + 0.2*rndGen.sample01<scalar>()),
+            U.z()*(0.8 + 0.2*rndGen.sample01<scalar>())
         );
 
         U_dot_nw = U & nw;
@@ -113,9 +112,9 @@ void Foam::MaxwellianThermal<CloudType>::correct
     U =
         sqrt(physicoChemical::k.value()*T/mass)
        *(
-            rndGen.GaussNormal()*tw1
-          + rndGen.GaussNormal()*tw2
-          - sqrt(-2.0*log(max(1 - rndGen.scalar01(), VSMALL)))*nw
+            rndGen.GaussNormal<scalar>()*tw1
+          + rndGen.GaussNormal<scalar>()*tw2
+          - sqrt(-2.0*log(max(1 - rndGen.sample01<scalar>(), VSMALL)))*nw
         );
 
     U += cloud.boundaryU().boundaryField()[wppIndex][wppLocalFace];
diff --git a/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C b/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
index 06e5a7079c..056251c533 100644
--- a/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
+++ b/src/lagrangian/DSMC/submodels/WallInteractionModel/MixedDiffuseSpecular/MixedDiffuseSpecular.C
@@ -73,9 +73,9 @@ void Foam::MixedDiffuseSpecular<CloudType>::correct
 
     CloudType& cloud(this->owner());
 
-    Random& rndGen(cloud.rndGen());
+    Random& rndGen = cloud.rndGen();
 
-    if (diffuseFraction_ > rndGen.scalar01())
+    if (diffuseFraction_ > rndGen.sample01<scalar>())
     {
         // Diffuse reflection
 
@@ -87,12 +87,11 @@ void Foam::MixedDiffuseSpecular<CloudType>::correct
             // 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.x()*(0.8 + 0.2*rndGen.sample01<scalar>()),
+                U.y()*(0.8 + 0.2*rndGen.sample01<scalar>()),
+                U.z()*(0.8 + 0.2*rndGen.sample01<scalar>())
             );
 
             U_dot_nw = U & nw;
@@ -115,9 +114,9 @@ void Foam::MixedDiffuseSpecular<CloudType>::correct
         U =
             sqrt(physicoChemical::k.value()*T/mass)
            *(
-                rndGen.GaussNormal()*tw1
-              + rndGen.GaussNormal()*tw2
-              - sqrt(-2.0*log(max(1 - rndGen.scalar01(), VSMALL)))*nw
+                rndGen.GaussNormal<scalar>()*tw1
+              + rndGen.GaussNormal<scalar>()*tw2
+              - sqrt(-2.0*log(max(1 - rndGen.sample01<scalar>(), VSMALL)))*nw
             );
 
         U += cloud.boundaryU().boundaryField()[wppIndex][wppLocalFace];
diff --git a/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C
index 2e5a045619..0ed45f62a2 100644
--- a/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C
+++ b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.C
@@ -42,7 +42,7 @@ namespace distributionModels
 Foam::distributionModels::RosinRammler::RosinRammler
 (
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dict, rndGen),
diff --git a/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H
index 448165a703..f7f7183d38 100644
--- a/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H
+++ b/src/lagrangian/distributionModels/RosinRammler/RosinRammler.H
@@ -82,7 +82,7 @@ public:
     // Constructors
 
         //- Construct from components
-        RosinRammler(const dictionary& dict, cachedRandom& rndGen);
+        RosinRammler(const dictionary& dict, Random& rndGen);
 
         //- Construct copy
         RosinRammler(const RosinRammler& p);
diff --git a/src/lagrangian/distributionModels/binned/binned.C b/src/lagrangian/distributionModels/binned/binned.C
index b9ed2813f7..57530fa649 100644
--- a/src/lagrangian/distributionModels/binned/binned.C
+++ b/src/lagrangian/distributionModels/binned/binned.C
@@ -78,7 +78,7 @@ void Foam::distributionModels::binned::initialise()
 Foam::distributionModels::binned::binned
 (
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dict, rndGen),
@@ -102,7 +102,7 @@ Foam::distributionModels::binned::binned
 (
     const UList<scalar>& sampleData,
     const scalar binWidth,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dictionary::null, rndGen),
diff --git a/src/lagrangian/distributionModels/binned/binned.H b/src/lagrangian/distributionModels/binned/binned.H
index a579a4a40b..4e719a1ef0 100644
--- a/src/lagrangian/distributionModels/binned/binned.H
+++ b/src/lagrangian/distributionModels/binned/binned.H
@@ -96,14 +96,14 @@ public:
     // Constructors
 
         //- Construct from dictionary
-        binned(const dictionary& dict, cachedRandom& rndGen);
+        binned(const dictionary& dict, Random& rndGen);
 
         //- Construct from components
         binned
         (
             const UList<scalar>& sampleData,
             const scalar binWidth,
-            cachedRandom& rndGen
+            Random& rndGen
         );
 
         //- Construct copy
diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModel.C b/src/lagrangian/distributionModels/distributionModel/distributionModel.C
index ff5d859942..27cf79a7ed 100644
--- a/src/lagrangian/distributionModels/distributionModel/distributionModel.C
+++ b/src/lagrangian/distributionModels/distributionModel/distributionModel.C
@@ -63,7 +63,7 @@ Foam::distributionModel::distributionModel
 (
     const word& name,
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModelDict_(dict),
diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModel.H b/src/lagrangian/distributionModels/distributionModel/distributionModel.H
index 04ab693482..c9611e8a31 100644
--- a/src/lagrangian/distributionModels/distributionModel/distributionModel.H
+++ b/src/lagrangian/distributionModels/distributionModel/distributionModel.H
@@ -55,7 +55,7 @@ SourceFiles
 
 #include "IOdictionary.H"
 #include "autoPtr.H"
-#include "cachedRandom.H"
+#include "Random.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -77,7 +77,7 @@ protected:
         const dictionary distributionModelDict_;
 
         //- Reference to the random number generator
-        cachedRandom& rndGen_;
+        Random& rndGen_;
 
 
     // Protected Member Functions
@@ -100,7 +100,7 @@ public:
         dictionary,
         (
             const dictionary& dict,
-            cachedRandom& rndGen
+            Random& rndGen
         ),
         (dict, rndGen)
     );
@@ -113,7 +113,7 @@ public:
         (
             const word& name,
             const dictionary& dict,
-            cachedRandom& rndGen
+            Random& rndGen
         );
 
         //- Construct copy
@@ -127,7 +127,7 @@ public:
     static autoPtr<distributionModel> New
     (
         const dictionary& dict,
-        cachedRandom& rndGen
+        Random& rndGen
     );
 
 
diff --git a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
index 49b6126c96..f8754ed153 100644
--- a/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
+++ b/src/lagrangian/distributionModels/distributionModel/distributionModelNew.C
@@ -30,7 +30,7 @@ License
 Foam::autoPtr<Foam::distributionModel> Foam::distributionModel::New
 (
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 {
     const word modelType(dict.lookup("type"));
diff --git a/src/lagrangian/distributionModels/exponential/exponential.C b/src/lagrangian/distributionModels/exponential/exponential.C
index 013e5c39bb..3253151351 100644
--- a/src/lagrangian/distributionModels/exponential/exponential.C
+++ b/src/lagrangian/distributionModels/exponential/exponential.C
@@ -42,7 +42,7 @@ namespace distributionModels
 Foam::distributionModels::exponential::exponential
 (
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dict, rndGen),
diff --git a/src/lagrangian/distributionModels/exponential/exponential.H b/src/lagrangian/distributionModels/exponential/exponential.H
index 76f62acbb8..a68bc4f804 100644
--- a/src/lagrangian/distributionModels/exponential/exponential.H
+++ b/src/lagrangian/distributionModels/exponential/exponential.H
@@ -75,7 +75,7 @@ public:
     // Constructors
 
         //- Construct from components
-        exponential(const dictionary& dict, cachedRandom& rndGen);
+        exponential(const dictionary& dict, Random& rndGen);
 
         //- Construct copy
         exponential(const exponential& p);
diff --git a/src/lagrangian/distributionModels/fixedValue/fixedValue.C b/src/lagrangian/distributionModels/fixedValue/fixedValue.C
index f8f0c234a9..0275a404ad 100644
--- a/src/lagrangian/distributionModels/fixedValue/fixedValue.C
+++ b/src/lagrangian/distributionModels/fixedValue/fixedValue.C
@@ -42,7 +42,7 @@ namespace distributionModels
 Foam::distributionModels::fixedValue::fixedValue
 (
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dict, rndGen),
diff --git a/src/lagrangian/distributionModels/fixedValue/fixedValue.H b/src/lagrangian/distributionModels/fixedValue/fixedValue.H
index aa08973031..875d172e42 100644
--- a/src/lagrangian/distributionModels/fixedValue/fixedValue.H
+++ b/src/lagrangian/distributionModels/fixedValue/fixedValue.H
@@ -66,7 +66,7 @@ public:
     // Constructors
 
         //- Construct from components
-        fixedValue(const dictionary& dict, cachedRandom& rndGen);
+        fixedValue(const dictionary& dict, Random& rndGen);
 
         //- Construct copy
         fixedValue(const fixedValue& p);
diff --git a/src/lagrangian/distributionModels/general/general.C b/src/lagrangian/distributionModels/general/general.C
index 87339642bf..9f96ff7b80 100644
--- a/src/lagrangian/distributionModels/general/general.C
+++ b/src/lagrangian/distributionModels/general/general.C
@@ -78,7 +78,7 @@ void Foam::distributionModels::general::initialise()
 Foam::distributionModels::general::general
 (
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dict, rndGen),
@@ -96,7 +96,7 @@ Foam::distributionModels::general::general
 (
     const UList<scalar>& sampleData,
     const scalar binWidth,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dictionary::null, rndGen),
diff --git a/src/lagrangian/distributionModels/general/general.H b/src/lagrangian/distributionModels/general/general.H
index db8a18194a..689cfa6cc7 100644
--- a/src/lagrangian/distributionModels/general/general.H
+++ b/src/lagrangian/distributionModels/general/general.H
@@ -96,14 +96,14 @@ public:
     // Constructors
 
         //- Construct from components
-        general(const dictionary& dict, cachedRandom& rndGen);
+        general(const dictionary& dict, Random& rndGen);
 
         //- Construct from components
         general
         (
             const UList<scalar>& sampleData,
             const scalar binWidth,
-            cachedRandom& rndGen
+            Random& rndGen
         );
 
         //- Construct copy
diff --git a/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C b/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C
index 015343b711..23339eca0f 100644
--- a/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C
+++ b/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.C
@@ -42,7 +42,7 @@ namespace distributionModels
 Foam::distributionModels::massRosinRammler::massRosinRammler
 (
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dict, rndGen),
diff --git a/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.H b/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.H
index f1745326b6..1f180f5bd6 100644
--- a/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.H
+++ b/src/lagrangian/distributionModels/massRosinRammler/massRosinRammler.H
@@ -93,7 +93,7 @@ public:
     // Constructors
 
         //- Construct from components
-        massRosinRammler(const dictionary& dict, cachedRandom& rndGen);
+        massRosinRammler(const dictionary& dict, Random& rndGen);
 
         //- Construct copy
         massRosinRammler(const massRosinRammler& p);
diff --git a/src/lagrangian/distributionModels/multiNormal/multiNormal.C b/src/lagrangian/distributionModels/multiNormal/multiNormal.C
index 1cbb5a5856..8779281fc0 100644
--- a/src/lagrangian/distributionModels/multiNormal/multiNormal.C
+++ b/src/lagrangian/distributionModels/multiNormal/multiNormal.C
@@ -42,7 +42,7 @@ namespace distributionModels
 Foam::distributionModels::multiNormal::multiNormal
 (
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dict, rndGen),
diff --git a/src/lagrangian/distributionModels/multiNormal/multiNormal.H b/src/lagrangian/distributionModels/multiNormal/multiNormal.H
index 03bb0e270d..a58a96bba1 100644
--- a/src/lagrangian/distributionModels/multiNormal/multiNormal.H
+++ b/src/lagrangian/distributionModels/multiNormal/multiNormal.H
@@ -85,7 +85,7 @@ public:
     // Constructors
 
         //- Construct from components
-        multiNormal(const dictionary& dict, cachedRandom& rndGen);
+        multiNormal(const dictionary& dict, Random& rndGen);
 
         //- Construct copy
         multiNormal(const multiNormal& p);
diff --git a/src/lagrangian/distributionModels/normal/normal.C b/src/lagrangian/distributionModels/normal/normal.C
index 1fc16376a9..a6ebd9d594 100644
--- a/src/lagrangian/distributionModels/normal/normal.C
+++ b/src/lagrangian/distributionModels/normal/normal.C
@@ -43,7 +43,7 @@ namespace distributionModels
 Foam::distributionModels::normal::normal
 (
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dict, rndGen),
diff --git a/src/lagrangian/distributionModels/normal/normal.H b/src/lagrangian/distributionModels/normal/normal.H
index d78ec5a86a..77d11e426a 100644
--- a/src/lagrangian/distributionModels/normal/normal.H
+++ b/src/lagrangian/distributionModels/normal/normal.H
@@ -85,7 +85,7 @@ public:
     // Constructors
 
         //- Construct from components
-        normal(const dictionary& dict, cachedRandom& rndGen);
+        normal(const dictionary& dict, Random& rndGen);
 
         //- Construct copy
         normal(const normal& p);
diff --git a/src/lagrangian/distributionModels/uniform/uniform.C b/src/lagrangian/distributionModels/uniform/uniform.C
index 72a0d2fc3d..ccf60544b5 100644
--- a/src/lagrangian/distributionModels/uniform/uniform.C
+++ b/src/lagrangian/distributionModels/uniform/uniform.C
@@ -42,7 +42,7 @@ namespace distributionModels
 Foam::distributionModels::uniform::uniform
 (
     const dictionary& dict,
-    cachedRandom& rndGen
+    Random& rndGen
 )
 :
     distributionModel(typeName, dict, rndGen),
diff --git a/src/lagrangian/distributionModels/uniform/uniform.H b/src/lagrangian/distributionModels/uniform/uniform.H
index 3efaee8219..a47bb8495f 100644
--- a/src/lagrangian/distributionModels/uniform/uniform.H
+++ b/src/lagrangian/distributionModels/uniform/uniform.H
@@ -70,7 +70,7 @@ public:
     // Constructors
 
         //- Construct from components
-        uniform(const dictionary& dict, cachedRandom& rndGen);
+        uniform(const dictionary& dict, Random& rndGen);
 
         //- Construct copy
         uniform(const uniform& p);
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
index d82b1bba67..0dfb75094d 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.C
@@ -316,13 +316,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     (
         particleProperties_.subOrEmptyDict("subModels", solution_.active())
     ),
-    rndGen_
-    (
-        label(0),
-        solution_.steadyState() ?
-        particleProperties_.lookupOrDefault<label>("randomSampleSize", 100000)
-      : -1
-    ),
+    rndGen_(Pstream::myProcNo()),
     cellOccupancyPtr_(),
     cellLengthScale_(cbrt(mesh_.V())),
     rho_(rho),
@@ -515,7 +509,7 @@ Foam::KinematicCloud<CloudType>::KinematicCloud
     solution_(mesh),
     constProps_(),
     subModelProperties_(dictionary::null),
-    rndGen_(0, 0),
+    rndGen_(),
     cellOccupancyPtr_(nullptr),
     cellLengthScale_(c.cellLengthScale_),
     rho_(c.rho_),
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
index d0c8b57603..15abbe9ac9 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloud.H
@@ -59,7 +59,7 @@ SourceFiles
 #include "kinematicCloud.H"
 #include "IOdictionary.H"
 #include "autoPtr.H"
-#include "cachedRandom.H"
+#include "Random.H"
 #include "fvMesh.H"
 #include "volFields.H"
 #include "fvMatrices.H"
@@ -163,7 +163,7 @@ protected:
         const dictionary subModelProperties_;
 
         //- Random number generator - used by some injection routines
-        mutable cachedRandom rndGen_;
+        mutable Random rndGen_;
 
         //- Cell occupancy information for each parcel, (demand driven)
         autoPtr<List<DynamicList<parcelType*>>> cellOccupancyPtr_;
@@ -366,7 +366,7 @@ public:
             // Cloud data
 
                 //- Return reference to the random object
-                inline cachedRandom& rndGen() const;
+                inline Random& rndGen() const;
 
                 //- Return the cell occupancy information for each
                 //  parcel, non-const access, the caller is
diff --git a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
index ce92455169..f5ac343730 100644
--- a/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
+++ b/src/lagrangian/intermediate/clouds/Templates/KinematicCloud/KinematicCloudI.H
@@ -356,7 +356,7 @@ inline Foam::scalar Foam::KinematicCloud<CloudType>::Dmax() const
 
 
 template<class CloudType>
-inline Foam::cachedRandom& Foam::KinematicCloud<CloudType>::rndGen() const
+inline Foam::Random& Foam::KinematicCloud<CloudType>::rndGen() const
 {
     return rndGen_;
 }
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
index 3cba483747..835aa969eb 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleCollector/ParticleCollector.C
@@ -177,10 +177,10 @@ void Foam::ParticleCollector<CloudType>::initConcentricCircles()
         vector tangent = Zero;
         scalar magTangent = 0.0;
 
-        Random rnd(1234);
+        Random& rnd = this->owner().rndGen();
         while (magTangent < SMALL)
         {
-            vector v = rnd.vector01();
+            vector v = rnd.sample01<vector>();
 
             tangent = v - (v & normal_[0])*normal_[0];
             magTangent = mag(tangent);
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
index b9a692fbf6..f7e66700b8 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.C
@@ -128,7 +128,7 @@ void Foam::ParticleTracks<CloudType>::postFace
              << "Cloud storage not allocated" << abort(FatalError);
         }
 
-        hitTableType::iterator iter =
+        labelPairLookup::iterator iter =
             faceHitCounter_.find(labelPair(p.origProc(), p.origId()));
 
         label localI = -1;
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
index c1dc52a09c..6c5d6a17b6 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracks.H
@@ -39,6 +39,7 @@ SourceFiles
 #define ParticleTracks_H
 
 #include "CloudFunctionObject.H"
+#include "labelPairHashes.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -61,9 +62,6 @@ class ParticleTracks
             //- Convenience typedef for parcel type
             typedef typename CloudType::parcelType parcelType;
 
-            //- Convenience typedef for hash hit-table
-            typedef HashTable<label, labelPair, typename labelPair::Hash<>>
-                hitTableType;
 
         //- Number of face-hit intervals between storing parcel data
         label trackInterval_;
@@ -75,7 +73,7 @@ class ParticleTracks
         Switch resetOnWrite_;
 
         //- Table of number of times a particle has hit a face
-        hitTableType faceHitCounter_;
+        labelPairLookup faceHitCounter_;
 
         //- Pointer to the cloud storage
         autoPtr<Cloud<parcelType>> cloudPtr_;
@@ -135,8 +133,8 @@ public:
             //- Return const access to the reset on write flag
             inline const Switch& resetOnWrite() const;
 
-            //- Rerurn the table of number of times a particle has hit a face
-            inline const hitTableType& faceHitCounter() const;
+            //- Return the table of number of times a particle has hit a face
+            inline const labelPairLookup& faceHitCounter() const;
 
             //- Return const access to the cloud
             inline const Cloud<parcelType>& cloud() const;
diff --git a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H
index f09356a3b3..8e64611fbf 100644
--- a/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H
+++ b/src/lagrangian/intermediate/submodels/CloudFunctionObjects/ParticleTracks/ParticleTracksI.H
@@ -49,7 +49,7 @@ inline const Foam::Switch& Foam::ParticleTracks<CloudType>::resetOnWrite() const
 
 
 template<class CloudType>
-inline const typename Foam::ParticleTracks<CloudType>::hitTableType&
+inline const Foam::labelPairLookup&
 Foam::ParticleTracks<CloudType>::faceHitCounter() const
 {
     return faceHitCounter_;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
index a1b8efbefc..1e39c9050a 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/CellZoneInjection/CellZoneInjection.C
@@ -40,7 +40,7 @@ void Foam::CellZoneInjection<CloudType>::setPositions
     const fvMesh& mesh = this->owner().mesh();
     const scalarField& V = mesh.V();
     const label nCells = cellZoneCells.size();
-    cachedRandom& rnd = this->owner().rndGen();
+    Random& rnd = this->owner().rndGen();
 
     DynamicList<vector> positions(nCells);          // initial size only
     DynamicList<label> injectorCells(nCells);       // initial size only
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
index 3a50c5bc47..6651a9573f 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeInjection/ConeInjection.C
@@ -110,7 +110,7 @@ Foam::ConeInjection<CloudType>::ConeInjection
         vector tangent = Zero;
         scalar magTangent = 0.0;
 
-        cachedRandom& rnd = this->owner().rndGen();
+        Random& rnd = this->owner().rndGen();
         while (magTangent < SMALL)
         {
             vector v = rnd.sample01<vector>();
@@ -260,7 +260,7 @@ void Foam::ConeInjection<CloudType>::setProperties
     typename CloudType::parcelType& parcel
 )
 {
-    cachedRandom& rnd = this->owner().rndGen();
+    Random& rnd = this->owner().rndGen();
 
     // Set particle velocity
     const label i = parcelI % positionAxis_.size();
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
index 4cedfad5ea..6ac062ee57 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/ConeNozzleInjection/ConeNozzleInjection.C
@@ -175,7 +175,7 @@ Foam::ConeNozzleInjection<CloudType>::ConeNozzleInjection
 
     setFlowType();
 
-    cachedRandom& rndGen = this->owner().rndGen();
+    Random& rndGen = this->owner().rndGen();
 
     // Normalise direction vector
     direction_ /= mag(direction_);
@@ -321,7 +321,7 @@ void Foam::ConeNozzleInjection<CloudType>::setPositionAndCell
     label& tetPti
 )
 {
-    cachedRandom& rndGen = this->owner().rndGen();
+    Random& rndGen = this->owner().rndGen();
 
     scalar beta = mathematical::twoPi*rndGen.sample01<scalar>();
     normal_ = tanVec1_*cos(beta) + tanVec2_*sin(beta);
@@ -373,7 +373,7 @@ void Foam::ConeNozzleInjection<CloudType>::setProperties
     typename CloudType::parcelType& parcel
 )
 {
-    cachedRandom& rndGen = this->owner().rndGen();
+    Random& rndGen = this->owner().rndGen();
 
     // Set particle velocity
     const scalar deg2Rad = mathematical::pi/180.0;
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
index dd33b815bc..5078830ad9 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InflationInjection/InflationInjection.C
@@ -203,7 +203,7 @@ Foam::label Foam::InflationInjection<CloudType>::parcelsToInject
 
     newParticles_.clear();
 
-    cachedRandom& rnd = this->owner().rndGen();
+    Random& rnd = this->owner().rndGen();
 
     // Diameter factor, when splitting particles into 4, this is the
     // factor that modifies the diameter.
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C
index 3bef483fc3..2ae5e8031b 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/InjectedParticleDistributionInjection/InjectedParticleDistributionInjection.C
@@ -148,7 +148,7 @@ void Foam::InjectedParticleDistributionInjection<CloudType>::initialise()
     scalar minTime = GREAT;
 
     // Populate injector properties, filtering out invalid entries
-    cachedRandom& rnd = this->owner().rndGen();
+    Random& rnd = this->owner().rndGen();
     label injectori = 0;
     forAll(injDiameter, i)
     {
@@ -448,7 +448,7 @@ void Foam::InjectedParticleDistributionInjection<CloudType>::setPositionAndCell
     label& tetPtI
 )
 {
-    cachedRandom& rnd = this->owner().rndGen();
+    Random& rnd = this->owner().rndGen();
     currentInjectori_ = rnd.globalPosition<label>(0, position_.size() - 1);
     currentSamplei_ = rnd.globalPosition<label>(0, resampleSize_ - 1);
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
index d081be437f..739599c153 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/KinematicLookupTableInjection/KinematicLookupTableInjection.C
@@ -182,7 +182,7 @@ void Foam::KinematicLookupTableInjection<CloudType>::setPositionAndCell
     label injectorI = 0;
     if (randomise_)
     {
-        cachedRandom& rnd = this->owner().rndGen();
+        Random& rnd = this->owner().rndGen();
         injectorI = rnd.position<label>(0, injectorCells_.size() - 1);
     }
     else
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
index 58d62059a1..a7ad2372dd 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchFlowRateInjection/PatchFlowRateInjection.C
@@ -162,7 +162,7 @@ Foam::label Foam::PatchFlowRateInjection<CloudType>::parcelsToInject
 
         scalar nParcels = parcelConcentration_*c*flowRate()*dt;
 
-        cachedRandom& rnd = this->owner().rndGen();
+        Random& rnd = this->owner().rndGen();
 
         label nParcelsToInject = floor(nParcels);
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
index ebb1f9cc65..a56d81e3ce 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/PatchInjection.C
@@ -121,7 +121,7 @@ Foam::label Foam::PatchInjection<CloudType>::parcelsToInject
     if ((time0 >= 0.0) && (time0 < duration_))
     {
         scalar nParcels = (time1 - time0)*parcelsPerSecond_;
-        cachedRandom& rnd = this->owner().rndGen();
+        Random& rnd = this->owner().rndGen();
         scalar rndPos = rnd.globalPosition(scalar(0), scalar(1));
         label nParcelsToInject = floor(nParcels);
 
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
index 293010fd13..a0c0127043 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.C
@@ -26,7 +26,7 @@ License
 #include "patchInjectionBase.H"
 #include "polyMesh.H"
 #include "SubField.H"
-#include "cachedRandom.H"
+#include "Random.H"
 #include "triPointRef.H"
 #include "volFields.H"
 #include "polyMeshTetDecomposition.H"
@@ -151,7 +151,7 @@ void Foam::patchInjectionBase::updateMesh(const polyMesh& mesh)
 void Foam::patchInjectionBase::setPositionAndCell
 (
     const fvMesh& mesh,
-    cachedRandom& rnd,
+    Random& rnd,
     vector& position,
     label& cellOwner,
     label& tetFacei,
diff --git a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H
index 2124b3acfc..8b1d837dee 100644
--- a/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H
+++ b/src/lagrangian/intermediate/submodels/Kinematic/InjectionModel/PatchInjection/patchInjectionBase.H
@@ -54,7 +54,7 @@ namespace Foam
 // Forward class declarations
 class polyMesh;
 class fvMesh;
-class cachedRandom;
+class Random;
 
 /*---------------------------------------------------------------------------*\
                      Class patchInjectionBase Declaration
@@ -118,7 +118,7 @@ public:
         virtual void setPositionAndCell
         (
             const fvMesh& mesh,
-            cachedRandom& rnd,
+            Random& rnd,
             vector& position,
             label& cellOwner,
             label& tetFacei,
diff --git a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
index 6aa5354455..068568a1b5 100644
--- a/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
+++ b/src/lagrangian/intermediate/submodels/MPPIC/IsotropyModels/Stochastic/Stochastic.C
@@ -71,7 +71,7 @@ Foam::scalar Foam::IsotropyModels::Stochastic<CloudType>::sampleGauss()
     }
     else
     {
-        cachedRandom& rndGen = this->owner().rndGen();
+        Random& rndGen = this->owner().rndGen();
 
         scalar f, m, x, y;
 
@@ -98,7 +98,7 @@ void Foam::IsotropyModels::Stochastic<CloudType>::calculate()
 {
     const fvMesh& mesh = this->owner().mesh();
     const scalar deltaT(this->owner().db().time().deltaTValue());
-    cachedRandom& rndGen = this->owner().rndGen();
+    Random& rndGen = this->owner().rndGen();
 
     const scalar oneBySqrtThree = sqrt(1.0/3.0);
 
diff --git a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
index 40290f9a85..7b0982e6a6 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/InjectionModel/ReactingLookupTableInjection/ReactingLookupTableInjection.C
@@ -181,7 +181,7 @@ void Foam::ReactingLookupTableInjection<CloudType>::setPositionAndCell
     label injectorI = 0;
     if (randomise_)
     {
-        cachedRandom& rnd = this->owner().rndGen();
+        Random& rnd = this->owner().rndGen();
         injectorI = rnd.position<label>(0, injectorCells_.size() - 1);
     }
     else
diff --git a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
index 7361402d21..79423e612e 100644
--- a/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/ReactingMultiphase/InjectionModel/ReactingMultiphaseLookupTableInjection/ReactingMultiphaseLookupTableInjection.C
@@ -187,7 +187,7 @@ void Foam::ReactingMultiphaseLookupTableInjection<CloudType>::setPositionAndCell
     label injectorI = 0;
     if (randomise_)
     {
-        cachedRandom& rnd = this->owner().rndGen();
+        Random& rnd = this->owner().rndGen();
         injectorI = rnd.position<label>(0, injectorCells_.size() - 1);
     }
     else
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
index b93166d4d4..b746e3fd3f 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/InjectionModel/ThermoLookupTableInjection/ThermoLookupTableInjection.C
@@ -182,7 +182,7 @@ void Foam::ThermoLookupTableInjection<CloudType>::setPositionAndCell
     label injectorI = 0;
     if (randomise_)
     {
-        cachedRandom& rnd = this->owner().rndGen();
+        Random& rnd = this->owner().rndGen();
         injectorI = rnd.position<label>(0, injectorCells_.size() - 1);
     }
     else
diff --git a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
index a5143921b9..fd2fb238c9 100644
--- a/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
+++ b/src/lagrangian/intermediate/submodels/Thermodynamic/SurfaceFilmModel/ThermoSurfaceFilm/ThermoSurfaceFilm.H
@@ -101,7 +101,7 @@ protected:
         typedef typename CloudType::parcelType parcelType;
 
         //- Reference to the cloud random number generator
-        cachedRandom& rndGen_;
+        Random& rndGen_;
 
         //- Reference to the cloud thermo package
         const SLGThermo& thermo_;
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
index ffcb260118..5318c57867 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloud.C
@@ -1041,11 +1041,11 @@ void Foam::moleculeCloud::createMolecule
     {
         pi = equipartitionAngularMomentum(temperature, cP);
 
-        scalar phi(rndGen_.scalar01()*twoPi);
+        scalar phi(rndGen_.sample01<scalar>()*twoPi);
 
-        scalar theta(rndGen_.scalar01()*twoPi);
+        scalar theta(rndGen_.sample01<scalar>()*twoPi);
 
-        scalar psi(rndGen_.scalar01()*twoPi);
+        scalar psi(rndGen_.sample01<scalar>()*twoPi);
 
         Q = tensor
         (
diff --git a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
index 63f89a69bd..ebc738cab2 100644
--- a/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
+++ b/src/lagrangian/molecularDynamics/molecule/moleculeCloud/moleculeCloudI.H
@@ -301,12 +301,9 @@ inline Foam::vector Foam::moleculeCloud::equipartitionLinearVelocity
     scalar mass
 )
 {
-    return sqrt(physicoChemical::k.value()*temperature/mass)*vector
-    (
-        rndGen_.GaussNormal(),
-        rndGen_.GaussNormal(),
-        rndGen_.GaussNormal()
-    );
+    return
+        sqrt(physicoChemical::k.value()*temperature/mass)
+       *rndGen_.GaussNormal<vector>();
 }
 
 
@@ -323,17 +320,17 @@ inline Foam::vector Foam::moleculeCloud::equipartitionAngularMomentum
         return sqrtKbT*vector
         (
             0.0,
-            sqrt(cP.momentOfInertia().yy())*rndGen_.GaussNormal(),
-            sqrt(cP.momentOfInertia().zz())*rndGen_.GaussNormal()
+            sqrt(cP.momentOfInertia().yy())*rndGen_.GaussNormal<scalar>(),
+            sqrt(cP.momentOfInertia().zz())*rndGen_.GaussNormal<scalar>()
         );
     }
     else
     {
         return sqrtKbT*vector
         (
-            sqrt(cP.momentOfInertia().xx())*rndGen_.GaussNormal(),
-            sqrt(cP.momentOfInertia().yy())*rndGen_.GaussNormal(),
-            sqrt(cP.momentOfInertia().zz())*rndGen_.GaussNormal()
+            sqrt(cP.momentOfInertia().xx())*rndGen_.GaussNormal<scalar>(),
+            sqrt(cP.momentOfInertia().yy())*rndGen_.GaussNormal<scalar>(),
+            sqrt(cP.momentOfInertia().zz())*rndGen_.GaussNormal<scalar>()
         );
     }
 }
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
index 216990ea91..1630aafdb2 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/AtomizationModel/AtomizationModel.H
@@ -136,7 +136,7 @@ public:
             const vector& injectionPos,
             const scalar pAmbient,
             const scalar chi,
-            cachedRandom& rndGen
+            Random& rndGen
         ) const = 0;
 };
 
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C
index 63b5d4ff5c..63670b0845 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.C
@@ -92,7 +92,7 @@ void Foam::BlobsSheetAtomization<CloudType>::update
     const vector& injectionPos,
     const scalar pAmbient,
     const scalar chi,
-    cachedRandom& rndGen
+    Random& rndGen
 ) const
 {
     scalar lBU =
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H
index 56175bf095..e95e930c5a 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/BlobsSheetAtomization/BlobsSheetAtomization.H
@@ -122,7 +122,7 @@ public:
             const vector& injectionPos,
             const scalar pAmbient,
             const scalar chi,
-            cachedRandom& rndGen
+            Random& rndGen
         ) const;
 };
 
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
index c21fdfd583..2cc52829da 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.C
@@ -118,7 +118,7 @@ void Foam::LISAAtomization<CloudType>::update
     const vector& injectionPos,
     const scalar pAmbient,
     const scalar chi,
-    cachedRandom& rndGen
+    Random& rndGen
 ) const
 {
     if (volFlowRate < SMALL)
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H
index 1c8ed5c897..2a0f1a5ef0 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/LISAAtomization/LISAAtomization.H
@@ -142,7 +142,7 @@ public:
             const vector& injectionPos,
             const scalar pAmbient,
             const scalar chi,
-            cachedRandom& rndGen
+            Random& rndGen
         ) const;
 };
 
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.C b/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.C
index 038e90c5b4..ed5fed5ec6 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.C
+++ b/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.C
@@ -95,7 +95,7 @@ void Foam::NoAtomization<CloudType>::update
     const vector& injectionPos,
     const scalar pAmbient,
     const scalar chi,
-    cachedRandom& rndGen
+    Random& rndGen
 ) const
 {}
 
diff --git a/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H b/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H
index 975f511810..24133879f3 100644
--- a/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H
+++ b/src/lagrangian/spray/submodels/AtomizationModel/NoAtomization/NoAtomization.H
@@ -105,7 +105,7 @@ public:
             const vector& injectionPos,
             const scalar pAmbient,
             const scalar chi,
-            cachedRandom& rndGen
+            Random& rndGen
         ) const;
 };
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
index 41e3ac307a..642df18a86 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
@@ -138,7 +138,7 @@ bool Foam::SHF<CloudType>::update
     scalar& massChild
 )
 {
-    cachedRandom& rndGen = this->owner().rndGen();
+    Random& rndGen = this->owner().rndGen();
 
     bool addChild = false;
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
index 4f3607b6e9..5817c8c441 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/TAB/TAB.C
@@ -110,7 +110,7 @@ bool Foam::TAB<CloudType>::update
     scalar& massChild
 )
 {
-    cachedRandom& rndGen = this->owner().rndGen();
+    Random& rndGen = this->owner().rndGen();
 
     scalar r = 0.5*d;
     scalar r2 = r*r;
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
index ef93f6a3cf..cdba049f9e 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/GradientDispersionRAS/GradientDispersionRAS.C
@@ -100,7 +100,7 @@ Foam::vector Foam::GradientDispersionRAS<CloudType>::update
     scalar& tTurb
 )
 {
-    cachedRandom& rnd = this->owner().rndGen();
+    Random& rnd = this->owner().rndGen();
 
     const scalar cps = 0.16432;
 
diff --git a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
index e78fcf9ed9..56ee5d5054 100644
--- a/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
+++ b/src/lagrangian/turbulence/submodels/Kinematic/DispersionModel/StochasticDispersionRAS/StochasticDispersionRAS.C
@@ -71,7 +71,7 @@ Foam::vector Foam::StochasticDispersionRAS<CloudType>::update
     scalar& tTurb
 )
 {
-    cachedRandom& rnd = this->owner().rndGen();
+    Random& rnd = this->owner().rndGen();
 
     const scalar cps = 0.16432;
 
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
index a2228fa5e3..86a24ff4c1 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.C
@@ -206,7 +206,7 @@ Foam::forceSuSp Foam::BrownianMotionForce<CloudType>::calcCoupled
 
     // To generate a spherical distribution:
 
-    cachedRandom& rnd = this->owner().rndGen();
+    Random& rnd = this->owner().rndGen();
 
     const scalar theta = rnd.sample01<scalar>()*twoPi;
     const scalar u = 2*rnd.sample01<scalar>() - 1;
diff --git a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
index 0c7a5e89f7..2990a0f253 100644
--- a/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
+++ b/src/lagrangian/turbulence/submodels/Thermodynamic/ParticleForces/BrownianMotion/BrownianMotionForce.H
@@ -46,7 +46,7 @@ SourceFiles
 #define BrownianMotionForce_H
 
 #include "ParticleForce.H"
-#include "cachedRandom.H"
+#include "Random.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -65,7 +65,7 @@ class BrownianMotionForce
     // Private data
 
         //- Reference to the cloud random number generator
-        cachedRandom& rndGen_;
+        Random& rndGen_;
 
         //- Molecular free path length [m]
         const scalar lambda_;
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
index c30fe849b1..3500a3aef1 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H
@@ -47,7 +47,7 @@ SourceFiles
 #include "hexRef8.H"
 #include "mapPolyMesh.H"
 #include "autoPtr.H"
-#include "labelPair.H"
+#include "labelPairHashes.H"
 #include "indirectPrimitivePatch.H"
 #include "pointFieldsFwd.H"
 #include "Tuple2.H"
@@ -735,7 +735,7 @@ private:
                 const label ownZone,
                 const label neiZone,
                 wordPairHashTable& zonesToFaceZone,
-                HashTable<word, labelPair, labelPair::Hash<>>&
+                LabelPairMap<word>& zoneIDsToFaceZone
             ) const;
 
             //- Remove any loose standing cells
@@ -1355,6 +1355,12 @@ public:
                     const labelHashSet& set
                 ) const;
 
+                // Pick up faces of cells of faces in set.
+                labelList growFaceCellFace
+                (
+                    const UList<label>& set
+                ) const;
+
                 // Pick up faces of cells of faces in set.
                 labelList growFaceCellFace
                 (
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
index 6871b2f413..cae319df79 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementBaffles.C
@@ -3361,7 +3361,7 @@ void Foam::meshRefinement::allocateInterRegionFaceZone
     const label ownZone,
     const label neiZone,
     wordPairHashTable& zonesToFaceZone,
-    HashTable<word, labelPair, labelPair::Hash<>>& zoneIDsToFaceZone
+    LabelPairMap<word>& zoneIDsToFaceZone
 ) const
 {
     const cellZoneMesh& cellZones = mesh_.cellZones();
@@ -3383,13 +3383,7 @@ void Foam::meshRefinement::allocateInterRegionFaceZone
             Swap(key.first(), key.second());
         }
 
-        HashTable<word, labelPair, labelPair::Hash<>>::
-        const_iterator zoneFnd = zoneIDsToFaceZone.find
-        (
-            key
-        );
-
-        if (zoneFnd == zoneIDsToFaceZone.end())
+        if (!zoneIDsToFaceZone.found(key))
         {
             // Not found. Allocate.
             const word ownZoneName =
diff --git a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
index 3b27edf918..ba70983f59 100644
--- a/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
+++ b/src/mesh/snappyHexMesh/meshRefinement/meshRefinementMerge.C
@@ -790,6 +790,62 @@ Foam::labelList Foam::meshRefinement::collectFaces
 }
 
 
+namespace Foam
+{
+    // Pick up faces of cells of faces in set.
+    // file-scope
+    static inline void markGrowFaceCellFace
+    (
+        const polyMesh& pMesh,
+        const label faceI,
+        boolList& selected
+    )
+    {
+        const label own = pMesh.faceOwner()[faceI];
+
+        const cell& ownFaces = pMesh.cells()[own];
+        forAll(ownFaces, ownFaceI)
+        {
+            selected[ownFaces[ownFaceI]] = true;
+        }
+
+        if (pMesh.isInternalFace(faceI))
+        {
+            const label nbr = pMesh.faceNeighbour()[faceI];
+
+            const cell& nbrFaces = pMesh.cells()[nbr];
+            forAll(nbrFaces, nbrFaceI)
+            {
+                selected[nbrFaces[nbrFaceI]] = true;
+            }
+        }
+    }
+}
+
+
+// Pick up faces of cells of faces in set.
+Foam::labelList Foam::meshRefinement::growFaceCellFace
+(
+    const UList<label>& set
+) const
+{
+    boolList selected(mesh_.nFaces(), false);
+
+    for (auto faceI : set)
+    {
+        markGrowFaceCellFace(mesh_, faceI, selected);
+    }
+
+    syncTools::syncFaceList
+    (
+        mesh_,
+        selected,
+        orEqOp<bool>()      // combine operator
+    );
+    return findIndices(selected, true);
+}
+
+
 // Pick up faces of cells of faces in set.
 Foam::labelList Foam::meshRefinement::growFaceCellFace
 (
@@ -798,29 +854,12 @@ Foam::labelList Foam::meshRefinement::growFaceCellFace
 {
     boolList selected(mesh_.nFaces(), false);
 
-    forAllConstIter(faceSet, set, iter)
+    forAllConstIter(labelHashSet, set, iter)
     {
-        label faceI = iter.key();
-
-        label own = mesh_.faceOwner()[faceI];
-
-        const cell& ownFaces = mesh_.cells()[own];
-        forAll(ownFaces, ownFaceI)
-        {
-            selected[ownFaces[ownFaceI]] = true;
-        }
-
-        if (mesh_.isInternalFace(faceI))
-        {
-            label nbr = mesh_.faceNeighbour()[faceI];
-
-            const cell& nbrFaces = mesh_.cells()[nbr];
-            forAll(nbrFaces, nbrFaceI)
-            {
-                selected[nbrFaces[nbrFaceI]] = true;
-            }
-        }
+        const label faceI = iter.key();
+        markGrowFaceCellFace(mesh_, faceI, selected);
     }
+
     syncTools::syncFaceList
     (
         mesh_,
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
index 0c02195ad3..a8ebbcd9ea 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015-2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -272,6 +272,267 @@ bool Foam::snappyLayerDriver::unmarkExtrusion
 }
 
 
+Foam::label Foam::snappyLayerDriver::constrainFp(const label sz, const label fp)
+{
+    if (fp >= sz)
+    {
+        return 0;
+    }
+    else if (fp < 0)
+    {
+        return sz-1;
+    }
+    else
+    {
+        return fp;
+    }
+}
+
+
+void Foam::snappyLayerDriver::countCommonPoints
+(
+    const indirectPrimitivePatch& pp,
+    const label facei,
+
+    Map<label>& nCommonPoints
+) const
+{
+    const faceList& localFaces = pp.localFaces();
+    const labelListList& pointFaces = pp.pointFaces();
+
+    const face& f = localFaces[facei];
+
+    nCommonPoints.clear();
+
+    forAll(f, fp)
+    {
+        label pointi = f[fp];
+        const labelList& pFaces = pointFaces[pointi];
+
+        forAll(pFaces, pFacei)
+        {
+            label nbFacei = pFaces[pFacei];
+
+            if (facei < nbFacei)
+            {
+                // Only check once for each combination of two faces.
+
+                Map<label>::iterator fnd = nCommonPoints.find(nbFacei);
+
+                if (fnd == nCommonPoints.end())
+                {
+                    // First common vertex found.
+                    nCommonPoints.insert(nbFacei, 1);
+                }
+                else
+                {
+                    fnd()++;
+                }
+            }
+        }
+    }
+}
+
+
+bool Foam::snappyLayerDriver::checkCommonOrder
+(
+    const label nCommon,
+    const face& curFace,
+    const face& nbFace
+) const
+{
+    forAll(curFace, fp)
+    {
+        // Get the index in the neighbouring face shared with curFace
+        const label nb = findIndex(nbFace, curFace[fp]);
+
+        if (nb != -1)
+        {
+
+            // Check the whole face from nb onwards for shared vertices
+            // with neighbouring face. Rule is that any shared vertices
+            // should be consecutive on both faces i.e. if they are
+            // vertices fp,fp+1,fp+2 on one face they should be
+            // vertices nb, nb+1, nb+2 (or nb+2, nb+1, nb) on the
+            // other face.
+
+
+            // Vertices before and after on curFace
+            label fpPlus1 = curFace.fcIndex(fp);
+            label fpMin1  = curFace.rcIndex(fp);
+
+            // Vertices before and after on nbFace
+            label nbPlus1 = nbFace.fcIndex(nb);
+            label nbMin1  = nbFace.rcIndex(nb);
+
+            // Find order of walking by comparing next points on both
+            // faces.
+            label curInc = labelMax;
+            label nbInc = labelMax;
+
+            if (nbFace[nbPlus1] == curFace[fpPlus1])
+            {
+                curInc = 1;
+                nbInc = 1;
+            }
+            else if (nbFace[nbPlus1] == curFace[fpMin1])
+            {
+                curInc = -1;
+                nbInc = 1;
+            }
+            else if (nbFace[nbMin1] == curFace[fpMin1])
+            {
+                curInc = -1;
+                nbInc = -1;
+            }
+            else
+            {
+                curInc = 1;
+                nbInc = -1;
+            }
+
+
+            // Pass1: loop until start of common vertices found.
+            label curNb = nb;
+            label curFp = fp;
+
+            do
+            {
+                curFp = constrainFp(curFace.size(), curFp+curInc);
+                curNb = constrainFp(nbFace.size(), curNb+nbInc);
+            } while (curFace[curFp] == nbFace[curNb]);
+
+            // Pass2: check equality walking from curFp, curNb
+            // in opposite order.
+
+            curInc = -curInc;
+            nbInc = -nbInc;
+
+            for (label commonI = 0; commonI < nCommon; commonI++)
+            {
+                curFp = constrainFp(curFace.size(), curFp+curInc);
+                curNb = constrainFp(nbFace.size(), curNb+nbInc);
+
+                if (curFace[curFp] != nbFace[curNb])
+                {
+                    // Error: gap in string of connected vertices
+                    return false;
+                }
+            }
+
+            // Done the curFace - nbFace combination.
+            break;
+        }
+    }
+
+    return true;
+}
+
+
+void Foam::snappyLayerDriver::checkCommonOrder
+(
+    const indirectPrimitivePatch& pp,
+    const label facei,
+    const Map<label>& nCommonPoints,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+) const
+{
+    forAllConstIter(Map<label>, nCommonPoints, iter)
+    {
+        label nbFacei = iter.key();
+        label nCommon = iter();
+
+        const face& curFace = pp[facei];
+        const face& nbFace = pp[nbFacei];
+
+        if
+        (
+            nCommon >= 2
+         && nCommon != nbFace.size()
+         && nCommon != curFace.size()
+        )
+        {
+            bool stringOk = checkCommonOrder(nCommon, curFace, nbFace);
+
+            if (!stringOk)
+            {
+                // Note: unmark whole face or just the common points?
+                // For now unmark the whole face
+                unmarkExtrusion
+                (
+                    pp.localFaces()[facei],
+                    patchDisp,
+                    patchNLayers,
+                    extrudeStatus
+                );
+                unmarkExtrusion
+                (
+                    pp.localFaces()[nbFacei],
+                    patchDisp,
+                    patchNLayers,
+                    extrudeStatus
+                );
+            }
+        }
+    }
+}
+
+
+void Foam::snappyLayerDriver::handleNonStringConnected
+(
+    const indirectPrimitivePatch& pp,
+    pointField& patchDisp,
+    labelList& patchNLayers,
+    List<extrudeMode>& extrudeStatus
+) const
+{
+    // Detect faces which are connected on non-consecutive vertices.
+    // This is the "<<Number of faces with non-consecutive shared points"
+    // warning from checkMesh. These faces cannot be extruded so
+    // there is no need to even attempt it.
+
+List<extrudeMode> oldExtrudeStatus(extrudeStatus);
+OBJstream str(meshRefiner_.mesh().time().path()/"nonStringConnected.obj");
+Pout<< "Dumping string edges to " << str.name();
+
+    // 1) Local
+    Map<label> nCommonPoints(100);
+
+    forAll(pp, facei)
+    {
+        countCommonPoints(pp, facei, nCommonPoints);
+
+        // Faces share pointi. Find any more shared points
+        // and if not in single string unmark all. See
+        // primitiveMesh::checkCommonOrder
+        checkCommonOrder
+        (
+            pp,
+            facei,
+            nCommonPoints,
+
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+    }
+
+    // 2) TDB. Other face remote
+
+forAll(extrudeStatus, pointi)
+{
+    if (extrudeStatus[pointi] != oldExtrudeStatus[pointi])
+    {
+        str.write(meshRefiner_.mesh().points()[pp.meshPoints()[pointi]]);
+    }
+}
+
+
+}
+
+
 // No extrusion at non-manifold points.
 void Foam::snappyLayerDriver::handleNonManifolds
 (
@@ -3333,6 +3594,19 @@ void Foam::snappyLayerDriver::addLayers
         // Precalculate mesh edge labels for patch edges
         labelList meshEdges(pp().meshEdges(mesh.edges(), mesh.pointEdges()));
 
+
+        // Disable extrusion on split strings of common points
+        // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        handleNonStringConnected
+        (
+            pp,
+            patchDisp,
+            patchNLayers,
+            extrudeStatus
+        );
+
+
         // Disable extrusion on non-manifold points
         // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
diff --git a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
index 6dfe8607e9..f015f01e0f 100644
--- a/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
+++ b/src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyLayerDriver.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -159,6 +159,48 @@ private:
                     List<extrudeMode>& extrudeStatus
                 );
 
+                //- Truncate index in face
+                static label constrainFp(const label sz, const label fp);
+
+                //- Count common points between face and its neighbours
+                void countCommonPoints
+                (
+                    const indirectPrimitivePatch&,
+                    const label facei,
+                    Map<label>&
+                ) const;
+
+                //- Check if any common points form single string. Return
+                //  false if not.
+                bool checkCommonOrder
+                (
+                    const label nCommon,
+                    const face& curFace,
+                    const face& nbFace
+                ) const;
+
+                //- Check if any common points form single string; unmark
+                //  points on face if not
+                void checkCommonOrder
+                (
+                    const indirectPrimitivePatch& pp,
+                    const label facei,
+                    const Map<label>& nCommonPoints,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                ) const;
+
+                //- Check if any common points form single string; unmark
+                //  points on face if not
+                void handleNonStringConnected
+                (
+                    const indirectPrimitivePatch& pp,
+                    pointField& patchDisp,
+                    labelList& patchNLayers,
+                    List<extrudeMode>& extrudeStatus
+                ) const;
+
                 //- No extrusion at non-manifold points.
                 void handleNonManifolds
                 (
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 4bc572916a..c503db2975 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -215,6 +215,7 @@ triSurface/triSurfaceSearch/triSurfaceSearch.C
 triSurface/triSurfaceSearch/triSurfaceRegionSearch.C
 triSurface/triangleFuncs/triangleFuncs.C
 triSurface/surfaceFeatures/surfaceFeatures.C
+triSurface/triSurfaceLoader/triSurfaceLoader.C
 triSurface/triSurfaceTools/triSurfaceTools.C
 triSurface/triSurfaceTools/geompack/geompack.C
 triSurface/triSurfaceTools/pointToPointPlanarInterpolation.C
diff --git a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
index e595206f0d..b1457329ff 100644
--- a/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
+++ b/src/meshTools/coordinateSystems/coordinateRotation/coordinateRotationNew.C
@@ -30,30 +30,31 @@ License
 
 Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
 (
-    const dictionary& dict, const objectRegistry& obr
+    const dictionary& dict,
+    const objectRegistry& obr
 )
 {
     if (debug)
     {
-        Pout<< "coordinateRotation::New(const dictionary&) : "
+        Pout<< "coordinateRotation::New"
+            "(const dictionary&, const objectRegistry&) : "
             << "constructing coordinateRotation"
             << endl;
     }
 
-    word rotType = dict.lookup("type");
+    const word rotType = dict.lookup("type");
 
     objectRegistryConstructorTable::iterator cstrIter =
         objectRegistryConstructorTablePtr_->find(rotType);
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "Unknown coordinateRotation type "
+        FatalIOErrorInFunction(dict)
+            << "Unknown coordinateRotation type "
             << rotType << nl << nl
             << "Valid coordinateRotation types are :" <<  nl
-            << dictionaryConstructorTablePtr_->sortedToc()
+            << "[default: axes ]"
+            << objectRegistryConstructorTablePtr_->sortedToc()
             << exit(FatalIOError);
     }
 
@@ -73,17 +74,15 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
             << endl;
     }
 
-    word rotType = dict.lookup("type");
+    const word rotType = dict.lookup("type");
 
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(rotType);
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if (!cstrIter.found())
     {
-        FatalIOErrorInFunction
-        (
-            dict
-        )   << "Unknown coordinateRotation type "
+        FatalIOErrorInFunction(dict)
+            << "Unknown coordinateRotation type "
             << rotType << nl << nl
             << "Valid coordinateRotation types are :" <<  nl
             << dictionaryConstructorTablePtr_->sortedToc()
@@ -93,4 +92,5 @@ Foam::autoPtr<Foam::coordinateRotation> Foam::coordinateRotation::New
     return autoPtr<coordinateRotation>(cstrIter()(dict));
 }
 
+
 // ************************************************************************* //
diff --git a/src/meshTools/edgeMesh/edgeMesh.C b/src/meshTools/edgeMesh/edgeMesh.C
index 66ac58cf0c..879bdf7e1e 100644
--- a/src/meshTools/edgeMesh/edgeMesh.C
+++ b/src/meshTools/edgeMesh/edgeMesh.C
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -29,6 +29,7 @@ License
 #include "addToMemberFunctionSelectionTable.H"
 #include "ListOps.H"
 #include "EdgeMap.H"
+#include "PackedBoolList.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -286,16 +287,12 @@ void Foam::edgeMesh::scalePoints(const scalar scaleFactor)
 }
 
 
-void Foam::edgeMesh::mergePoints
-(
-    const scalar mergeDist,
-    labelList& reversePointMap
-)
+void Foam::edgeMesh::mergePoints(const scalar mergeDist)
 {
     pointField newPoints;
     labelList pointMap;
 
-    bool hasMerged = Foam::mergePoints
+    const bool hasMerged = Foam::mergePoints
     (
         points_,
         mergeDist,
@@ -307,92 +304,107 @@ void Foam::edgeMesh::mergePoints
 
     if (hasMerged)
     {
-        pointEdgesPtr_.clear();
+        pointEdgesPtr_.clear();   // connectivity change
 
         points_.transfer(newPoints);
 
-        // connectivity changed
-        pointEdgesPtr_.clear();
-
-        // Renumber and make sure e[0] < e[1] (not really necessary)
         forAll(edges_, edgeI)
         {
             edge& e = edges_[edgeI];
 
-            label p0 = pointMap[e[0]];
-            label p1 = pointMap[e[1]];
-
-            if (p0 < p1)
-            {
-                e[0] = p0;
-                e[1] = p1;
-            }
-            else
-            {
-                e[0] = p1;
-                e[1] = p0;
-            }
-        }
-
-        // Compact using a hashtable and commutative hash of edge.
-        EdgeMap<label> edgeToLabel(2*edges_.size());
-
-        label newEdgeI = 0;
-
-        forAll(edges_, edgeI)
-        {
-            const edge& e = edges_[edgeI];
-
-            if (e[0] != e[1])
-            {
-                if (edgeToLabel.insert(e, newEdgeI))
-                {
-                    newEdgeI++;
-                }
-            }
-        }
-
-        edges_.setSize(newEdgeI);
-
-        forAllConstIter(EdgeMap<label>, edgeToLabel, iter)
-        {
-            edges_[iter()] = iter.key();
+            e[0] = pointMap[e[0]];
+            e[1] = pointMap[e[1]];
         }
     }
+
+    this->mergeEdges();
 }
 
 
 void Foam::edgeMesh::mergeEdges()
 {
-    EdgeMap<label> existingEdges(2*edges_.size());
+    HashSet<edge, Hash<edge>> uniqEdges(2*edges_.size());
+    PackedBoolList pointIsUsed(points_.size());
 
-    label curEdgeI = 0;
+    label nUniqEdges = 0;
+    label nUniqPoints = 0;
     forAll(edges_, edgeI)
     {
         const edge& e = edges_[edgeI];
 
-        if (existingEdges.insert(e, curEdgeI))
+        // Remove degenerate and repeated edges
+        // - reordering (e[0] < e[1]) is not really necessary
+        if (e[0] != e[1] && uniqEdges.insert(e))
         {
-            curEdgeI++;
+            if (nUniqEdges != edgeI)
+            {
+                edges_[nUniqEdges] = e;
+            }
+            edges_[nUniqEdges].sort();
+            ++nUniqEdges;
+
+            if (pointIsUsed.set(e[0], 1))
+            {
+                ++nUniqPoints;
+            }
+            if (pointIsUsed.set(e[1], 1))
+            {
+                ++nUniqPoints;
+            }
         }
     }
 
     if (debug)
     {
         Info<< "Merging duplicate edges: "
-            << edges_.size() - existingEdges.size()
-            << " edges will be deleted." << endl;
+            << (edges_.size() - nUniqEdges)
+            << " edges will be deleted, "
+            << (points_.size() - nUniqPoints)
+            << " unused points will be removed." << endl;
     }
 
-    edges_.setSize(existingEdges.size());
-
-    forAllConstIter(EdgeMap<label>, existingEdges, iter)
+    if (nUniqEdges < edges_.size())
     {
-        edges_[iter()] = iter.key();
+        pointEdgesPtr_.clear(); // connectivity change
+        edges_.setSize(nUniqEdges);  // truncate
+    }
+
+    if (nUniqPoints < points_.size())
+    {
+        pointEdgesPtr_.clear(); // connectivity change
+
+        // build a oldToNew point-map and rewrite the points.
+        // We can do this simultaneously since the point order is unchanged
+        // and we are only effectively eliminating some entries.
+        labelList pointMap(points_.size(), -1);
+
+        label newId = 0;
+        forAll(pointMap, pointi)
+        {
+            if (pointIsUsed[pointi])
+            {
+                pointMap[pointi] = newId;
+
+                if (newId < pointi)
+                {
+                    // copy down
+                    points_[newId] = points_[pointi];
+                }
+                ++newId;
+            }
+        }
+        points_.setSize(newId);
+
+        // Renumber edges - already sorted (above)
+        forAll(edges_, edgeI)
+        {
+            edge& e = edges_[edgeI];
+
+            e[0] = pointMap[e[0]];
+            e[1] = pointMap[e[1]];
+        }
     }
 
-    // connectivity changed
-    pointEdgesPtr_.clear();
 }
 
 
diff --git a/src/meshTools/edgeMesh/edgeMesh.H b/src/meshTools/edgeMesh/edgeMesh.H
index 7d78ff4f2c..9a5404736b 100644
--- a/src/meshTools/edgeMesh/edgeMesh.H
+++ b/src/meshTools/edgeMesh/edgeMesh.H
@@ -2,8 +2,8 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  |
+    \\  /    A nd           | Copyright (C) 2011-2014 OpenFOAM Foundation
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -59,8 +59,8 @@ class Ostream;
 
 // Forward declaration of friend functions and operators
 class edgeMesh;
-Istream& operator>>(Istream&, edgeMesh&);
-Ostream& operator<<(Ostream&, const edgeMesh&);
+Istream& operator>>(Istream& is, edgeMesh& em);
+Ostream& operator<<(Ostream& os, const edgeMesh& em);
 
 
 /*---------------------------------------------------------------------------*\
@@ -109,7 +109,7 @@ public:
     // Static
 
         //- Can we read this file format?
-        static bool canRead(const fileName&, const bool verbose=false);
+        static bool canRead(const fileName& name, const bool verbose=false);
 
         //- Can we read this file format?
         static bool canReadType(const word& ext, const bool verbose=false);
@@ -127,26 +127,23 @@ public:
         edgeMesh();
 
         //- Construct from components
-        edgeMesh(const pointField&, const edgeList&);
+        edgeMesh(const pointField& points, const edgeList& edges);
 
         //- Construct by transferring components (points, edges).
         edgeMesh
         (
-            const Xfer<pointField>&,
-            const Xfer<edgeList>&
+            const Xfer<pointField>& pointLst,
+            const Xfer<edgeList>& edgeLst
         );
 
         //- Construct as copy
-        edgeMesh(const edgeMesh&);
+        edgeMesh(const edgeMesh& em);
 
         //- Construct from file name (uses extension to determine type)
-        edgeMesh(const fileName&);
+        edgeMesh(const fileName& name);
 
         //- Construct from file name (uses extension to determine type)
-        edgeMesh(const fileName&, const word& ext);
-
-        //- Construct from Istream
-        edgeMesh(Istream&);
+        edgeMesh(const fileName& name, const word& ext);
 
 
     // Declare run-time constructor selection table
@@ -168,12 +165,12 @@ public:
         //- Select constructed from filename (explicit extension)
         static autoPtr<edgeMesh> New
         (
-            const fileName&,
+            const fileName& name,
             const word& ext
         );
 
         //- Select constructed from filename (implicit extension)
-        static autoPtr<edgeMesh> New(const fileName&);
+        static autoPtr<edgeMesh> New(const fileName& name);
 
 
     //- Destructor
@@ -196,7 +193,7 @@ public:
         );
 
         //- Write to file
-        static void write(const fileName&, const edgeMesh&);
+        static void write(const fileName& name, const edgeMesh& mesh);
 
 
     // Member Functions
@@ -205,15 +202,15 @@ public:
         void transfer(edgeMesh&);
 
         //- Transfer contents to the Xfer container
-        Xfer<edgeMesh > xfer();
+        Xfer<edgeMesh> xfer();
 
     // Read
 
         //- Read from file. Chooses reader based on explicit extension
-        bool read(const fileName&, const word& ext);
+        bool read(const fileName& name, const word& ext);
 
         //- Read from file. Chooses reader based on detected extension
-        virtual bool read(const fileName&);
+        virtual bool read(const fileName& name);
 
 
     // Access
@@ -246,13 +243,13 @@ public:
         );
 
         //- Scale points. A non-positive factor is ignored
-        virtual void scalePoints(const scalar);
+        virtual void scalePoints(const scalar scaleFactor);
 
-        //- Merge common points (points within mergeDist). Return map from
-        //  old to new points.
-        virtual void mergePoints(const scalar mergeDist, labelList&);
+        //- Geometric merge points (points within mergeDist) prior to
+        //  automatically calling mergeEdges().
+        virtual void mergePoints(const scalar mergeDist);
 
-        //- Merge duplicate edges
+        //- Merge duplicate edges and eliminate unused points.
         virtual void mergeEdges();
 
 
@@ -269,12 +266,12 @@ public:
 
     // Member Operators
 
-        inline void operator=(const edgeMesh&);
+        inline void operator=(const edgeMesh& rhs);
 
         // Ostream Operator
 
-            friend Ostream& operator<<(Ostream&, const edgeMesh&);
-            friend Istream& operator>>(Istream&, edgeMesh&);
+            friend Ostream& operator<<(Ostream& os, const edgeMesh& em);
+            friend Istream& operator>>(Istream& is, edgeMesh& em);
 
 };
 
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
index bbcf6ab080..a13061b7ff 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.C
@@ -454,6 +454,34 @@ Foam::extendedEdgeMesh::extendedEdgeMesh(Istream& is)
 }
 
 
+Foam::extendedEdgeMesh::extendedEdgeMesh
+(
+    const pointField& points,
+    const edgeList& edges
+)
+:
+    edgeMesh(points, edges),
+    concaveStart_(0),
+    mixedStart_(0),
+    nonFeatureStart_(0),
+    internalStart_(0),
+    flatStart_(0),
+    openStart_(0),
+    multipleStart_(0),
+    normals_(0),
+    normalVolumeTypes_(0),
+    edgeDirections_(0),
+    normalDirections_(0),
+    edgeNormals_(0),
+    featurePointNormals_(0),
+    featurePointEdges_(0),
+    regionEdges_(0),
+    pointTree_(),
+    edgeTree_(),
+    edgeTreesByType_()
+{}
+
+
 Foam::extendedEdgeMesh::extendedEdgeMesh
 (
     const Xfer<pointField>& pointLst,
@@ -1260,20 +1288,36 @@ void Foam::extendedEdgeMesh::add(const extendedEdgeMesh& fem)
     // ~~~~~~~
 
     // Combine normals
-    DynamicField<point> newNormals(normals().size()+fem.normals().size());
+    DynamicField<point> newNormals
+    (
+        normals().size()
+      + fem.normals().size()
+    );
     newNormals.append(normals());
     newNormals.append(fem.normals());
 
 
     // Combine and re-index into newNormals
-    labelListList newEdgeNormals(edgeNormals().size()+fem.edgeNormals().size());
-    UIndirectList<labelList>(newEdgeNormals, reverseEdgeMap) =
-        edgeNormals();
-    UIndirectList<labelList>(newEdgeNormals, reverseFemEdgeMap) =
-        fem.edgeNormals();
-    forAll(reverseFemEdgeMap, i)
+    labelListList newEdgeNormals
+    (
+        edgeNormals().size()
+      + fem.edgeNormals().size()
+    );
+
+    UIndirectList<labelList>
+    (
+        newEdgeNormals,
+        SubList<label>(reverseEdgeMap, edgeNormals().size())
+    ) = edgeNormals();
+    UIndirectList<labelList>
+    (
+        newEdgeNormals,
+        SubList<label>(reverseFemEdgeMap, fem.edgeNormals().size())
+    ) = fem.edgeNormals();
+
+    forAll(fem.edgeNormals(), i)
     {
-        label mapI = reverseFemEdgeMap[i];
+        const label mapI = reverseFemEdgeMap[i];
         labelList& en = newEdgeNormals[mapI];
         forAll(en, j)
         {
@@ -1300,9 +1344,10 @@ void Foam::extendedEdgeMesh::add(const extendedEdgeMesh& fem)
         newFeaturePointNormals,
         SubList<label>(reverseFemPointMap, fem.featurePointNormals().size())
     ) = fem.featurePointNormals();
+
     forAll(fem.featurePointNormals(), i)
     {
-        label mapI = reverseFemPointMap[i];
+        const label mapI = reverseFemPointMap[i];
         labelList& fn = newFeaturePointNormals[mapI];
         forAll(fn, j)
         {
diff --git a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
index 1f9feaf627..914287df13 100644
--- a/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
+++ b/src/meshTools/edgeMesh/extendedEdgeMesh/extendedEdgeMesh.H
@@ -250,7 +250,7 @@ public:
         static label nEdgeTypes;
 
         //- Can we read this file format?
-        static bool canRead(const fileName&, const bool verbose=false);
+        static bool canRead(const fileName& name, const bool verbose=false);
 
         //- Can we read this file format?
         static bool canReadType(const word& ext, const bool verbose=false);
@@ -268,7 +268,7 @@ public:
         extendedEdgeMesh();
 
         //- Construct as copy
-        explicit extendedEdgeMesh(const extendedEdgeMesh&);
+        explicit extendedEdgeMesh(const extendedEdgeMesh& fem);
 
         //- Construct from file name (uses extension to determine type)
         extendedEdgeMesh(const fileName&);
@@ -277,13 +277,16 @@ public:
         extendedEdgeMesh(const fileName&, const word& ext);
 
         //- Construct from Istream
-        extendedEdgeMesh(Istream&);
+        extendedEdgeMesh(Istream& is);
+
+        //- Construct from components
+        extendedEdgeMesh(const pointField& points, const edgeList& edges);
 
         //- Construct by transferring components (points, edges)
         extendedEdgeMesh
         (
-            const Xfer<pointField>&,
-            const Xfer<edgeList>&
+            const Xfer<pointField>& pointLst,
+            const Xfer<edgeList>& edgeLst
         );
 
         //- Construct given a surface with selected edges,points
@@ -346,12 +349,12 @@ public:
         //- Select constructed from filename (explicit extension)
         static autoPtr<extendedEdgeMesh> New
         (
-            const fileName&,
+            const fileName& name,
             const word& ext
         );
 
         //- Select constructed from filename (implicit extension)
-        static autoPtr<extendedEdgeMesh> New(const fileName&);
+        static autoPtr<extendedEdgeMesh> New(const fileName& name);
 
 
     //- Destructor
@@ -509,16 +512,16 @@ public:
         // Edit
 
             //- Transfer the contents of the argument and annul the argument
-            void transfer(extendedEdgeMesh&);
+            void transfer(extendedEdgeMesh& mesh);
 
             //- Transfer contents to the Xfer container
-            Xfer<extendedEdgeMesh > xfer();
+            Xfer<extendedEdgeMesh> xfer();
 
             //- Clear all storage
             virtual void clear();
 
             //- Add extendedEdgeMesh. No filtering of duplicates.
-            void add(const extendedEdgeMesh&);
+            void add(const extendedEdgeMesh& fem);
 
             //- Flip normals. All concave become convex, all internal external
             //  etc.
@@ -527,8 +530,8 @@ public:
             //- Update with derived geometry
             void autoMap
             (
-                const pointField&,
-                const edgeList&,
+                const pointField& subPoints,
+                const edgeList& subEdges,
                 const labelList& pointMap,
                 const labelList& edgeMap
             );
@@ -565,10 +568,10 @@ public:
         // Read
 
             //- Read from file. Chooses reader based on explicit extension
-            bool read(const fileName&, const word& ext);
+            bool read(const fileName& name, const word& ext);
 
             //- Read from file. Chooses reader based on detected extension
-            virtual bool read(const fileName&);
+            virtual bool read(const fileName& name);
 
 
         // Write
diff --git a/src/meshTools/meshTools/meshTools.C b/src/meshTools/meshTools/meshTools.C
index 1358505ebb..9a9012b925 100644
--- a/src/meshTools/meshTools/meshTools.C
+++ b/src/meshTools/meshTools/meshTools.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,6 +26,7 @@ License
 #include "meshTools.H"
 #include "polyMesh.H"
 #include "hexMatcher.H"
+#include "treeBoundBox.H"
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
@@ -209,16 +210,31 @@ void Foam::meshTools::writeOBJ
 }
 
 
+void Foam::meshTools::writeOBJ
+(
+    Ostream& os,
+    const UList<point>& pts
+)
+{
+    forAll(pts, i)
+    {
+        const point& pt = pts[i];
+        os << "v " << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
+    }
+
+}
+
+
 void Foam::meshTools::writeOBJ
 (
     Ostream& os,
     const triad& t,
-    const point& pt
+    const point& origin
 )
 {
     forAll(t, dirI)
     {
-        writeOBJ(os, pt, pt + t[dirI]);
+        writeOBJ(os, origin, origin + t[dirI]);
     }
 }
 
@@ -231,10 +247,9 @@ void Foam::meshTools::writeOBJ
     label& count
 )
 {
-    os << "v" << ' ' << p1.x() << ' ' << p1.y() << ' ' << p1.z() << endl;
-    os << "v" << ' ' << p2.x() << ' ' << p2.y() << ' ' << p2.z() << endl;
-
-    os << "l" << " " << (count + 1) << " " << (count + 2) << endl;
+    os << "v " << p1.x() << ' ' << p1.y() << ' ' << p1.z() << nl;
+    os << "v " << p2.x() << ' ' << p2.y() << ' ' << p2.z() << nl;
+    os << "l " << (count + 1) << " " << (count + 2) << endl;
 
     count += 2;
 }
@@ -247,12 +262,28 @@ void Foam::meshTools::writeOBJ
     const point& p2
 )
 {
-    os << "v" << ' ' << p1.x() << ' ' << p1.y() << ' ' << p1.z() << endl;
+    os  << "v " << p1.x() << ' ' << p1.y() << ' ' << p1.z() << nl;
+    os  << "vn "
+        << (p2.x() - p1.x()) << ' '
+        << (p2.y() - p1.y()) << ' '
+        << (p2.z() - p1.z()) << endl;
+}
 
-    os << "vn"
-        << ' ' << p2.x() - p1.x()
-        << ' ' << p2.y() - p1.y()
-        << ' ' << p2.z() - p1.z() << endl;
+
+void Foam::meshTools::writeOBJ
+(
+    Ostream& os,
+    const treeBoundBox& bb
+)
+{
+    writeOBJ(os, bb.points());
+
+    forAll(treeBoundBox::edges, edgei)
+    {
+        const edge& e = treeBoundBox::edges[edgei];
+
+        os << "l " << (e[0] + 1) <<  ' ' << (e[1] + 1) << nl;
+    }
 }
 
 
@@ -261,7 +292,7 @@ void Foam::meshTools::writeOBJ
     Ostream& os,
     const cellList& cells,
     const faceList& faces,
-    const pointField& points,
+    const UList<point>& points,
     const labelList& cellLabels
 )
 {
@@ -342,7 +373,7 @@ Foam::label Foam::meshTools::findEdge
 {
     forAll(candidates, i)
     {
-        label edgeI = candidates[i];
+        const label edgeI = candidates[i];
 
         const edge& e = edges[edgeI];
 
diff --git a/src/meshTools/meshTools/meshTools.H b/src/meshTools/meshTools/meshTools.H
index 90ac99b749..7c904281b5 100644
--- a/src/meshTools/meshTools/meshTools.H
+++ b/src/meshTools/meshTools/meshTools.H
@@ -49,8 +49,9 @@ SourceFiles
 namespace Foam
 {
 
-class primitiveMesh;
 class polyMesh;
+class primitiveMesh;
+class treeBoundBox;
 
 /*---------------------------------------------------------------------------*\
                         Namespace meshTools Declaration
@@ -101,23 +102,30 @@ namespace meshTools
 
     // OBJ writing
 
-        //- Write obj representation of point
+        //- Write obj representation of a point
         void writeOBJ
         (
             Ostream& os,
             const point& pt
         );
 
-        //- Write obj representation of a triad. Requires the location of the
+        //- Write obj representation of points
+        void writeOBJ
+        (
+            Ostream& os,
+            const UList<point>& pts
+        );
+
+        //- Write obj representation of a triad. Requires the origin of the
         //  triad to be supplied
         void writeOBJ
         (
             Ostream& os,
             const triad& t,
-            const point& pt
+            const point& origin
         );
 
-        //- Write obj representation of a line connecting two points
+        //- Write obj representation of a line connecting two points.
         //  Need to keep track of points that have been added. count starts at 0
         void writeOBJ
         (
@@ -135,13 +143,20 @@ namespace meshTools
             const point& p2
         );
 
+        //- Write obj representation of tree-bounding box as a series of lines
+        void writeOBJ
+        (
+            Ostream& os,
+            const treeBoundBox& bb
+        );
+
         //- Write obj representation of faces subset
         template<class FaceType>
         void writeOBJ
         (
             Ostream& os,
-            const UList<FaceType>&,
-            const pointField&,
+            const UList<FaceType>& faces,
+            const UList<point>& points,
             const labelList& faceLabels
         );
 
@@ -150,17 +165,17 @@ namespace meshTools
         void writeOBJ
         (
             Ostream& os,
-            const UList<FaceType>&,
-            const pointField&
+            const UList<FaceType>& faces,
+            const UList<point>& points
         );
 
         //- Write obj representation of cell subset
         void writeOBJ
         (
             Ostream& os,
-            const cellList&,
-            const faceList&,
-            const pointField&,
+            const cellList& cells,
+            const faceList& faces,
+            const UList<point>& points,
             const labelList& cellLabels
         );
 
@@ -170,7 +185,7 @@ namespace meshTools
         //- Is edge used by cell
         bool edgeOnCell
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label celli,
             const label edgeI
         );
@@ -178,7 +193,7 @@ namespace meshTools
         //- Is edge used by face
         bool edgeOnFace
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label facei,
             const label edgeI
         );
@@ -186,7 +201,7 @@ namespace meshTools
         //- Is face used by cell
         bool faceOnCell
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label celli,
             const label facei
         );
@@ -203,7 +218,7 @@ namespace meshTools
         //- Return edge between two mesh vertices. Returns -1 if no edge.
         label findEdge
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label v0,
             const label v1
         );
@@ -211,7 +226,7 @@ namespace meshTools
         //- Return edge shared by two faces. Throws error if no edge found.
         label getSharedEdge
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label f0,
             const label f1
         );
@@ -219,7 +234,7 @@ namespace meshTools
         //- Return face shared by two cells. Throws error if none found.
         label getSharedFace
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label cell0,
             const label cell1
         );
@@ -227,7 +242,7 @@ namespace meshTools
         //- Get faces on cell using edgeI. Throws error if no two found.
         void getEdgeFaces
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label celli,
             const label edgeI,
             label& face0,
@@ -238,17 +253,17 @@ namespace meshTools
         //  connected to vertex but not edgeI. Throws error if none found.
         label otherEdge
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const labelList& edgeLabels,
-            const label edgeI,
-            const label vertI
+            const label thisEdgeI,
+            const label thisVertI
         );
 
         //- Return face on cell using edgeI but not facei. Throws error
         //  if none found.
         label otherFace
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label celli,
             const label facei,
             const label edgeI
@@ -258,7 +273,7 @@ namespace meshTools
         //  if face not internal.
         label otherCell
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label celli,
             const label facei
         );
@@ -267,7 +282,7 @@ namespace meshTools
         // of startVertI)
         label walkFace
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label facei,
             const label startEdgeI,
             const label startVertI,
@@ -309,19 +324,19 @@ namespace meshTools
         //- Given edge on hex find other 'parallel', non-connected edges.
         void getParallelEdges
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label celli,
             const label e0,
-            label&,
-            label&,
-            label&
+            label& e1,
+            label& e2,
+            label& e3
         );
 
         //- Given edge on hex find all 'parallel' (i.e. non-connected)
         //  edges and average direction of them
         vector edgeToCutDir
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label celli,
             const label edgeI
         );
@@ -330,7 +345,7 @@ namespace meshTools
         //  return one of them.
         label cutDirToEdge
         (
-            const primitiveMesh&,
+            const primitiveMesh& mesh,
             const label celli,
             const vector& cutDir
         );
diff --git a/src/meshTools/meshTools/meshToolsTemplates.C b/src/meshTools/meshTools/meshToolsTemplates.C
index 16ccca1a12..51d7e328ec 100644
--- a/src/meshTools/meshTools/meshToolsTemplates.C
+++ b/src/meshTools/meshTools/meshToolsTemplates.C
@@ -28,7 +28,7 @@ void Foam::meshTools::writeOBJ
 (
     Ostream& os,
     const UList<FaceType>& faces,
-    const pointField& points,
+    const UList<point>& points,
     const labelList& faceLabels
 )
 {
@@ -64,7 +64,7 @@ void Foam::meshTools::writeOBJ
 (
     Ostream& os,
     const UList<FaceType>& faces,
-    const pointField& points
+    const UList<point>& points
 )
 {
     labelList allFaces(faces.size());
diff --git a/src/meshTools/momentOfInertia/volumeIntegration/README b/src/meshTools/momentOfInertia/volumeIntegration/README
index dadca677b7..9d17e91275 100644
--- a/src/meshTools/momentOfInertia/volumeIntegration/README
+++ b/src/meshTools/momentOfInertia/volumeIntegration/README
@@ -1,146 +1,146 @@
 1.  OVERVIEW
 
-	This code accompanies the paper:
+        This code accompanies the paper:
 
-	Brian Mirtich, "Fast and Accurate Computation of
-	Polyhedral Mass Properties," journal of graphics
-	tools, volume 1, number 2, 1996.
+        Brian Mirtich, "Fast and Accurate Computation of
+        Polyhedral Mass Properties," journal of graphics
+        tools, volume 1, number 2, 1996.
 
-	It computes the ten volume integrals needed for
-	determining the center of mass, moments of
-	inertia, and products of inertia for a uniform
-	density polyhedron.  From this information, a
-	body frame can be computed.
+        It computes the ten volume integrals needed for
+        determining the center of mass, moments of
+        inertia, and products of inertia for a uniform
+        density polyhedron.  From this information, a
+        body frame can be computed.
 
-	To compile the program, use an ANSI compiler, and
-	type something like
-  
-		% cc volInt.c -O2 -lm -o volInt
+        To compile the program, use an ANSI compiler, and
+        type something like
+
+                % cc volInt.c -O2 -lm -o volInt
 
 
-	Revision history
+        Revision history
 
-	26 Jan 1996	Program creation.
+        26 Jan 1996     Program creation.
 
-	 3 Aug 1996	Corrected bug arising when polyhedron density
-			is not 1.0.  Changes confined to function main().
-			Thanks to Zoran Popovic for catching this one.
+         3 Aug 1996     Corrected bug arising when polyhedron density
+                        is not 1.0.  Changes confined to function main().
+                        Thanks to Zoran Popovic for catching this one.
 
 
 
 2.  POLYHEDRON GEOMETRY FILES
 
-	The program reads a data file specified on the
-	command line.  This data file describes the
-	geometry of a polyhedron, and has the following
-	format:
+        The program reads a data file specified on the
+        command line.  This data file describes the
+        geometry of a polyhedron, and has the following
+        format:
 
-	N	
+        N
 
-	x_0	y_0	z_0
-	x_1	y_1	z_1
-	.
-	.
-	.
-	x_{N-1}	y_{N-1}	z_{N-1}
+        x_0     y_0     z_0
+        x_1     y_1     z_1
+        .
+        .
+        .
+        x_{N-1} y_{N-1} z_{N-1}
 
-	M
+        M
 
-	k1	v_{1,1} v_{1,2} ... v_{1,k1}
-	k2	v_{2,1} v_{2,2} ... v_{2,k2}
-	.
-	.
-	.
-	kM	v_{M,1} v_{M,2} ... v_{M,kM}
+        k1      v_{1,1} v_{1,2} ... v_{1,k1}
+        k2      v_{2,1} v_{2,2} ... v_{2,k2}
+        .
+        .
+        .
+        kM      v_{M,1} v_{M,2} ... v_{M,kM}
 
 
-	where:
-		N		number of vertices on polyhedron
-		x_i y_i z_i	x, y, and z coordinates of ith vertex
-		M		number of faces on polyhedron
-		ki		number of vertices on ith face
-		v_{i,j}		jth vertex on ith face
+        where:
+                N               number of vertices on polyhedron
+                x_i y_i z_i     x, y, and z coordinates of ith vertex
+                M               number of faces on polyhedron
+                ki              number of vertices on ith face
+                v_{i,j}         jth vertex on ith face
 
-	In English:
+        In English:
 
-		First the number of vertices are specified.  Next
-		the vertices are defined by listing the 3
-		coordinates of each one.  Next the number of faces
-		are specified.  Finally, the faces themselves are
-		specified.  A face is specified by first giving
-		the number of vertices around the polygonal face,
-		followed by the (integer) indices of these
-		vertices.  When specifying indices, note that
-		they must be given in counter-clockwise order
-		(when looking at the face from outside the
-		polyhedron), and the vertices are indexed from 0
-		to N-1 for a polyhedron with N faces.
+                First the number of vertices are specified.  Next
+                the vertices are defined by listing the 3
+                coordinates of each one.  Next the number of faces
+                are specified.  Finally, the faces themselves are
+                specified.  A face is specified by first giving
+                the number of vertices around the polygonal face,
+                followed by the (integer) indices of these
+                vertices.  When specifying indices, note that
+                they must be given in counter-clockwise order
+                (when looking at the face from outside the
+                polyhedron), and the vertices are indexed from 0
+                to N-1 for a polyhedron with N faces.
 
-	White space can be inserted (or not) as desired.
-	Three example polyhedron geometry files are included:
+        White space can be inserted (or not) as desired.
+        Three example polyhedron geometry files are included:
 
-	cube	A cube, 20 units on a side, centered at 
-		the origin and aligned with the coordinate axes.
+        cube    A cube, 20 units on a side, centered at
+                the origin and aligned with the coordinate axes.
 
-	tetra	A tetrahedron formed by taking the convex 
-		hull of the origin, and	the points (5,0,0), 
-		(0,4,0), and (0,0,3).
+        tetra   A tetrahedron formed by taking the convex
+                hull of the origin, and the points (5,0,0),
+                (0,4,0), and (0,0,3).
 
-	icosa	An icosahedron with vertices lying on the unit 
-		sphere, centered at the origin.
+        icosa   An icosahedron with vertices lying on the unit
+                sphere, centered at the origin.
 
 
 
 3.  RUNNING THE PROGRAM
 
-	Simply type,
-	
-		% volInt <polyhedron geometry filename>
+        Simply type,
 
-	The program will read in the geometry of the
-	polyhedron, and the print out the ten volume
-	integrals.
+                % volInt <polyhedron geometry filename>
 
-	The program also computes some of the mass
-	properties which may be inferred from the volume
-	integrals.  A density of 1.0 is assumed, although
-	this may be changed in function main().  The
-	center of mass is computed as well as the inertia
-	tensor relative to a frame with origin at the
-	center of mass.  Note, however, that this matrix
-	may not be diagonal.  If not, a diagonalization
-	routine must be performed, to determine the
-	orientation of the true body frame relative to
-	the original model frame.  The Jacobi method
-	works quite well (see Numerical Recipes in C by
-	Press, et. al.).
+        The program will read in the geometry of the
+        polyhedron, and the print out the ten volume
+        integrals.
+
+        The program also computes some of the mass
+        properties which may be inferred from the volume
+        integrals.  A density of 1.0 is assumed, although
+        this may be changed in function main().  The
+        center of mass is computed as well as the inertia
+        tensor relative to a frame with origin at the
+        center of mass.  Note, however, that this matrix
+        may not be diagonal.  If not, a diagonalization
+        routine must be performed, to determine the
+        orientation of the true body frame relative to
+        the original model frame.  The Jacobi method
+        works quite well (see Numerical Recipes in C by
+        Press, et. al.).
 
 
 
 4.  DISCLAIMERS
 
-	1.  The volume integration code has been written
-	to match the development and algorithms presented
-	in the paper, and not with maximum optimization
-	in mind.  While inherently very efficient, a few
-	more cycles can be squeezed out of the algorithm.
-	This is left as an exercise. :)
+        1.  The volume integration code has been written
+        to match the development and algorithms presented
+        in the paper, and not with maximum optimization
+        in mind.  While inherently very efficient, a few
+        more cycles can be squeezed out of the algorithm.
+        This is left as an exercise. :)
 
-	2.  Don't like global variables?  The three
-	procedures which evaluate the volume integrals
-	can be combined into a single procedure with two
-	nested loops.  In addition to providing some
-	speedup, all of the global variables can then be
-	made local.
+        2.  Don't like global variables?  The three
+        procedures which evaluate the volume integrals
+        can be combined into a single procedure with two
+        nested loops.  In addition to providing some
+        speedup, all of the global variables can then be
+        made local.
 
-	3.  The polyhedron data structure used by the
-	program is admittedly lame; much better schemes
-	are possible.  The idea here is just to give the
-	basic integral evaluation code, which will have
-	to be adjusted for other polyhedron data
-	structures.
+        3.  The polyhedron data structure used by the
+        program is admittedly lame; much better schemes
+        are possible.  The idea here is just to give the
+        basic integral evaluation code, which will have
+        to be adjusted for other polyhedron data
+        structures.
 
-	4.  There is no error checking for the input
-	files.  Be careful.  Note the hard limits
-	#defined for the number of vertices, number of
-	faces, and number of vertices per faces.
+        4.  There is no error checking for the input
+        files.  Be careful.  Note the hard limits
+        #defined for the number of vertices, number of
+        faces, and number of vertices per faces.
diff --git a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H
index 4fb964266b..26fe024b59 100644
--- a/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H
+++ b/src/meshTools/searchableSurfaces/searchableSurfaces/searchableSurfaces.H
@@ -63,9 +63,6 @@ class searchableSurfaces
         //- Region names per surface
         List<wordList> regionNames_;
 
-        ////- From global region name to surface and region on surface
-        //HashTable<labelPair> regionNames_;
-
         //- Indices of all surfaces. Precalculated and stored.
         labelList allSurfaces_;
 
diff --git a/src/meshTools/sets/topoSets/cellSet.C b/src/meshTools/sets/topoSets/cellSet.C
index c38bb209c6..32a9506f39 100644
--- a/src/meshTools/sets/topoSets/cellSet.C
+++ b/src/meshTools/sets/topoSets/cellSet.C
@@ -30,29 +30,26 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "mapDistributePolyMesh.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 defineTypeNameAndDebug(cellSet, 0);
 
 addToRunTimeSelectionTable(topoSet, cellSet, word);
 addToRunTimeSelectionTable(topoSet, cellSet, size);
 addToRunTimeSelectionTable(topoSet, cellSet, set);
-
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-cellSet::cellSet(const IOobject& obj)
+Foam::cellSet::cellSet(const IOobject& obj)
 :
     topoSet(obj, typeName)
 {}
 
 
-cellSet::cellSet
+Foam::cellSet::cellSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -67,7 +64,7 @@ cellSet::cellSet
 }
 
 
-cellSet::cellSet
+Foam::cellSet::cellSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -79,7 +76,7 @@ cellSet::cellSet
 {}
 
 
-cellSet::cellSet
+Foam::cellSet::cellSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -91,7 +88,7 @@ cellSet::cellSet
 {}
 
 
-cellSet::cellSet
+Foam::cellSet::cellSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -103,8 +100,20 @@ cellSet::cellSet
 {}
 
 
+Foam::cellSet::cellSet
+(
+    const polyMesh& mesh,
+    const word& name,
+    const UList<label>& set,
+    writeOption w
+)
+:
+    topoSet(mesh, name, set, w)
+{}
+
+
 // Database constructors (for when no mesh available)
-cellSet::cellSet
+Foam::cellSet::cellSet
 (
     const Time& runTime,
     const word& name,
@@ -114,32 +123,13 @@ cellSet::cellSet
 :
     topoSet
     (
-        IOobject
-        (
-            name,
-            runTime.findInstance
-            (
-                polyMesh::meshSubDir/"sets",    //polyMesh::meshSubDir,
-                word::null,                     //"faces"
-                IOobject::MUST_READ,
-                runTime.findInstance
-                (
-                    polyMesh::meshSubDir,
-                    "faces",
-                    IOobject::READ_IF_PRESENT
-                )
-            ),
-            polyMesh::meshSubDir/"sets",
-            runTime,
-            r,
-            w
-        ),
+        findIOobject(runTime, name, r, w),
         typeName
     )
 {}
 
 
-cellSet::cellSet
+Foam::cellSet::cellSet
 (
     const Time& runTime,
     const word& name,
@@ -149,32 +139,13 @@ cellSet::cellSet
 :
     topoSet
     (
-        IOobject
-        (
-            name,
-            runTime.findInstance
-            (
-                polyMesh::meshSubDir/"sets",    //polyMesh::meshSubDir,
-                word::null,                     //"faces"
-                IOobject::NO_READ,
-                runTime.findInstance
-                (
-                    polyMesh::meshSubDir,
-                    "faces",
-                    IOobject::READ_IF_PRESENT
-                )
-            ),
-            polyMesh::meshSubDir/"sets",
-            runTime,
-            IOobject::NO_READ,
-            w
-        ),
+        findIOobject(runTime, name, IOobject::NO_READ, w),
         size
     )
 {}
 
 
-cellSet::cellSet
+Foam::cellSet::cellSet
 (
     const Time& runTime,
     const word& name,
@@ -184,26 +155,7 @@ cellSet::cellSet
 :
     topoSet
     (
-        IOobject
-        (
-            name,
-            runTime.findInstance
-            (
-                polyMesh::meshSubDir/"sets",    //polyMesh::meshSubDir,
-                word::null,                     //"faces"
-                IOobject::NO_READ,
-                runTime.findInstance
-                (
-                    polyMesh::meshSubDir,
-                    "faces",
-                    IOobject::READ_IF_PRESENT
-                )
-            ),
-            polyMesh::meshSubDir/"sets",
-            runTime,
-            IOobject::NO_READ,
-            w
-        ),
+        findIOobject(runTime, name, IOobject::NO_READ, w),
         set
     )
 {}
@@ -211,25 +163,25 @@ cellSet::cellSet
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-cellSet::~cellSet()
+Foam::cellSet::~cellSet()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-label cellSet::maxSize(const polyMesh& mesh) const
+Foam::label Foam::cellSet::maxSize(const polyMesh& mesh) const
 {
     return mesh.nCells();
 }
 
 
-void cellSet::updateMesh(const mapPolyMesh& morphMap)
+void Foam::cellSet::updateMesh(const mapPolyMesh& morphMap)
 {
     updateLabels(morphMap.reverseCellMap());
 }
 
 
-void cellSet::distribute(const mapDistributePolyMesh& map)
+void Foam::cellSet::distribute(const mapDistributePolyMesh& map)
 {
     boolList inSet(map.nOldCells());
     forAllConstIter(cellSet, *this, iter)
@@ -271,8 +223,4 @@ void Foam::cellSet::writeDebug
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/meshTools/sets/topoSets/cellSet.H b/src/meshTools/sets/topoSets/cellSet.H
index 4f02b2cdb6..260695f6ad 100644
--- a/src/meshTools/sets/topoSets/cellSet.H
+++ b/src/meshTools/sets/topoSets/cellSet.H
@@ -53,7 +53,7 @@ class cellSet
     // Private Member Functions
 
         //- Disallow default bitwise copy construct
-        cellSet(const cellSet&);
+        cellSet(const cellSet&) = delete;
 
 
 public:
@@ -81,7 +81,7 @@ public:
         (
             const polyMesh& mesh,
             const word& name,
-            const label sizes,
+            const label size,
             writeOption w=NO_WRITE
         );
 
@@ -90,7 +90,7 @@ public:
         (
             const polyMesh& mesh,
             const word& name,
-            const topoSet&,
+            const topoSet& set,
             writeOption w=NO_WRITE
         );
 
@@ -99,7 +99,16 @@ public:
         (
             const polyMesh& mesh,
             const word& name,
-            const labelHashSet&,
+            const labelHashSet& set,
+            writeOption w=NO_WRITE
+        );
+
+        //- Construct from additional list of labels for the labelHashSet
+        cellSet
+        (
+            const polyMesh& mesh,
+            const word& name,
+            const UList<label>& set,
             writeOption w=NO_WRITE
         );
 
diff --git a/src/meshTools/sets/topoSets/faceSet.C b/src/meshTools/sets/topoSets/faceSet.C
index 7049f36a66..4d9c25640b 100644
--- a/src/meshTools/sets/topoSets/faceSet.C
+++ b/src/meshTools/sets/topoSets/faceSet.C
@@ -31,29 +31,26 @@ License
 
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
 namespace Foam
 {
-
-// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
-
 defineTypeNameAndDebug(faceSet, 0);
 
 addToRunTimeSelectionTable(topoSet, faceSet, word);
 addToRunTimeSelectionTable(topoSet, faceSet, size);
 addToRunTimeSelectionTable(topoSet, faceSet, set);
+}
 
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-faceSet::faceSet(const IOobject& obj)
+Foam::faceSet::faceSet(const IOobject& obj)
 :
     topoSet(obj, typeName)
 {}
 
 
-faceSet::faceSet
+Foam::faceSet::faceSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -67,7 +64,7 @@ faceSet::faceSet
 }
 
 
-faceSet::faceSet
+Foam::faceSet::faceSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -79,7 +76,7 @@ faceSet::faceSet
 {}
 
 
-faceSet::faceSet
+Foam::faceSet::faceSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -91,7 +88,7 @@ faceSet::faceSet
 {}
 
 
-faceSet::faceSet
+Foam::faceSet::faceSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -103,15 +100,27 @@ faceSet::faceSet
 {}
 
 
+Foam::faceSet::faceSet
+(
+    const polyMesh& mesh,
+    const word& name,
+    const UList<label>& set,
+    writeOption w
+)
+:
+    topoSet(mesh, name, set, w)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-faceSet::~faceSet()
+Foam::faceSet::~faceSet()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void faceSet::sync(const polyMesh& mesh)
+void Foam::faceSet::sync(const polyMesh& mesh)
 {
     boolList set(mesh.nFaces(), false);
 
@@ -150,19 +159,19 @@ void faceSet::sync(const polyMesh& mesh)
 }
 
 
-label faceSet::maxSize(const polyMesh& mesh) const
+Foam::label Foam::faceSet::maxSize(const polyMesh& mesh) const
 {
     return mesh.nFaces();
 }
 
 
-void faceSet::updateMesh(const mapPolyMesh& morphMap)
+void Foam::faceSet::updateMesh(const mapPolyMesh& morphMap)
 {
     updateLabels(morphMap.reverseFaceMap());
 }
 
 
-void faceSet::distribute(const mapDistributePolyMesh& map)
+void Foam::faceSet::distribute(const mapDistributePolyMesh& map)
 {
     boolList inSet(map.nOldFaces());
     forAllConstIter(faceSet, *this, iter)
@@ -193,7 +202,7 @@ void faceSet::distribute(const mapDistributePolyMesh& map)
 }
 
 
-void faceSet::writeDebug
+void Foam::faceSet::writeDebug
 (
     Ostream& os,
     const primitiveMesh& mesh,
@@ -204,8 +213,4 @@ void faceSet::writeDebug
 }
 
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/meshTools/sets/topoSets/faceSet.H b/src/meshTools/sets/topoSets/faceSet.H
index 75b5f817d1..18787ca5de 100644
--- a/src/meshTools/sets/topoSets/faceSet.H
+++ b/src/meshTools/sets/topoSets/faceSet.H
@@ -51,7 +51,6 @@ class faceSet
     public topoSet
 {
 
-
 public:
 
     //- Runtime type information
@@ -78,7 +77,7 @@ public:
         (
             const polyMesh& mesh,
             const word& name,
-            const label,
+            const label size,
             writeOption w=NO_WRITE
         );
 
@@ -87,7 +86,7 @@ public:
         (
             const polyMesh& mesh,
             const word& name,
-            const topoSet&,
+            const topoSet& set,
             writeOption w=NO_WRITE
         );
 
@@ -96,7 +95,16 @@ public:
         (
             const polyMesh& mesh,
             const word& name,
-            const labelHashSet&,
+            const labelHashSet& set,
+            writeOption w=NO_WRITE
+        );
+
+        //- Construct from additional list of labels for the labelHashSet
+        faceSet
+        (
+            const polyMesh& mesh,
+            const word& name,
+            const UList<label>& set,
             writeOption w=NO_WRITE
         );
 
diff --git a/src/meshTools/sets/topoSets/pointSet.C b/src/meshTools/sets/topoSets/pointSet.C
index e9d3542cf7..32d1d90f9b 100644
--- a/src/meshTools/sets/topoSets/pointSet.C
+++ b/src/meshTools/sets/topoSets/pointSet.C
@@ -28,32 +28,28 @@ License
 #include "polyMesh.H"
 #include "syncTools.H"
 #include "mapDistributePolyMesh.H"
-
 #include "addToRunTimeSelectionTable.H"
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-namespace Foam
-{
-
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
+namespace Foam
+{
 defineTypeNameAndDebug(pointSet, 0);
 
 addToRunTimeSelectionTable(topoSet, pointSet, word);
 addToRunTimeSelectionTable(topoSet, pointSet, size);
 addToRunTimeSelectionTable(topoSet, pointSet, set);
-
+}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-pointSet::pointSet(const IOobject& obj)
+Foam::pointSet::pointSet(const IOobject& obj)
 :
     topoSet(obj, typeName)
 {}
 
 
-pointSet::pointSet
+Foam::pointSet::pointSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -67,7 +63,7 @@ pointSet::pointSet
 }
 
 
-pointSet::pointSet
+Foam::pointSet::pointSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -79,7 +75,7 @@ pointSet::pointSet
 {}
 
 
-pointSet::pointSet
+Foam::pointSet::pointSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -91,7 +87,7 @@ pointSet::pointSet
 {}
 
 
-pointSet::pointSet
+Foam::pointSet::pointSet
 (
     const polyMesh& mesh,
     const word& name,
@@ -103,15 +99,27 @@ pointSet::pointSet
 {}
 
 
+Foam::pointSet::pointSet
+(
+    const polyMesh& mesh,
+    const word& name,
+    const UList<label>& set,
+    writeOption w
+)
+:
+    topoSet(mesh, name, set, w)
+{}
+
+
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
 
-pointSet::~pointSet()
+Foam::pointSet::~pointSet()
 {}
 
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void pointSet::sync(const polyMesh& mesh)
+void Foam::pointSet::sync(const polyMesh& mesh)
 {
     // Convert to boolList
 
@@ -145,19 +153,19 @@ void pointSet::sync(const polyMesh& mesh)
 }
 
 
-label pointSet::maxSize(const polyMesh& mesh) const
+Foam::label Foam::pointSet::maxSize(const polyMesh& mesh) const
 {
     return mesh.nPoints();
 }
 
 
-void pointSet::updateMesh(const mapPolyMesh& morphMap)
+void Foam::pointSet::updateMesh(const mapPolyMesh& morphMap)
 {
     updateLabels(morphMap.reversePointMap());
 }
 
 
-void pointSet::distribute(const mapDistributePolyMesh& map)
+void Foam::pointSet::distribute(const mapDistributePolyMesh& map)
 {
     boolList inSet(map.nOldPoints());
     forAllConstIter(pointSet, *this, iter)
@@ -188,7 +196,7 @@ void pointSet::distribute(const mapDistributePolyMesh& map)
 }
 
 
-void pointSet::writeDebug
+void Foam::pointSet::writeDebug
 (
     Ostream& os,
     const primitiveMesh& mesh,
@@ -198,8 +206,4 @@ void pointSet::writeDebug
     topoSet::writeDebug(os, mesh.points(), maxLen);
 }
 
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-} // End namespace Foam
-
 // ************************************************************************* //
diff --git a/src/meshTools/sets/topoSets/pointSet.H b/src/meshTools/sets/topoSets/pointSet.H
index e5f92b1205..c31f86e688 100644
--- a/src/meshTools/sets/topoSets/pointSet.H
+++ b/src/meshTools/sets/topoSets/pointSet.H
@@ -78,7 +78,16 @@ public:
         (
             const polyMesh& mesh,
             const word& name,
-            const label,
+            const label size,
+            writeOption w=NO_WRITE
+        );
+
+        //- Construct from existing set
+        pointSet
+        (
+            const polyMesh& mesh,
+            const word& name,
+            const topoSet& set,
             writeOption w=NO_WRITE
         );
 
@@ -87,16 +96,16 @@ public:
         (
             const polyMesh& mesh,
             const word& name,
-            const topoSet&,
+            const labelHashSet& set,
             writeOption w=NO_WRITE
         );
 
-        //- Construct from additional labelHashSet
+        //- Construct from additional list of labels for the labelHashSet
         pointSet
         (
             const polyMesh& mesh,
             const word& name,
-            const labelHashSet&,
+            const UList<label>& set,
             writeOption w=NO_WRITE
         );
 
diff --git a/src/meshTools/sets/topoSets/topoSet.C b/src/meshTools/sets/topoSets/topoSet.C
index 59f0ea2ff5..cc65eb8097 100644
--- a/src/meshTools/sets/topoSets/topoSet.C
+++ b/src/meshTools/sets/topoSets/topoSet.C
@@ -289,6 +289,63 @@ void Foam::topoSet::writeDebug
 }
 
 
+Foam::IOobject Foam::topoSet::findIOobject
+(
+    const polyMesh& mesh,
+    const word& name,
+    readOption r,
+    writeOption w
+)
+{
+    return IOobject
+    (
+        name,
+        mesh.time().findInstance
+        (
+            mesh.dbDir()/polyMesh::meshSubDir/"sets",
+            word::null,
+            r,
+            mesh.facesInstance()
+        ),
+        polyMesh::meshSubDir/"sets",
+        mesh,
+        r,
+        w
+    );
+}
+
+
+Foam::IOobject Foam::topoSet::findIOobject
+(
+    const Time& runTime,
+    const word& name,
+    readOption r,
+    writeOption w
+)
+{
+    return IOobject
+    (
+        name,
+        runTime.findInstance
+        (
+            polyMesh::meshSubDir/"sets",
+            word::null,
+            IOobject::MUST_READ,
+            runTime.findInstance
+            (
+                polyMesh::meshSubDir,
+                "faces",
+                IOobject::READ_IF_PRESENT
+            )
+        ),
+        polyMesh::meshSubDir/"sets",
+        runTime,
+        r,
+        w
+    );
+}
+
+
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
 Foam::topoSet::topoSet(const IOobject& obj, const word& wantedType)
@@ -324,24 +381,7 @@ Foam::topoSet::topoSet
     writeOption w
 )
 :
-    regIOobject
-    (
-        IOobject
-        (
-            name,
-            mesh.time().findInstance
-            (
-                mesh.dbDir()/polyMesh::meshSubDir/"sets",
-                word::null,
-                r,  //IOobject::MUST_READ,
-                mesh.facesInstance()
-            ),
-            polyMesh::meshSubDir/"sets",
-            mesh,
-            r,
-            w
-        )
-    )
+    regIOobject(findIOobject(mesh, name, r, w))
 {
     if
     (
@@ -371,24 +411,7 @@ Foam::topoSet::topoSet
     writeOption w
 )
 :
-    regIOobject
-    (
-        IOobject
-        (
-            name,
-            mesh.time().findInstance
-            (
-                mesh.dbDir()/polyMesh::meshSubDir/"sets",
-                word::null,
-                IOobject::NO_READ,
-                mesh.facesInstance()
-            ),
-            polyMesh::meshSubDir/"sets",
-            mesh,
-            IOobject::NO_READ,
-            w
-        )
-    ),
+    regIOobject(findIOobject(mesh, name, IOobject::NO_READ, w)),
     labelHashSet(size)
 {}
 
@@ -401,24 +424,20 @@ Foam::topoSet::topoSet
     writeOption w
 )
 :
-    regIOobject
-    (
-        IOobject
-        (
-            name,
-            mesh.time().findInstance
-            (
-                mesh.dbDir()/polyMesh::meshSubDir/"sets",
-                word::null,
-                IOobject::NO_READ,
-                mesh.facesInstance()
-            ),
-            polyMesh::meshSubDir/"sets",
-            mesh,
-            IOobject::NO_READ,
-            w
-        )
-    ),
+    regIOobject(findIOobject(mesh, name, IOobject::NO_READ, w)),
+    labelHashSet(set)
+{}
+
+
+Foam::topoSet::topoSet
+(
+    const polyMesh& mesh,
+    const word& name,
+    const UList<label>& set,
+    writeOption w
+)
+:
+    regIOobject(findIOobject(mesh, name, IOobject::NO_READ, w)),
     labelHashSet(set)
 {}
 
diff --git a/src/meshTools/sets/topoSets/topoSet.H b/src/meshTools/sets/topoSets/topoSet.H
index 3d0ec883b9..7a8ecbae92 100644
--- a/src/meshTools/sets/topoSets/topoSet.H
+++ b/src/meshTools/sets/topoSets/topoSet.H
@@ -108,7 +108,29 @@ protected:
 
 
         //- Disallow default bitwise copy construct
-        topoSet(const topoSet&);
+        topoSet(const topoSet&) = delete;
+
+
+protected:
+
+        //- Helper for constructor - return IOobject in the polyMesh/sets
+        static IOobject findIOobject
+        (
+            const polyMesh& mesh,
+            const word& name,
+            readOption r,
+            writeOption w
+        );
+
+        //- Helper for constructor - return IOobject in the polyMesh/sets
+        static IOobject findIOobject
+        (
+            const Time& runTime,
+            const word& name,
+            readOption r,
+            writeOption w
+        );
+
 
 public:
 
@@ -175,7 +197,7 @@ public:
 
         //- Construct from IOobject as explicitly passed type.
         //  Can't use typeName info here since subclasses not yet instantiated
-        topoSet(const IOobject&, const word& wantedType);
+        topoSet(const IOobject& obj, const word& wantedType);
 
         //- Construct from polyMesh and name. Searches for a polyMesh/sets
         //  directory but not beyond mesh.facesInstance.
@@ -195,7 +217,7 @@ public:
         (
             const polyMesh& mesh,
             const word& name,
-            const label,
+            const label size,
             writeOption w=NO_WRITE
         );
 
@@ -206,7 +228,18 @@ public:
         (
             const polyMesh& mesh,
             const word& name,
-            const labelHashSet&,
+            const labelHashSet& set,
+            writeOption w=NO_WRITE
+        );
+
+        //- Construct empty from additional labelHashSet
+        //  Searches for a polyMesh/sets
+        //  directory but not beyond mesh.facesInstance.
+        topoSet
+        (
+            const polyMesh& mesh,
+            const word& name,
+            const UList<label>&,
             writeOption w=NO_WRITE
         );
 
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
index 559bcfc6e6..851898de7e 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/edgeIntersections.C
@@ -25,9 +25,7 @@ License
 
 #include "edgeIntersections.H"
 #include "triSurfaceSearch.H"
-#include "labelPairLookup.H"
 #include "OFstream.H"
-#include "HashSet.H"
 #include "triSurface.H"
 #include "pointIndexHit.H"
 #include "treeDataTriSurface.H"
@@ -260,7 +258,7 @@ bool Foam::edgeIntersections::inlinePerturb
             if (perturbStart)
             {
                 // Perturb with something (hopefully) larger than tolerance.
-                scalar t = 4.0*(rndGen.scalar01() - 0.5);
+                scalar t = 4.0*(rndGen.sample01<scalar>() - 0.5);
                 points1[v0] += t*surf1PointTol[e[0]]*n;
 
                 const labelList& pEdges = surf1.pointEdges()[e[0]];
@@ -273,7 +271,7 @@ bool Foam::edgeIntersections::inlinePerturb
             if (perturbEnd)
             {
                 // Perturb with something larger than tolerance.
-                scalar t = 4.0*(rndGen.scalar01() - 0.5);
+                scalar t = 4.0*(rndGen.sample01<scalar>() - 0.5);
                 points1[v1] += t*surf1PointTol[e[1]]*n;
 
                 const labelList& pEdges = surf1.pointEdges()[e[1]];
@@ -320,7 +318,7 @@ bool Foam::edgeIntersections::rotatePerturb
             //label pointi = e[0];
 
             // Generate random vector slightly larger than tolerance.
-            vector rndVec = rndGen.vector01() - vector(0.5, 0.5, 0.5);
+            vector rndVec = rndGen.sample01<vector>() - vector(0.5, 0.5, 0.5);
 
             // Make sure rndVec only perp to edge
             vector n(points1[meshPoints[e[1]]] - points1[meshPoints[e[0]]]);
@@ -405,7 +403,8 @@ bool Foam::edgeIntersections::offsetPerturb
         if (nearType == triPointRef::POINT || nearType == triPointRef::EDGE)
         {
             // Shift edge towards tri centre
-            vector offset = 0.01*rndGen.scalar01()*(ctr - pHit.hitPoint());
+            vector offset =
+                0.01*rndGen.sample01<scalar>()*(ctr - pHit.hitPoint());
 
             // shift e[0]
             points1[meshPoints[e[0]]] += offset;
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
index eb33629bfa..a98dd53e91 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.C
@@ -25,9 +25,8 @@ License
 
 #include "surfaceIntersection.H"
 #include "triSurfaceSearch.H"
-#include "labelPairLookup.H"
 #include "OFstream.H"
-#include "HashSet.H"
+#include "labelPairHashes.H"
 #include "triSurface.H"
 #include "pointIndexHit.H"
 #include "mergePoints.H"
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
index d316bf2915..99265c9b35 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersection.H
@@ -59,7 +59,7 @@ SourceFiles
 #include "DynamicList.H"
 #include "point.H"
 #include "edge.H"
-#include "labelPairLookup.H"
+#include "labelPairHashes.H"
 #include "typeInfo.H"
 #include "edgeList.H"
 #include "pointIndexHit.H"
diff --git a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
index 3ae120f594..cd3af9da0c 100644
--- a/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
+++ b/src/meshTools/triSurface/booleanOps/surfaceIntersection/surfaceIntersectionFuncs.C
@@ -25,7 +25,7 @@ License
 
 #include "surfaceIntersection.H"
 #include "triSurfaceSearch.H"
-#include "labelPairLookup.H"
+#include "labelPairHashes.H"
 #include "OFstream.H"
 #include "HashSet.H"
 #include "triSurface.H"
diff --git a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
new file mode 100644
index 0000000000..d5e6d4d8e7
--- /dev/null
+++ b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.C
@@ -0,0 +1,262 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "triSurfaceLoader.H"
+#include "fileNameList.H"
+#include "Time.H"
+#include "OSspecific.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+Foam::triSurfaceLoader::triSurfaceLoader(const fileName& directory)
+:
+    directory_(directory),
+    available_(),
+    selected_()
+{
+    readDir();
+}
+
+
+Foam::triSurfaceLoader::triSurfaceLoader(const Time& runTime)
+:
+    directory_(runTime.constantPath()/"triSurface"),
+    available_(),
+    selected_()
+{
+    readDir();
+}
+
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::triSurfaceLoader::~triSurfaceLoader()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+Foam::label Foam::triSurfaceLoader::readDir()
+{
+    fileNameList files = Foam::readDir(directory_, fileName::FILE);
+
+    // Will be using triSurface
+    //
+    // - filter according to what is supported
+    //
+    // Transform from fileName to word and eliminate duplicates
+    // (eg, files with/without .gz)
+    wordHashSet names(2*files.size());
+
+    forAll(files, filei)
+    {
+        const fileName& f = files[filei];
+        if (triSurface::canRead(f))
+        {
+            names.insert(f.name());
+        }
+    }
+    available_ = names.sortedToc();     // Also hashes the names
+
+    return available_.size();
+}
+
+
+Foam::label Foam::triSurfaceLoader::selectAll()
+{
+    selected_ = available_;
+    return selected_.size();
+}
+
+
+Foam::label Foam::triSurfaceLoader::select(const word& name)
+{
+    if (available_.found(name))
+    {
+        selected_ = wordList{name};  // hashedWordList::operator[] is hidden!
+    }
+    else
+    {
+        selected_.clear();
+    }
+
+    return selected_.size();
+}
+
+
+Foam::label Foam::triSurfaceLoader::select(const wordRe& mat)
+{
+    DynamicList<label> foundIds(available_.size());
+
+    if (mat.isPattern())
+    {
+        foundIds = findMatchingStrings(mat, available_);
+        sort(foundIds);
+    }
+    else
+    {
+        const word& plain = static_cast<const word&>(mat);
+        if (available_.found(plain))
+        {
+            foundIds.append(available_[plain]);
+        }
+        else
+        {
+            FatalErrorInFunction
+                << "Specified the surfaces " << mat << nl
+                << "  - but could not find it"
+                << exit(FatalError);
+        }
+    }
+
+    selected_ = wordList(available_, foundIds);
+    return selected_.size();
+}
+
+
+Foam::label Foam::triSurfaceLoader::select(const wordReList& matcher)
+{
+    // Need to be more careful when select.
+    // - preserve same order as the input matcher itself
+    // - avoid duplicate selections
+    // - flag explicitly named files as missing.
+    //   (Eg, foo.stl must exist, but "foo.*\.stl" is optional)
+
+    // Track which files have already been selected
+    DynamicList<label> foundIds(available_.size());
+    labelHashSet hashedFound(2*available_.size());
+
+    DynamicList<word>  missing(matcher.size());
+    wordHashSet hashedMissing(2*matcher.size());
+
+    // Exact matches must exist
+    forAll(matcher, i)
+    {
+        const wordRe& mat = matcher[i];
+
+        if (mat.isPattern())
+        {
+            labelList indices = findMatchingStrings(mat, available_);
+            sort(indices);
+
+            forAll(indices, j)
+            {
+                const label idx = indices[j];
+                if (hashedFound.insert(idx))
+                {
+                    foundIds.append(idx);
+                }
+            }
+        }
+        else
+        {
+            const word& plain = static_cast<const word&>(mat);
+            if (available_.found(plain))
+            {
+                const label idx = available_[plain];
+                if (hashedFound.insert(idx))
+                {
+                    foundIds.append(idx);
+                }
+            }
+            else if (hashedMissing.insert(plain))
+            {
+                missing.append(plain);
+            }
+        }
+    }
+
+    if (missing.size())
+    {
+        FatalErrorInFunction
+            << "Specified the surfaces " << flatOutput(matcher) << nl
+            << "  - but could not find " << flatOutput(missing)
+            << exit(FatalError);
+    }
+
+    selected_ = wordList(available_, foundIds);
+    return selected_.size();
+}
+
+
+Foam::autoPtr<Foam::triSurface> Foam::triSurfaceLoader::load() const
+{
+    if (selected_.empty())
+    {
+        return autoPtr<triSurface>();
+    }
+    else if (selected_.size() == 1)
+    {
+        return autoPtr<triSurface>(new triSurface(directory_/selected_[0]));
+    }
+
+    List<labelledTri> faces;
+    pointField points;
+    label regoff = 0; // region offset
+
+    // collect all patches, preserving names.
+    // This will be horrible for output, but is good if we are relying on
+    // the names for defining baffles.
+    DynamicList<geometricSurfacePatch> patches(16*selected_.size());
+
+    forAll(selected_, surfi)
+    {
+        triSurface addsurf(directory_/selected_[surfi]);
+
+        List<labelledTri> addfaces(addsurf.xferFaces());
+        List<point> addpoints(addsurf.xferPoints());
+        patches.append(addsurf.patches());
+
+        if (surfi)
+        {
+            const label ptoff = points.size(); // point offset
+
+            forAll(addfaces, facei)
+            {
+                labelledTri& f = addfaces[facei];
+                forAll(f, fi)
+                {
+                    f[fi] += ptoff;
+                }
+                f.region() += regoff;
+            }
+
+            faces.append(addfaces);
+            points.append(addpoints);
+        }
+        else
+        {
+            faces.transfer(addfaces);
+            points.transfer(addpoints);
+        }
+
+        regoff += addsurf.patches().size();
+    }
+
+    return autoPtr<triSurface>(new triSurface(faces, patches, points, true));
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H
new file mode 100644
index 0000000000..aec554ec52
--- /dev/null
+++ b/src/meshTools/triSurface/triSurfaceLoader/triSurfaceLoader.H
@@ -0,0 +1,152 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::triSurfaceLoader
+
+Description
+    Convenience class for loading single or multiple surface files
+    from the constant/triSurface (or other) directory.
+
+    Surfaces selection based on word, wordRe, wordReList.
+    If multiple surfaces are selected, they are concatenated into a
+    single surface with offset faces,points,regions.
+
+SourceFiles
+    triSurfaceLoader.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef triSurfaceLoader_H
+#define triSurfaceLoader_H
+
+#include "triSurface.H"
+#include "wordReList.H"
+#include "hashedWordList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+// Forward declaration of classes
+class triSurfaceLoader;
+class Time;
+
+/*---------------------------------------------------------------------------*\
+                      Class triSurfaceLoader Declaration
+\*---------------------------------------------------------------------------*/
+
+class triSurfaceLoader
+{
+    // Private data
+
+        //- The directory to load from (eg, case/constant/triSurface)
+        fileName directory_;
+
+        //- All available files
+        hashedWordList available_;
+
+        //- Selected files
+        hashedWordList selected_;
+
+
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        triSurfaceLoader(const triSurfaceLoader&) = delete;
+
+        //- Disallow default bitwise assignment
+        void operator=(const triSurfaceLoader&) = delete;
+
+public:
+
+    // Constructors
+
+        //- Construct with directory name
+        triSurfaceLoader(const fileName& directory);
+
+        //- Construct with time. Selects "constant/triSurface" directory.
+        triSurfaceLoader(const Time& runTime);
+
+
+    //- Destructor
+    ~triSurfaceLoader();
+
+
+    // Member Functions
+
+      // Access
+
+        //- The directory being used
+        inline const fileName& directory() const
+        {
+            return directory_;
+        }
+
+        //- The list of available files
+        inline const hashedWordList& available() const
+        {
+            return available_;
+        }
+
+        //- The list of selected files
+        inline const hashedWordList& selected() const
+        {
+            return selected_;
+        }
+
+
+      // Edit
+
+        //- Read directory and populate the 'available' files.
+        //  Automatically called on construction.
+        label readDir();
+
+        //- Populates 'selected' with all available files.
+        label selectAll();
+
+        //- Populates 'selected' with a subset of the available files.
+        label select(const word& name);
+
+        //- Populates 'selected' with a subset of the available files.
+        label select(const wordRe& mat);
+
+        //- Populates 'selected' with a subset of the available files.
+        label select(const wordReList& matcher);
+
+        //- Load a single file, or load and combine multiple selected files
+        autoPtr<triSurface> load() const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
index e826500f15..e4c4b9c14c 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2015 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2015-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -175,7 +175,12 @@ Foam::triSurfaceSearch::triSurfaceSearch
     tolerance_(tolerance),
     maxTreeDepth_(maxTreeDepth),
     treePtr_(nullptr)
-{}
+{
+    if (tolerance_ < 0)
+    {
+        tolerance_ = indexedOctree<treeDataTriSurface>::perturbTol();
+    }
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
@@ -227,7 +232,7 @@ Foam::triSurfaceSearch::tree() const
             bb.max() += point(ROOTVSMALL, ROOTVSMALL, ROOTVSMALL);
         }
 
-        scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
+        const scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
         indexedOctree<treeDataTriSurface>::perturbTol() = tolerance_;
 
         treePtr_.reset
@@ -285,7 +290,7 @@ void Foam::triSurfaceSearch::findNearest
     List<pointIndexHit>& info
 ) const
 {
-    scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
+    const scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
     indexedOctree<treeDataTriSurface>::perturbTol() = tolerance();
 
     const indexedOctree<treeDataTriSurface>& octree = tree();
@@ -332,7 +337,7 @@ void Foam::triSurfaceSearch::findLine
 
     info.setSize(start.size());
 
-    scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
+    const scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
     indexedOctree<treeDataTriSurface>::perturbTol() = tolerance();
 
     forAll(start, i)
@@ -355,7 +360,7 @@ void Foam::triSurfaceSearch::findLineAny
 
     info.setSize(start.size());
 
-    scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
+    const scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
     indexedOctree<treeDataTriSurface>::perturbTol() = tolerance();
 
     forAll(start, i)
@@ -378,7 +383,7 @@ void Foam::triSurfaceSearch::findLineAll
 
     info.setSize(start.size());
 
-    scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
+    const scalar oldTol = indexedOctree<treeDataTriSurface>::perturbTol();
     indexedOctree<treeDataTriSurface>::perturbTol() = tolerance();
 
     // Work array
diff --git a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H
index 1debfc8ff6..b46e758985 100644
--- a/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H
+++ b/src/meshTools/triSurface/triSurfaceSearch/triSurfaceSearch.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -85,10 +85,10 @@ class triSurfaceSearch
         ) const;
 
         //- Disallow default bitwise copy construct
-        triSurfaceSearch(const triSurfaceSearch&);
+        triSurfaceSearch(const triSurfaceSearch&) = delete;
 
         //- Disallow default bitwise assignment
-        void operator=(const triSurfaceSearch&);
+        void operator=(const triSurfaceSearch&) = delete;
 
 
 public:
@@ -96,17 +96,18 @@ public:
     // Constructors
 
         //- Construct from surface. Holds reference to surface!
-        explicit triSurfaceSearch(const triSurface&);
+        explicit triSurfaceSearch(const triSurface& surface);
 
         //- Construct from surface and dictionary.
-        triSurfaceSearch(const triSurface&, const dictionary& dict);
+        triSurfaceSearch(const triSurface& surface, const dictionary& dict);
 
-        //- Construct from components
+        //- Construct from components.
+        //  A invalid (negative) tolerance uses the default tolerance.
         triSurfaceSearch
         (
             const triSurface& surface,
             const scalar tolerance,
-            const label maxTreeDepth
+            const label maxTreeDepth = 10
         );
 
 
@@ -155,7 +156,7 @@ public:
         //  - hit()      : whether nearest point found within bounding box
         //  - hitPoint() : coordinate of nearest point
         //  - index()    : surface triangle label
-        pointIndexHit nearest(const point&, const vector& span) const;
+        pointIndexHit nearest(const point& pt, const vector& span) const;
 
         void findLine
         (
diff --git a/src/parallel/decompose/Allwmake b/src/parallel/decompose/Allwmake
index 19257df545..b29e68ce29 100755
--- a/src/parallel/decompose/Allwmake
+++ b/src/parallel/decompose/Allwmake
@@ -4,6 +4,9 @@ cd ${0%/*} || exit 1    # Run from this directory
 # Parse arguments for library compilation
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
+: ${FOAM_EXT_LIBBIN:=/usr/lib$WM_COMPILER_LIB_ARCH}  # Extra safety
+export FOAM_EXT_LIBBIN
+
 # Test for metis.
 # - return 0 and export METIS_ARCH_PATH on success
 hasMetis()
diff --git a/src/randomProcesses/processes/UOprocess/UOprocess.C b/src/randomProcesses/processes/UOprocess/UOprocess.C
index 8d33b5d2e2..800d79025f 100644
--- a/src/randomProcesses/processes/UOprocess/UOprocess.C
+++ b/src/randomProcesses/processes/UOprocess/UOprocess.C
@@ -40,9 +40,9 @@ complexVector UOprocess::WeinerProcess()
 {
     return RootDeltaT*complexVector
     (
-        complex(GaussGen.GaussNormal(), GaussGen.GaussNormal()),
-        complex(GaussGen.GaussNormal(), GaussGen.GaussNormal()),
-        complex(GaussGen.GaussNormal(), GaussGen.GaussNormal())
+        complex(GaussGen.GaussNormal<scalar>(), GaussGen.GaussNormal<scalar>()),
+        complex(GaussGen.GaussNormal<scalar>(), GaussGen.GaussNormal<scalar>()),
+        complex(GaussGen.GaussNormal<scalar>(), GaussGen.GaussNormal<scalar>())
     );
 }
 
@@ -57,7 +57,7 @@ UOprocess::UOprocess
     const dictionary& UOdict
 )
 :
-    GaussGen(label(0)),
+    GaussGen(),
     Mesh(kmesh),
     DeltaT(deltaT),
     RootDeltaT(sqrt(DeltaT)),
diff --git a/src/randomProcesses/turbulence/turbGen.C b/src/randomProcesses/turbulence/turbGen.C
index 66162c9a13..b942ee49b6 100644
--- a/src/randomProcesses/turbulence/turbGen.C
+++ b/src/randomProcesses/turbulence/turbGen.C
@@ -51,8 +51,8 @@ Foam::vectorField Foam::turbGen::U()
 
     forAll(K, i)
     {
-        s[i] = RanGen.vector01();
-        rndPhases[i] = RanGen.scalar01();
+        s[i] = RanGen.sample01<vector>();
+        rndPhases[i] = RanGen.sample01<scalar>();
     }
 
     s = K ^ s;
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C
index 85333cc828..bcf86c018d 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.C
@@ -50,7 +50,7 @@ distributionContactAngleForce::distributionContactAngleForce
 )
 :
     contactAngleForce(typeName, film, dict),
-    rndGen_(label(0), -1),
+    rndGen_(),
     distribution_
     (
         distributionModel::New
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H
index 2a0ace4303..48ffcf5da8 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/distribution/distributionContactAngleForce.H
@@ -41,7 +41,7 @@ SourceFiles
 
 #include "contactAngleForce.H"
 #include "distributionModel.H"
-#include "cachedRandom.H"
+#include "Random.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -63,7 +63,7 @@ class distributionContactAngleForce
     // Private Data
 
         //- Random number generator
-        cachedRandom rndGen_;
+        Random rndGen_;
 
         //- Parcel size PDF model
         const autoPtr<distributionModel> distribution_;
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
index 62ffeba4f9..e42d520074 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.C
@@ -57,7 +57,7 @@ perturbedTemperatureDependentContactAngleForce
 :
     contactAngleForce(typeName, film, dict),
     thetaPtr_(Function1<scalar>::New("theta", coeffDict_)),
-    rndGen_(label(0), -1),
+    rndGen_(label(0)),
     distribution_
     (
         distributionModel::New
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H
index 00dddb2577..3b7a2d99ed 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/force/contactAngleForces/perturbedTemperatureDependent/perturbedTemperatureDependentContactAngleForce.H
@@ -51,7 +51,7 @@ SourceFiles
 #include "contactAngleForce.H"
 #include "Function1.H"
 #include "distributionModel.H"
-#include "cachedRandom.H"
+#include "Random.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -76,7 +76,7 @@ class perturbedTemperatureDependentContactAngleForce
         autoPtr<Function1<scalar>> thetaPtr_;
 
         //- Random number generator
-        cachedRandom rndGen_;
+        Random rndGen_;
 
         //- Parcel size PDF model
         const autoPtr<distributionModel> distribution_;
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
index cfd6d408f0..7a534b1104 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.C
@@ -57,7 +57,7 @@ drippingInjection::drippingInjection
     injectionModel(type(), film, dict),
     deltaStable_(readScalar(coeffDict_.lookup("deltaStable"))),
     particlesPerParcel_(readScalar(coeffDict_.lookup("particlesPerParcel"))),
-    rndGen_(label(0), -1),
+    rndGen_(),
     parcelDistribution_
     (
         distributionModel::New
diff --git a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
index af9583bf22..27525a2dd6 100644
--- a/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
+++ b/src/regionModels/surfaceFilmModels/submodels/kinematic/injectionModel/drippingInjection/drippingInjection.H
@@ -42,7 +42,7 @@ SourceFiles
 
 #include "injectionModel.H"
 #include "distributionModel.H"
-#include "cachedRandom.H"
+#include "Random.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -84,7 +84,7 @@ protected:
         scalar particlesPerParcel_;
 
         //- Random number generator
-        cachedRandom rndGen_;
+        Random rndGen_;
 
         //- Parcel size PDF model
         const autoPtr<distributionModel>
diff --git a/src/renumber/Allwmake b/src/renumber/Allwmake
index e1fcc89e66..aef86c6450 100755
--- a/src/renumber/Allwmake
+++ b/src/renumber/Allwmake
@@ -5,14 +5,11 @@ cd ${0%/*} || exit 1    # Run from this directory
 targetType=libso
 . $WM_PROJECT_DIR/wmake/scripts/AllwmakeParseArguments
 
-## Get ZOLTAN_ARCH_PATH
-#if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan)
-#then
-#    . $settings
-#    echo "using ZOLTAN_ARCH_PATH=$ZOLTAN_ARCH_PATH"
-#else
-#    echo "Error: no config.sh/zoltan settings"
-#fi
+# Optional: get ZOLTAN_ARCH_PATH
+if settings=$($WM_PROJECT_DIR/bin/foamEtcFile config.sh/zoltan)
+then
+    . $settings
+fi
 
 wmake $targetType renumberMethods
 
diff --git a/src/renumber/renumberMethods/randomRenumber/randomRenumber.C b/src/renumber/renumberMethods/randomRenumber/randomRenumber.C
index e5268f7ed7..ecc8d32dce 100644
--- a/src/renumber/renumberMethods/randomRenumber/randomRenumber.C
+++ b/src/renumber/renumberMethods/randomRenumber/randomRenumber.C
@@ -65,7 +65,7 @@ Foam::labelList Foam::randomRenumber::renumber
     {
         forAll(newToOld, i)
         {
-            label j = rndGen.integer(0, newToOld.size()-1);
+            label j = rndGen.position<label>(0, newToOld.size()-1);
             Swap(newToOld[i], newToOld[j]);
         }
     }
diff --git a/src/renumber/zoltanRenumber/Make/options b/src/renumber/zoltanRenumber/Make/options
index c637f39ba9..e92e24e096 100644
--- a/src/renumber/zoltanRenumber/Make/options
+++ b/src/renumber/zoltanRenumber/Make/options
@@ -4,10 +4,13 @@ sinclude $(RULES)/mplib$(WM_MPLIB)
 EXE_INC = \
     /* -DFULLDEBUG -g -O0 */ \
     $(PFLAGS) $(PINC) \
-    -I$(FOAM_SRC)/renumber/renumberMethods/lnInclude \
-    -I$(ZOLTAN_ARCH_PATH)/include/ \
-    -I$(LIB_SRC)/meshTools/lnInclude
+    ${c++LESSWARN} \
+    -I$(LIB_SRC)/renumber/renumberMethods/lnInclude \
+    -I$(LIB_SRC)/meshTools/lnInclude \
+    -I$(ZOLTAN_ARCH_PATH)/include
 
 LIB_LIBS = \
-    /* -L$(ZOLTAN_ARCH_PATH)/lib -lzoltan */ \
+    -L$(ZOLTAN_ARCH_PATH)/lib \
+    -L$(ZOLTAN_ARCH_PATH)/lib$(WM_COMPILER_LIB_ARCH) \
+    -lzoltan \
     -lmeshTools
diff --git a/src/sampling/probes/patchProbesTemplates.C b/src/sampling/probes/patchProbesTemplates.C
index d43444cb91..ab2b3208ff 100644
--- a/src/sampling/probes/patchProbesTemplates.C
+++ b/src/sampling/probes/patchProbesTemplates.C
@@ -115,7 +115,7 @@ void Foam::patchProbes::sampleAndWrite
 
             if
             (
-                iter != objectRegistry::end()
+                iter.found()
              && iter()->type()
              == GeometricField<Type, fvPatchField, volMesh>::typeName
             )
@@ -167,7 +167,7 @@ void Foam::patchProbes::sampleAndWriteSurfaceFields
 
             if
             (
-                iter != objectRegistry::end()
+                iter.found()
              && iter()->type()
              == GeometricField<Type, fvsPatchField, surfaceMesh>::typeName
             )
diff --git a/src/sampling/probes/probesTemplates.C b/src/sampling/probes/probesTemplates.C
index 3ac7b08379..b5c4693657 100644
--- a/src/sampling/probes/probesTemplates.C
+++ b/src/sampling/probes/probesTemplates.C
@@ -141,7 +141,7 @@ void Foam::probes::sampleAndWrite(const fieldGroup<Type>& fields)
 
             if
             (
-                iter != objectRegistry::end()
+                iter.found()
              && iter()->type()
              == GeometricField<Type, fvPatchField, volMesh>::typeName
             )
@@ -190,7 +190,7 @@ void Foam::probes::sampleAndWriteSurfaceFields(const fieldGroup<Type>& fields)
 
             if
             (
-                iter != objectRegistry::end()
+                iter.found()
              && iter()->type()
              == GeometricField<Type, fvsPatchField, surfaceMesh>::typeName
             )
diff --git a/src/sampling/sampledSet/patchSeed/patchSeedSet.C b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
index db106e4336..9060f8aeb7 100644
--- a/src/sampling/sampledSet/patchSeed/patchSeedSet.C
+++ b/src/sampling/sampledSet/patchSeed/patchSeedSet.C
@@ -227,7 +227,7 @@ void Foam::patchSeedSet::calcSamples
         {
             forAll(subset, i)
             {
-                label j = rndGen.integer(0, subset.size()-1);
+                label j = rndGen.position<label>(0, subset.size()-1);
                 Swap(subset[i], subset[j]);
             }
         }
diff --git a/src/sampling/sampledSurface/sampledPlane/sampledPlane.C b/src/sampling/sampledSurface/sampledPlane/sampledPlane.C
index 33ace2cd2c..85ef3a9d4f 100644
--- a/src/sampling/sampledSurface/sampledPlane/sampledPlane.C
+++ b/src/sampling/sampledSurface/sampledPlane/sampledPlane.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -139,7 +139,7 @@ bool Foam::sampledPlane::update()
 
     labelList selectedCells = mesh().cellZones().findMatching(zoneKey_).used();
 
-    if (selectedCells.empty())
+    if (returnReduce(selectedCells.empty(), andOp<bool>()))
     {
         reCut(mesh(), triangulate_);
     }
diff --git a/src/sampling/surface/isoSurface/isoSurface.C b/src/sampling/surface/isoSurface/isoSurface.C
index 59f64567ed..94ae0a3293 100644
--- a/src/sampling/surface/isoSurface/isoSurface.C
+++ b/src/sampling/surface/isoSurface/isoSurface.C
@@ -24,21 +24,11 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "isoSurface.H"
-#include "fvMesh.H"
 #include "mergePoints.H"
-#include "addToRunTimeSelectionTable.H"
 #include "slicedVolFields.H"
 #include "volFields.H"
-#include "surfaceFields.H"
-#include "OFstream.H"
-#include "meshTools.H"
-#include "triSurfaceSearch.H"
 #include "triSurfaceTools.H"
-#include "surfaceIntersection.H"
-#include "intersectedSurface.H"
-#include "searchableBox.H"
 #include "triSurface.H"
-#include "triSurfaceMesh.H"
 #include "triPoints.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.C b/src/surfMesh/MeshedSurface/MeshedSurface.C
index 0606860e64..41d0418a3b 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.C
@@ -33,24 +33,17 @@ License
 #include "polyMesh.H"
 #include "surfMesh.H"
 #include "primitivePatch.H"
+#include "faceTraits.H"
 #include "addToRunTimeSelectionTable.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
-template<class Face>
-inline bool Foam::MeshedSurface<Face>::isTri()
-{
-    return false;
-}
-
-
 template<class Face>
 Foam::wordHashSet Foam::MeshedSurface<Face>::readTypes()
 {
     return wordHashSet(*fileExtensionConstructorTablePtr_);
 }
 
-
 template<class Face>
 Foam::wordHashSet Foam::MeshedSurface<Face>::writeTypes()
 {
@@ -116,25 +109,34 @@ void Foam::MeshedSurface<Face>::write
     const fileName& name,
     const MeshedSurface<Face>& surf
 )
+{
+    write(name, name.ext(), surf);
+}
+
+
+template<class Face>
+void Foam::MeshedSurface<Face>::write
+(
+    const fileName& name,
+    const word& ext,
+    const MeshedSurface<Face>& surf
+)
 {
     if (debug)
     {
         InfoInFunction << "Writing to " << name << endl;
     }
 
-    const word ext = name.ext();
+    auto mfIter = writefileExtensionMemberFunctionTablePtr_->find(ext);
 
-    typename writefileExtensionMemberFunctionTable::iterator mfIter =
-        writefileExtensionMemberFunctionTablePtr_->find(ext);
-
-    if (mfIter == writefileExtensionMemberFunctionTablePtr_->end())
+    if (!mfIter.found())
     {
         // No direct writer, delegate to proxy if possible
         const wordHashSet& delegate = ProxyType::writeTypes();
 
         if (delegate.found(ext))
         {
-            MeshedSurfaceProxy<Face>(surf).write(name);
+            MeshedSurfaceProxy<Face>(surf).write(name, ext);
         }
         else
         {
@@ -850,6 +852,11 @@ bool Foam::MeshedSurface<Face>::checkFaces
 template<class Face>
 Foam::label Foam::MeshedSurface<Face>::nTriangles() const
 {
+    if (faceTraits<Face>::isTri())
+    {
+        return ParentType::size();
+    }
+
     return nTriangles
     (
         const_cast<List<label>&>(List<label>::null())
@@ -905,10 +912,18 @@ Foam::label Foam::MeshedSurface<Face>::nTriangles
 template<class Face>
 Foam::label Foam::MeshedSurface<Face>::triangulate()
 {
-    return triangulate
-    (
-        const_cast<List<label>&>(List<label>::null())
-    );
+    if (faceTraits<Face>::isTri())
+    {
+        // Inplace triangulation of triFace/labelledTri surface = no-op
+        return 0;
+    }
+    else
+    {
+        return triangulate
+        (
+            const_cast<List<label>&>(List<label>::null())
+        );
+    }
 }
 
 
@@ -918,6 +933,17 @@ Foam::label Foam::MeshedSurface<Face>::triangulate
     List<label>& faceMapOut
 )
 {
+    if (faceTraits<Face>::isTri())
+    {
+        // Inplace triangulation of triFace/labelledTri surface = no-op
+        if (notNull(faceMapOut))
+        {
+            faceMapOut.clear();
+        }
+
+        return 0;
+    }
+
     label nTri = 0;
     label maxTri = 0;  // the maximum number of triangles for any single face
     List<Face>& faceLst = this->storedFaces();
@@ -966,7 +992,7 @@ Foam::label Foam::MeshedSurface<Face>::triangulate
             {
                 label fp1 = f.fcIndex(fp);
 
-                newFaces[nTri] = triFace(f[0], f[fp], f[fp1]);
+                newFaces[nTri] = Face{f[0], f[fp], f[fp1]};
                 faceMap[nTri] = facei;
                 nTri++;
             }
diff --git a/src/surfMesh/MeshedSurface/MeshedSurface.H b/src/surfMesh/MeshedSurface/MeshedSurface.H
index 513a813597..aca6e18647 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurface.H
+++ b/src/surfMesh/MeshedSurface/MeshedSurface.H
@@ -186,9 +186,6 @@ public:
 
     // Static
 
-        //- Face storage only handles triangulated faces
-        inline static bool isTri();
-
         //- Can we read this file format?
         static bool canRead(const fileName&, const bool verbose=false);
 
@@ -210,36 +207,36 @@ public:
         //- Construct by transferring components (points, faces, zones).
         MeshedSurface
         (
-            const Xfer<pointField>&,
-            const Xfer<List<Face>>&,
-            const Xfer<surfZoneList>&
+            const Xfer<pointField>& pointLst,
+            const Xfer<List<Face>>& faceLst,
+            const Xfer<surfZoneList>& zoneLst
         );
 
         //- Construct by transferring components (points, faces).
         //  Use zone information if available
         MeshedSurface
         (
-            const Xfer<pointField>&,
-            const Xfer<List<Face>>&,
+            const Xfer<pointField>& pointLst,
+            const Xfer<List<Face>>& faceLst,
             const labelUList& zoneSizes = labelUList(),
             const UList<word>& zoneNames = UList<word>()
         );
 
         //- Construct as copy
-        MeshedSurface(const MeshedSurface&);
+        MeshedSurface(const MeshedSurface& surf);
 
         //- Construct from a UnsortedMeshedSurface
-        MeshedSurface(const UnsortedMeshedSurface<Face>&);
+        MeshedSurface(const UnsortedMeshedSurface<Face>& surf);
 
         //- Construct from a boundary mesh with local points/faces
         MeshedSurface
         (
-            const polyBoundaryMesh&,
+            const polyBoundaryMesh& bMesh,
             const bool globalPoints=false
         );
 
         //- Construct from a surfMesh
-        MeshedSurface(const surfMesh&);
+        MeshedSurface(const surfMesh& mesh);
 
         //- Construct by transferring the contents from a UnsortedMeshedSurface
         MeshedSurface(const Xfer<UnsortedMeshedSurface<Face>>&);
@@ -248,18 +245,18 @@ public:
         MeshedSurface(const Xfer<MeshedSurface<Face>>&);
 
         //- Construct from file name (uses extension to determine type)
-        MeshedSurface(const fileName&);
+        MeshedSurface(const fileName& name);
 
         //- Construct from file name (uses extension to determine type)
-        MeshedSurface(const fileName&, const word& ext);
+        MeshedSurface(const fileName& name, const word& ext);
 
         //- Construct from Istream
-        MeshedSurface(Istream&);
+        MeshedSurface(Istream& is);
 
         //- Construct from database
         MeshedSurface
         (
-            const Time&,
+            const Time& t,
             const word& surfName = word::null
         );
 
@@ -283,7 +280,7 @@ public:
         //- Select constructed from filename (explicit extension)
         static autoPtr<MeshedSurface> New
         (
-            const fileName&,
+            const fileName& name,
             const word& ext
         );
 
@@ -310,11 +307,19 @@ public:
             (name, surf)
         );
 
-        //- Write to file
+        //- Write to file, selecting writer based on its extension
         static void write
         (
-            const fileName&,
-            const MeshedSurface<Face>&
+            const fileName& name,
+            const MeshedSurface<Face>& surf
+        );
+
+        //- Write to file, selecting writer based on the given extension
+        static void write
+        (
+            const fileName& name,
+            const word& ext,
+            const MeshedSurface<Face>& surf
         );
 
 
@@ -563,8 +568,6 @@ bool MeshedSurface<labelledTri>::addZonesToFaces();
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#include "MeshedSurfaceI.H"
-
 #ifdef NoRepository
     #include "MeshedSurface.C"
 #endif
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C b/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
index 8640b6e5ae..4a9bb6cac1 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceCore.C
@@ -50,7 +50,7 @@ namespace Foam
     )
     {
         // First triangulate
-        // - slightly wasteful for space, but manages adjusts the zones too!
+        // - slightly wasteful for space, but adjusts the zones too!
         surf.triangulate();
         this->storedPoints().transfer(surf.storedPoints());
         this->storedZones().transfer(surf.storedZones());
@@ -81,12 +81,12 @@ namespace Foam
     )
     {
         // First triangulate
-        // - slightly wasteful for space, but manages adjusts the zones too!
+        // - slightly wasteful for space, but adjusts the zones too!
         surf.triangulate();
         this->storedPoints().transfer(surf.storedPoints());
         this->storedZones().transfer(surf.storedZones());
 
-        // transcribe from face -> triFace
+        // transcribe from face -> labelledTri (via triFace)
         const List<face>& origFaces = surf.surfFaces();
         List<labelledTri> newFaces(origFaces.size());
         forAll(origFaces, facei)
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C b/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C
index 9d8c5dd091..a8c8e4c7a3 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceIO.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,6 +25,7 @@ License
 
 #include "MeshedSurface.H"
 #include "boundBox.H"
+#include "faceTraits.H"
 #include "Istream.H"
 #include "Ostream.H"
 
@@ -58,7 +59,7 @@ template<class Face>
 void Foam::MeshedSurface<Face>::writeStats(Ostream& os) const
 {
     os  << "points      : " << this->points().size() << nl;
-    if (MeshedSurface<Face>::isTri())
+    if (faceTraits<Face>::isTri())
     {
         os << "triangles   : " << this->size() << nl;
     }
@@ -82,7 +83,7 @@ void Foam::MeshedSurface<Face>::writeStats(Ostream& os) const
 
         os  << "faces       : " << this->size()
             << "  (tri:" << nTri << " quad:" << nQuad
-            << " poly:" << (this->size() - nTri - nQuad ) << ")" << nl;
+            << " poly:" << (this->size() - nTri - nQuad) << ")" << nl;
     }
 
     os  << "boundingBox : " << boundBox(this->points()) << endl;
diff --git a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
index a8280451ee..7d345191ff 100644
--- a/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
+++ b/src/surfMesh/MeshedSurface/MeshedSurfaceNew.C
@@ -38,10 +38,9 @@ Foam::MeshedSurface<Face>::New(const fileName& name, const word& ext)
         InfoInFunction << "Constructing MeshedSurface" << endl;
     }
 
-    typename fileExtensionConstructorTable::iterator cstrIter =
-        fileExtensionConstructorTablePtr_->find(ext);
+    auto cstrIter = fileExtensionConstructorTablePtr_->find(ext);
 
-    if (cstrIter == fileExtensionConstructorTablePtr_->end())
+    if (!cstrIter.found())
     {
         // No direct reader, delegate to friend if possible
         const wordHashSet& delegate = FriendType::readTypes();
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
index 168155a597..b5dbdb6c99 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.C
@@ -29,6 +29,7 @@ License
 #include "ListOps.H"
 #include "surfMesh.H"
 #include "OFstream.H"
+#include "faceTraits.H"
 
 // * * * * * * * * * * * * * Static Member Functions * * * * * * * * * * * * //
 
@@ -59,18 +60,27 @@ void Foam::MeshedSurfaceProxy<Face>::write
     const fileName& name,
     const MeshedSurfaceProxy& surf
 )
+{
+    write(name, name.ext(), surf);
+}
+
+
+template<class Face>
+void Foam::MeshedSurfaceProxy<Face>::write
+(
+    const fileName& name,
+    const word& ext,
+    const MeshedSurfaceProxy& surf
+)
 {
     if (debug)
     {
         InfoInFunction << "Writing to " << name << endl;
     }
 
-    const word ext = name.ext();
+    auto mfIter = writefileExtensionMemberFunctionTablePtr_->find(ext);
 
-    typename writefileExtensionMemberFunctionTable::iterator mfIter =
-        writefileExtensionMemberFunctionTablePtr_->find(ext);
-
-    if (mfIter == writefileExtensionMemberFunctionTablePtr_->end())
+    if (!mfIter.found())
     {
         FatalErrorInFunction
             << "Unknown file extension " << ext << nl << nl
@@ -237,38 +247,24 @@ Foam::MeshedSurfaceProxy<Face>::~MeshedSurfaceProxy()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
-namespace Foam
-{
-
-// Number of triangles for a triFace surface
-template<>
-inline label MeshedSurfaceProxy<triFace>::nTriangles() const
-{
-    return this->size();
-}
-
-// Number of triangles for a labelledTri surface
-template<>
-inline label MeshedSurfaceProxy<labelledTri>::nTriangles() const
-{
-    return this->size();
-}
-
-}
-
-
 template<class Face>
 inline Foam::label Foam::MeshedSurfaceProxy<Face>::nTriangles() const
 {
-    label nTri = 0;
-    const List<Face>& faceLst = this->surfFaces();
-    forAll(faceLst, facei)
+    if (faceTraits<Face>::isTri())
     {
-        nTri += faceLst[facei].nTriangles();
+        return this->size();
     }
+    else
+    {
+        label nTri = 0;
+        const List<Face>& faceLst = this->surfFaces();
+        forAll(faceLst, facei)
+        {
+            nTri += faceLst[facei].nTriangles();
+        }
 
-    return nTri;
+        return nTri;
+    }
 }
 
 
diff --git a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
index 3bedc3f076..6c0f3582e5 100644
--- a/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
+++ b/src/surfMesh/MeshedSurfaceProxy/MeshedSurfaceProxy.H
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -100,9 +100,9 @@ public:
         //- Construct from component references
         MeshedSurfaceProxy
         (
-            const pointField&,
-            const List<Face>&,
-            const List<surfZone>& = List<surfZone>(),
+            const pointField& pointLst,
+            const List<Face>& faceLst,
+            const List<surfZone>& zoneLst = List<surfZone>(),
             const List<label>& faceMap = List<label>()
         );
 
@@ -126,11 +126,19 @@ public:
             (name, surf)
         );
 
-        //- Write to file
+        //- Write to file, selected based on its extension
         static void write
         (
-            const fileName&,
-            const MeshedSurfaceProxy<Face>&
+            const fileName& name,
+            const MeshedSurfaceProxy& surf
+        );
+
+        //- Write to file, selected based on given extension
+        static void write
+        (
+            const fileName& name,
+            const word& ext,
+            const MeshedSurfaceProxy& surf
         );
 
 
@@ -188,10 +196,16 @@ public:
                 write(name, *this);
             }
 
+            //- Generic write routine. Chooses writer based on extension.
+            virtual void write(const fileName& name, const word& ext) const
+            {
+                write(name, ext, *this);
+            }
+
             //- Write to database
             virtual void write
             (
-                const Time&,
+                const Time& t,
                 const word& surfName = word::null
             ) const;
 };
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
index 42a7d1d9fe..7ac9a3e598 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurface.C
@@ -113,17 +113,16 @@ void Foam::UnsortedMeshedSurface<Face>::write
 
     const word ext = name.ext();
 
-    typename writefileExtensionMemberFunctionTable::iterator mfIter =
-        writefileExtensionMemberFunctionTablePtr_->find(ext);
+    auto mfIter = writefileExtensionMemberFunctionTablePtr_->find(ext);
 
-    if (mfIter == writefileExtensionMemberFunctionTablePtr_->end())
+    if (!mfIter.found())
     {
         // No direct writer, delegate to proxy if possible
         const wordHashSet& delegate = ProxyType::writeTypes();
 
         if (delegate.found(ext))
         {
-            MeshedSurfaceProxy<Face>(surf).write(name);
+            MeshedSurfaceProxy<Face>(surf).write(name, ext);
         }
         else
         {
diff --git a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
index f6f1431a83..6f50b23897 100644
--- a/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
+++ b/src/surfMesh/UnsortedMeshedSurface/UnsortedMeshedSurfaceNew.C
@@ -37,10 +37,9 @@ Foam::UnsortedMeshedSurface<Face>::New(const fileName& name, const word& ext)
         InfoInFunction << "Constructing UnsortedMeshedSurface" << endl;
     }
 
-    typename fileExtensionConstructorTable::iterator cstrIter =
-        fileExtensionConstructorTablePtr_->find(ext);
+    auto cstrIter = fileExtensionConstructorTablePtr_->find(ext);
 
-    if (cstrIter == fileExtensionConstructorTablePtr_->end())
+    if (!cstrIter.found())
     {
         // No direct reader, delegate to parent if possible
         const wordHashSet& delegate = ParentType::readTypes();
diff --git a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
index 0c60b22ede..daa0e2c1f8 100644
--- a/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/ac3d/AC3DsurfaceFormat.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,6 +26,7 @@ License
 #include "AC3DsurfaceFormat.H"
 #include "IStringStream.H"
 #include "PrimitivePatch.H"
+#include "faceTraits.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -194,9 +195,9 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
                         verts[vertI] = parse<int>(line) + vertexOffset;
                     }
 
-                    labelUList& f = static_cast<labelUList&>(verts);
+                    const labelUList& f = static_cast<const labelUList&>(verts);
 
-                    if (MeshedSurface<Face>::isTri() && f.size() > 3)
+                    if (faceTraits<Face>::isTri() && f.size() > 3)
                     {
                         // simple face triangulation about f[0]
                         // points may be incomplete
@@ -204,7 +205,7 @@ bool Foam::fileFormats::AC3DsurfaceFormat<Face>::read
                         {
                             label fp2 = f.fcIndex(fp1);
 
-                            dynFaces.append(triFace(f[0], f[fp1], f[fp2]));
+                            dynFaces.append(Face{f[0], f[fp1], f[fp2]});
                             sizes[zoneI]++;
                         }
                     }
diff --git a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
index 731b2e1b96..f2aa5b22ee 100644
--- a/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/gts/GTSsurfaceFormat.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -28,8 +28,8 @@ License
 #include "clock.H"
 #include "IFstream.H"
 #include "IStringStream.H"
-#include "Ostream.H"
 #include "OFstream.H"
+#include "faceTraits.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -187,7 +187,7 @@ bool Foam::fileFormats::GTSsurfaceFormat<Face>::read
                 << exit(FatalError);
         }
 
-        faceLst[facei] = triFace(e0Far, common01, e1Far);
+        faceLst[facei] = Face{e0Far, common01, e1Far};
         zoneIds[facei] = zoneI;
     }
 
@@ -229,7 +229,7 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
     // check if output triangulation would be required
     // It is too annoying to triangulate on-the-fly
     // just issue a warning and get out
-    if (!MeshedSurface<Face>::isTri())
+    if (!faceTraits<Face>::isTri())
     {
         label nNonTris = 0;
         forAll(faceLst, facei)
@@ -249,7 +249,6 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
         }
     }
 
-
     OFstream os(filename);
     if (!os.good())
     {
@@ -331,7 +330,7 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
     // check if output triangulation would be required
     // It is too annoying to triangulate on-the-fly
     // just issue a warning and get out
-    if (!MeshedSurface<Face>::isTri())
+    if (!faceTraits<Face>::isTri())
     {
         label nNonTris = 0;
         forAll(faceLst, facei)
@@ -351,7 +350,6 @@ void Foam::fileFormats::GTSsurfaceFormat<Face>::write
         }
     }
 
-
     OFstream os(filename);
     if (!os.good())
     {
diff --git a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
index d7b932ec48..55f941bf43 100644
--- a/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/nas/NASsurfaceFormat.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2015 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,6 +26,7 @@ License
 #include "NASsurfaceFormat.H"
 #include "IFstream.H"
 #include "IStringStream.H"
+#include "faceTraits.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -191,12 +192,10 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
 
         if (cmd == "CTRIA3")
         {
-            triFace fTri;
-
             label groupId = readLabel(IStringStream(line.substr(16,8))());
-            fTri[0] = readLabel(IStringStream(line.substr(24,8))());
-            fTri[1] = readLabel(IStringStream(line.substr(32,8))());
-            fTri[2] = readLabel(IStringStream(line.substr(40,8))());
+            label a = readLabel(IStringStream(line.substr(24,8))());
+            label b = readLabel(IStringStream(line.substr(32,8))());
+            label c = readLabel(IStringStream(line.substr(40,8))());
 
             // Convert groupID into zoneId
             Map<label>::const_iterator fnd = lookup.find(groupId);
@@ -217,20 +216,17 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
                 // Info<< "zone" << zoneI << " => group " << groupId <<endl;
             }
 
-            dynFaces.append(fTri);
+            dynFaces.append(Face{a, b, c});
             dynZones.append(zoneI);
             dynSizes[zoneI]++;
         }
         else if (cmd == "CQUAD4")
         {
-            face fQuad(4);
-            labelUList& f = static_cast<labelUList&>(fQuad);
-
             label groupId = readLabel(IStringStream(line.substr(16,8))());
-            fQuad[0] = readLabel(IStringStream(line.substr(24,8))());
-            fQuad[1] = readLabel(IStringStream(line.substr(32,8))());
-            fQuad[2] = readLabel(IStringStream(line.substr(40,8))());
-            fQuad[3] = readLabel(IStringStream(line.substr(48,8))());
+            label a = readLabel(IStringStream(line.substr(24,8))());
+            label b = readLabel(IStringStream(line.substr(32,8))());
+            label c = readLabel(IStringStream(line.substr(40,8))());
+            label d = readLabel(IStringStream(line.substr(48,8))());
 
             // Convert groupID into zoneId
             Map<label>::const_iterator fnd = lookup.find(groupId);
@@ -251,18 +247,17 @@ bool Foam::fileFormats::NASsurfaceFormat<Face>::read
                 // Info<< "zone" << zoneI << " => group " << groupId <<endl;
             }
 
-
-            if (MeshedSurface<Face>::isTri())
+            if (faceTraits<Face>::isTri())
             {
-                dynFaces.append(triFace(f[0], f[1], f[2]));
-                dynFaces.append(triFace(f[0], f[2], f[3]));
+                dynFaces.append(Face{a, b, c});
+                dynFaces.append(Face{c, d, a});
                 dynZones.append(zoneI);
                 dynZones.append(zoneI);
                 dynSizes[zoneI] += 2;
             }
             else
             {
-                dynFaces.append(Face(f));
+                dynFaces.append(Face{a,b,c,d});
                 dynZones.append(zoneI);
                 dynSizes[zoneI]++;
             }
diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.C b/src/surfMesh/surfaceFormats/obj/OBJstream.C
index 695e518528..7c3b34c1ae 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJstream.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJstream.C
@@ -24,8 +24,8 @@ License
 \*---------------------------------------------------------------------------*/
 
 #include "OBJstream.H"
-//#include "token.H"
 #include "primitivePatch.H"
+#include "treeBoundBox.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -98,51 +98,13 @@ Foam::Ostream& Foam::OBJstream::write(const char* str)
 
 Foam::Ostream& Foam::OBJstream::write(const word& str)
 {
-    write(str.c_str());
-    return *this;
+    return writeQuoted(str, false);
 }
 
 
 Foam::Ostream& Foam::OBJstream::write(const string& str)
 {
-    OFstream::write(token::BEGIN_STRING);
-
-    int backslash = 0;
-    for (string::const_iterator iter = str.begin(); iter != str.end(); ++iter)
-    {
-        char c = *iter;
-
-        if (c == '\\')
-        {
-            backslash++;
-            // suppress output until we know if other characters follow
-            continue;
-        }
-        else if (c == token::NL)
-        {
-            lineNumber_++;
-            backslash++;    // backslash escape for newline
-        }
-        else if (c == token::END_STRING)
-        {
-            backslash++;    // backslash escape for quote
-        }
-
-        // output pending backslashes
-        while (backslash)
-        {
-            OFstream::write('\\');
-            backslash--;
-        }
-
-        writeAndCheck(c);
-    }
-
-    // silently drop any trailing backslashes
-    // they would otherwise appear like an escaped end-quote
-
-    OFstream::write(token::END_STRING);
-    return *this;
+    return writeQuoted(str, true);
 }
 
 
@@ -159,7 +121,7 @@ Foam::Ostream& Foam::OBJstream::writeQuoted
         int backslash = 0;
         for
         (
-            string::const_iterator iter = str.begin();
+            std::string::const_iterator iter = str.begin();
             iter != str.end();
             ++iter
         )
@@ -199,7 +161,15 @@ Foam::Ostream& Foam::OBJstream::writeQuoted
     else
     {
         // output unquoted string, only advance line number on newline
-        write(str.c_str());
+        for
+        (
+            std::string::const_iterator iter = str.begin();
+            iter != str.end();
+            ++iter
+        )
+        {
+            writeAndCheck(*iter);
+        }
     }
 
     return *this;
@@ -208,8 +178,7 @@ Foam::Ostream& Foam::OBJstream::writeQuoted
 
 Foam::Ostream& Foam::OBJstream::write(const point& pt)
 {
-    write("v ") << pt.x() << ' ' << pt.y() << ' ' << pt.z()
-        << nl;
+    write("v ") << pt.x() << ' ' << pt.y() << ' ' << pt.z() << nl;
     return *this;
 }
 
@@ -217,8 +186,7 @@ Foam::Ostream& Foam::OBJstream::write(const point& pt)
 Foam::Ostream& Foam::OBJstream::write(const point& pt, const vector& n)
 {
     write(pt);
-    OFstream::write("vn ") << n.x() << ' ' << n.y()
-        << ' ' << n.z() << nl;
+    OFstream::write("vn ") << n.x() << ' ' << n.y() << ' ' << n.z() << nl;
     return *this;
 }
 
@@ -261,7 +229,7 @@ Foam::Ostream& Foam::OBJstream::write
     const bool lines
 )
 {
-    label start = nVertices_;
+    const label start = nVertices_+1;  // 1-offset for obj included here
     write(f.a());
     write(f.b());
     write(f.c());
@@ -270,16 +238,16 @@ Foam::Ostream& Foam::OBJstream::write
         write('l');
         for (int i = 0; i < 3; i++)
         {
-            write(' ') << start+1+i;
+            write(' ') << i+start;
         }
-        write(' ') << start+1 << '\n';
+        write(' ') << start << '\n';
     }
     else
     {
         write('f');
         for (int i = 0; i < 3; i++)
         {
-            write(' ') << start+1+i;
+            write(' ') << i+start;
         }
         write('\n');
     }
@@ -294,7 +262,7 @@ Foam::Ostream& Foam::OBJstream::write
     const bool lines
 )
 {
-    label start = nVertices_;
+    const label start = nVertices_+1;  // 1-offset for obj included here
     forAll(f, i)
     {
         write(points[f[i]]);
@@ -304,16 +272,16 @@ Foam::Ostream& Foam::OBJstream::write
         write('l');
         forAll(f, i)
         {
-            write(' ') << start+1+i;
+            write(' ') << i+start;
         }
-        write(' ') << start+1 << '\n';
+        write(' ') << start << '\n';
     }
     else
     {
         write('f');
         forAll(f, i)
         {
-            write(' ') << start+1+i;
+            write(' ') << i+start;
         }
         write('\n');
     }
@@ -323,19 +291,19 @@ Foam::Ostream& Foam::OBJstream::write
 
 Foam::Ostream& Foam::OBJstream::write
 (
-    const faceList& fcs,
+    const UList<face>& faces,
     const pointField& points,
     const bool lines
 )
 {
-    SubList<face> allFcs(fcs, fcs.size());
+    SubList<face> allFcs(faces, faces.size());
 
     primitivePatch pp(allFcs, points);
 
     const pointField& localPoints = pp.localPoints();
     const faceList& localFaces = pp.localFaces();
 
-    label start = nVertices_;
+    const label start = nVertices_+1;  // 1-offset for obj included here
 
     forAll(localPoints, i)
     {
@@ -349,7 +317,7 @@ Foam::Ostream& Foam::OBJstream::write
         {
             const edge& e = edges[edgeI];
 
-            write("l ") << start+e[0]+1 << ' ' << start+e[1]+1 << nl;
+            write("l ") << e[0]+start << ' ' << e[1]+start << nl;
         }
     }
     else
@@ -360,7 +328,7 @@ Foam::Ostream& Foam::OBJstream::write
             write('f');
             forAll(f, i)
             {
-                write(' ') << start+f[i]+1;
+                write(' ') << f[i]+start;
             }
             write('\n');
         }
@@ -369,4 +337,108 @@ Foam::Ostream& Foam::OBJstream::write
 }
 
 
+Foam::Ostream& Foam::OBJstream::write
+(
+    const UList<edge>& edges,
+    const UList<point>& points,
+    const bool compact
+)
+{
+    if (compact)
+    {
+        // Code similar to PrimitivePatch::calcMeshData()
+        // Unsorted version
+
+        label objPointId = nVertices_+1;  // 1-offset for obj included here
+
+        Map<label> markedPoints(2*edges.size());
+        forAll(edges, edgei)
+        {
+            const edge& e = edges[edgei];
+
+            if (markedPoints.insert(e[0], objPointId))
+            {
+                write(points[e[0]]);
+                ++objPointId;
+            }
+            if (markedPoints.insert(e[1], objPointId))
+            {
+                write(points[e[1]]);
+                ++objPointId;
+            }
+        }
+
+        forAll(edges, edgei)
+        {
+            const edge& e = edges[edgei];
+
+            write("l ")
+                << markedPoints[e[0]] << ' '
+                << markedPoints[e[1]] << nl;
+        }
+    }
+    else
+    {
+        const label start = nVertices_+1;  // 1-offset for obj included here
+
+        forAll(points, i)
+        {
+            write(points[i]);
+        }
+
+        forAll(edges, edgei)
+        {
+            const edge& e = edges[edgei];
+
+            write("l ")
+                << e[0]+start << ' ' << e[1]+start << nl;
+        }
+    }
+
+    return *this;
+}
+
+
+Foam::Ostream& Foam::OBJstream::write
+(
+    const treeBoundBox& bb,
+    const bool lines
+)
+{
+    const label start = nVertices_+1;  // 1-offset for obj included here
+
+    pointField points(bb.points());
+    forAll(points, i)
+    {
+        write(points[i]);
+    }
+
+    if (lines)
+    {
+        forAll(treeBoundBox::edges, edgei)
+        {
+            const edge& e = treeBoundBox::edges[edgei];
+
+            write("l ") << e[0]+start << ' ' << e[1]+start << nl;
+        }
+    }
+    else
+    {
+        forAll(treeBoundBox::faces, facei)
+        {
+            const face& f = treeBoundBox::faces[facei];
+
+            write('f');
+            forAll(f, i)
+            {
+                write(' ') << f[i]+start;
+            }
+            write('\n');
+        }
+    }
+
+    return *this;
+}
+
+
 // ************************************************************************* //
diff --git a/src/surfMesh/surfaceFormats/obj/OBJstream.H b/src/surfMesh/surfaceFormats/obj/OBJstream.H
index a2188a9136..e5cf4227a8 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJstream.H
+++ b/src/surfMesh/surfaceFormats/obj/OBJstream.H
@@ -25,7 +25,7 @@ Class
     Foam::OBJstream
 
 Description
-    OFstream which keeps track of vertices
+    OFstream that keeps track of vertices
 
 SourceFiles
     OBJstream.C
@@ -47,6 +47,8 @@ SourceFiles
 namespace Foam
 {
 
+class treeBoundBox;
+
 /*---------------------------------------------------------------------------*\
                           Class OBJstream Declaration
 \*---------------------------------------------------------------------------*/
@@ -64,7 +66,7 @@ class OBJstream
 
     // Private Member Functions
 
-        void writeAndCheck(const char);
+        void writeAndCheck(const char c);
 
 public:
 
@@ -105,21 +107,22 @@ public:
             using Ostream::write;
 
             //- Write character
-            virtual Ostream& write(const char);
+            virtual Ostream& write(const char c);
 
             //- Write character string
-            virtual Ostream& write(const char*);
+            virtual Ostream& write(const char* str);
 
             //- Write word
-            virtual Ostream& write(const word&);
+            virtual Ostream& write(const word& str);
 
-            virtual Ostream& write(const string&);
+            //- Write string
+            virtual Ostream& write(const string& str);
 
             //- Write std::string surrounded by quotes.
             //  Optional write without quotes.
             virtual Ostream& writeQuoted
             (
-                const std::string&,
+                const std::string& str,
                 const bool quoted=true
             );
 
@@ -127,41 +130,57 @@ public:
         // Direct write functionality
 
             //- Write point
-            Ostream& write(const point&);
+            Ostream& write(const point& pt);
 
             //- Write point and vector normal ('vn')
-            Ostream& write(const point&, const vector&);
+            Ostream& write(const point& pt, const vector& n);
 
-            //- Write edge as points with line
-            Ostream& write(const edge&, const UList<point>&);
+            //- Write edge as points and line
+            Ostream& write(const edge& e, const UList<point>& points);
 
             //- Write line
-            Ostream& write(const linePointRef&);
+            Ostream& write(const linePointRef& ln);
 
             //- Write line with points and vector normals ('vn')
             Ostream& write
             (
-                const linePointRef&,
+                const linePointRef& ln,
                 const vector& n0,
                 const vector& n1
             );
 
-            //- Write triangle as points with lines or filled polygon
-            Ostream& write(const triPointRef&, const bool lines = true);
+            //- Write triangle as points and lines/filled-polygon
+            Ostream& write(const triPointRef& f, const bool lines = true);
 
-            //- Write face as points with lines or filled polygon
+            //- Write face as points and lines/filled-polygon
             Ostream& write
             (
-                const face&,
-                const UList<point>&,
+                const face& f,
+                const UList<point>& points,
                 const bool lines = true
             );
 
-            //- Write patch as points and faces with lines or filled polygons
+            //- Write patch faces as points and lines/filled-polygon
             Ostream& write
             (
-                const faceList&,
-                const pointField&,
+                const UList<face>& faces,
+                const pointField& points,
+                const bool lines = true
+            );
+
+            //- Write edges as points and lines.
+            //  Optionally eliminate unused points.
+            Ostream& write
+            (
+                const UList<edge>& edges,
+                const UList<point>& points,
+                const bool compact = false
+            );
+
+            //- Write tree-bounding box as lines/filled-polygons
+            Ostream& write
+            (
+                const treeBoundBox& bb,
                 const bool lines = true
             );
 
diff --git a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
index 395e2bacb7..db2036aa88 100644
--- a/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/obj/OBJsurfaceFormat.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,9 +27,9 @@ License
 #include "clock.H"
 #include "IFstream.H"
 #include "IStringStream.H"
-#include "Ostream.H"
 #include "OFstream.H"
 #include "ListOps.H"
+#include "faceTraits.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -172,7 +172,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
 
             labelUList& f = static_cast<labelUList&>(dynVertices);
 
-            if (MeshedSurface<Face>::isTri() && f.size() > 3)
+            if (faceTraits<Face>::isTri() && f.size() > 3)
             {
                 // simple face triangulation about f[0]
                 // points may be incomplete
@@ -180,7 +180,7 @@ bool Foam::fileFormats::OBJsurfaceFormat<Face>::read
                 {
                     label fp2 = f.fcIndex(fp1);
 
-                    dynFaces.append(triFace(f[0], f[fp1], f[fp2]));
+                    dynFaces.append(Face{f[0], f[fp1], f[fp2]});
                     dynZones.append(zoneI);
                     dynSizes[zoneI]++;
                 }
diff --git a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
index fd869a0c50..3146f01b99 100644
--- a/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/off/OFFsurfaceFormat.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -27,7 +27,7 @@ License
 #include "clock.H"
 #include "IFstream.H"
 #include "IStringStream.H"
-#include "Ostream.H"
+#include "faceTraits.H"
 #include "OFstream.H"
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
@@ -113,9 +113,9 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
                 lineStream >> verts[vertI];
             }
 
-            labelUList& f = static_cast<labelUList&>(verts);
+            const labelUList& f = static_cast<const labelUList&>(verts);
 
-            if (MeshedSurface<Face>::isTri() && f.size() > 3)
+            if (faceTraits<Face>::isTri() && f.size() > 3)
             {
                 // simple face triangulation about f[0]
                 // cannot use face::triangulation (points may be incomplete)
@@ -123,7 +123,7 @@ bool Foam::fileFormats::OFFsurfaceFormat<Face>::read
                 {
                     label fp2 = f.fcIndex(fp1);
 
-                    dynFaces.append(triFace(f[0], f[fp1], f[fp2]));
+                    dynFaces.append(Face{f[0], f[fp1], f[fp2]});
                 }
             }
             else
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
index 7240ee7824..36e3f2b0a0 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormat.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,6 +25,7 @@ License
 
 #include "STARCDsurfaceFormat.H"
 #include "ListOps.H"
+#include "faceTraits.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -193,7 +194,7 @@ bool Foam::fileFormats::STARCDsurfaceFormat<Face>::read
             }
 
             SubList<label> vertices(vertexLabels, vertexLabels.size());
-            if (MeshedSurface<Face>::isTri() && nLabels > 3)
+            if (faceTraits<Face>::isTri() && nLabels > 3)
             {
                 // face needs triangulation
                 face f(vertices);
diff --git a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
index 1894f293af..b926f96802 100644
--- a/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
+++ b/src/surfMesh/surfaceFormats/starcd/STARCDsurfaceFormatCore.C
@@ -58,7 +58,7 @@ Foam::fileFormats::STARCDsurfaceFormatCore::readInpCellTable
     );
 
     string line;
-    List<string> groups;
+    List<std::string> groups;
     while (is.good() && is.getLine(line).good())
     {
         if (ctnameRE.match(line, groups))
diff --git a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
index ee598a5228..f9e335c39e 100644
--- a/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/stl/STLsurfaceFormat.C
@@ -146,7 +146,7 @@ bool Foam::fileFormats::STLsurfaceFormat<Face>::read
         forAll(faceLst, facei)
         {
             const label startPt = 3*facei;
-            faceLst[facei] = triFace(startPt, startPt+1, startPt+2);
+            faceLst[facei] = Face{startPt, startPt+1, startPt+2};
         }
     }
     else
@@ -160,7 +160,7 @@ bool Foam::fileFormats::STLsurfaceFormat<Face>::read
         forAll(faceMap, facei)
         {
             const label startPt = 3*faceMap[facei];
-            faceLst[facei] = triFace(startPt, startPt+1, startPt+2);
+            faceLst[facei] = Face{startPt, startPt+1, startPt+2};
         }
     }
     zoneIds.clear();
diff --git a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
index 5b0aba1f88..cb2aa80823 100644
--- a/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/tri/TRIsurfaceFormat.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -97,7 +97,7 @@ bool Foam::fileFormats::TRIsurfaceFormat<Face>::read
         forAll(faceLst, facei)
         {
             const label startPt = 3*facei;
-            faceLst[facei] = triFace(startPt, startPt+1, startPt+2);
+            faceLst[facei] = Face{startPt, startPt+1, startPt+2};
         }
     }
     else
@@ -111,7 +111,7 @@ bool Foam::fileFormats::TRIsurfaceFormat<Face>::read
         forAll(faceMap, facei)
         {
             const label startPt = 3*faceMap[facei];
-            faceLst[facei] = triFace(startPt, startPt+1, startPt+2);
+            faceLst[facei] = Face{startPt, startPt+1, startPt+2};
         }
     }
     zoneIds.clear();
diff --git a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
index aedd18d6c8..b0a5d27114 100644
--- a/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
+++ b/src/surfMesh/surfaceFormats/vtk/VTKsurfaceFormat.C
@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2107 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -26,6 +26,7 @@ License
 #include "VTKsurfaceFormat.H"
 #include "vtkUnstructuredReader.H"
 #include "scalarIOField.H"
+#include "faceTraits.H"
 #include "OFstream.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
@@ -150,7 +151,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
 
     // Check if it needs triangulation
     label nTri = 0;
-    if (MeshedSurface<Face>::isTri())
+    if (faceTraits<Face>::isTri())
     {
         forAll(faces, facei)
         {
@@ -172,7 +173,7 @@ bool Foam::fileFormats::VTKsurfaceFormat<Face>::read
             {
                 label fp2 = f.fcIndex(fp1);
 
-                dynFaces.append(triFace(f[0], f[fp1], f[fp2]));
+                dynFaces.append(Face{f[0], f[fp1], f[fp2]});
                 dynZones.append(zones[facei]);
             }
         }
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
index 673e80162d..f26d242681 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2016 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -31,12 +31,45 @@ License
 namespace Foam
 {
     defineTypeNameAndDebug(thermophysicalFunction, 0);
+    defineRunTimeSelectionTable(thermophysicalFunction, Istream);
     defineRunTimeSelectionTable(thermophysicalFunction, dictionary);
 }
 
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
+Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
+(
+    Istream& is
+)
+{
+    if (debug)
+    {
+        InfoInFunction
+            << "Constructing thermophysicalFunction"
+            << endl;
+    }
+
+    const word thermophysicalFunctionType(is);
+
+    IstreamConstructorTable::iterator cstrIter =
+        IstreamConstructorTablePtr_->find(thermophysicalFunctionType);
+
+    if (!cstrIter.found())
+    {
+        FatalErrorInFunction
+            << "Unknown thermophysicalFunction type "
+            << thermophysicalFunctionType
+            << nl << nl
+            << "Valid thermophysicalFunction types are :" << endl
+            << IstreamConstructorTablePtr_->sortedToc()
+            << abort(FatalError);
+    }
+
+    return autoPtr<thermophysicalFunction>(cstrIter()(is));
+}
+
+
 Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
 (
     const dictionary& dict
@@ -54,7 +87,7 @@ Foam::autoPtr<Foam::thermophysicalFunction> Foam::thermophysicalFunction::New
     dictionaryConstructorTable::iterator cstrIter =
         dictionaryConstructorTablePtr_->find(thermophysicalFunctionType);
 
-    if (cstrIter == dictionaryConstructorTablePtr_->end())
+    if (!cstrIter.found())
     {
         FatalErrorInFunction
             << "Unknown thermophysicalFunction type "
diff --git a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
index 8f263ed553..63d3b28879 100644
--- a/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
+++ b/src/thermophysicalModels/thermophysicalProperties/thermophysicalFunctions/thermophysicalFunction/thermophysicalFunction.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -59,6 +59,15 @@ public:
 
     // Declare run-time constructor selection tables
 
+        declareRunTimeSelectionTable
+        (
+            autoPtr,
+            thermophysicalFunction,
+            Istream,
+            (Istream& is),
+            (is)
+        );
+
         declareRunTimeSelectionTable
         (
             autoPtr,
@@ -75,6 +84,9 @@ public:
         thermophysicalFunction()
         {}
 
+        //- Return pointer to new thermophysicalFunction created from input
+        static autoPtr<thermophysicalFunction> New(Istream& is);
+
         //- Return pointer to new thermophysicalFunction created from dict
         static autoPtr<thermophysicalFunction> New(const dictionary& dict);
 
diff --git a/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
index a81f32dd8a..f3b15401c4 100644
--- a/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
+++ b/src/waveModels/waveGenerationModels/derived/Boussinesq/BoussinesqWaveModel.C
@@ -189,7 +189,7 @@ void Foam::waveModels::Boussinesq::setVelocity
             const label paddlei = faceToPaddle_[facei];
 
             const vector Uf = this->Uf
-	        (
+            (
                 waveHeight_,
                 waterDepthRef_,
                 xPaddle_[paddlei],
diff --git a/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
index b160934851..504a5a77b3 100644
--- a/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
+++ b/src/waveModels/waveGenerationModels/derived/StokesI/StokesIWaveModel.C
@@ -128,7 +128,7 @@ void Foam::waveModels::StokesI::setLevel
     {
         const scalar eta =
             this->eta
-	        (
+            (
                 waveHeight_,
                 waveKx,
                 xPaddle_[paddlei],
@@ -171,7 +171,7 @@ void Foam::waveModels::StokesI::setVelocity
             const label paddlei = faceToPaddle_[facei];
 
             const vector Uf = UfBase
-	        (
+            (
                 waveHeight_,
                 waterDepthRef_,
                 waveKx,
@@ -221,7 +221,7 @@ bool Foam::waveModels::StokesI::readDict(const dictionary& overrideDict)
 {
     if (regularWaveModel::readDict(overrideDict))
     {
-		waveLength_ = waveLength(waterDepthRef_, wavePeriod_);
+        waveLength_ = waveLength(waterDepthRef_, wavePeriod_);
 
         return true;
     }
diff --git a/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
index e77122fd05..ca4c776698 100644
--- a/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
+++ b/src/waveModels/waveGenerationModels/derived/StokesII/StokesIIWaveModel.C
@@ -119,7 +119,7 @@ void Foam::waveModels::StokesII::setLevel
     {
         const scalar eta =
             this->eta
-	        (
+            (
                 waveHeight_,
                 waterDepthRef_,
                 waveKx,
diff --git a/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
index 4ba32ea445..433723cc27 100644
--- a/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
+++ b/src/waveModels/waveGenerationModels/derived/StokesV/StokesVWaveModel.C
@@ -672,11 +672,13 @@ Foam::scalar Foam::waveModels::StokesV::eta
     const scalar theta = kx*x + ky*y - 2.0*mathematical::pi/T*t + phase;
 
     return
+    (
         amp1*cos(theta)
       + amp2*cos(2*theta)
       + amp3*cos(3*theta)
-	  + amp4*cos(4*theta)
-      + amp5*cos(5*theta);
+      + amp4*cos(4*theta)
+      + amp5*cos(5*theta)
+    );
 }
 
 
@@ -758,9 +760,9 @@ void Foam::waveModels::StokesV::setLevel
     {
         const scalar eta =
             this->eta
-	        (
+            (
                 waterDepthRef_,
-		        waveKx,
+                waveKx,
                 waveKy,
                 lambda_,
                 wavePeriod_,
@@ -801,7 +803,7 @@ void Foam::waveModels::StokesV::setVelocity
             const label paddlei = faceToPaddle_[facei];
 
             const vector Uf = this->Uf
-	        (
+            (
                 waterDepthRef_,
                 waveKx,
                 waveKy,
@@ -869,11 +871,11 @@ bool Foam::waveModels::StokesV::readDict(const dictionary& overrideDict)
 
         if (f1 > 0.001 || f2 > 0.001)
         {
-	        FatalErrorInFunction
+            FatalErrorInFunction
                 << "No convergence for Stokes V wave theory" << nl
                 << "    f1: " << f1 << nl
                 << "    f2: " << f2 << nl
-	            << exit(FatalError);
+                << exit(FatalError);
         }
 
         return true;
diff --git a/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
index efa9481f8f..13ccc96ec4 100644
--- a/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
+++ b/src/waveModels/waveGenerationModels/derived/cnoidal/cnoidalWaveModel.C
@@ -248,7 +248,7 @@ void Foam::waveModels::cnoidal::setLevel
     {
         const scalar eta =
             this->eta
-	        (
+            (
                 waveHeight_,
                 m_,
                 waveKx,
@@ -290,7 +290,7 @@ void Foam::waveModels::cnoidal::setVelocity
             const label paddlei = faceToPaddle_[facei];
 
             const vector Uf = this->Uf
-	        (
+            (
                 waveHeight_,
                 waterDepthRef_,
                 m_,
diff --git a/src/waveModels/waveModel/waveModel.C b/src/waveModels/waveModel/waveModel.C
index 1f86780e88..484aac3f6d 100644
--- a/src/waveModels/waveModel/waveModel.C
+++ b/src/waveModels/waveModel/waveModel.C
@@ -111,6 +111,9 @@ void Foam::waveModel::initialiseGeometry()
         }
     }
 
+    // Set minimum z reference level
+    zMin0_ = gMin(zMin_);
+
     // Local paddle-to-face addressing
     faceToPaddle_.setSize(patch_.size(), -1);
     forAll(faceToPaddle_, facei)
@@ -162,19 +165,22 @@ void Foam::waveModel::setAlpha(const scalarField& level)
         const label paddlei = faceToPaddle_[facei];
         const scalar paddleCalc = level[paddlei];
 
-    	if (zMax_[facei] < paddleCalc)
-    	{
-    	    alpha_[facei] = 1.0;
-    	}
-    	else if (zMin_[facei] > paddleCalc)
-    	{
-    	    alpha_[facei] = 0.0;
-    	}
-    	else
-    	{
-    	    scalar dz = paddleCalc - zMin_[facei];
-    	    alpha_[facei] = dz/zSpan_;
-    	}
+        const scalar zMin0 = zMin_[facei] - zMin0_;
+        const scalar zMax0 = zMax_[facei] - zMin0_;
+
+        if (zMax0 < paddleCalc)
+        {
+            alpha_[facei] = 1.0;
+        }
+        else if (zMin0 > paddleCalc)
+        {
+            alpha_[facei] = 0.0;
+        }
+        else
+        {
+            scalar dz = paddleCalc - zMin0;
+            alpha_[facei] = dz/(zMax0 - zMin0);
+        }
     }
 }
 
@@ -190,15 +196,15 @@ void Foam::waveModel::setPaddlePropeties
     const label paddlei = faceToPaddle_[facei];
     const scalar paddleCalc = level[paddlei];
     const scalar paddleHeight = min(paddleCalc, waterDepthRef_);
-    const scalar zMin = zMin_[facei];
-    const scalar zMax = zMax_[facei];
+    const scalar zMin = zMin_[facei] - zMin0_;
+    const scalar zMax = zMax_[facei] - zMin0_;
 
     fraction = 1;
     z = 0;
 
     if (zMax < paddleHeight)
     {
-        z = z_[facei];
+        z = z_[facei] - zMin0_;
     }
     else if (zMin > paddleCalc)
     {
@@ -211,11 +217,11 @@ void Foam::waveModel::setPaddlePropeties
             if ((zMax > paddleCalc) && (zMin < paddleCalc))
             {
                 scalar dz = paddleCalc - zMin;
-	            fraction = dz/zSpan_;
-                z = z_[facei];
+                fraction = dz/(zMax - zMin);
+                z = z_[facei] - zMin0_;
             }
         }
-	    else
+        else
         {
             if (zMax < paddleCalc)
             {
@@ -224,7 +230,7 @@ void Foam::waveModel::setPaddlePropeties
             else if ((zMax > paddleCalc) && (zMin < paddleCalc))
             {
                 scalar dz = paddleCalc - zMin;
-	            fraction = dz/zSpan_;
+                fraction = dz/(zMax - zMin);
                 z = waterDepthRef_;
             }
         }
@@ -382,7 +388,7 @@ void Foam::waveModel::correct(const scalar t)
             {
                 const label paddlei = faceToPaddle_[facei];
 
-                if (zMin_[facei] < activeLevel[paddlei])
+                if (zMin_[facei] - zMin0_ < activeLevel[paddlei])
                 {
                     scalar UCorr =
                         (calculatedLevel[paddlei] - activeLevel[paddlei])
diff --git a/src/waveModels/waveModel/waveModel.H b/src/waveModels/waveModel/waveModel.H
index f7cea6c719..36d48ddd8f 100644
--- a/src/waveModels/waveModel/waveModel.H
+++ b/src/waveModels/waveModel/waveModel.H
@@ -106,6 +106,9 @@ protected:
         //- Maximum z (point) height per patch face / [m]
         scalarField zMax_;
 
+        //- Minimum z reference level / [m]
+        scalar zMin0_;
+
         //- Reference water depth / [m]
         scalar waterDepthRef_;
 
diff --git a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/p b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/p
index 398442fa78..406c937d7b 100644
--- a/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/p
+++ b/tutorials/compressible/sonicFoam/RAS/nacaAirfoil/0/p
@@ -32,7 +32,7 @@ boundaryField
         type            waveTransmissive;
         field           p;
         psi             thermo:psi;
-        gamma           1.3;
+        gamma           1.4;
         fieldInf        $pressure;
         lInf            1;
         value           $internalField;
diff --git a/wmake/scripts/cmakeFunctions b/wmake/scripts/cmakeFunctions
index c64bdb3525..f3fb0abb39 100644
--- a/wmake/scripts/cmakeFunctions
+++ b/wmake/scripts/cmakeFunctions
@@ -158,7 +158,15 @@ canBuildPlugin()
         return 1
     }
 
-    type cmake > /dev/null 2>&1 || {
+    [ -d "$ParaView_INCLUDE_DIR" ] && \
+    [ -f "$ParaView_INCLUDE_DIR/pqServerManagerModel.h" ] || {
+        echo "==> cannot build ParaView plugins without an include directory"
+        echo "    ... or without GUI support"
+        echo "    ParaView_INCLUDE_DIR=$ParaView_INCLUDE_DIR"
+        return 1
+    }
+
+    command -v cmake > /dev/null 2>&1 || {
         echo "==> cannot build ParaView plugins without cmake"
         return 1
     }
diff --git a/wmake/wclean b/wmake/wclean
index 3becc51746..f75e90fcaf 100755
--- a/wmake/wclean
+++ b/wmake/wclean
@@ -161,7 +161,7 @@ then
 
     # Second pass: clean up object directories with WM_PROJECT_DIR that don't
     # have respective source code folders, along with the respective binaries
-    if [ "$(expandPath $PWD)" = "$WM_PROJECT_DIR" ]
+    if [ "$(expandPath $PWD)" = "$(expandPath $WM_PROJECT_DIR)" ]
     then
         objectsDir=$(findObjectDir $PWD 2>/dev/null) || exit 1 # Fatal
 
diff --git a/wmake/wmake b/wmake/wmake
index 8a8d51af4f..5ac39d1a63 100755
--- a/wmake/wmake
+++ b/wmake/wmake
@@ -100,25 +100,18 @@ USAGE
     exit 1
 }
 
-
 # Default make is the "make" in the path
 make="make"
 
 
-#------------------------------------------------------------------------------
-# Set WM_NCOMPPROCS to number of cores on local machine
 #------------------------------------------------------------------------------
 
-useAllCores()
+# Set nCores to the number of cores on the local machine
+nCores=0
+allCores()
 {
-    if [ -r /proc/cpuinfo ]
-    then
-        WM_NCOMPPROCS=$(egrep "^processor" /proc/cpuinfo | wc -l)
-    else
-        WM_NCOMPPROCS=1
-    fi
-
-    export WM_NCOMPPROCS
+    nCores=$(egrep -c "^processor" /proc/cpuinfo 2>/dev/null) || nCores=1
+    : ${nCores:=1}
 }
 
 
@@ -145,11 +138,17 @@ do
         -q | -queue | queue)
             all=queue
             ;;
-        # Parallel compilation on all cores of local machine
+        # Parallel compilation on all cores (or specified number of cores)
         -j)
-            useAllCores
+            nCores=0
             test $# -ge 2 && expr $2 + 1 > /dev/null 2>&1 \
-                && shift && export WM_NCOMPPROCS=$1
+                && shift && nCores=$1
+
+            if [ "$nCores" = 0 ]
+            then
+                allCores
+            fi
+            export WM_NCOMPPROCS=$nCores
             echo "Compiling enabled on $WM_NCOMPPROCS cores"
             ;;
         # Parallel compilation on specified number of cores
@@ -214,8 +213,7 @@ checkEnv
 # Set WM_NCOMPPROCS automatically when both WM_HOSTS and WM_SCHEDULER are set
 if [ -z "$WM_NCOMPPROCS" -a -n "$WM_HOSTS" -a -n "$WM_SCHEDULER" ]
 then
-    WM_NCOMPPROCS=$(wmakeScheduler -count)
-    [ $? -eq 0 ] || unset WM_NCOMPPROCS
+    WM_NCOMPPROCS=$(wmakeScheduler -count) || unset WM_NCOMPPROCS
 fi
 
 if [ -n "$WM_NCOMPPROCS" ]
@@ -348,8 +346,8 @@ then
         export WM_COLLECT_DIR=$WM_PROJECT_DIR/build/${WM_OPTIONS}/${PWD////_}
         export WM_SCHEDULER=wmakeCollect
         trap '$WM_SCHEDULER -kill' TERM INT
-        $WM_SCHEDULER -clean                                                   \
-     && wmake -all objects                                                     \
+        $WM_SCHEDULER -clean \
+     && wmake -all objects   \
      && $WM_SCHEDULER
     ) && wmake -all
     exit $?
diff --git a/wmake/wmakeLnIncludeAll b/wmake/wmakeLnIncludeAll
index 03a8930963..f110da9581 100755
--- a/wmake/wmakeLnIncludeAll
+++ b/wmake/wmakeLnIncludeAll
@@ -29,7 +29,7 @@
 #     wmakeLnIncludeAll [dir1 .. dirN]
 #
 # Description
-#     Find directories with a 'Make/files' that contains a 'LIB =' directive
+#     Find directories with a 'Make/files' containing a 'LIB =' directive
 #     and execute 'wmakeLnInclude' for each one
 #
 #------------------------------------------------------------------------------
@@ -46,7 +46,7 @@ options:
   -jN or -j N       Compile using N cores/hyperthreads
   -h | -help        Print the usage
 
-Find directories with a 'Make/files' that contains a 'LIB =' directive
+Find directories with a 'Make/files' containing a 'LIB =' directive
 and execute 'wmakeLnInclude -update' for each one
 
 USAGE
@@ -78,6 +78,11 @@ do
             nCores=${WM_NCOMPPROCS:-0}
             test $# -ge 2 && expr $2 + 1 > /dev/null 2>&1 \
                 && shift && nCores=$1
+
+            if [ "$nCores" = 0 ]
+            then
+                nCores=1
+            fi
             ;;
         # Parallel compilation on specified number of cores
         -j[1-9]*)
@@ -93,6 +98,18 @@ do
     shift
 done
 
+# Default search is from CWD, with special handling of the top-level
+# project directory: {applications,src} directories
+if [ "$#" -eq 0 ]
+then
+    if wmakeCheckPwd "$WM_PROJECT_DIR" 2>/dev/null
+    then
+        set -- applications src
+    else
+        set -- .
+    fi
+fi
+
 if [ "$nCores" -gt 0 ]
 then
     echo "$Script: starting wmakeLnInclude processes on $nCores cores"
@@ -100,10 +117,6 @@ else
     echo "$Script: running wmakeLnInclude"
 fi
 
-
-# Defaults to searching from CWD
-[ "$#" -gt 0 ] || set -- .
-
 for checkDir
 do
     if [ -d $checkDir ]
@@ -114,7 +127,7 @@ do
         continue
     fi
 
-    find $checkDir -depth -type d -name Make -print | while read MakeDir
+    find $checkDir -depth -name Make -type d -print | while read MakeDir
     do
         topDir=${MakeDir%/Make}    # trim /Make from the end
         if [ -d "$topDir" ]