From bd5fafddec00cfb0f67c217d4c446a65d1571f81 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 11 Jul 2012 15:35:53 +0100
Subject: [PATCH 01/28] ENH: targetVolumeToCell: new cellSetSource

---
 .../mesh/manipulation/topoSet/topoSetDict     |   9 +
 src/meshTools/Make/files                      |   1 +
 .../targetVolumeToCell/targetVolumeToCell.C   | 328 ++++++++++++++++++
 .../targetVolumeToCell/targetVolumeToCell.H   | 142 ++++++++
 4 files changed, 480 insertions(+)
 create mode 100644 src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C
 create mode 100644 src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H

diff --git a/applications/utilities/mesh/manipulation/topoSet/topoSetDict b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
index 562c006ab1..be90a8fb80 100644
--- a/applications/utilities/mesh/manipulation/topoSet/topoSetDict
+++ b/applications/utilities/mesh/manipulation/topoSet/topoSetDict
@@ -171,6 +171,15 @@ FoamFile
 //        insidePoint (1 2 3);    // point inside region to select
 //    }
 //
+//    // Cells underneath plane such that volume is reached. Can be used
+//    // in setFields.
+//    source targetVolumeToCell;
+//    sourceInfo
+//    {
+//        volume  2e-05;
+//        normal  (1 1 1);
+//    }
+//
 //
 //
 // faceSet
diff --git a/src/meshTools/Make/files b/src/meshTools/Make/files
index 4abc57669e..2621adbc23 100644
--- a/src/meshTools/Make/files
+++ b/src/meshTools/Make/files
@@ -99,6 +99,7 @@ $(cellSources)/sphereToCell/sphereToCell.C
 $(cellSources)/cylinderToCell/cylinderToCell.C
 $(cellSources)/faceZoneToCell/faceZoneToCell.C
 $(cellSources)/cylinderAnnulusToCell/cylinderAnnulusToCell.C
+$(cellSources)/targetVolumeToCell/targetVolumeToCell.C
 
 faceSources = sets/faceSources
 $(faceSources)/faceToFace/faceToFace.C
diff --git a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C
new file mode 100644
index 0000000000..c64c29e1e6
--- /dev/null
+++ b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.C
@@ -0,0 +1,328 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "targetVolumeToCell.H"
+#include "polyMesh.H"
+#include "globalMeshData.H"
+#include "plane.H"
+
+#include "addToRunTimeSelectionTable.H"
+
+// * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+defineTypeNameAndDebug(targetVolumeToCell, 0);
+
+addToRunTimeSelectionTable(topoSetSource, targetVolumeToCell, word);
+
+addToRunTimeSelectionTable(topoSetSource, targetVolumeToCell, istream);
+
+}
+
+
+Foam::topoSetSource::addToUsageTable Foam::targetVolumeToCell::usage_
+(
+    targetVolumeToCell::typeName,
+    "\n    Usage: targetVolumeToCell (nx ny nz)\n\n"
+    "    Adjust plane until obtained selected volume\n\n"
+);
+
+
+// * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
+
+Foam::scalar Foam::targetVolumeToCell::volumeOfSet
+(
+    const PackedBoolList& selected
+) const
+{
+    scalar sumVol = 0.0;
+    forAll(selected, cellI)
+    {
+        if (selected[cellI])
+        {
+            sumVol += mesh_.cellVolumes()[cellI];
+        }
+    }
+    return returnReduce(sumVol, sumOp<scalar>());
+}
+
+
+Foam::label Foam::targetVolumeToCell::selectCells
+(
+    const scalar normalComp,
+    PackedBoolList& selected
+) const
+{
+    selected.setSize(mesh_.nCells());
+    selected = false;
+
+    label nSelected = 0;
+
+    forAll(mesh_.cellCentres(), cellI)
+    {
+        const point& cc = mesh_.cellCentres()[cellI];
+
+        if ((cc&n_) < normalComp)
+        {
+            selected[cellI] = true;
+            nSelected++;
+        }
+    }
+    return returnReduce(nSelected, sumOp<label>());
+}
+
+
+void Foam::targetVolumeToCell::combine(topoSet& set, const bool add) const
+{
+    if (vol_ <= 0)
+    {
+        // Select no cells
+        return;
+    }
+    else if (gSum(mesh_.cellVolumes()) < vol_)
+    {
+        // Select all cells
+        forAll(mesh_.cellVolumes(), cellI)
+        {
+            addOrDelete(set, cellI, add);
+        }
+        return;
+    }
+
+
+    // Get plane for min,max volume.
+    // Planes all have base (0 0 0) and fixed normal so work only on normal
+    // component.
+
+    scalar maxComp = -GREAT;
+    label maxCells = 0;
+    scalar maxVol = 0;
+    scalar minComp = GREAT;
+    {
+        const boundBox& bb = mesh_.bounds();
+        pointField points(bb.points());
+
+        label minPointI = -1;
+        label maxPointI = -1;
+        forAll(points, pointI)
+        {
+            scalar c = (points[pointI]&n_);
+            if (c > maxComp)
+            {
+                maxComp = c;
+                maxPointI = pointI;
+            }
+            else if (c < minComp)
+            {
+                minComp = c;
+                minPointI = pointI;
+            }
+        }
+
+        PackedBoolList maxSelected(mesh_.nCells());
+        maxCells = selectCells(maxComp, maxSelected);
+        maxVol = volumeOfSet(maxSelected);
+
+        // Check that maxPoint indeed selects all cells
+        if (maxCells != mesh_.globalData().nTotalCells())
+        {
+            WarningIn("targetVolumeToCell::combine(topoSet&, const bool) const")
+                << "Plane " << plane(points[maxPointI], n_)
+                << " selects " << maxCells
+                << " cells instead of all " << mesh_.globalData().nTotalCells()
+                << " cells. Results might be wrong." << endl;
+        }
+    }
+
+
+
+    // Bisection
+    // ~~~~~~~~~
+
+    PackedBoolList selected(mesh_.nCells());
+    label nSelected = -1;
+    scalar selectedVol = 0.0;
+    scalar selectedComp = 0.0;
+
+
+    scalar low = minComp;
+    scalar high = maxComp;
+
+    const scalar tolerance = SMALL*100*(maxComp-minComp);
+
+    while ((high-low) > tolerance)
+    {
+        scalar mid = 0.5*(low + high);
+
+        nSelected = selectCells(mid, selected);
+        selectedVol = volumeOfSet(selected);
+
+        //Pout<< "High:" << high << " low:" << low << " mid:" << mid << nl
+        //    << "    nSelected:" << nSelected << nl
+        //    << "    vol      :" << selectedVol << nl
+        //    << endl;
+
+        if (selectedVol < vol_)
+        {
+            low = mid;
+
+            PackedBoolList highSelected(mesh_.nCells());
+            label nHigh = selectCells(high, selected);
+            if (nSelected == nHigh)
+            {
+                break;
+            }
+        }
+        else
+        {
+            high = mid;
+
+            PackedBoolList lowSelected(mesh_.nCells());
+            label nLow = selectCells(low, selected);
+            if (nSelected == nLow)
+            {
+                break;
+            }
+        }
+    }
+
+    nSelected = selectCells(high, selected);
+    selectedVol = volumeOfSet(selected);
+
+    if (selectedVol < vol_)
+    {
+        selectedComp = high;
+    }
+    else
+    {
+        nSelected = selectCells(low, selected);
+        selectedVol = volumeOfSet(selected);
+
+        if (selectedVol < vol_)
+        {
+            selectedComp = low;
+        }
+        else
+        {
+            WarningIn("targetVolumeToCell::combine(topoSet&, const bool) const")
+                << "Did not converge onto plane. " << nl
+                << "high plane:"
+                << plane(high*n_, n_)
+                << nl
+                << "low plane :"
+                << plane(low*n_, n_)
+                << endl;
+        }
+    }
+
+
+    Info<< "    Selected " << nSelected << " with actual volume " << selectedVol
+        << endl;
+
+    forAll(selected, cellI)
+    {
+        if (selected[cellI])
+        {
+            addOrDelete(set, cellI, add);
+        }
+    }
+}
+
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+// Construct from components
+Foam::targetVolumeToCell::targetVolumeToCell
+(
+    const polyMesh& mesh,
+    const scalar vol,
+    const vector& n
+)
+:
+    topoSetSource(mesh),
+    vol_(vol),
+    n_(n)
+{}
+
+
+// Construct from dictionary
+Foam::targetVolumeToCell::targetVolumeToCell
+(
+    const polyMesh& mesh,
+    const dictionary& dict
+)
+:
+    topoSetSource(mesh),
+    vol_(readScalar(dict.lookup("volume"))),
+    n_(dict.lookup("normal"))
+{}
+
+
+// Construct from Istream
+Foam::targetVolumeToCell::targetVolumeToCell
+(
+    const polyMesh& mesh,
+    Istream& is
+)
+:
+    topoSetSource(mesh),
+    vol_(readScalar(checkIs(is))),
+    n_(checkIs(is))
+{}
+
+// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
+
+Foam::targetVolumeToCell::~targetVolumeToCell()
+{}
+
+
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::targetVolumeToCell::applyToSet
+(
+    const topoSetSource::setAction action,
+    topoSet& set
+) const
+{
+    if ((action == topoSetSource::NEW) || (action == topoSetSource::ADD))
+    {
+        Info<< "    Adding cells up to target volume " << vol_
+            << " out of total volume " << gSum(mesh_.cellVolumes()) << endl;
+
+        combine(set, true);
+    }
+    else if (action == topoSetSource::DELETE)
+    {
+        Info<< "    Removing cells up to target volume " << vol_
+            << " out of total volume " << gSum(mesh_.cellVolumes()) << endl;
+
+        combine(set, false);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H
new file mode 100644
index 0000000000..398e49c9f9
--- /dev/null
+++ b/src/meshTools/sets/cellSources/targetVolumeToCell/targetVolumeToCell.H
@@ -0,0 +1,142 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::targetVolumeToCell
+
+Description
+    A topoSetSource to select cells based on the wanted volume of selected
+    cells. Adapts a plane until it has enough.
+
+SourceFiles
+    targetVolumeToCell.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef targetVolumeToCell_H
+#define targetVolumeToCell_H
+
+#include "topoSetSource.H"
+//#include "plane.H"
+#include "PackedBoolList.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+/*---------------------------------------------------------------------------*\
+                         Class targetVolumeToCell Declaration
+\*---------------------------------------------------------------------------*/
+
+class targetVolumeToCell
+:
+    public topoSetSource
+{
+
+    // Private data
+
+        //- Add usage string
+        static addToUsageTable usage_;
+
+        //- Wanted volume
+        const scalar vol_;
+
+        //- Normal of plane to sweep
+        vector n_;
+        //plane pl_;
+
+
+    // Private Member Functions
+
+        scalar volumeOfSet(const PackedBoolList&) const;
+
+        label selectCells
+        (
+            const scalar normalComp,
+            PackedBoolList& selected
+        ) const;
+
+        void combine(topoSet& set, const bool add) const;
+
+
+public:
+
+    //- Runtime type information
+    TypeName("targetVolumeToCell");
+
+    // Constructors
+
+        //- Construct from components
+        targetVolumeToCell
+        (
+            const polyMesh& mesh,
+            const scalar vol,
+            //const plane&
+            const vector&
+        );
+
+        //- Construct from dictionary
+        targetVolumeToCell
+        (
+            const polyMesh& mesh,
+            const dictionary& dict
+        );
+
+        //- Construct from Istream
+        targetVolumeToCell
+        (
+            const polyMesh& mesh,
+            Istream&
+        );
+
+
+    //- Destructor
+    virtual ~targetVolumeToCell();
+
+
+    // Member Functions
+
+        virtual sourceType setType() const
+        {
+            return CELLSETSOURCE;
+        }
+
+        virtual void applyToSet
+        (
+            const topoSetSource::setAction action,
+            topoSet&
+        ) const;
+
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 87e8e18cb6be6e3f1ad7d043a6e2be446e867b1a Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 12 Jul 2012 13:57:27 +0100
Subject: [PATCH 02/28] quaternion: Correct constructor from angle and axis

---
 src/OpenFOAM/primitives/quaternion/quaternionI.H | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/OpenFOAM/primitives/quaternion/quaternionI.H b/src/OpenFOAM/primitives/quaternion/quaternionI.H
index 01c5b74bc2..622b306e72 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternionI.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternionI.H
@@ -37,10 +37,8 @@ inline Foam::quaternion::quaternion(const scalar w, const vector& v)
 inline Foam::quaternion::quaternion(const vector& d, const scalar theta)
 :
     w_(cos(0.5*theta)),
-    v_((sin(0.5*theta)/magSqr(d))*d)
-{
-    normalize();
-}
+    v_((sin(0.5*theta)/mag(d))*d)
+{}
 
 inline Foam::quaternion::quaternion(const scalar w)
 :

From 91ff5bcb928b539786c0c7d3778c371e468dd30e Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 12 Jul 2012 13:57:43 +0100
Subject: [PATCH 03/28] Updated header

---
 src/OpenFOAM/primitives/quaternion/quaternionI.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/quaternion/quaternionI.H b/src/OpenFOAM/primitives/quaternion/quaternionI.H
index 622b306e72..8f3c12fb06 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternionI.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternionI.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 13f46fd8896bf40ce4a6b5ec49b3bdf160eee1b0 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 13 Jul 2012 10:24:47 +0100
Subject: [PATCH 04/28] quaternion: Added new "normalized" function which
 returns the normalized form of the argument

---
 src/OpenFOAM/primitives/quaternion/quaternion.H  | 2 ++
 src/OpenFOAM/primitives/quaternion/quaternionI.H | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.H b/src/OpenFOAM/primitives/quaternion/quaternion.H
index 5a5e3fd697..730e86d68d 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.H
@@ -140,6 +140,8 @@ public:
                //- The rotation tensor corresponding the quaternion
                inline tensor R() const;
 
+               inline quaternion normalized() const;
+
 
            // Edit
 
diff --git a/src/OpenFOAM/primitives/quaternion/quaternionI.H b/src/OpenFOAM/primitives/quaternion/quaternionI.H
index 8f3c12fb06..709ee52b6d 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternionI.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternionI.H
@@ -166,6 +166,12 @@ inline Foam::vector& Foam::quaternion::v()
 }
 
 
+inline Foam::quaternion Foam::quaternion::normalized() const
+{
+    return *this/mag(*this);
+}
+
+
 inline void Foam::quaternion::normalize()
 {
     operator/=(mag(*this));

From 734f853ca905cb2fea58464f9de67aa89817758c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 13 Jul 2012 10:25:14 +0100
Subject: [PATCH 05/28] tutorials/combustion/XiFoam/les: Deleted the combusting
 pitzDaily case

---
 .../combustion/XiFoam/les/pitzDaily/0/Su      |  52 -----
 tutorials/combustion/XiFoam/les/pitzDaily/0/T |  54 ------
 .../combustion/XiFoam/les/pitzDaily/0/Tu      |  54 ------
 tutorials/combustion/XiFoam/les/pitzDaily/0/U |  55 ------
 .../combustion/XiFoam/les/pitzDaily/0/Xi      |  52 -----
 .../XiFoam/les/pitzDaily/0/alphaSgs           |  53 -----
 tutorials/combustion/XiFoam/les/pitzDaily/0/b |  52 -----
 tutorials/combustion/XiFoam/les/pitzDaily/0/k |  54 ------
 .../combustion/XiFoam/les/pitzDaily/0/muSgs   |  51 -----
 tutorials/combustion/XiFoam/les/pitzDaily/0/p |  57 ------
 .../les/pitzDaily/constant/LESProperties      |  88 ---------
 .../pitzDaily/constant/combustionProperties   |  93 ---------
 .../XiFoam/les/pitzDaily/constant/g           |  21 --
 .../pitzDaily/constant/polyMesh/blockMeshDict | 173 -----------------
 .../les/pitzDaily/constant/polyMesh/boundary  |  52 -----
 .../constant/thermophysicalProperties         |  67 -------
 .../pitzDaily/constant/turbulenceProperties   |  21 --
 .../XiFoam/les/pitzDaily/system/controlDict   |  80 --------
 .../XiFoam/les/pitzDaily/system/fvSchemes     |  80 --------
 .../XiFoam/les/pitzDaily/system/fvSolution    |  71 -------
 .../XiFoam/les/pitzDaily/system/setFieldsDict |  38 ----
 .../combustion/XiFoam/les/pitzDaily3D/0/Su    |  54 ------
 .../combustion/XiFoam/les/pitzDaily3D/0/T     |  56 ------
 .../combustion/XiFoam/les/pitzDaily3D/0/Tu    |  56 ------
 .../combustion/XiFoam/les/pitzDaily3D/0/U     |  58 ------
 .../combustion/XiFoam/les/pitzDaily3D/0/Xi    |  54 ------
 .../XiFoam/les/pitzDaily3D/0/alphaSgs         |  55 ------
 .../combustion/XiFoam/les/pitzDaily3D/0/b     |  54 ------
 .../combustion/XiFoam/les/pitzDaily3D/0/k     |  56 ------
 .../combustion/XiFoam/les/pitzDaily3D/0/muSgs |  53 -----
 .../combustion/XiFoam/les/pitzDaily3D/0/p     |  59 ------
 .../les/pitzDaily3D/constant/LESProperties    |  88 ---------
 .../pitzDaily3D/constant/combustionProperties |  93 ---------
 .../XiFoam/les/pitzDaily3D/constant/g         |  21 --
 .../constant/polyMesh/blockMeshDict           | 182 ------------------
 .../pitzDaily3D/constant/polyMesh/boundary    |  62 ------
 .../constant/thermophysicalProperties         |  67 -------
 .../pitzDaily3D/constant/turbulenceProperties |  21 --
 .../XiFoam/les/pitzDaily3D/system/controlDict |  80 --------
 .../XiFoam/les/pitzDaily3D/system/fvSchemes   |  80 --------
 .../XiFoam/les/pitzDaily3D/system/fvSolution  |  71 -------
 41 files changed, 2638 deletions(-)
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/Su
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/T
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/U
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/b
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/k
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/0/p
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/constant/g
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/constant/turbulenceProperties
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/T
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/U
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/b
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/k
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/0/p
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/constant/turbulenceProperties
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
 delete mode 100644 tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution

diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily/0/Su
deleted file mode 100644
index 1e1160406c..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Su
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Su;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform 0.135;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 0.135;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 0.135;
-        value           uniform 0.135;
-    }
-
-    upperWall
-    {
-        type            zeroGradient;
-    }
-
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-
-    frontAndBack
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/T b/tutorials/combustion/XiFoam/les/pitzDaily/0/T
deleted file mode 100644
index 146b0f1590..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/T
+++ /dev/null
@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 1 0 0 0];
-
-internalField   uniform 293;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 293;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 293;
-        value           uniform 293;
-    }
-
-    upperWall
-    {
-        type            fixedValue;
-        value           uniform 293;
-    }
-
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform 570;
-    }
-
-    frontAndBack
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
deleted file mode 100644
index a9867a886d..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Tu
+++ /dev/null
@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Tu;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 1 0 0 0];
-
-internalField   uniform 293;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 293;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 293;
-        value           uniform 293;
-    }
-
-    upperWall
-    {
-        type            fixedValue;
-        value           uniform 293;
-    }
-
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform 570;
-    }
-
-    frontAndBack
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/U b/tutorials/combustion/XiFoam/les/pitzDaily/0/U
deleted file mode 100644
index 72743b1ea6..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/U
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volVectorField;
-    object      U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -1 0 0 0 0];
-
-internalField   uniform (0 0 0);
-
-boundaryField
-{
-    inlet
-    {
-        type            turbulentInlet;
-        referenceField  uniform (13.3 0 0);
-        fluctuationScale (0.04 0.02 0.02);
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
-        value           uniform (0 0 0);
-    }
-
-    upperWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform (0 0 0);
-    }
-
-    frontAndBack
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
deleted file mode 100644
index 19c6b38249..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/Xi
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      Xi;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 1;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 1;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 1;
-        value           uniform 1;
-    }
-
-    upperWall
-    {
-        type            zeroGradient;
-    }
-
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-
-    frontAndBack
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
deleted file mode 100644
index c417948180..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/alphaSgs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      alphaSgs;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -1 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    inlet
-    {
-        type            zeroGradient;
-    }
-
-    outlet
-    {
-        type            zeroGradient;
-    }
-
-    upperWall
-    {
-        type            alphatJayatillekeWallFunction;
-        he              ha;
-        value           uniform 0;
-    }
-
-    lowerWall
-    {
-        type            alphatJayatillekeWallFunction;
-        he              ha;
-        value           uniform 0;
-    }
-
-    frontAndBack
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/b b/tutorials/combustion/XiFoam/les/pitzDaily/0/b
deleted file mode 100644
index d68bdbb995..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/b
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      b;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 0 0 0 0 0 0];
-
-internalField   uniform 1;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 1;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 1;
-        value           uniform 1;
-    }
-
-    upperWall
-    {
-        type            zeroGradient;
-    }
-
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-
-    frontAndBack
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/k b/tutorials/combustion/XiFoam/les/pitzDaily/0/k
deleted file mode 100644
index 339856ab69..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/k
+++ /dev/null
@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 2 -2 0 0 0 0];
-
-internalField   uniform 2e-05;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 2e-05;
-    }
-
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 2e-05;
-        value           uniform 2e-05;
-    }
-
-    upperWall
-    {
-        type            zeroGradient;
-        value           uniform 2e-05;
-    }
-
-    lowerWall
-    {
-        type            zeroGradient;
-        value           uniform 2e-05;
-    }
-
-    frontAndBack
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
deleted file mode 100644
index cec3a41ed6..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/muSgs
+++ /dev/null
@@ -1,51 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      muSgs;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -1 0 0 0 0];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    inlet
-    {
-        type            zeroGradient;
-    }
-
-    outlet
-    {
-        type            zeroGradient;
-    }
-
-    upperWall
-    {
-        type            mutUSpaldingWallFunction;
-        value           uniform 0;
-    }
-
-    lowerWall
-    {
-        type            mutUSpaldingWallFunction;
-        value           uniform 0;
-    }
-
-    frontAndBack
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/0/p b/tutorials/combustion/XiFoam/les/pitzDaily/0/p
deleted file mode 100644
index fa4008822f..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/0/p
+++ /dev/null
@@ -1,57 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    object      p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [1 -1 -2 0 0 0 0];
-
-internalField   uniform 1e5;
-
-boundaryField
-{
-    inlet
-    {
-        type            zeroGradient;
-    }
-
-    outlet
-    {
-        type            waveTransmissive;
-        field           p;
-        phi             phi;
-        rho             rho;
-        psi             psi;
-        gamma           1.3;
-        fieldInf        1e5;
-        lInf            0.3;
-        value           uniform 1e5;
-    }
-
-    upperWall
-    {
-        type            zeroGradient;
-    }
-
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-
-    frontAndBack
-    {
-        type            empty;
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties
deleted file mode 100644
index c4dc5c97e7..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/LESProperties
+++ /dev/null
@@ -1,88 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-delta           cubeRootVol;
-
-turbulence      on;
-
-printCoeffs     on;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties
deleted file mode 100644
index def747a82b..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/combustionProperties
+++ /dev/null
@@ -1,93 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      combustionProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-laminarFlameSpeedCorrelation constant;
-
-fuel            Propane;
-
-Su              Su [0 1 -1 0 0 0 0] 0.135;
-
-SuModel         transport;
-
-equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6;
-
-sigmaExt        sigmaExt [0 0 -1 0 0 0 0] 338;
-
-XiModel         transport;
-
-XiCoef          XiCoef [0 0 0 0 0 0 0] 0.62;
-
-XiShapeCoef     XiShapeCoef [0 0 0 0 0 0 0] 1;
-
-uPrimeCoef      uPrimeCoef [0 0 0 0 0 0 0] 1;
-
-GuldersCoeffs
-{
-    Methane
-    {
-        W               0.422;
-        eta             0.15;
-        xi              5.18;
-        alpha           2;
-        beta            -0.5;
-        f               2.3;
-    }
-
-    Propane
-    {
-        W               0.446;
-        eta             0.12;
-        xi              4.95;
-        alpha           1.77;
-        beta            -0.2;
-        f               2.3;
-    }
-
-    IsoOctane
-    {
-        W               0.4658;
-        eta             -0.326;
-        xi              4.48;
-        alpha           1.56;
-        beta            -0.22;
-        f               2.3;
-    }
-}
-
-ignite     yes;
-
-ignitionSites
-(
-    {
-        location (0.005 -0.02 0);
-        diameter 0.003;
-        start 0;
-        duration 0.1;
-        strength 100;
-    }
-);
-
-ignitionSphereFraction 0;
-
-ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0.001;
-
-ignitionCircleFraction 1;
-
-ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0;
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
deleted file mode 100644
index d182180d95..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/g
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       uniformDimensionedVectorField;
-    location    "constant";
-    object      g;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -2 0 0 0 0];
-value           (0 0 0);
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
deleted file mode 100644
index 3c9454a5cd..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/blockMeshDict
+++ /dev/null
@@ -1,173 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.001;
-
-vertices
-(
-    (-20.6 0 0)
-    (-20.6 3 0)
-    (-20.6 12.7 0)
-    (-20.6 25.4 0)
-    (0 -25.4 0)
-    (0 -5 0)
-    (0 0 0)
-    (0 3 0)
-    (0 12.7 0)
-    (0 25.4 0)
-    (206 -25.4 0)
-    (206 -8.5 0)
-    (206 0 0)
-    (206 6.5 0)
-    (206 17 0)
-    (206 25.4 0)
-    (290 -16.6 0)
-    (290 -6.3 0)
-    (290 0 0)
-    (290 4.5 0)
-    (290 11 0)
-    (290 16.6 0)
-    (-20.6 0 38.1)
-    (-20.6 3 38.1)
-    (-20.6 12.7 38.1)
-    (-20.6 25.4 38.1)
-    (0 -25.4 38.1)
-    (0 -5 38.1)
-    (0 0 38.1)
-    (0 3 38.1)
-    (0 12.7 38.1)
-    (0 25.4 38.1)
-    (206 -25.4 38.1)
-    (206 -8.5 38.1)
-    (206 0 38.1)
-    (206 6.5 38.1)
-    (206 17 38.1)
-    (206 25.4 38.1)
-    (290 -16.6 38.1)
-    (290 -6.3 38.1)
-    (290 0 38.1)
-    (290 4.5 38.1)
-    (290 11 38.1)
-    (290 16.6 38.1)
-);
-
-blocks
-(
-    hex (0 6 7 1 22 28 29 23) (18 7 1) simpleGrading (0.5 1.8 1)
-    hex (1 7 8 2 23 29 30 24) (18 10 1) simpleGrading (0.5 4 1)
-    hex (2 8 9 3 24 30 31 25) (18 13 1) simpleGrading (0.5 0.25 1)
-    hex (4 10 11 5 26 32 33 27) (180 18 1) simpleGrading (4 1 1)
-    hex (5 11 12 6 27 33 34 28) (180 9 1) edgeGrading (4 4 4 4 0.5 1 1 0.5 1 1 1 1)
-    hex (6 12 13 7 28 34 35 29) (180 7 1) edgeGrading (4 4 4 4 1.8 1 1 1.8 1 1 1 1)
-    hex (7 13 14 8 29 35 36 30) (180 10 1) edgeGrading (4 4 4 4 4 1 1 4 1 1 1 1)
-    hex (8 14 15 9 30 36 37 31) (180 13 1) simpleGrading (4 0.25 1)
-    hex (10 16 17 11 32 38 39 33) (25 18 1) simpleGrading (2.5 1 1)
-    hex (11 17 18 12 33 39 40 34) (25 9 1) simpleGrading (2.5 1 1)
-    hex (12 18 19 13 34 40 41 35) (25 7 1) simpleGrading (2.5 1 1)
-    hex (13 19 20 14 35 41 42 36) (25 10 1) simpleGrading (2.5 1 1)
-    hex (14 20 21 15 36 42 43 37) (25 13 1) simpleGrading (2.5 0.25 1)
-);
-
-edges
-(
-);
-
-boundary
-(
-    inlet
-    {
-        type patch;
-        faces
-        (
-            (0 22 23 1)
-            (1 23 24 2)
-            (2 24 25 3)
-        );
-    }
-    outlet
-    {
-        type patch;
-        faces
-        (
-            (16 17 39 38)
-            (17 18 40 39)
-            (18 19 41 40)
-            (19 20 42 41)
-            (20 21 43 42)
-        );
-    }
-    upperWall
-    {
-        type wall;
-        faces
-        (
-            (3 25 31 9)
-            (9 31 37 15)
-            (15 37 43 21)
-        );
-    }
-    lowerWall
-    {
-        type wall;
-        faces
-        (
-            (0 6 28 22)
-            (6 5 27 28)
-            (5 4 26 27)
-            (4 10 32 26)
-            (10 16 38 32)
-        );
-    }
-    frontAndBack
-    {
-        type empty;
-        faces
-        (
-            (22 28 29 23)
-            (23 29 30 24)
-            (24 30 31 25)
-            (26 32 33 27)
-            (27 33 34 28)
-            (28 34 35 29)
-            (29 35 36 30)
-            (30 36 37 31)
-            (32 38 39 33)
-            (33 39 40 34)
-            (34 40 41 35)
-            (35 41 42 36)
-            (36 42 43 37)
-            (0 1 7 6)
-            (1 2 8 7)
-            (2 3 9 8)
-            (4 5 11 10)
-            (5 6 12 11)
-            (6 7 13 12)
-            (7 8 14 13)
-            (8 9 15 14)
-            (10 11 17 16)
-            (11 12 18 17)
-            (12 13 19 18)
-            (13 14 20 19)
-            (14 15 21 20)
-        );
-    }
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
deleted file mode 100644
index 313dcceba1..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/polyMesh/boundary
+++ /dev/null
@@ -1,52 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-5
-(
-    inlet
-    {
-        type            patch;
-        nFaces          30;
-        startFace       24170;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          57;
-        startFace       24200;
-    }
-    upperWall
-    {
-        type            wall;
-        nFaces          223;
-        startFace       24257;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          250;
-        startFace       24480;
-    }
-    frontAndBack
-    {
-        type            empty;
-        nFaces          24450;
-        startFace       24730;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
deleted file mode 100644
index 7c51f8a404..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/thermophysicalProperties
+++ /dev/null
@@ -1,67 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType      heheuReactionThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
-
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
-
-reactants
-{
-    specie
-    {
-        nMoles          1;
-        molWeight       29.2068;
-    }
-    thermodynamics
-    {
-        Tlow            100;
-        Thigh           5000;
-        Tcommon         1000;
-        highCpCoeffs    ( 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 );
-        lowCpCoeffs     ( 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
-}
-
-products
-{
-    specie
-    {
-        nMoles          1;
-        molWeight       28.5396;
-    }
-    thermodynamics
-    {
-        Tlow            100;
-        Thigh           5000;
-        Tcommon         1000;
-        highCpCoeffs    ( 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 );
-        lowCpCoeffs     ( 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/constant/turbulenceProperties b/tutorials/combustion/XiFoam/les/pitzDaily/constant/turbulenceProperties
deleted file mode 100644
index a925d3cc2b..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/constant/turbulenceProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-simulationType  LESModel;
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
deleted file mode 100644
index bbb0e9ca40..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/controlDict
+++ /dev/null
@@ -1,80 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     XiFoam;
-
-startFrom       latestTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         3.0;//0.5;
-
-deltaT          5e-06;
-
-writeControl    adjustableRunTime;
-
-writeInterval   0.1;
-
-purgeWrite      0;
-
-writeFormat     ascii;
-
-writePrecision  6;
-
-writeCompression off;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable true;
-
-adjustTimeStep  yes;
-
-maxCo           0.5;
-
-functions
-{
-    fieldAverage1
-    {
-        type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled         true;
-        outputControl   outputTime;
-
-        fields
-        (
-            U
-            {
-                mean        on;
-                prime2Mean  on;
-                base        time;
-            }
-
-            p
-            {
-                mean        on;
-                prime2Mean  on;
-                base        time;
-            }
-        );
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
deleted file mode 100644
index 52ad2a1abd..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSchemes
+++ /dev/null
@@ -1,80 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
-    default         backward;
-}
-
-gradSchemes
-{
-    default         Gauss linear;
-}
-
-divSchemes
-{
-    default         none;
-    div(phi,U)      Gauss linear;
-    div(phi,K)      Gauss linear;
-    div(phi,k)      Gauss limitedLinear 0.1;
-    div(phiXi,Xi)   Gauss limitedLinear01 0.1;
-    div(phiXi,Su)   Gauss limitedLinear01 0.1;
-    div(phiSt,b)    Gauss limitedLinear01 0.1;
-    div(phi,ft_b_ha_hau) Gauss multivariateSelection
-    {
-        ft  limitedLinear01 0.1;
-        b   limitedLinear01 0.1;
-        ha  limitedLinear 0.1;
-        hau limitedLinear 0.1;
-    };
-    div(U)          Gauss linear;
-    div((Su*grad(b))) Gauss linear;
-    div((U+((Su*Xi)*grad(b)))) Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
-}
-
-laplacianSchemes
-{
-    default         none;
-    laplacian(muEff,U) Gauss linear corrected;
-    laplacian(DkEff,k) Gauss linear corrected;
-    laplacian(DBEff,B) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
-    laplacian(alphaEff,b) Gauss linear corrected;
-    laplacian(alphaEff,ft) Gauss linear corrected;
-    laplacian(alphaEff,ha) Gauss linear corrected;
-    laplacian(alphaEff,hau) Gauss linear corrected;
-}
-
-interpolationSchemes
-{
-    default         linear;
-}
-
-snGradSchemes
-{
-    default         corrected;
-}
-
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
deleted file mode 100644
index 9496a2a249..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/fvSolution
+++ /dev/null
@@ -1,71 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
-    "(p|rho)"
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-06;
-        relTol          0.1;
-    }
-
-    "(p|rho)Final"
-    {
-        $p;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    "(U|b|Su|Xi|ha|hau|k)"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0.1;
-    }
-
-    "(U|b|Su|Xi|ha|hau|k)Final"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-}
-
-PIMPLE
-{
-    nOuterCorrectors 2;
-    nCorrectors     1;
-    nNonOrthogonalCorrectors 0;
-}
-
-relaxationFactors
-{
-    fields
-    {
-    }
-    equations
-    {
-        "(Xi|Su)"       1;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict b/tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict
deleted file mode 100644
index 689a00901e..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily/system/setFieldsDict
+++ /dev/null
@@ -1,38 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      setFieldsDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-defaultFieldValues
-(
-    volScalarFieldValue b 1
-    volScalarFieldValue T 293
-);
-
-regions
-(
-    boxToCell
-    {
-        box (-1 -1 -1) (1 0 1);
-        fieldValues
-        (
-            volScalarFieldValue b 0
-            volScalarFieldValue T 1650
-        );
-    }
-);
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su
deleted file mode 100644
index 0c89151731..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Su
+++ /dev/null
@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      Su;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 1 -1 0 0 0 0 ];
-
-internalField   uniform 0.135;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 0.135;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 0.135;
-        value           uniform 0.135;
-    }
-    upperWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    front
-    {
-        type            cyclic;
-    }
-    back
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T
deleted file mode 100644
index f0b86aa5b7..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/T
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      T;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 0 0 1 0 0 0 ];
-
-internalField   uniform 293;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 293;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 293;
-        value           uniform 293;
-    }
-    upperWall
-    {
-        type            fixedValue;
-        value           uniform 293;
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform 570;
-    }
-    front
-    {
-        type            cyclic;
-    }
-    back
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu
deleted file mode 100644
index f4437248c6..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Tu
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      Tu;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 0 0 1 0 0 0 ];
-
-internalField   uniform 293;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 293;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 293;
-        value           uniform 293;
-    }
-    upperWall
-    {
-        type            fixedValue;
-        value           uniform 293;
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform 570;
-    }
-    front
-    {
-        type            cyclic;
-    }
-    back
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U
deleted file mode 100644
index 03c712abd6..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/U
+++ /dev/null
@@ -1,58 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volVectorField;
-    location    "0";
-    object      U;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 1 -1 0 0 0 0 ];
-
-internalField   uniform ( 0 0 0 );
-
-boundaryField
-{
-    inlet
-    {
-        type            turbulentInlet;
-        referenceField  uniform ( 13.3 0 0 );
-        fluctuationScale ( 0.04 0.02 0.02 );
-        alpha           0.1;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform ( 0 0 0 );
-        value           uniform ( 0 0 0 );
-    }
-    upperWall
-    {
-        type            fixedValue;
-        value           uniform ( 0 0 0 );
-    }
-    lowerWall
-    {
-        type            fixedValue;
-        value           uniform ( 0 0 0 );
-    }
-    front
-    {
-        type            cyclic;
-    }
-    back
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi
deleted file mode 100644
index 88eca49dc8..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/Xi
+++ /dev/null
@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      Xi;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 0 0 0 0 0 0 ];
-
-internalField   uniform 1;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 1;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 1;
-        value           uniform 1;
-    }
-    upperWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    front
-    {
-        type            cyclic;
-    }
-    back
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
deleted file mode 100644
index 07d5fba6de..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/alphaSgs
+++ /dev/null
@@ -1,55 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      alphaSgs;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 1 -1 -1 0 0 0 0 ];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    inlet
-    {
-        type            zeroGradient;
-    }
-    outlet
-    {
-        type            zeroGradient;
-    }
-    upperWall
-    {
-        type            alphatJayatillekeWallFunction;
-        he              ha;
-        value           uniform 0;
-    }
-    lowerWall
-    {
-        type            alphatJayatillekeWallFunction;
-        he              ha;
-        value           uniform 0;
-    }
-    front
-    {
-        type            cyclic;
-    }
-    back
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b
deleted file mode 100644
index 7bd7c2e4d1..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/b
+++ /dev/null
@@ -1,54 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      b;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 0 0 0 0 0 0 ];
-
-internalField   uniform 1;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 1;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 1;
-        value           uniform 1;
-    }
-    upperWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    front
-    {
-        type            cyclic;
-    }
-    back
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k
deleted file mode 100644
index 7b125caa40..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/k
+++ /dev/null
@@ -1,56 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      k;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 0 2 -2 0 0 0 0 ];
-
-internalField   uniform 2e-05;
-
-boundaryField
-{
-    inlet
-    {
-        type            fixedValue;
-        value           uniform 2e-05;
-    }
-    outlet
-    {
-        type            inletOutlet;
-        inletValue      uniform 2e-05;
-        value           uniform 2e-05;
-    }
-    upperWall
-    {
-        type            zeroGradient;
-        value           uniform 2e-05;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-        value           uniform 2e-05;
-    }
-    front
-    {
-        type            cyclic;
-    }
-    back
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
deleted file mode 100644
index 684139326d..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/muSgs
+++ /dev/null
@@ -1,53 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      muSgs;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 1 -1 -1 0 0 0 0 ];
-
-internalField   uniform 0;
-
-boundaryField
-{
-    inlet
-    {
-        type            zeroGradient;
-    }
-    outlet
-    {
-        type            zeroGradient;
-    }
-    upperWall
-    {
-        type            mutUSpaldingWallFunction;
-        value           uniform 0;
-    }
-    lowerWall
-    {
-        type            mutUSpaldingWallFunction;
-        value           uniform 0;
-    }
-    front
-    {
-        type            cyclic;
-    }
-    back
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p b/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p
deleted file mode 100644
index 15d5b1c104..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/0/p
+++ /dev/null
@@ -1,59 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       volScalarField;
-    location    "0";
-    object      p;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [ 1 -1 -2 0 0 0 0 ];
-
-internalField   uniform 100000;
-
-boundaryField
-{
-    inlet
-    {
-        type            zeroGradient;
-    }
-    outlet
-    {
-        type            waveTransmissive;
-        field           p;
-        phi             phi;
-        rho             rho;
-        psi             psi;
-        gamma           1.3;
-        fieldInf        100000;
-        lInf            0.3;
-        value           uniform 100000;
-    }
-    upperWall
-    {
-        type            zeroGradient;
-    }
-    lowerWall
-    {
-        type            zeroGradient;
-    }
-    front
-    {
-        type            cyclic;
-    }
-    back
-    {
-        type            cyclic;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties
deleted file mode 100644
index 9941fbb67c..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/LESProperties
+++ /dev/null
@@ -1,88 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      LESProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-LESModel        oneEqEddy;
-
-delta           vanDriest;
-
-turbulence      on;
-
-printCoeffs     on;
-
-cubeRootVolCoeffs
-{
-    deltaCoeff      1;
-}
-
-PrandtlCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Cdelta          0.158;
-}
-
-vanDriestCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    smoothCoeffs
-    {
-        delta           cubeRootVol;
-        cubeRootVolCoeffs
-        {
-            deltaCoeff      1;
-        }
-
-        maxDeltaRatio   1.1;
-    }
-
-    Aplus           26;
-    Cdelta          0.158;
-}
-
-smoothCoeffs
-{
-    delta           cubeRootVol;
-    cubeRootVolCoeffs
-    {
-        deltaCoeff      1;
-    }
-
-    maxDeltaRatio   1.1;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties
deleted file mode 100644
index f46b08c801..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/combustionProperties
+++ /dev/null
@@ -1,93 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      combustionProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-laminarFlameSpeedCorrelation Gulders;
-
-fuel            Propane;
-
-Su              Su [0 1 -1 0 0 0 0] 0.135;
-
-SuModel         transport;
-
-equivalenceRatio equivalenceRatio [0 0 0 0 0 0 0] 0.6;
-
-sigmaExt        sigmaExt [0 0 -1 0 0 0 0] 338;
-
-XiModel         transport;
-
-XiCoef          XiCoef [0 0 0 0 0 0 0] 0.62;
-
-XiShapeCoef     XiShapeCoef [0 0 0 0 0 0 0] 1;
-
-uPrimeCoef      uPrimeCoef [0 0 0 0 0 0 0] 1;
-
-GuldersCoeffs
-{
-    Methane
-    {
-        W               0.422;
-        eta             0.15;
-        xi              5.18;
-        alpha           2;
-        beta            -0.5;
-        f               2.3;
-    }
-
-    Propane
-    {
-        W               0.446;
-        eta             0.12;
-        xi              4.95;
-        alpha           1.77;
-        beta            -0.2;
-        f               2.3;
-    }
-
-    IsoOctane
-    {
-        W               0.4658;
-        eta             -0.326;
-        xi              4.48;
-        alpha           1.56;
-        beta            -0.22;
-        f               2.3;
-    }
-}
-
-ignite     yes;
-
-ignitionSites
-(
-    {
-        location (0.005 -0.02 0.01905);
-        diameter 0.003;
-        start 0;
-        duration 0.1;
-        strength 200;
-    }
-);
-
-ignitionSphereFraction 1;
-
-ignitionThickness ignitionThickness [0 1 0 0 0 0 0] 0;
-
-ignitionCircleFraction 0;
-
-ignitionKernelArea ignitionKernelArea [0 2 0 0 0 0 0] 0;
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
deleted file mode 100644
index d182180d95..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/g
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       uniformDimensionedVectorField;
-    location    "constant";
-    object      g;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dimensions      [0 1 -2 0 0 0 0];
-value           (0 0 0);
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
deleted file mode 100644
index a5ef35550b..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/blockMeshDict
+++ /dev/null
@@ -1,182 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      blockMeshDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-convertToMeters 0.001;
-
-vertices
-(
-    (-20.6 0 0)
-    (-20.6 2 0)
-    (-20.6 12.7 0)
-    (-20.6 25.4 0)
-    (0 -25.4 0)
-    (0 -4 0)
-    (0 0 0)
-    (0 2 0)
-    (0 12.7 0)
-    (0 25.4 0)
-    (206 -25.4 0)
-    (206 -8.5 0)
-    (206 0 0)
-    (206 8.5 0)
-    (206 17 0)
-    (206 25.4 0)
-    (290 -16.6 0)
-    (290 -8.3 0)
-    (290 0 0)
-    (290 5.5 0)
-    (290 11 0)
-    (290 16.6 0)
-    (-20.6 0 38.1)
-    (-20.6 2 38.1)
-    (-20.6 12.7 38.1)
-    (-20.6 25.4 38.1)
-    (0 -25.4 38.1)
-    (0 -4 38.1)
-    (0 0 38.1)
-    (0 2 38.1)
-    (0 12.7 38.1)
-    (0 25.4 38.1)
-    (206 -25.4 38.1)
-    (206 -8.5 38.1)
-    (206 0 38.1)
-    (206 8.5 38.1)
-    (206 17 38.1)
-    (206 25.4 38.1)
-    (290 -16.6 38.1)
-    (290 -8.3 38.1)
-    (290 0 38.1)
-    (290 5.5 38.1)
-    (290 11 38.1)
-    (290 16.6 38.1)
-);
-
-blocks
-(
-    hex (0 6 7 1 22 28 29 23) (18 7 20) simpleGrading (1 1 1)
-    hex (1 7 8 2 23 29 30 24) (18 10 20) simpleGrading (1 4 1)
-    hex (2 8 9 3 24 30 31 25) (18 13 20) simpleGrading (1 0.25 1)
-    hex (4 10 11 5 26 32 33 27) (180 18 20) simpleGrading (2 1 1)
-    hex (5 11 12 6 27 33 34 28) (180 9 20) simpleGrading (2 1 1)
-    hex (6 12 13 7 28 34 35 29) (180 7 20) simpleGrading (2 1 1)
-    hex (7 13 14 8 29 35 36 30) (180 10 20) simpleGrading (2 4 1)
-    hex (8 14 15 9 30 36 37 31) (180 13 20) simpleGrading (2 0.25 1)
-    hex (10 16 17 11 32 38 39 33) (25 18 20) simpleGrading (1 1 1)
-    hex (11 17 18 12 33 39 40 34) (25 9 20) simpleGrading (1 1 1)
-    hex (12 18 19 13 34 40 41 35) (25 7 20) simpleGrading (1 1 1)
-    hex (13 19 20 14 35 41 42 36) (25 10 20) simpleGrading (1 4 1)
-    hex (14 20 21 15 36 42 43 37) (25 13 20) simpleGrading (1 0.25 1)
-);
-
-edges
-(
-);
-
-boundary
-(
-    inlet
-    {
-        type patch;
-        faces
-        (
-            (0 22 23 1)
-            (1 23 24 2)
-            (2 24 25 3)
-        );
-    }
-    outlet
-    {
-        type patch;
-        faces
-        (
-            (16 17 39 38)
-            (17 18 40 39)
-            (18 19 41 40)
-            (19 20 42 41)
-            (20 21 43 42)
-        );
-    }
-    upperWall
-    {
-        type wall;
-        faces
-        (
-            (3 25 31 9)
-            (9 31 37 15)
-            (15 37 43 21)
-        );
-    }
-    lowerWall
-    {
-        type wall;
-        faces
-        (
-            (0 6 28 22)
-            (6 5 27 28)
-            (5 4 26 27)
-            (4 10 32 26)
-            (10 16 38 32)
-        );
-    }
-    front
-    {
-        type cyclic;
-        neighbourPatch back;
-        faces
-        (
-            (22 28 29 23)
-            (23 29 30 24)
-            (24 30 31 25)
-            (26 32 33 27)
-            (27 33 34 28)
-            (28 34 35 29)
-            (29 35 36 30)
-            (30 36 37 31)
-            (32 38 39 33)
-            (33 39 40 34)
-            (34 40 41 35)
-            (35 41 42 36)
-            (36 42 43 37)
-            );
-    }
-    back
-    {
-        type cyclic;
-        neighbourPatch front;
-        faces
-        (
-            (0 1 7 6)
-            (1 2 8 7)
-            (2 3 9 8)
-            (4 5 11 10)
-            (5 6 12 11)
-            (6 7 13 12)
-            (7 8 14 13)
-            (8 9 15 14)
-            (10 11 17 16)
-            (11 12 18 17)
-            (12 13 19 18)
-            (13 14 20 19)
-            (14 15 21 20)
-        );
-    }
-);
-
-mergePatchPairs
-(
-);
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
deleted file mode 100644
index 018eb9c2d6..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/polyMesh/boundary
+++ /dev/null
@@ -1,62 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       polyBoundaryMesh;
-    location    "constant/polyMesh";
-    object      boundary;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-6
-(
-    inlet
-    {
-        type            patch;
-        nFaces          600;
-        startFace       715675;
-    }
-    outlet
-    {
-        type            patch;
-        nFaces          1140;
-        startFace       716275;
-    }
-    upperWall
-    {
-        type            wall;
-        nFaces          4460;
-        startFace       717415;
-    }
-    lowerWall
-    {
-        type            wall;
-        nFaces          5000;
-        startFace       721875;
-    }
-    front
-    {
-        type            cyclic;
-        nFaces          12225;
-        startFace       726875;
-        matchTolerance  0.0001;
-        neighbourPatch  back;
-    }
-    back
-    {
-        type            cyclic;
-        nFaces          12225;
-        startFace       739100;
-        matchTolerance  0.0001;
-        neighbourPatch  front;
-    }
-)
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
deleted file mode 100644
index 7c51f8a404..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/thermophysicalProperties
+++ /dev/null
@@ -1,67 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      thermophysicalProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-thermoType      heheuReactionThermo<homogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>,absoluteEnthalpy>>>>;
-
-stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [ 0 0 0 0 0 0 0 ] 15.675;
-
-reactants
-{
-    specie
-    {
-        nMoles          1;
-        molWeight       29.2068;
-    }
-    thermodynamics
-    {
-        Tlow            100;
-        Thigh           5000;
-        Tcommon         1000;
-        highCpCoeffs    ( 3.20495 0.00165359 -5.55661e-07 8.62503e-11 -4.93973e-15 -1347.25 4.81241 );
-        lowCpCoeffs     ( 3.52181 -9.21936e-05 1.77427e-06 -6.2049e-10 -1.99209e-13 -1352.32 3.48856 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
-}
-
-products
-{
-    specie
-    {
-        nMoles          1;
-        molWeight       28.5396;
-    }
-    thermodynamics
-    {
-        Tlow            100;
-        Thigh           5000;
-        Tcommon         1000;
-        highCpCoeffs    ( 3.10383 0.00156927 -5.22523e-07 8.06527e-11 -4.60363e-15 -6892.54 5.21744 );
-        lowCpCoeffs     ( 3.53318 7.81943e-05 5.77097e-07 6.68595e-10 -6.30433e-13 -6964.71 3.15336 );
-    }
-    transport
-    {
-        As              1.67212e-06;
-        Ts              170.672;
-    }
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/turbulenceProperties b/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/turbulenceProperties
deleted file mode 100644
index a925d3cc2b..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/constant/turbulenceProperties
+++ /dev/null
@@ -1,21 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "constant";
-    object      turbulenceProperties;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-simulationType  LESModel;
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
deleted file mode 100644
index c2fb356873..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/controlDict
+++ /dev/null
@@ -1,80 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      controlDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-application     XiFoam;
-
-startFrom       latestTime;
-
-startTime       0;
-
-stopAt          endTime;
-
-endTime         0.5;
-
-deltaT          5e-06;
-
-writeControl    adjustableRunTime;
-
-writeInterval   0.0005;
-
-purgeWrite      0;
-
-writeFormat     ascii;
-
-writePrecision  6;
-
-writeCompression off;
-
-timeFormat      general;
-
-timePrecision   6;
-
-runTimeModifiable true;
-
-adjustTimeStep  yes;
-
-maxCo           0.5;
-
-functions
-{
-    fieldAverage1
-    {
-        type            fieldAverage;
-        functionObjectLibs ( "libfieldFunctionObjects.so" );
-        enabled         true;
-        outputControl   outputTime;
-
-        fields
-        (
-            U
-            {
-                mean        on;
-                prime2Mean  on;
-                base        time;
-            }
-
-            p
-            {
-                mean        on;
-                prime2Mean  on;
-                base        time;
-            }
-        );
-    }
-}
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
deleted file mode 100644
index 52ad2a1abd..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSchemes
+++ /dev/null
@@ -1,80 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      fvSchemes;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-ddtSchemes
-{
-    default         backward;
-}
-
-gradSchemes
-{
-    default         Gauss linear;
-}
-
-divSchemes
-{
-    default         none;
-    div(phi,U)      Gauss linear;
-    div(phi,K)      Gauss linear;
-    div(phi,k)      Gauss limitedLinear 0.1;
-    div(phiXi,Xi)   Gauss limitedLinear01 0.1;
-    div(phiXi,Su)   Gauss limitedLinear01 0.1;
-    div(phiSt,b)    Gauss limitedLinear01 0.1;
-    div(phi,ft_b_ha_hau) Gauss multivariateSelection
-    {
-        ft  limitedLinear01 0.1;
-        b   limitedLinear01 0.1;
-        ha  limitedLinear 0.1;
-        hau limitedLinear 0.1;
-    };
-    div(U)          Gauss linear;
-    div((Su*grad(b))) Gauss linear;
-    div((U+((Su*Xi)*grad(b)))) Gauss linear;
-    div((muEff*dev2(T(grad(U))))) Gauss linear;
-}
-
-laplacianSchemes
-{
-    default         none;
-    laplacian(muEff,U) Gauss linear corrected;
-    laplacian(DkEff,k) Gauss linear corrected;
-    laplacian(DBEff,B) Gauss linear corrected;
-    laplacian((rho*(1|A(U))),p) Gauss linear corrected;
-    laplacian(alphaEff,b) Gauss linear corrected;
-    laplacian(alphaEff,ft) Gauss linear corrected;
-    laplacian(alphaEff,ha) Gauss linear corrected;
-    laplacian(alphaEff,hau) Gauss linear corrected;
-}
-
-interpolationSchemes
-{
-    default         linear;
-}
-
-snGradSchemes
-{
-    default         corrected;
-}
-
-fluxRequired
-{
-    default         no;
-    p               ;
-}
-
-
-// ************************************************************************* //
diff --git a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution b/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
deleted file mode 100644
index a7597acd35..0000000000
--- a/tutorials/combustion/XiFoam/les/pitzDaily3D/system/fvSolution
+++ /dev/null
@@ -1,71 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    location    "system";
-    object      fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
-    "(p|rho)"
-    {
-        solver          PCG;
-        preconditioner  DIC;
-        tolerance       1e-06;
-        relTol          0.1;
-    }
-
-    "(p|rho)Final"
-    {
-        $p;
-        tolerance       1e-06;
-        relTol          0;
-    }
-
-    "(U|b|Su|Xi|ha|hau|k)"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0.1;
-    }
-
-    "(U|b|Su|Xi|ha|hau|k)Final"
-    {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-05;
-        relTol          0;
-    }
-}
-
-PIMPLE
-{
-    nOuterCorrectors 2;
-    nCorrectors     1;
-    nNonOrthogonalCorrectors 0;
-}
-
-relaxationFactors
-{
-    fields
-    {
-    }
-    equations
-    {
-        "(Xi|Su)"       1;
-    }
-}
-
-
-// ************************************************************************* //

From 9cc4f9a923898883b5e2b9dd3b8504435a87d8d6 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 13 Jul 2012 11:42:55 +0100
Subject: [PATCH 06/28] ENH: BinSum: new summing container. Replacement for
 uniform-binned Histograms

---
 applications/test/BinSum/Make/files           |   3 +
 applications/test/BinSum/Make/options         |   2 +
 applications/test/BinSum/Test-BinSum.C        |  74 ++++++++++
 src/OpenFOAM/containers/Lists/BinSum/BinSum.C |  73 ++++++++++
 src/OpenFOAM/containers/Lists/BinSum/BinSum.H | 131 ++++++++++++++++++
 5 files changed, 283 insertions(+)
 create mode 100644 applications/test/BinSum/Make/files
 create mode 100644 applications/test/BinSum/Make/options
 create mode 100644 applications/test/BinSum/Test-BinSum.C
 create mode 100644 src/OpenFOAM/containers/Lists/BinSum/BinSum.C
 create mode 100644 src/OpenFOAM/containers/Lists/BinSum/BinSum.H

diff --git a/applications/test/BinSum/Make/files b/applications/test/BinSum/Make/files
new file mode 100644
index 0000000000..34d265d30c
--- /dev/null
+++ b/applications/test/BinSum/Make/files
@@ -0,0 +1,3 @@
+Test-BinSum.C
+
+EXE = $(FOAM_USER_APPBIN)/Test-BinSum
diff --git a/applications/test/BinSum/Make/options b/applications/test/BinSum/Make/options
new file mode 100644
index 0000000000..6a9e9810b3
--- /dev/null
+++ b/applications/test/BinSum/Make/options
@@ -0,0 +1,2 @@
+/* EXE_INC = -I$(LIB_SRC)/cfdTools/include */
+/* EXE_LIBS = -lfiniteVolume */
diff --git a/applications/test/BinSum/Test-BinSum.C b/applications/test/BinSum/Test-BinSum.C
new file mode 100644
index 0000000000..fb768f80c6
--- /dev/null
+++ b/applications/test/BinSum/Test-BinSum.C
@@ -0,0 +1,74 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Application
+    Test-BinSum
+
+Description
+    Test BinSum container
+
+\*---------------------------------------------------------------------------*/
+
+#include "BinSum.H"
+#include "IOstreams.H"
+#include "Random.H"
+#include "scalarField.H"
+
+using namespace Foam;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+int main(int argc, char *argv[])
+{
+    Random rndGen(0);
+
+    scalarField samples(10000000);
+    forAll(samples, i)
+    {
+        samples[i] = rndGen.scalar01();
+    }
+
+    const scalar min = 0;
+    const scalar max = 1;
+    const scalar delta = 0.1;
+
+    BinSum<scalar, scalarField> count(min, max, delta);
+    BinSum<scalar, scalarField> sum(min, max, delta);
+
+    forAll(samples, i)
+    {
+        count.add(samples[i], 1);
+        sum.add(samples[i], samples[i]);
+    }
+
+    Info<< "sum    : " << sum << endl;
+    Info<< "count  : " << count << endl;
+    Info<< "average: " << sum/count << endl;
+
+    Info<< "End\n" << endl;
+
+    return 0;
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/BinSum/BinSum.C b/src/OpenFOAM/containers/Lists/BinSum/BinSum.C
new file mode 100644
index 0000000000..6854597644
--- /dev/null
+++ b/src/OpenFOAM/containers/Lists/BinSum/BinSum.C
@@ -0,0 +1,73 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+\*---------------------------------------------------------------------------*/
+
+#include "BinSum.H"
+
+// * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
+
+template<class IndexType, class List, class CombineOp>
+Foam::BinSum<IndexType, List, CombineOp>::BinSum
+(
+    const IndexType min,
+    const IndexType max,
+    const IndexType delta
+)
+:
+    List(ceil((max-min)/delta), pTraits<typename List::value_type>::zero),
+    min_(min),
+    max_(max),
+    delta_(delta),
+    lowSum_(pTraits<typename List::value_type>::zero),
+    highSum_(pTraits<typename List::value_type>::zero)
+{}
+
+
+// * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
+
+template<class IndexType, class List, class CombineOp>
+void Foam::BinSum<IndexType, List, CombineOp>::add
+(
+    const IndexType& indexVal,
+    const typename List::const_reference val,
+    const CombineOp& cop
+)
+{
+    if (indexVal < min_)
+    {
+        cop(lowSum_, val);
+    }
+    else if (indexVal >= max_)
+    {
+        cop(highSum_, val);
+    }
+    else
+    {
+        label index = (indexVal-min_)/delta_;
+        cop(this->operator[](index), val);
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/BinSum/BinSum.H b/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
new file mode 100644
index 0000000000..6e0195a780
--- /dev/null
+++ b/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
@@ -0,0 +1,131 @@
+/*---------------------------------------------------------------------------*\
+  =========                 |
+  \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
+   \\    /   O peration     |
+    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+     \\/     M anipulation  |
+-------------------------------------------------------------------------------
+License
+    This file is part of OpenFOAM.
+
+    OpenFOAM is free software: you can redistribute it and/or modify it
+    under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+    ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+    FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+    for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with OpenFOAM.  If not, see <http://www.gnu.org/licenses/>.
+
+Class
+    Foam::BinSum
+
+Description
+    Sums into bins
+
+SourceFiles
+    BinSum.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef BinSum_H
+#define BinSum_H
+
+#include "ops.H"
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+
+/*---------------------------------------------------------------------------*\
+                          Class BinSum Declaration
+\*---------------------------------------------------------------------------*/
+
+template
+<
+    class IndexType,
+    class List,
+    class CombineOp = plusEqOp<typename List::value_type>
+>
+class BinSum
+:
+    public List
+{
+    // Private data
+
+        const IndexType min_;
+
+        const IndexType max_;
+
+        const IndexType delta_;
+
+
+        //- Sum < lowest bin
+        typename List::value_type lowSum_;
+
+        //- Sum of >= highest bin
+        typename List::value_type highSum_;
+
+public:
+
+    // Constructors
+
+        //- Construct given min, max, delta
+        BinSum
+        (
+            const IndexType min,
+            const IndexType max,
+            const IndexType delta
+        );
+
+
+        // Access
+
+            //- Return the delta
+            inline IndexType delta() const
+            {
+                return delta_;
+            }
+
+            //- Return the sum of all added elements < min
+            inline const IndexType& lowSum() const
+            {
+                return lowSum_;
+            }
+
+            //- Return the sum of all added elements >= max
+            inline const IndexType& highSum() const
+            {
+                return highSum_;
+            }
+
+            void add
+            (
+                const IndexType& indexVal,
+                const typename List::const_reference val,
+                const CombineOp& cop = plusEqOp<typename List::value_type>()
+            );
+};
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#ifdef NoRepository
+#   include "BinSum.C"
+#endif
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //

From 963e86e8bfebbaa665688db7abdb335267b1f38c Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 13 Jul 2012 11:43:38 +0100
Subject: [PATCH 07/28] STYLE: snappyHexMeshDict: added comment

---
 .../utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
index 25405d2ff3..db67ba8a93 100644
--- a/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
+++ b/applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict
@@ -165,8 +165,12 @@ castellatedMeshControls
         }
     }
 
+    // Feature angle:
+    // - used if min and max refinement level of a surface differ
+    // - used if feature snapping (see snapControls below) is used
     resolveFeatureAngle 30;
 
+
     // Region-wise refinement
     // ~~~~~~~~~~~~~~~~~~~~~~
 

From 84834779fece59cd6fea3ed8f4378c7ec58b02f5 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Fri, 13 Jul 2012 11:44:04 +0100
Subject: [PATCH 08/28] STYLE: conformalVoronoiMesh: removed extraneous include
 file

---
 .../conformalVoronoiMesh/conformalVoronoiMesh.H                  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index cc22f92088..3be6dab81c 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -67,7 +67,6 @@ SourceFiles
 #include "transform.H"
 #include "volFields.H"
 #include "fvMesh.H"
-#include "Histogram.H"
 #include "labelPair.H"
 #include "HashSet.H"
 #include "memInfo.H"

From 09aa9fbeb2a8670c120842a0767cc0b40d9bdd9f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 16 Jul 2012 09:49:04 +0100
Subject: [PATCH 09/28] rhoPorousMRFSimpleFoam: Changed to rhoThermo Also
 renamed addEnthalpySource -> addEnergySource

---
 .../solvers/compressible/rhoSimpleFoam/pEqn.H | 194 +++++++++---------
 .../rhoPorousMRFSimpleFoam/createFields.H     |  61 ++++++
 .../rhoPorousMRFSimpleFoam/eEqn.H             |   3 +-
 .../rhoPorousMRFSimpleFoam/pEqn.H             | 123 +++++------
 .../rhoPorousMRFSimpleFoam.C                  |   2 +-
 .../porousFluid/pPorousFluidEqn.H             |   1 -
 .../mixtures/basicMixture/basicMixtures.C     | 126 ++++++++----
 .../psiThermo/hePsiThermo/hePsiThermos.C      |  40 ++--
 .../rhoThermo/heRhoThermo/heRhoThermos.C      |  98 +++++++++
 .../fixedTemperature/fixedTemperature.C       |   2 +-
 .../fixedTemperature/fixedTemperature.H       |   5 +-
 .../noThermalModel/noThermalModel.C           |   4 +-
 .../noThermalModel/noThermalModel.H           |   5 +-
 .../thermalModel/thermalModel/thermalModel.H  |   5 +-
 .../thermalPorousZone/thermalPorousZone.C     |   6 +-
 .../thermalPorousZone/thermalPorousZone.H     |   4 +-
 .../thermalPorousZone/thermalPorousZones.C    |   6 +-
 .../thermalPorousZone/thermalPorousZones.H    |   4 +-
 18 files changed, 430 insertions(+), 259 deletions(-)
 create mode 100644 applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H

diff --git a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
index 6c64056be2..4d7334c5f8 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/pEqn.H
@@ -1,98 +1,102 @@
-rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
-rho.relax();
-
-volScalarField rAU(1.0/UEqn().A());
-volVectorField HbyA("HbyA", U);
-HbyA = rAU*UEqn().H();
-
-UEqn.clear();
-
-bool closedVolume = false;
-
-if (simple.transonic())
-{
-    surfaceScalarField phid
-    (
-        "phid",
-        fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
-    );
-
-    while (simple.correctNonOrthogonal())
-    {
-        fvScalarMatrix pEqn
-        (
-            fvm::div(phid, p)
-          - fvm::laplacian(rho*rAU, p)
-        );
-
-        // Relax the pressure equation to ensure diagonal-dominance
-        pEqn.relax();
-
-        pEqn.setReference(pRefCell, pRefValue);
-
-        pEqn.solve();
-
-        if (simple.finalNonOrthogonalIter())
-        {
-            phi == pEqn.flux();
-        }
-    }
-}
-else
-{
-    surfaceScalarField phiHbyA
-    (
-        "phiHbyA",
-        fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
-    );
-
-    closedVolume = adjustPhi(phiHbyA, U, p);
-
-    while (simple.correctNonOrthogonal())
-    {
-        fvScalarMatrix pEqn
-        (
-            fvc::div(phiHbyA)
-          - fvm::laplacian(rho*rAU, p)
-        );
-
-        pEqn.setReference(pRefCell, pRefValue);
-
-        pEqn.solve();
-
-        if (simple.finalNonOrthogonalIter())
-        {
-            phi = phiHbyA + pEqn.flux();
-        }
-    }
-}
-
-
-#include "incompressible/continuityErrs.H"
-
-// Explicitly relax pressure for momentum corrector
-p.relax();
-
-U = HbyA - rAU*fvc::grad(p);
-U.correctBoundaryConditions();
-
-// For closed-volume cases adjust the pressure and density levels
-// to obey overall mass continuity
-if (closedVolume)
-{
-    p += (initialMass - fvc::domainIntegrate(psi*p))
-        /fvc::domainIntegrate(psi);
-}
-
-rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
-
-if (!simple.transonic())
 {
+    rho = thermo.rho();
+    rho = max(rho, rhoMin);
+    rho = min(rho, rhoMax);
     rho.relax();
-}
 
-Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
+    volScalarField rAU(1.0/UEqn().A());
+    volVectorField HbyA("HbyA", U);
+    HbyA = rAU*UEqn().H();
+
+    UEqn.clear();
+
+    bool closedVolume = false;
+
+    if (simple.transonic())
+    {
+        surfaceScalarField phid
+        (
+            "phid",
+            fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
+        );
+
+        while (simple.correctNonOrthogonal())
+        {
+            fvScalarMatrix pEqn
+            (
+                fvm::div(phid, p)
+                - fvm::laplacian(rho*rAU, p)
+            );
+
+            // Relax the pressure equation to ensure diagonal-dominance
+            pEqn.relax();
+
+            pEqn.setReference(pRefCell, pRefValue);
+
+            pEqn.solve();
+
+            if (simple.finalNonOrthogonalIter())
+            {
+                phi == pEqn.flux();
+            }
+        }
+    }
+    else
+    {
+        surfaceScalarField phiHbyA
+        (
+            "phiHbyA",
+            fvc::interpolate(rho)*(fvc::interpolate(HbyA) & mesh.Sf())
+        );
+
+        closedVolume = adjustPhi(phiHbyA, U, p);
+
+        while (simple.correctNonOrthogonal())
+        {
+            fvScalarMatrix pEqn
+            (
+                fvc::div(phiHbyA)
+                - fvm::laplacian(rho*rAU, p)
+            );
+
+            pEqn.setReference(pRefCell, pRefValue);
+
+            pEqn.solve();
+
+            if (simple.finalNonOrthogonalIter())
+            {
+                phi = phiHbyA + pEqn.flux();
+            }
+        }
+    }
+
+
+    #include "incompressible/continuityErrs.H"
+
+    // Explicitly relax pressure for momentum corrector
+    p.relax();
+
+    U = HbyA - rAU*fvc::grad(p);
+    U.correctBoundaryConditions();
+
+    // For closed-volume cases adjust the pressure and density levels
+    // to obey overall mass continuity
+    if (closedVolume)
+    {
+        p += (initialMass - fvc::domainIntegrate(psi*p))
+            /fvc::domainIntegrate(psi);
+    }
+
+    rho = thermo.rho();
+    rho = max(rho, rhoMin);
+    rho = min(rho, rhoMax);
+
+    if (!simple.transonic())
+    {
+        rho.relax();
+    }
+
+    Info<< "rho max/min : "
+        << max(rho).value() << " "
+        << min(rho).value() << endl;
+}
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H
new file mode 100644
index 0000000000..96bdb2a122
--- /dev/null
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/createFields.H
@@ -0,0 +1,61 @@
+    Info<< "Reading thermophysical properties\n" << endl;
+
+    autoPtr<rhoThermo> pThermo
+    (
+        rhoThermo::New(mesh)
+    );
+    rhoThermo& thermo = pThermo();
+
+    volScalarField rho
+    (
+        IOobject
+        (
+            "rho",
+            runTime.timeName(),
+            mesh,
+            IOobject::READ_IF_PRESENT,
+            IOobject::AUTO_WRITE
+        ),
+        thermo.rho()
+    );
+
+    volScalarField& p = thermo.p();
+    volScalarField& e = thermo.he();
+
+    Info<< "Reading field U\n" << endl;
+    volVectorField U
+    (
+        IOobject
+        (
+            "U",
+            runTime.timeName(),
+            mesh,
+            IOobject::MUST_READ,
+            IOobject::AUTO_WRITE
+        ),
+        mesh
+    );
+
+    #include "compressibleCreatePhi.H"
+
+
+    label pRefCell = 0;
+    scalar pRefValue = 0.0;
+    setRefCell(p, simple.dict(), pRefCell, pRefValue);
+
+    dimensionedScalar rhoMax(simple.dict().lookup("rhoMax"));
+    dimensionedScalar rhoMin(simple.dict().lookup("rhoMin"));
+
+    Info<< "Creating turbulence model\n" << endl;
+    autoPtr<compressible::RASModel> turbulence
+    (
+        compressible::RASModel::New
+        (
+            rho,
+            U,
+            phi,
+            thermo
+        )
+    );
+
+    dimensionedScalar initialMass = fvc::domainIntegrate(rho);
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H
index 4791062d35..5d0f174623 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/eEqn.H
@@ -1,4 +1,5 @@
 {
+    // Kinetic + pressure energy
     volScalarField Ekp("Ekp", 0.5*magSqr(U) + p/rho);
 
     fvScalarMatrix eEqn
@@ -10,7 +11,7 @@
         fvc::div(phi)*Ekp - fvc::div(phi, Ekp)
     );
 
-    //pZones.addEnergySource(thermo, rho, eEqn);
+    pZones.addEnergySource(thermo, rho, eEqn);
 
     eEqn.relax();
     eEqn.solve();
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H
index c3e0a43a15..81b194823c 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/pEqn.H
@@ -1,52 +1,24 @@
-volVectorField HbyA("HbyA", U);
-
-if (pressureImplicitPorosity)
 {
-    HbyA = trTU() & UEqn().H();
-}
-else
-{
-    HbyA = trAU()*UEqn().H();
-}
+    rho = thermo.rho();
+    rho = max(rho, rhoMin);
+    rho = min(rho, rhoMax);
+    rho.relax();
 
-UEqn.clear();
+    volVectorField HbyA("HbyA", U);
 
-bool closedVolume = false;
-
-if (simple.transonic())
-{
-    surfaceScalarField phid
-    (
-        "phid",
-        fvc::interpolate(psi)*(fvc::interpolate(HbyA) & mesh.Sf())
-    );
-    mrfZones.relativeFlux(fvc::interpolate(psi), phid);
-
-    while (simple.correctNonOrthogonal())
+    if (pressureImplicitPorosity)
     {
-        tmp<fvScalarMatrix> tpEqn;
-
-        if (pressureImplicitPorosity)
-        {
-            tpEqn = (fvc::div(phid, p) - fvm::laplacian(rho*trTU(), p));
-        }
-        else
-        {
-            tpEqn = (fvc::div(phid, p) - fvm::laplacian(rho*trAU(), p));
-        }
-
-        tpEqn().setReference(pRefCell, pRefValue);
-
-        tpEqn().solve();
-
-        if (simple.finalNonOrthogonalIter())
-        {
-            phi == tpEqn().flux();
-        }
+        HbyA = trTU() & UEqn().H();
     }
-}
-else
-{
+    else
+    {
+        HbyA = trAU()*UEqn().H();
+    }
+
+    UEqn.clear();
+
+    bool closedVolume = false;
+
     surfaceScalarField phiHbyA
     (
         "phiHbyA",
@@ -79,34 +51,37 @@ else
             phi = phiHbyA - tpEqn().flux();
         }
     }
+
+    #include "incompressible/continuityErrs.H"
+
+    // Explicitly relax pressure for momentum corrector
+    p.relax();
+
+    if (pressureImplicitPorosity)
+    {
+        U = HbyA - (trTU() & fvc::grad(p));
+    }
+    else
+    {
+        U = HbyA - trAU()*fvc::grad(p);
+    }
+
+    U.correctBoundaryConditions();
+
+    // For closed-volume cases adjust the pressure and density levels
+    // to obey overall mass continuity
+    if (closedVolume)
+    {
+        const volScalarField& psi = thermo.psi();
+        p += (initialMass - fvc::domainIntegrate(psi*p))
+            /fvc::domainIntegrate(psi);
+    }
+
+    rho = thermo.rho();
+    rho = max(rho, rhoMin);
+    rho = min(rho, rhoMax);
+    rho.relax();
+    Info<< "rho max/min : "
+        << max(rho).value() << " "
+        << min(rho).value() << endl;
 }
-
-#include "incompressible/continuityErrs.H"
-
-// Explicitly relax pressure for momentum corrector
-p.relax();
-
-if (pressureImplicitPorosity)
-{
-    U = HbyA - (trTU() & fvc::grad(p));
-}
-else
-{
-    U = HbyA - trAU()*fvc::grad(p);
-}
-
-U.correctBoundaryConditions();
-
-// For closed-volume cases adjust the pressure and density levels
-// to obey overall mass continuity
-if (closedVolume)
-{
-    p += (initialMass - fvc::domainIntegrate(psi*p))
-        /fvc::domainIntegrate(psi);
-}
-
-rho = thermo.rho();
-rho = max(rho, rhoMin);
-rho = min(rho, rhoMax);
-rho.relax();
-Info<< "rho max/min : " << max(rho).value() << " " << min(rho).value() << endl;
diff --git a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
index 9238106885..22a58da1cc 100644
--- a/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
+++ b/applications/solvers/compressible/rhoSimpleFoam/rhoPorousMRFSimpleFoam/rhoPorousMRFSimpleFoam.C
@@ -32,7 +32,7 @@ Description
 \*---------------------------------------------------------------------------*/
 
 #include "fvCFD.H"
-#include "psiThermo.H"
+#include "rhoThermo.H"
 #include "RASModel.H"
 #include "MRFZones.H"
 #include "thermalPorousZones.H"
diff --git a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H
index ca338975fb..9051805b87 100644
--- a/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H
+++ b/applications/solvers/heatTransfer/chtMultiRegionFoam/chtMultiRegionSimpleFoam/porousFluid/pPorousFluidEqn.H
@@ -16,7 +16,6 @@ porousPhi =
 
 for (int nonOrth=0; nonOrth<=nNonOrthCorr; nonOrth++)
 {
-
     fvScalarMatrix pEqn
     (
         fvm::laplacian(porousRho*rAUPorous, porousP) ==  fvc::div(porousPhi)
diff --git a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
index bb09e15803..248bbed9fe 100644
--- a/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
+++ b/src/thermophysicalModels/basic/mixtures/basicMixture/basicMixtures.C
@@ -61,51 +61,6 @@ namespace Foam
 
 /* * * * * * * * * * * * * * * private static data * * * * * * * * * * * * * */
 
-makeBasicMixture
-(
-    pureMixture,
-    constTransport,
-    sensibleInternalEnergy,
-    eConstThermo,
-    perfectGas
-);
-
-makeBasicMixture
-(
-    pureMixture,
-    sutherlandTransport,
-    sensibleInternalEnergy,
-    eConstThermo,
-    perfectGas
-);
-
-makeBasicMixture
-(
-    pureMixture,
-    constTransport,
-    sensibleInternalEnergy,
-    hConstThermo,
-    perfectGas
-);
-
-makeBasicMixture
-(
-    pureMixture,
-    sutherlandTransport,
-    sensibleInternalEnergy,
-    hConstThermo,
-    perfectGas
-);
-
-makeBasicMixture
-(
-    pureMixture,
-    sutherlandTransport,
-    sensibleInternalEnergy,
-    janafThermo,
-    perfectGas
-);
-
 makeBasicMixture
 (
     pureMixture,
@@ -185,6 +140,87 @@ makeBasicMixture
 );
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeBasicMixture
+(
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    perfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    janafThermo,
+    perfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    incompressible
+);
+
+makeBasicPolyMixture
+(
+    pureMixture,
+    3,
+    sensibleInternalEnergy
+);
+
+makeBasicPolyMixture
+(
+    pureMixture,
+    8,
+    sensibleInternalEnergy
+);
+
+
+makeBasicMixture
+(
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    isobaricPerfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    isobaricPerfectGas
+);
+
+makeBasicMixture
+(
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    janafThermo,
+    isobaricPerfectGas
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C b/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
index b5a48fc315..56baf3fa0b 100644
--- a/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
+++ b/src/thermophysicalModels/basic/psiThermo/hePsiThermo/hePsiThermos.C
@@ -84,27 +84,27 @@ makeThermo
 
 /* * * * * * * * * * * * * * Internal-energy-based * * * * * * * * * * * * * */
 
-makeThermo
-(
-    psiThermo,
-    hePsiThermo,
-    pureMixture,
-    constTransport,
-    sensibleInternalEnergy,
-    eConstThermo,
-    perfectGas
-);
+// makeThermo
+// (
+//     psiThermo,
+//     hePsiThermo,
+//     pureMixture,
+//     constTransport,
+//     sensibleInternalEnergy,
+//     eConstThermo,
+//     perfectGas
+// );
 
-makeThermo
-(
-    psiThermo,
-    hePsiThermo,
-    pureMixture,
-    sutherlandTransport,
-    sensibleInternalEnergy,
-    eConstThermo,
-    perfectGas
-);
+// makeThermo
+// (
+//     psiThermo,
+//     hePsiThermo,
+//     pureMixture,
+//     sutherlandTransport,
+//     sensibleInternalEnergy,
+//     eConstThermo,
+//     perfectGas
+// );
 
 makeThermo
 (
diff --git a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C
index c4045c70db..e9272e97b8 100644
--- a/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C
+++ b/src/thermophysicalModels/basic/rhoThermo/heRhoThermo/heRhoThermos.C
@@ -149,6 +149,104 @@ makeThermo
 );
 
 
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    perfectGas
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    perfectGas
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    janafThermo,
+    perfectGas
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    incompressible
+);
+
+makePolyThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    3,
+    sensibleInternalEnergy
+);
+
+makePolyThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    8,
+    sensibleInternalEnergy
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    constTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    isobaricPerfectGas
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    hConstThermo,
+    isobaricPerfectGas
+);
+
+makeThermo
+(
+    rhoThermo,
+    heRhoThermo,
+    pureMixture,
+    sutherlandTransport,
+    sensibleInternalEnergy,
+    janafThermo,
+    isobaricPerfectGas
+);
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
index 152c075bfe..47cfe67dcd 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.C
@@ -64,7 +64,7 @@ Foam::porousMedia::fixedTemperature::~fixedTemperature()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::porousMedia::fixedTemperature::addEnthalpySource
+void Foam::porousMedia::fixedTemperature::addEnergySource
 (
     const basicThermo& thermo,
     const volScalarField& rho,
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
index a09e9eae89..b8932dd2e4 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/fixedTemperature/fixedTemperature.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -78,7 +78,7 @@ public:
     // Member Functions
 
         //- Add the thermal source to the enthalpy equation
-        virtual void addEnthalpySource
+        virtual void addEnergySource
         (
             const basicThermo&,
             const volScalarField& rho,
@@ -100,4 +100,3 @@ public:
 #endif
 
 // ************************************************************************* //
-
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
index 3f172395cf..7a5a1be53e 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -63,7 +63,7 @@ Foam::porousMedia::noThermalModel::~noThermalModel()
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::porousMedia::noThermalModel::addEnthalpySource
+void Foam::porousMedia::noThermalModel::addEnergySource
 (
     const basicThermo&,
     const volScalarField&,
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
index 5fec230046..bad8b4dae0 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/noThermalModel/noThermalModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -70,7 +70,7 @@ public:
     // Member Functions
 
         //- Add the thermal source to the enthalpy equation
-        virtual void addEnthalpySource
+        virtual void addEnergySource
         (
             const basicThermo&,
             const volScalarField& rho,
@@ -92,4 +92,3 @@ public:
 #endif
 
 // ************************************************************************* //
-
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
index b4ededc452..35d2965a7a 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalModel/thermalModel/thermalModel.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -105,7 +105,7 @@ public:
     // Member Functions
 
         //- Add the thermal source to the enthalpy equation
-        virtual void addEnthalpySource
+        virtual void addEnergySource
         (
             const basicThermo&,
             const volScalarField& rho,
@@ -127,4 +127,3 @@ public:
 #endif
 
 // ************************************************************************* //
-
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
index 79bdea0b4c..befa29b013 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -44,7 +44,7 @@ Foam::thermalPorousZone::thermalPorousZone
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermalPorousZone::addEnthalpySource
+void Foam::thermalPorousZone::addEnergySource
 (
     const basicThermo& thermo,
     const volScalarField& rho,
@@ -53,7 +53,7 @@ void Foam::thermalPorousZone::addEnthalpySource
 {
     if (model_.valid())
     {
-        model_->addEnthalpySource(thermo, rho, hEqn);
+        model_->addEnergySource(thermo, rho, hEqn);
     }
 }
 
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
index 1ebf6d0f7d..4356f87cdf 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZone.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -125,7 +125,7 @@ public:
     // Member Functions
 
         //- Add the thermal source to the enthalpy equation
-        void addEnthalpySource
+        void addEnergySource
         (
             const basicThermo&,
             const volScalarField& rho,
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C
index cb7d1f5902..1e0da4b7a6 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -46,7 +46,7 @@ Foam::thermalPorousZones::thermalPorousZones
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-void Foam::thermalPorousZones::addEnthalpySource
+void Foam::thermalPorousZones::addEnergySource
 (
     const basicThermo& thermo,
     const volScalarField& rho,
@@ -55,7 +55,7 @@ void Foam::thermalPorousZones::addEnthalpySource
 {
     forAll(*this, i)
     {
-        operator[](i).addEnthalpySource(thermo, rho, hEqn);
+        operator[](i).addEnergySource(thermo, rho, hEqn);
     }
 }
 
diff --git a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H
index dacd445830..d30a38b299 100644
--- a/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H
+++ b/src/thermophysicalModels/thermalPorousZone/thermalPorousZone/thermalPorousZones.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -93,7 +93,7 @@ public:
     // Member Functions
 
         //- Add the thermal source to the enthalpy equation
-        void addEnthalpySource
+        void addEnergySource
         (
             const basicThermo&,
             const volScalarField& rho,

From 658485a60f6763f3a41119ae8ed95bbac3e97b7e Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 16 Jul 2012 10:24:11 +0100
Subject: [PATCH 10/28] BUG: corrected lagrangian evaporation models after
 changes to he thermo

---
 .../PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C  | 2 +-
 .../LiquidEvaporationBoil/LiquidEvaporationBoil.C           | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
index 475430bd83..97b84a6049 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporation/LiquidEvaporation.C
@@ -216,7 +216,7 @@ Foam::scalar Foam::LiquidEvaporation<CloudType>::dh
         }
         case (parent::etEnthalpyDifference):
         {
-            scalar hc = this->owner().composition().carrier().Hs(idc, p, T);
+            scalar hc = this->owner().composition().carrier().Ha(idc, p, T);
             scalar hp = liquids_.properties()[idl].h(p, T);
 
             dh = hc - hp;
diff --git a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
index 32821f8966..803b849fa4 100644
--- a/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
+++ b/src/lagrangian/intermediate/submodels/Reacting/PhaseChangeModel/LiquidEvaporationBoil/LiquidEvaporationBoil.C
@@ -171,8 +171,8 @@ void Foam::LiquidEvaporationBoil<CloudType>::calculate
     forAll(this->owner().thermo().carrier().Y(), i)
     {
         scalar Yc = this->owner().thermo().carrier().Y()[i][cellI];
-        Hc += Yc*this->owner().thermo().carrier().Hs(i, pc, Tc);
-        Hsc += Yc*this->owner().thermo().carrier().Hs(i, ps, Ts);
+        Hc += Yc*this->owner().thermo().carrier().Ha(i, pc, Tc);
+        Hsc += Yc*this->owner().thermo().carrier().Ha(i, ps, Ts);
         Cpc += Yc*this->owner().thermo().carrier().Cp(i, ps, Ts);
         kappac += Yc*this->owner().thermo().carrier().kappa(i, ps, Ts);
     }
@@ -315,7 +315,7 @@ Foam::scalar Foam::LiquidEvaporationBoil<CloudType>::dh
         }
         case (parent::etEnthalpyDifference):
         {
-            scalar hc = this->owner().composition().carrier().Hs(idc, p, TDash);
+            scalar hc = this->owner().composition().carrier().Ha(idc, p, TDash);
             scalar hp = liquids_.properties()[idl].h(p, TDash);
 
             dh = hc - hp;

From 2eff8dd2db0a406d156b8fe3aca814ca9fab7912 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Tue, 17 Jul 2012 16:47:15 +0100
Subject: [PATCH 11/28] ENH: wedge patch - moved vector normalisation after
 error check

---
 .../constraint/wedge/wedgePolyPatch.C         | 30 ++++++++-----------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
index 35b18aaf69..6223661b81 100644
--- a/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
+++ b/src/OpenFOAM/meshes/polyMesh/polyPatches/constraint/wedge/wedgePolyPatch.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -58,33 +58,25 @@ void Foam::wedgePolyPatch::initTransforms()
             );
         centreNormal_ /= mag(centreNormal_);
 
-        if
-        (
-            mag(centreNormal_.x() + centreNormal_.y() + centreNormal_.z())
-            < (1 - SMALL)
-        )
+        const scalar cnCmptSum =
+            centreNormal_.x() + centreNormal_.y() + centreNormal_.z();
+
+        if (mag(cnCmptSum) < (1 - SMALL))
         {
-            FatalErrorIn
-            (
-                "wedgePolyPatch::wedgePolyPatch(const polyPatch&, "
-                "const fvBoundaryMesh&)"
-            )   << "wedge " << name()
+            FatalErrorIn("wedgePolyPatch::initTransforms()")
+                << "wedge " << name()
                 << " centre plane does not align with a coordinate plane by "
-                << 1
-                 - mag(centreNormal_.x()+centreNormal_.y()+centreNormal_.z())
+                << 1 - mag(cnCmptSum)
                 << exit(FatalError);
         }
 
         axis_ = centreNormal_ ^ patchNormal_;
         scalar magAxis = mag(axis_);
-        axis_ /= magAxis;
 
         if (magAxis < SMALL)
         {
-            FatalErrorIn
-            (
-                "wedgePolyPatch::initTransforms()"
-            )   << "wedge " << name()
+            FatalErrorIn("wedgePolyPatch::initTransforms()")
+                << "wedge " << name()
                 << " plane aligns with a coordinate plane." << nl
                 << "    The wedge plane should make a small angle (~2.5deg)"
                    " with the coordinate plane" << nl
@@ -95,6 +87,8 @@ void Foam::wedgePolyPatch::initTransforms()
                 << exit(FatalError);
         }
 
+        axis_ /= magAxis;
+
         faceT_ = rotationTensor(centreNormal_, patchNormal_);
         cellT_ = faceT_ & faceT_;
     }

From 261ff062aebb53d8edbe0f1379f1de31ce7baa4f Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 19 Jul 2012 17:55:43 +0100
Subject: [PATCH 12/28] quaternion: added constructor from angle cosine and
 slerp

---
 .../primitives/quaternion/quaternion.C        | 25 +++++++++++++++++
 .../primitives/quaternion/quaternion.H        | 17 ++++++++++++
 .../primitives/quaternion/quaternionI.H       | 27 ++++++++++++++++---
 3 files changed, 66 insertions(+), 3 deletions(-)

diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.C b/src/OpenFOAM/primitives/quaternion/quaternion.C
index f7ff1904c9..0e7b1b8c3a 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.C
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.C
@@ -51,6 +51,31 @@ Foam::word Foam::name(const quaternion& q)
 }
 
 
+Foam::quaternion Foam::slerp
+(
+    const quaternion& qa,
+    const quaternion& qb,
+    const scalar t
+)
+{
+    // Calculate angle between the quaternions
+    scalar cosHalfTheta = qa & qb;
+
+    if (mag(cosHalfTheta) >= 1)
+    {
+        return qa;
+    }
+
+    scalar halfTheta = acos(cosHalfTheta);
+    scalar sinHalfTheta = sqrt(1.0 - sqr(cosHalfTheta));
+
+    scalar wa = sin((1 - t)*halfTheta)/sinHalfTheta;
+    scalar wb = sin(t*halfTheta)/sinHalfTheta;
+
+    return wa*qa + wb*qb;
+}
+
+
 // * * * * * * * * * * * * * * * IOstream Operators  * * * * * * * * * * * * //
 
 Foam::Istream& Foam::operator>>(Istream& is, quaternion& q)
diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.H b/src/OpenFOAM/primitives/quaternion/quaternion.H
index 730e86d68d..dbe7ad15b5 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.H
@@ -106,6 +106,15 @@ public:
         //  and angle theta
         inline quaternion(const vector& d, const scalar theta);
 
+        //- Construct a rotation quaternion given the direction d
+        //  and cosine angle cosTheta and a if d is normalized
+        inline quaternion
+        (
+            const vector& d,
+            const scalar cosTheta,
+            const bool normalized
+        );
+
         //- Construct given scalar part, the vector part = vector::zero
         inline explicit quaternion(const scalar w);
 
@@ -209,6 +218,14 @@ inline quaternion inv(const quaternion& q);
 //- Return a string representation of a quaternion
 word name(const quaternion&);
 
+//- Spherical linear interpolation of quaternions
+quaternion slerp
+(
+    const quaternion& qa,
+    const quaternion& qb,
+    const scalar t
+);
+
 //- Data associated with quaternion type are contiguous
 template<>
 inline bool contiguous<quaternion>() {return true;}
diff --git a/src/OpenFOAM/primitives/quaternion/quaternionI.H b/src/OpenFOAM/primitives/quaternion/quaternionI.H
index 709ee52b6d..1582f5c733 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternionI.H
+++ b/src/OpenFOAM/primitives/quaternion/quaternionI.H
@@ -40,6 +40,26 @@ inline Foam::quaternion::quaternion(const vector& d, const scalar theta)
     v_((sin(0.5*theta)/mag(d))*d)
 {}
 
+inline Foam::quaternion::quaternion
+(
+    const vector& d,
+    const scalar cosTheta,
+    const bool normalized
+)
+{
+    scalar cosHalfTheta2 = 0.5*(cosTheta + 1);
+    w_ = sqrt(cosHalfTheta2);
+
+    if (normalized)
+    {
+        v_ = sqrt(1 - cosHalfTheta2)*d;
+    }
+    else
+    {
+        v_ = (sqrt(1 - cosHalfTheta2)/mag(d))*d;
+    }
+}
+
 inline Foam::quaternion::quaternion(const scalar w)
 :
     w_(w),
@@ -69,9 +89,10 @@ inline Foam::quaternion::quaternion
     const tensor& rotationTensor
 )
 {
-    scalar trace = rotationTensor.xx()
-                 + rotationTensor.yy()
-                 + rotationTensor.zz();
+    scalar trace =
+        rotationTensor.xx()
+      + rotationTensor.yy()
+      + rotationTensor.zz();
 
     if (trace > 0)
     {

From ceae57bf01aed04338fcd657b26c9c2ea35b78b7 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 19 Jul 2012 17:55:52 +0100
Subject: [PATCH 13/28] Updated header

---
 src/OpenFOAM/primitives/quaternion/quaternion.C | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/OpenFOAM/primitives/quaternion/quaternion.C b/src/OpenFOAM/primitives/quaternion/quaternion.C
index 0e7b1b8c3a..cedbb56c32 100644
--- a/src/OpenFOAM/primitives/quaternion/quaternion.C
+++ b/src/OpenFOAM/primitives/quaternion/quaternion.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

From 01653a50cc13cecf2295ec62ce6d15c76996f5e0 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 19 Jul 2012 17:56:08 +0100
Subject: [PATCH 14/28] oneEqEddy: updated documentation

---
 .../compressible/LES/oneEqEddy/oneEqEddy.H            | 11 ++++++-----
 .../incompressible/LES/oneEqEddy/oneEqEddy.H          |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
index aa00969499..0b463fb5c9 100644
--- a/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/compressible/LES/oneEqEddy/oneEqEddy.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -25,14 +25,14 @@ Class
     Foam::compressible::LESModels::oneEqEddy
 
 Description
-    One Equation Eddy Viscosity Model for incompressible flows
+    One Equation Eddy Viscosity Model for compressible flows
 
     Eddy viscosity SGS model using a modeled balance equation to simulate the
     behaviour of k, hence,
     \verbatim
         d/dt(rho*k) + div(rho*U*k) - div(muEff*grad(k))
         =
-        -rho*D:B - ce*rho*k^3/2/delta
+        -rho*D:B - ce*rho*k^(3/2)/delta
 
     and
 
@@ -41,10 +41,11 @@ Description
     where
 
         D = symm(grad(U));
-        muSgs = ck*rho*sqrt(k)*delta
+        nuSgs = ck*sqrt(k)*delta
+        muSgs = rho*nuSgs
+        muEff = muSgs + mu
     \endverbatim
 
-
 SourceFiles
     oneEqEddy.C
 
diff --git a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
index 0f040d829a..143329c8c6 100644
--- a/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
+++ b/src/turbulenceModels/incompressible/LES/oneEqEddy/oneEqEddy.H
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -32,7 +32,7 @@ Description
     \verbatim
         d/dt(k) + div(U*k) - div(nuEff*grad(k))
         =
-        -B*L - ce*k^3/2/delta
+        -D:B - ce*k^(3/2)/delta
 
     and
 

From 0f03a90a69145dce02981a811591d3f3dac623c8 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 20 Jul 2012 16:54:08 +0100
Subject: [PATCH 15/28] rhoCentralFoam/biconic25-55Run35: Reduced the Courant
 number to improve boundedness and stability

---
 .../rhoCentralFoam/biconic25-55Run35/system/controlDict         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
index 70776c56ae..8ead0df1ce 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/system/controlDict
@@ -45,7 +45,7 @@ timePrecision   6;
 
 adjustTimeStep  yes;
 
-maxCo           0.4;
+maxCo           0.3;
 
 maxDeltaT       1;
 

From 249975bb75cc365f9b864cb2ca21273399c63955 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 20 Jul 2012 16:56:14 +0100
Subject: [PATCH 16/28] rhoCentralFoam/biconic25-55Run35: Reduced the Courant
 number to improve boundedness and stability

---
 tutorials/multiphase/interFoam/ras/Allclean   |   2 +-
 tutorials/multiphase/interFoam/ras/Allrun     |   3 +
 .../multiphase/interFoam/ras/waterChannel/0/U |  51 +++++++++
 .../interFoam/ras/waterChannel/0/alpha1.org   |  48 ++++++++
 .../multiphase/interFoam/ras/waterChannel/0/k |  44 ++++++++
 .../interFoam/ras/waterChannel/0/nut          |  38 +++++++
 .../interFoam/ras/waterChannel/0/omega        |  43 +++++++
 .../interFoam/ras/waterChannel/0/p_rgh        |  42 +++++++
 .../interFoam/ras/waterChannel/Allclean       |  10 ++
 .../interFoam/ras/waterChannel/Allrun         |  25 +++++
 .../LTSInterFoam/system/controlDict           |  86 ++++++++++++++
 .../LTSInterFoam/system/fvSchemes             |  61 ++++++++++
 .../LTSInterFoam/system/fvSolution            | 106 ++++++++++++++++++
 .../LTSInterFoam/system/setFieldsDict         |  45 ++++++++
 .../interFoam/ras/waterChannel/README         |   6 +
 .../ras/waterChannel/constant/RASProperties   |  25 +++++
 .../interFoam/ras/waterChannel/constant/g     |  21 ++++
 .../constant/polyMesh/blockMeshDict           | 101 +++++++++++++++++
 .../waterChannel/constant/polyMesh/boundary   |  46 ++++++++
 .../waterChannel/constant/transportProperties |  35 ++++++
 .../constant/turbulenceProperties             |  21 ++++
 .../ras/waterChannel/system/controlDict       |  86 ++++++++++++++
 .../ras/waterChannel/system/extrudeMeshDict   |  37 ++++++
 .../ras/waterChannel/system/extrudeMeshDict.1 |  37 ++++++
 .../ras/waterChannel/system/extrudeMeshDict.2 |  37 ++++++
 .../ras/waterChannel/system/fvSchemes         |  62 ++++++++++
 .../ras/waterChannel/system/fvSolution        |  88 +++++++++++++++
 .../ras/waterChannel/system/setFieldsDict     |  36 ++++++
 28 files changed, 1241 insertions(+), 1 deletion(-)
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/0/U
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/0/alpha1.org
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/0/k
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/0/nut
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/0/omega
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
 create mode 100755 tutorials/multiphase/interFoam/ras/waterChannel/Allclean
 create mode 100755 tutorials/multiphase/interFoam/ras/waterChannel/Allrun
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/controlDict
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/README
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/constant/g
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/blockMeshDict
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/boundary
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
 create mode 100644 tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict

diff --git a/tutorials/multiphase/interFoam/ras/Allclean b/tutorials/multiphase/interFoam/ras/Allclean
index bd5bed3856..63a607fe3f 100755
--- a/tutorials/multiphase/interFoam/ras/Allclean
+++ b/tutorials/multiphase/interFoam/ras/Allclean
@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # Source tutorial clean functions
 . $WM_PROJECT_DIR/bin/tools/CleanFunctions
 
-keepCases="damBreak damBreakPorousBaffle weirOverflow"
+keepCases="damBreak damBreakPorousBaffle weirOverflow waterChannel"
 loseCases="damBreakFine"
 
 for case in $keepCases
diff --git a/tutorials/multiphase/interFoam/ras/Allrun b/tutorials/multiphase/interFoam/ras/Allrun
index 85cfa0fbfb..f130490987 100755
--- a/tutorials/multiphase/interFoam/ras/Allrun
+++ b/tutorials/multiphase/interFoam/ras/Allrun
@@ -52,4 +52,7 @@ cloneCase damBreak damBreakFine
 # Do weirOverflow
 (cd weirOverflow && foamRunTutorials)
 
+# Do waterChannel
+(cd waterChannel && foamRunTutorials)
+
 # ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/U b/tutorials/multiphase/interFoam/ras/waterChannel/0/U
new file mode 100644
index 0000000000..526fadc344
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/U
@@ -0,0 +1,51 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volVectorField;
+    object      U;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -1 0 0 0 0];
+
+internalField   uniform (2 0 0);
+
+boundaryField
+{
+    inlet
+    {
+        type            flowRateInletVelocity;
+        flowRate        constant 50;
+        value           uniform (0 0 0);
+    }
+
+    walls
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+
+    atmosphere
+    {
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
+    }
+
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform (0 0 0);
+        value           $internalField;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha1.org b/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha1.org
new file mode 100644
index 0000000000..914cb9ee1a
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/alpha1.org
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alpha;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 1;
+    }
+
+    walls
+    {
+        type            zeroGradient;
+    }
+
+    outlet
+    {
+        type            zeroGradient;
+        value           uniform 0;
+    }
+
+    atmosphere
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/k b/tutorials/multiphase/interFoam/ras/waterChannel/0/k
new file mode 100644
index 0000000000..8025412250
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/k
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      k;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -2 0 0 0 0];
+
+internalField   uniform 0.0001;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        intensity       0.05;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            kqRWallFunction;
+        value           $internalField;
+    }
+
+    ".*"
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField ;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/nut b/tutorials/multiphase/interFoam/ras/waterChannel/0/nut
new file mode 100644
index 0000000000..2498d72cf1
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/nut
@@ -0,0 +1,38 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      nut;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 2 -1 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    walls
+    {
+        type            nutkWallFunction;
+        value           uniform 0;
+    }
+
+    ".*"
+    {
+        type            calculated;
+        value           uniform 0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/omega b/tutorials/multiphase/interFoam/ras/waterChannel/0/omega
new file mode 100644
index 0000000000..1db5db7122
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/omega
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      omega;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 -1 0 0 0 0];
+
+internalField   uniform 0.003;
+
+boundaryField
+{
+    inlet
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+
+    walls
+    {
+        type            omegaWallFunction;
+        value           $internalField;
+    }
+
+    ".*"
+    {
+        type            inletOutlet;
+        inletValue      $internalField;
+        value           $internalField;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh b/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
new file mode 100644
index 0000000000..d30fb85487
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/0/p_rgh
@@ -0,0 +1,42 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    atmosphere
+    {
+        type            totalPressure;
+        p0              uniform 0;
+        U               U;
+        phi             phi;
+        rho             rho;
+        psi             none;
+        gamma           1;
+        value           uniform 0;
+    }
+
+    ".*"
+    {
+        type            buoyantPressure;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allclean b/tutorials/multiphase/interFoam/ras/waterChannel/Allclean
new file mode 100755
index 0000000000..0c04649fe1
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allclean
@@ -0,0 +1,10 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial clean functions
+. $WM_PROJECT_DIR/bin/tools/CleanFunctions
+
+rm 0/alpha1.gz 0/alpha1 2>/dev/null
+rm -rf *Flux
+
+cleanCase
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/Allrun b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
new file mode 100755
index 0000000000..813ad03d79
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/Allrun
@@ -0,0 +1,25 @@
+#!/bin/sh
+cd ${0%/*} || exit 1    # run from this directory
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+application=`getApplication`
+
+runApplication blockMesh
+
+echo "Creating channel"
+i=1
+while [ "$i" -lt 3 ] ; do
+    cp system/extrudeMeshDict.${i} system/extrudeMeshDict
+    echo "Running extrudeMesh, instance" ${i}
+    extrudeMesh > log.extrudeMesh.${i}
+    i=`expr $i + 1`
+done
+
+cp 0/alpha1.org 0/alpha1
+runApplication setFields
+
+runApplication $application
+
+# ----------------------------------------------------------------- end-of-file
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/controlDict b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/controlDict
new file mode 100644
index 0000000000..64eae52fe0
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/controlDict
@@ -0,0 +1,86 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     LTSInterFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         5000;
+
+deltaT          1;
+
+writeControl    timeStep;
+
+writeInterval   200;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression compressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+maxCo           0.5;
+maxAlphaCo      0.5;
+maxDeltaT       1;
+
+functions
+{
+    inletFlux
+    {
+        type            faceSource;
+        functionObjectLibs ("libfieldFunctionObjects.so");
+        outputControl   timeStep;
+        log             true;
+        // Output field values as well
+        valueOutput     false;
+        source          patch;
+        sourceName      inlet;
+        operation       sum;
+
+        fields
+        (
+            rho*phi
+        );
+    }
+
+    outletFlux
+    {
+        $inletFlux;
+        sourceName      outlet;
+    }
+
+    atmosphereFlux
+    {
+        $inletFlux;
+        sourceName      atmosphere;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
new file mode 100644
index 0000000000..22366f437b
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSchemes
@@ -0,0 +1,61 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         localEuler rDeltaT;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    div(rho*phi,U)  Gauss linearUpwind grad(U);
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss interfaceCompression;
+    div(phi,k)      Gauss upwind;
+    div(phi,omega)  Gauss upwind;
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p_rgh;
+    pcorr;
+    alpha1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
new file mode 100644
index 0000000000..7a6ad628f6
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/fvSolution
@@ -0,0 +1,106 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    pcorr
+    {
+        solver          PCG;
+        preconditioner
+        {
+            preconditioner  GAMG;
+            tolerance       1e-05;
+            relTol          0;
+            smoother        DICGaussSeidel;
+            nPreSweeps      0;
+            nPostSweeps     2;
+            nFinestSweeps   2;
+            cacheAgglomeration false;
+            nCellsInCoarsestLevel 10;
+            agglomerator    faceAreaPair;
+            mergeLevels     1;
+        }
+        tolerance       1e-05;
+        relTol          0;
+        maxIter         100;
+    }
+
+/*    pcorr
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-10;
+        relTol          0;
+    };
+*/
+    p_rgh
+    {
+        $pcorr;
+        tolerance       1e-6;
+        relTol          0.01;
+    };
+
+    p_rghFinal
+    {
+        $p_rgh;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    "(U|k|omega).*"
+    {
+        solver          smoothSolver;
+
+        smoother        GaussSeidel;
+        nSweeps         1;
+
+        tolerance       1e-7;
+        relTol          0.1;
+    };
+}
+
+PIMPLE
+{
+    momentumPredictor no;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+
+    nAlphaCorr      1;
+    nAlphaSubCycles 3;
+    cAlpha          1;
+
+    maxCo           0.5;
+    maxAlphaCo      0.2;
+    nAlphaSweepIter 1;
+
+    rDeltaTSmoothingCoeff 0.1;
+    rDeltaTDampingCoeff 1;
+    maxDeltaT       100;
+}
+
+relaxationFactors
+{
+    fields
+    {
+    }
+    equations
+    {
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
new file mode 100644
index 0000000000..468fd9778b
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/LTSInterFoam/system/setFieldsDict
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha1 0
+);
+
+regions
+(
+    boxToCell
+    {
+        box (0 0 0) (50 130 27);
+        fieldValues
+        (
+            volScalarFieldValue alpha1 1
+        );
+    }
+
+    boxToFace
+    {
+        box (0 0 0) (50 10.0001 24);
+        fieldValues
+        (
+            volScalarFieldValue alpha1 1
+        );
+    }
+);
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/README b/tutorials/multiphase/interFoam/ras/waterChannel/README
new file mode 100644
index 0000000000..965538a764
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/README
@@ -0,0 +1,6 @@
+- This case uses blockMesh and extrudeMesh to create a channel geometry.
+  - See Allrun script to generate geometry.
+- The case is set up to run with interFoam.
+- For running with LTSInterFoam, an alternative set of main files from
+  system directory (controlDict, etc) are included in LTSInterFoam
+  subdirectory to replace the existing files set up for interFoam.
\ No newline at end of file
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties
new file mode 100644
index 0000000000..e0e6b776a2
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/RASProperties
@@ -0,0 +1,25 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      RASProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+RASModel        kOmegaSST;
+
+turbulence      on;
+
+printCoeffs     on;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/g b/tutorials/multiphase/interFoam/ras/waterChannel/constant/g
new file mode 100644
index 0000000000..a0d7102656
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/g
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       uniformDimensionedVectorField;
+    location    "constant";
+    object      g;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 1 -2 0 0 0 0];
+value           (0 0 -9.81);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/blockMeshDict b/tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/blockMeshDict
new file mode 100644
index 0000000000..ccbeabfc98
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/blockMeshDict
@@ -0,0 +1,101 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    ( 0 -10   2) // 0
+    (20 -10   2) // 1
+    ( 0  -3   2) // 2
+    (20  -3   2) // 3
+    ( 0   3   2) // 4
+    (20   3   2) // 5
+    ( 0  10   2) // 6
+    (20  10   2) // 7
+
+    ( 0 -10   8) // 8
+    (20 -10   8) // 9
+    ( 0  -4   8) // 10
+    (20  -4   8) // 11
+    ( 0   4   8) // 12
+    (20   4   8) // 13
+    ( 0  10   8) // 14
+    (20  10   8) // 15
+);
+
+blocks
+(
+    hex (0 1 3 2  8  9 11 10) (20  5 20) simpleGrading (1 1 1)
+    hex (2 3 5 4 10 11 13 12) (20 10 20) simpleGrading (1 1 1)
+    hex (4 5 7 6 12 13 15 14) (20  5 20) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+boundary
+(
+    inlet
+    {
+        type patch;
+        faces
+        (
+            (0 1 3 2)
+            (4 5 7 6)
+        );
+    }
+
+    walls
+    {
+        type wall;
+        faces
+        (
+            (2 3 5 4)
+            (0 1 9 8)
+            (0 2 10 8)
+            (1 3 11 9)
+            (2 4 12 10)
+            (5 7 15 13)
+            (6 7 15 14)
+            (4 6 14 12)
+        );
+    }
+
+    outlet
+    {
+        type patch;
+        faces
+        (
+            (3 5 13 11)
+        );
+    }
+
+    atmosphere
+    {
+        type patch;
+        faces
+        (
+            (8  9 11 10)
+            (10 11 13 12)
+            (12 13 15 14)
+        );
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/boundary b/tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/boundary
new file mode 100644
index 0000000000..eed322680a
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/polyMesh/boundary
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+4
+(
+    inlet
+    {
+        type            patch;
+        nFaces          200;
+        startFace       79800;
+    }
+    walls
+    {
+        type            wall;
+        nFaces          6600;
+        startFace       80000;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          200;
+        startFace       86600;
+    }
+    atmosphere
+    {
+        type            patch;
+        nFaces          1400;
+        startFace       86800;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
new file mode 100644
index 0000000000..c90677dd56
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/transportProperties
@@ -0,0 +1,35 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      transportProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+phase1
+{
+    transportModel  Newtonian;
+    nu              nu [ 0 2 -1 0 0 0 0 ]  1e-06;
+    rho             rho [ 1 -3 0 0 0 0 0 ] 1000;
+}
+
+phase2
+{
+    transportModel  Newtonian;
+    nu              nu [ 0 2 -1 0 0 0 0 ]  1.48e-05;
+    rho             rho [ 1 -3 0 0 0 0 0 ] 1;
+}
+
+sigma           sigma [ 1 0 -2 0 0 0 0 ] 0.07;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties b/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties
new file mode 100644
index 0000000000..3721a46a2e
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  RASModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
new file mode 100644
index 0000000000..be315b40ac
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/controlDict
@@ -0,0 +1,86 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     interFoam;
+
+startFrom       latestTime;
+
+startTime       0;
+
+stopAt          endTime;
+
+endTime         100;
+
+deltaT          0.01;
+
+writeControl    adjustableRunTime;
+
+writeInterval   5;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression compressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+maxCo           0.5;
+maxAlphaCo      0.5;
+maxDeltaT       1;
+
+functions
+{
+    inletFlux
+    {
+        type            faceSource;
+        functionObjectLibs ("libfieldFunctionObjects.so");
+        outputControl   timeStep;
+        log             true;
+        // Output field values as well
+        valueOutput     false;
+        source          patch;
+        sourceName      inlet;
+        operation       sum;
+
+        fields
+        (
+            rho*phi
+        );
+    }
+
+    outletFlux
+    {
+        $inletFlux;
+        sourceName      outlet;
+    }
+
+    atmosphereFlux
+    {
+        $inletFlux;
+        sourceName      atmosphere;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict
new file mode 100644
index 0000000000..ffa39b334a
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      extrudeProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+constructFrom mesh;
+sourceCase "$FOAM_CASE";
+sourcePatches (outlet);
+
+flipNormals false;
+
+extrudeModel        linearDirection;
+
+nLayers             40;
+expansionRatio      1.0;
+
+linearDirectionCoeffs
+{
+    axisPt          (0 0 0);
+    direction       (1 -0.2 -0.02);
+    thickness       40;
+}
+
+mergeFaces false;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1 b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1
new file mode 100644
index 0000000000..8204a892dd
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.1
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      extrudeProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+constructFrom mesh;
+sourceCase "$FOAM_CASE";
+sourcePatches (outlet);
+
+flipNormals false;
+
+extrudeModel        linearDirection;
+
+nLayers             60;
+expansionRatio      1.0;
+
+linearDirectionCoeffs
+{
+    axisPt          (0 0 0);
+    direction       (1 0.2 -0.02);
+    thickness       60;
+}
+
+mergeFaces false;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2 b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2
new file mode 100644
index 0000000000..ffa39b334a
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/extrudeMeshDict.2
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      extrudeProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+constructFrom mesh;
+sourceCase "$FOAM_CASE";
+sourcePatches (outlet);
+
+flipNormals false;
+
+extrudeModel        linearDirection;
+
+nLayers             40;
+expansionRatio      1.0;
+
+linearDirectionCoeffs
+{
+    axisPt          (0 0 0);
+    direction       (1 -0.2 -0.02);
+    thickness       40;
+}
+
+mergeFaces false;
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
new file mode 100644
index 0000000000..43847dd841
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSchemes
@@ -0,0 +1,62 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSchemes;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+ddtSchemes
+{
+    default         Euler;
+}
+
+gradSchemes
+{
+    default         Gauss linear;
+}
+
+divSchemes
+{
+    div(rho*phi,U)  Gauss linearUpwind grad(U);
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss interfaceCompression;
+
+    div(phi,k)      Gauss upwind;
+    div(phi,omega)  $div(phi,k);
+}
+
+laplacianSchemes
+{
+    default         Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p_rgh;
+    pcorr;
+    alpha1;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
new file mode 100644
index 0000000000..8b86c656c8
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/fvSolution
@@ -0,0 +1,88 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    pcorr
+    {
+        solver          PCG;
+        preconditioner
+        {
+            preconditioner  GAMG;
+            tolerance       1e-05;
+            relTol          0;
+            smoother        DICGaussSeidel;
+            nPreSweeps      0;
+            nPostSweeps     2;
+            nFinestSweeps   2;
+            cacheAgglomeration false;
+            nCellsInCoarsestLevel 10;
+            agglomerator    faceAreaPair;
+            mergeLevels     1;
+        }
+        tolerance       1e-10;
+        relTol          0;
+        maxIter         100;
+    }
+
+    p_rgh
+    {
+        $pcorr;
+        tolerance       1e-6;
+        relTol          0.01;
+    };
+
+    p_rghFinal
+    {
+        $p_rgh;
+        tolerance       1e-6;
+        relTol          0;
+    }
+
+    "(U|k|omega).*"
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        nSweeps         1;
+        tolerance       1e-7;
+        relTol          0.1;
+    };
+}
+
+PIMPLE
+{
+    momentumPredictor no;
+    nCorrectors     2;
+    nNonOrthogonalCorrectors 0;
+
+    nAlphaCorr      1;
+    nAlphaSubCycles 3;
+    cAlpha          1;
+}
+
+relaxationFactors
+{
+    fields
+    {
+    }
+    equations
+    {
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict b/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
new file mode 100644
index 0000000000..f4f1c44476
--- /dev/null
+++ b/tutorials/multiphase/interFoam/ras/waterChannel/system/setFieldsDict
@@ -0,0 +1,36 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      setFieldsDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+defaultFieldValues
+(
+    volScalarFieldValue alpha1 0
+);
+
+regions
+(
+    boxToCell
+    {
+        box (-10 -20 -10) (200 20 4);
+        fieldValues
+        (
+            volScalarFieldValue alpha1 1
+        );
+    }
+);
+
+
+// ************************************************************************* //

From 531c25463cb294373cfc8ddbc8d4d15c06f7279e Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Mon, 23 Jul 2012 10:39:17 +0100
Subject: [PATCH 17/28] BUG: Correcting turbulence production term in
 kOmega-SAS model. Now in line with its RANS counterpart

---
 .../incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
index 45b2ec34fe..5e6890d016 100644
--- a/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
+++ b/src/turbulenceModels/incompressible/LES/kOmegaSSTSAS/kOmegaSSTSAS.C
@@ -353,7 +353,7 @@ void kOmegaSSTSAS::correct(const tmp<volTensorField>& gradU)
     volScalarField L(sqrt(k_)/(pow025(Cmu_)*omega_));
     volScalarField CDkOmega((2.0*alphaOmega2_)*(gradK & gradOmega)/omega_);
     volScalarField F1(this->F1(CDkOmega));
-    volScalarField G(nuSgs_*0.5*S2);
+    volScalarField G(nuSgs_*S2);
 
     // Turbulent kinetic energy equation
     {

From 6f3e9c1572b4d84e8f290380dfcf7534cc811a27 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 23 Jul 2012 12:15:16 +0100
Subject: [PATCH 18/28] ENH: BinSum: added construct from values

---
 src/OpenFOAM/containers/Lists/BinSum/BinSum.C | 40 +++++++++++++++++++
 src/OpenFOAM/containers/Lists/BinSum/BinSum.H | 18 +++++++++
 2 files changed, 58 insertions(+)

diff --git a/src/OpenFOAM/containers/Lists/BinSum/BinSum.C b/src/OpenFOAM/containers/Lists/BinSum/BinSum.C
index 6854597644..1e09961326 100644
--- a/src/OpenFOAM/containers/Lists/BinSum/BinSum.C
+++ b/src/OpenFOAM/containers/Lists/BinSum/BinSum.C
@@ -44,6 +44,31 @@ Foam::BinSum<IndexType, List, CombineOp>::BinSum
 {}
 
 
+template<class IndexType, class List, class CombineOp>
+Foam::BinSum<IndexType, List, CombineOp>::BinSum
+(
+    const IndexType min,
+    const IndexType max,
+    const IndexType delta,
+    const UList<IndexType>& indexVals,
+    const List& vals,
+    const CombineOp& cop
+)
+:
+    List(ceil((max-min)/delta), pTraits<typename List::value_type>::zero),
+    min_(min),
+    max_(max),
+    delta_(delta),
+    lowSum_(pTraits<typename List::value_type>::zero),
+    highSum_(pTraits<typename List::value_type>::zero)
+{
+    forAll(indexVals, i)
+    {
+        add(indexVals[i], vals[i], cop);
+    }
+}
+
+
 // * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * * //
 
 template<class IndexType, class List, class CombineOp>
@@ -70,4 +95,19 @@ void Foam::BinSum<IndexType, List, CombineOp>::add
 }
 
 
+template<class IndexType, class List, class CombineOp>
+void Foam::BinSum<IndexType, List, CombineOp>::add
+(
+    const UList<IndexType>& indexVals,
+    const List& vals,
+    const CombineOp& cop
+)
+{
+    forAll(indexVals, i)
+    {
+        add(indexVals[i], vals[i], cop);
+    }
+}
+
+
 // ************************************************************************* //
diff --git a/src/OpenFOAM/containers/Lists/BinSum/BinSum.H b/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
index 6e0195a780..3cf09bc3a7 100644
--- a/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
+++ b/src/OpenFOAM/containers/Lists/BinSum/BinSum.H
@@ -84,6 +84,17 @@ public:
             const IndexType delta
         );
 
+        //- Construct given min, max, delta and data
+        BinSum
+        (
+            const IndexType min,
+            const IndexType max,
+            const IndexType delta,
+            const UList<IndexType>& indexVals,
+            const List& vals,
+            const CombineOp& cop = plusEqOp<typename List::value_type>()
+        );
+
 
         // Access
 
@@ -111,6 +122,13 @@ public:
                 const typename List::const_reference val,
                 const CombineOp& cop = plusEqOp<typename List::value_type>()
             );
+
+            void add
+            (
+                const UList<IndexType>& indexVals,
+                const List& vals,
+                const CombineOp& cop = plusEqOp<typename List::value_type>()
+            );
 };
 
 

From 9d350dee414e2879fbf2defc0d23fd78b00cdfc0 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 23 Jul 2012 12:15:38 +0100
Subject: [PATCH 19/28] ENH: polyMeshAdder: construction order of polyPatch
 clones

---
 src/dynamicMesh/polyMeshAdder/polyMeshAdder.C | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
index 348f61db2b..3a9773ce23 100644
--- a/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
+++ b/src/dynamicMesh/polyMeshAdder/polyMeshAdder.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2011-2012 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -1604,6 +1604,8 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
     polyBoundaryMesh& allPatches =
         const_cast<polyBoundaryMesh&>(mesh0.boundaryMesh());
     allPatches.setSize(allPatchNames.size());
+    labelList patchSizes(allPatches.size());
+    labelList patchStarts(allPatches.size());
 
     label startFaceI = nInternalFaces;
 
@@ -1629,7 +1631,9 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
         }
         else
         {
-            // Clone.
+            // Clone. Note dummy size and start. Gets overwritten later in
+            // resetPrimitives. This avoids getting temporarily illegal
+            // SubList construction in polyPatch.
             allPatches.set
             (
                 allPatchI,
@@ -1637,10 +1641,12 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
                 (
                     allPatches,
                     allPatchI,
-                    nFaces[patch0],
-                    startFaceI
+                    0,          // dummy size
+                    0           // dummy start
                 )
             );
+            patchSizes[allPatchI] = nFaces[patch0];
+            patchStarts[allPatchI] = startFaceI;
 
             // Record new index in allPatches
             from0ToAllPatches[patch0] = allPatchI;
@@ -1686,10 +1692,12 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
                     (
                         allPatches,
                         allPatchI,
-                        nFaces[uncompactAllPatchI],
-                        startFaceI
+                        0,          // dummy size
+                        0           // dummy start
                     )
                 );
+                patchSizes[allPatchI] = nFaces[uncompactAllPatchI];
+                patchStarts[allPatchI] = startFaceI;
 
                 // Record new index in allPatches
                 from1ToAllPatches[patch1] = allPatchI;
@@ -1702,6 +1710,8 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
     }
 
     allPatches.setSize(allPatchI);
+    patchSizes.setSize(allPatchI);
+    patchStarts.setSize(allPatchI);
 
 
     // Construct map information before changing mesh0 primitives
@@ -1740,9 +1750,6 @@ Foam::autoPtr<Foam::mapAddedPolyMesh> Foam::polyMeshAdder::add
     // Now we have extracted all information from all meshes.
     // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-    labelList patchSizes(getPatchSizes(allPatches));
-    labelList patchStarts(getPatchStarts(allPatches));
-
     mesh0.resetMotion();    // delete any oldPoints.
     mesh0.resetPrimitives
     (

From f28d44d680a772c584ddf34f4b70a7bee2214039 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 23 Jul 2012 12:49:06 +0100
Subject: [PATCH 20/28] STYLE: atmBoundaryLayer: corrected comment

---
 .../atmBoundaryLayerInletEpsilonFvPatchScalarField.H            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
index 7eded6ae1e..c72e35372a 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
@@ -102,7 +102,7 @@ class atmBoundaryLayerInletEpsilonFvPatchScalarField
         //- Surface roughness length
         scalarField z0_;
 
-        //- Minimum corrdinate value in z direction
+        //- Minimum coordinate value in z direction
         scalarField zGround_;
 
         //- Frictional velocity

From ea4e23eedf591bb1974acc882184cbbb9aed1bd7 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Mon, 23 Jul 2012 15:11:42 +0100
Subject: [PATCH 21/28] BUG: atmBoundaryLayer: missing mapping functions

---
 ...ndaryLayerInletEpsilonFvPatchScalarField.C |  6 ++--
 ...daryLayerInletVelocityFvPatchVectorField.C | 35 +++++++++++++++++--
 ...daryLayerInletVelocityFvPatchVectorField.H | 23 ++++++++++--
 3 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
index 4862689fab..51f4aae20c 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -71,9 +71,9 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
     kappa_(ptf.kappa_),
     Uref_(ptf.Uref_),
     Href_(ptf.Href_),
-    z0_(ptf.z0_),
-    zGround_(ptf.zGround_),
-    Ustar_(ptf.Ustar_)
+    z0_(ptf.z0_, mapper),
+    zGround_(ptf.zGround_, mapper),
+    Ustar_(ptf.Ustar_, mapper)
 {}
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index d5943dda5e..3a33677025 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -68,14 +68,14 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
 )
 :
     fixedValueFvPatchVectorField(ptf, p, iF, mapper),
-    Ustar_(ptf.Ustar_),
+    Ustar_(ptf.Ustar_, mapper),
     n_(ptf.n_),
     z_(ptf.z_),
-    z0_(ptf.z0_),
+    z0_(ptf.z0_, mapper),
     kappa_(ptf.kappa_),
     Uref_(ptf.Uref_),
     Href_(ptf.Href_),
-    zGround_(ptf.zGround_)
+    zGround_(ptf.zGround_, mapper)
 {}
 
 
@@ -145,6 +145,35 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
+void atmBoundaryLayerInletVelocityFvPatchVectorField::autoMap
+(
+    const fvPatchFieldMapper& m
+)
+{
+    fixedValueFvPatchVectorField::autoMap(m);
+    z0_.autoMap(m);
+    zGround_.autoMap(m);
+    Ustar_.autoMap(m);
+}
+
+
+void atmBoundaryLayerInletVelocityFvPatchVectorField::rmap
+(
+    const fvPatchVectorField& ptf,
+    const labelList& addr
+)
+{
+    fixedValueFvPatchVectorField::rmap(ptf, addr);
+
+    const atmBoundaryLayerInletVelocityFvPatchVectorField& blptf =
+        refCast<const atmBoundaryLayerInletVelocityFvPatchVectorField>(ptf);
+
+    z0_.rmap(blptf.z0_, addr);
+    zGround_.rmap(blptf.zGround_, addr);
+    Ustar_.rmap(blptf.Ustar_, addr);
+}
+
+
 void atmBoundaryLayerInletVelocityFvPatchVectorField::updateCoeffs()
 {
     const vectorField& c = patch().Cf();
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
index 16c05dcee5..68a6408f2b 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
@@ -198,8 +198,27 @@ public:
             return z_;
         }
 
-        //- Update coefficients
-        virtual void updateCoeffs();
+        // Mapping functions
+
+            //- Map (and resize as needed) from self given a mapping object
+            virtual void autoMap
+            (
+                const fvPatchFieldMapper&
+            );
+
+            //- Reverse map the given fvPatchField onto this fvPatchField
+            virtual void rmap
+            (
+                const fvPatchVectorField&,
+                const labelList&
+            );
+
+
+        // Evaluation functions
+
+            //- Update coefficients
+            virtual void updateCoeffs();
+
 
         //- Write
         virtual void write(Ostream&) const;

From 33a5944fc8fc8869d5b8199b1f0e756a97ff810d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 24 Jul 2012 15:03:58 +0100
Subject: [PATCH 22/28] Corrected updateCoeffs in BCs

---
 ...veViewFactorFixedValueFvPatchScalarField.C |  7 ++-
 ...convectiveHeatTransferFvPatchScalarField.C |  2 +
 ...ndaryLayerInletEpsilonFvPatchScalarField.C | 11 +----
 ...ndaryLayerInletEpsilonFvPatchScalarField.H |  8 +---
 ...daryLayerInletVelocityFvPatchVectorField.C | 46 ++++++++-----------
 ...daryLayerInletVelocityFvPatchVectorField.H | 39 ++++++++--------
 6 files changed, 48 insertions(+), 65 deletions(-)

diff --git a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
index 642d2aeee8..1b1d55c8a7 100644
--- a/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
+++ b/src/thermophysicalModels/radiationModels/derivedFvPatchFields/greyDiffusiveViewFactor/greyDiffusiveViewFactorFixedValueFvPatchScalarField.C
@@ -128,10 +128,14 @@ greyDiffusiveViewFactorFixedValueFvPatchScalarField
 
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
-
 void Foam::radiation::greyDiffusiveViewFactorFixedValueFvPatchScalarField::
 updateCoeffs()
 {
+    if (this->updated())
+    {
+        return;
+    }
+
     // Do nothing
 
     if (debug)
@@ -149,6 +153,7 @@ updateCoeffs()
             << endl;
     }
 
+    fixedValueFvPatchScalarField::updateCoeffs();
 }
 
 
diff --git a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
index c747a97b84..116bfc9c25 100644
--- a/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
+++ b/src/turbulenceModels/compressible/RAS/derivedFvPatchFields/convectiveHeatTransfer/convectiveHeatTransferFvPatchScalarField.C
@@ -142,6 +142,8 @@ void convectiveHeatTransferFvPatchScalarField::updateCoeffs()
             htc[faceI] = 0.037*pow(Re, 0.8)*cbrt(Pr[faceI])*kappaw[faceI]/L_;
         }
     }
+
+    fixedValueFvPatchScalarField::updateCoeffs();
 }
 
 
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
index 51f4aae20c..80aa64362a 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.C
@@ -116,7 +116,8 @@ atmBoundaryLayerInletEpsilonFvPatchScalarField
 
     z_ /= mag(z_);
 
-    evaluate();
+    const vectorField& c = patch().Cf();
+    scalarField::operator=(pow3(Ustar_)/(kappa_*((c & z_) - zGround_ + z0_)));
 }
 
 
@@ -169,14 +170,6 @@ void atmBoundaryLayerInletEpsilonFvPatchScalarField::rmap
 }
 
 
-void atmBoundaryLayerInletEpsilonFvPatchScalarField::updateCoeffs()
-{
-    const vectorField& c = patch().Cf();
-    tmp<scalarField> coord = (c & z_);
-    scalarField::operator=(pow3(Ustar_)/(kappa_*(coord - zGround_ + z0_)));
-}
-
-
 void atmBoundaryLayerInletEpsilonFvPatchScalarField::write(Ostream& os) const
 {
     fvPatchScalarField::write(os);
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
index c72e35372a..bce9e01480 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletEpsilon/atmBoundaryLayerInletEpsilonFvPatchScalarField.H
@@ -176,7 +176,7 @@ public:
         // Access
 
             //- Return max value
-            scalarField Ustar() const
+            const scalarField& Ustar() const
             {
                 return Ustar_;
             }
@@ -204,12 +204,6 @@ public:
             );
 
 
-        // Evaluation functions
-
-            //- Update coefficients
-            virtual void updateCoeffs();
-
-
         //- Write
         virtual void write(Ostream&) const;
 };
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
index 3a33677025..e41c3904fa 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.C
@@ -120,7 +120,25 @@ atmBoundaryLayerInletVelocityFvPatchVectorField
         Ustar_[i] = kappa_*Uref_/(log((Href_  + z0_[i])/max(z0_[i] , 0.001)));
     }
 
-    evaluate();
+    const vectorField& c = patch().Cf();
+    const scalarField coord(c & z_);
+    scalarField Un(coord.size());
+
+    forAll(coord, i)
+    {
+        if ((coord[i] - zGround_[i]) < Href_)
+        {
+            Un[i] =
+                (Ustar_[i]/kappa_)
+              * log((coord[i] - zGround_[i] + z0_[i])/max(z0_[i], 0.001));
+        }
+        else
+        {
+            Un[i] = Uref_;
+        }
+    }
+
+    vectorField::operator=(n_*Un);
 }
 
 
@@ -174,32 +192,6 @@ void atmBoundaryLayerInletVelocityFvPatchVectorField::rmap
 }
 
 
-void atmBoundaryLayerInletVelocityFvPatchVectorField::updateCoeffs()
-{
-    const vectorField& c = patch().Cf();
-    const scalarField coord(c & z_);
-    scalarField Un(coord.size());
-
-    forAll(coord, i)
-    {
-        if ((coord[i] - zGround_[i]) < Href_)
-        {
-            Un[i] =
-                (Ustar_[i]/kappa_)
-              * log((coord[i] - zGround_[i] + z0_[i])/max(z0_[i], 0.001));
-        }
-        else
-        {
-            Un[i] = Uref_;
-        }
-    }
-
-    vectorField::operator=(n_*Un);
-
-    fixedValueFvPatchVectorField::updateCoeffs();
-}
-
-
 void atmBoundaryLayerInletVelocityFvPatchVectorField::write(Ostream& os) const
 {
     fvPatchVectorField::write(os);
diff --git a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
index 68a6408f2b..0249b7111c 100644
--- a/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
+++ b/src/turbulenceModels/incompressible/RAS/derivedFvPatchFields/atmBoundaryLayerInletVelocity/atmBoundaryLayerInletVelocityFvPatchVectorField.H
@@ -180,23 +180,26 @@ public:
 
     // Member functions
 
-        //- Return Ustar
-        scalarField& Ustar()
-        {
-            return Ustar_;
-        }
+        // Access
 
-        //- Return flow direction
-        vector& n()
-        {
-            return n_;
-        }
+            //- Return Ustar
+            const scalarField& Ustar() const
+            {
+                return Ustar_;
+            }
+
+            //- Return flow direction
+            const vector& n() const
+            {
+                return n_;
+            }
+
+            //- Return z direction
+            const vector& z() const
+            {
+                return z_;
+            }
 
-        //- Return z direction
-        vector& z()
-        {
-            return z_;
-        }
 
         // Mapping functions
 
@@ -214,12 +217,6 @@ public:
             );
 
 
-        // Evaluation functions
-
-            //- Update coefficients
-            virtual void updateCoeffs();
-
-
         //- Write
         virtual void write(Ostream&) const;
 };

From 1df540b4f5674704e1e4c56ec3f63504bd6c8f50 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 24 Jul 2012 15:04:40 +0100
Subject: [PATCH 23/28] simpleFoam/turbineSiting: corrected fvSchemes

---
 .../simpleFoam/turbineSiting/system/fvSchemes             | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
index e3d9959b1f..4c101301a1 100644
--- a/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
+++ b/tutorials/incompressible/simpleFoam/turbineSiting/system/fvSchemes
@@ -16,20 +16,18 @@ FoamFile
 
 ddtSchemes
 {
-    default            steadyState;
+    default             steadyState;
 }
 
 gradSchemes
 {
-    default            Gauss linear;
-    grad(p)             Gauss linear;
-    grad(U)             Gauss linear;
+    default             Gauss linear;
 }
 
 divSchemes
 {
     default             none;
-    div(phi,U)          Gauss upwind grad(U);
+    div(phi,U)          Gauss upwind;
     div((nuEff*dev(T(grad(U)))))    Gauss linear;
     div(phi,epsilon)    Gauss upwind;
     div(phi,k)          Gauss upwind;

From 6a5711af6972adf6bca28fb3d51f6f82363fe97d Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 24 Jul 2012 15:24:22 +0100
Subject: [PATCH 24/28] Removed unused file

---
 .../propeller/system/changeDictionaryDict     | 42 -------------------
 1 file changed, 42 deletions(-)
 delete mode 100644 tutorials/incompressible/pimpleDyMFoam/propeller/system/changeDictionaryDict

diff --git a/tutorials/incompressible/pimpleDyMFoam/propeller/system/changeDictionaryDict b/tutorials/incompressible/pimpleDyMFoam/propeller/system/changeDictionaryDict
deleted file mode 100644
index 3eb586f140..0000000000
--- a/tutorials/incompressible/pimpleDyMFoam/propeller/system/changeDictionaryDict
+++ /dev/null
@@ -1,42 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  dev                                   |
-|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      changeDictionaryDict;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-dictionaryReplacement
-{
-    boundary
-    {
-        AMI1
-        {
-            type            cyclicAMI;
-            neighbourPatch  AMI2;
-            transform       noOrdering;
-            surface         
-            {
-            }
-        }
-        AMI2
-        {
-            type            cyclicAMI;
-            neighbourPatch  AMI1;
-            transform       noOrdering;
-            surface         
-            {
-            }
-        }
-    }
-}
-
-// ************************************************************************* //

From 5cb555db9ebdbb4c80a0b14bb3fb0d2d02dc3d78 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 24 Jul 2012 15:36:51 +0100
Subject: [PATCH 25/28] Tutorials: Corrected selection of thermodynamics
 packages

---
 .../les/oppositeBurningPanels/constant/combustionProperties | 2 +-
 .../les/smallPoolFire2D/constant/combustionProperties       | 6 +++---
 .../les/smallPoolFire3D/constant/combustionProperties       | 2 +-
 .../angledDuctImplicit/constant/polyMesh/boundary           | 2 +-
 .../angledDuctImplicit/constant/thermophysicalProperties    | 4 ++--
 .../squareBend/constant/thermophysicalProperties            | 4 ++--
 .../laminar/shockTube/constant/thermophysicalProperties     | 4 ++--
 .../ras/nacaAirfoil/constant/thermophysicalProperties       | 4 ++--
 .../sonicFoam/ras/prism/constant/thermophysicalProperties   | 2 +-
 9 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/combustionProperties b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/combustionProperties
index 08ddd33fd3..355d1e1b36 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/constant/combustionProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  infinitelyFastChemistry<psiCombustionModel,gasThermoPhysics>;
+combustionModel  infinitelyFastChemistry<psiThermoCombustion,gasThermoPhysics>;
 
 active true;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties
index ae740ee671..9973e9ad7b 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire2D/constant/combustionProperties
@@ -15,9 +15,9 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-//combustionModel  noCombustion<psiCombustionModel>;
-combustionModel  infinitelyFastChemistry<psiCombustionModel,gasThermoPhysics>;
-//combustionModel  FSD<psiCombustionModel,gasThermoPhysics>;
+//combustionModel  noCombustion<psiThermoCombustion>;
+combustionModel  infinitelyFastChemistry<psiThermoCombustion,gasThermoPhysics>;
+//combustionModel  FSD<psiThermoCombustion,gasThermoPhysics>;
 
 active  true;
 
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties
index 62192a7bd7..cfa2cd8f28 100644
--- a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties
@@ -16,7 +16,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-combustionModel  infinitelyFastChemistry<psiCombustionModel,gasThermoPhysics>;
+combustionModel  infinitelyFastChemistry<psiThermoCombustion,gasThermoPhysics>;
 
 active  on;
 
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
index a664893343..0abd1608ab 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/polyMesh/boundary
@@ -8,7 +8,7 @@
 FoamFile
 {
     version     2.0;
-    format      binary;
+    format      ascii;
     class       polyBoundaryMesh;
     location    "constant/polyMesh";
     object      boundary;
diff --git a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
index dd688c1b3f..abc41fb6ce 100644
--- a/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoPorousMRFSimpleFoam/angledDuctImplicit/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType heRhoThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
 
 mixture
 {
@@ -26,7 +26,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          719.3;
+        Cp          1005;
         Hf          0;
     }
     transport
diff --git a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
index dd688c1b3f..1523354896 100644
--- a/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
+++ b/tutorials/compressible/rhoSimplecFoam/squareBend/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<eConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType hePsiThermo<pureMixture<sutherlandTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
 
 mixture
 {
@@ -26,7 +26,7 @@ mixture
     }
     thermodynamics
     {
-        Cv          719.3;
+        Cp          1007;
         Hf          0;
     }
     transport
diff --git a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
index 76fd63c9b7..f409900f93 100644
--- a/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/laminar/shockTube/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType      hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
 
 mixture
 {
@@ -26,7 +26,7 @@ mixture
     }
     thermodynamics
     {
-        Cv              717.5;
+        Cp              1005;
         Hf              0;
     }
     transport
diff --git a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
index b302f7e040..e2a0824661 100644
--- a/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/nacaAirfoil/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType      hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
 
 mixture
 {
@@ -26,7 +26,7 @@ mixture
     }
     thermodynamics
     {
-        Cv              717.5;
+        Cp              1005;
         Hf              0;
     }
     transport
diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
index b302f7e040..8a8e41f6a3 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
@@ -26,7 +26,7 @@ mixture
     }
     thermodynamics
     {
-        Cv              717.5;
+        Cp              1005;
         Hf              0;
     }
     transport

From b18dac86cb1dbc01aeaad08a76e0e55df2ef356c Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 24 Jul 2012 16:42:03 +0100
Subject: [PATCH 26/28] fireFoam/les/oppositeBurningPanels/0/alphaSgs: Update
 for new generalised wall-functions

---
 .../combustion/fireFoam/les/oppositeBurningPanels/0/alphaSgs    | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphaSgs b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphaSgs
index f50fb4a481..fbf52cc809 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphaSgs
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/0/alphaSgs
@@ -24,6 +24,7 @@ boundaryField
     ground
     {
         type        alphatWallFunction;
+        mut         muSgs;
         value       uniform 0;
     }
 
@@ -45,6 +46,7 @@ boundaryField
     "(region0_to.*)"
     {
         type        alphatWallFunction;
+        mut         muSgs;
         value       uniform 0;
     }
 }

From df152c1ca4cc42e808f001ec8db6e152afc565af Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Tue, 24 Jul 2012 16:42:29 +0100
Subject: [PATCH 27/28] sonicFoam/ras/prism/constant/thermophysicalProperties:
 Corrected choice of thermodynamics

---
 .../sonicFoam/ras/prism/constant/thermophysicalProperties       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
index 8a8e41f6a3..e2a0824661 100644
--- a/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
+++ b/tutorials/compressible/sonicFoam/ras/prism/constant/thermophysicalProperties
@@ -15,7 +15,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-thermoType      hePsiThermo<pureMixture<constTransport<specieThermo<eConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
+thermoType      hePsiThermo<pureMixture<constTransport<specieThermo<hConstThermo<perfectGas>,sensibleInternalEnergy>>>>;
 
 mixture
 {

From 785adf0495dffd98bb068b62d97fec72044774b5 Mon Sep 17 00:00:00 2001
From: sergio <sergio>
Date: Tue, 24 Jul 2012 17:08:39 +0100
Subject: [PATCH 28/28] BUG: Changing rho name in fvSolution for the solid
 region

---
 .../les/oppositeBurningPanels/system/panelRegion/fvSolution     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution
index 688f40489e..e1d5b8db0b 100644
--- a/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution
+++ b/tutorials/combustion/fireFoam/les/oppositeBurningPanels/system/panelRegion/fvSolution
@@ -32,7 +32,7 @@ solvers
         relTol          0;
     }
 
-    "rho|rhot"
+    rhoThermo
     {
         solver          PCG;
         preconditioner  DIC;