diff --git a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
index 186abb2c..a6e64bae 100644
--- a/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
+++ b/applications/solvers/compressible/rhoCentralFoam/BCs/U/maxwellSlipUFvPatchVectorField.C
@@ -107,6 +107,8 @@ maxwellSlipUFvPatchVectorField::maxwellSlipUFvPatchVectorField
         (
             vectorField("value", dict, p.size())
         );
+        refValue() = vectorField("refValue", dict, p.size());
+        valueFraction() = scalarField("valueFraction", dict, p.size());
     }
     else
     {
@@ -190,10 +192,8 @@ void maxwellSlipUFvPatchVectorField::write(Ostream& os) const
         << thermalCreep_ << token::END_STATEMENT << nl;
     os.writeKeyword("curvature") << curvature_ << token::END_STATEMENT << nl;
 
-    os.writeKeyword("refValue")
-        << refValue() << token::END_STATEMENT << nl;
-    os.writeKeyword("valueFraction")
-        << valueFraction() << token::END_STATEMENT << nl;
+    refValue().writeEntry("refValue", os);
+    valueFraction().writeEntry("valueFraction", os);
 
     writeEntry("value", os);
 }
diff --git a/applications/solvers/multiphase/interFoam/MRFInterFoam/Make/files b/applications/solvers/multiphase/interFoam/MRFInterFoam/Make/files
index 70685844..9610e63e 100644
--- a/applications/solvers/multiphase/interFoam/MRFInterFoam/Make/files
+++ b/applications/solvers/multiphase/interFoam/MRFInterFoam/Make/files
@@ -1,3 +1,3 @@
 MRFInterFoam.C
 
-EXE = $(FOAM_USER_APPBIN)/MRFInterFoam
+EXE = $(FOAM_APPBIN)/MRFInterFoam
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index f0998af7..e7908cf8 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -331,20 +331,18 @@ Foam::label Foam::checkTopology
                 const pointField& pts = pp.points();
                 const labelList& mp = pp.meshPoints();
 
-                boundBox bb;   // zero-sized
                 if (returnReduce(mp.size(), sumOp<label>()) > 0)
                 {
-                    bb.min() = pts[mp[0]];
-                    bb.max() = pts[mp[0]];
-                    for (label i = 1; i < mp.size(); i++)
+                    boundBox bb(point::max, point::min);
+                    forAll(mp, i)
                     {
                         bb.min() = min(bb.min(), pts[mp[i]]);
                         bb.max() = max(bb.max(), pts[mp[i]]);
                     }
                     reduce(bb.min(), minOp<vector>());
                     reduce(bb.max(), maxOp<vector>());
+                    Pout<< ' ' << bb;
                 }
-                Pout<< ' ' << bb;
             }
             Pout<< endl;
         }
diff --git a/bin/foamEtcFile b/bin/foamEtcFile
index d2c74039..5bae566b 100755
--- a/bin/foamEtcFile
+++ b/bin/foamEtcFile
@@ -1,11 +1,11 @@
 #!/bin/sh
-#---------------------------------*- sh -*-------------------------------------
+#------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
-#   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
+#   \\  /    A nd           | Copyright (C) 2008-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
@@ -26,12 +26,19 @@
 #     foamEtcFile
 #
 # Description
-#     Locate user/site/shipped file with the semantics used in the
-#     ~OpenFOAM/fileName expansion
+#     Locate user/group/shipped file with semantics similar to the
+#     ~OpenFOAM/fileName expansion.
+#
+#     The -mode option can be used to allow chaining from
+#     personal settings to site-wide settings.
+#
+#     For example, within the user ~/.OpenFOAM/<VER>/prefs.sh:
+#     @verbatim
+#        foamPrefs=`$WM_PROJECT_DIR/bin/foamEtcFile -m go prefs.sh` \
+#            && _foamSource $foamPrefs
+#     @endverbatim
 #
 #-------------------------------------------------------------------------------
-unset listOpt quietOpt
-
 usage() {
     [ "$quietOpt" = true ] && exit 1
 
@@ -39,24 +46,89 @@ usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] fileName
-       ${0##*/} -list
-
+Usage: ${0##*/} [OPTION] fileName
+       ${0##*/} [OPTION] -list
 options:
-  -l | -list    list the directories to be searched
-  -q | -quiet   suppress all normal output
+  -list             list the directories to be searched
+  -mode <mode>      any combination of u(user), g(group), o(other)
+  -prefix <dir>     specify an alternative installation prefix
+  -quiet            suppress all normal output
+  -version <ver>    specify an alternative OpenFOAM version
+                    in the form Maj.Min.Rev (eg, 1.7.0)
+  -help             print the usage
+
+  Locate user/group/shipped file with semantics similar to the
+  ~OpenFOAM/fileName expansion.
 
-  Locate user/site/shipped file with the semantics used in the
-  ~OpenFOAM/fileName expansion
+  The options can also be specified as a single character
+  (eg, '-q' instead of '-quiet'), but must not be grouped.
 
-  Exit status 0 when the file is found and output resolved path to stdout.
-  Exit status 1 for miscellaneous errors.
-  Exit status 2 when the file is not found.
+  Exit status
+      0  when the file is found. Print resolved path to stdout.
+      1  for miscellaneous errors.
+      2  when the file is not found.
 
 USAGE
     exit 1
 }
 
+#
+# This script must exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
+# or <foamInstall>/openfoam<VERSION>/bin/ (for the debian version)
+#
+#-------------------------------------------------------------------------------
+
+# the bindir:
+binDir="${0%/*}"
+
+# the project dir:
+projectDir="${binDir%/bin}"
+
+# the prefix dir (same as foamInstall):
+prefixDir="${projectDir%/*}"
+
+# the name used for the project directory
+projectDirName="${projectDir##*/}"
+
+# version number used for debian packaging
+unset versionNum
+
+#
+# handle standard and debian naming convention
+#
+case "$projectDirName" in
+OpenFOAM-*)         # standard naming convention OpenFOAM-<VERSION>
+    version="${projectDirName##OpenFOAM-}"
+    ;;
+
+openfoam[0-9]*)     # debian naming convention 'openfoam<VERSION>'
+    versionNum="${projectDirName##openfoam}"
+    case "$versionNum" in
+    ??)         # convert 2 digit version number to decimal delineated
+        version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)@\1.\2@')
+        ;;
+    ???)        # convert 3 digit version number to decimal delineated
+        version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)\(.\)@\1.\2.\3@')
+        ;;
+    ????)       # convert 4 digit version number to decimal delineated
+        version=$(echo "$versionNum" | sed -e 's@\(.\)\(.\)\(.\)\(.\)@\1.\2.\3.\4@')
+        ;;
+    *)          # failback - use current environment setting
+        version="$WM_PROJECT_VERSION"
+        ;;
+    esac
+    ;;
+
+*)
+    echo "Error : unknown/unsupported naming convention"
+    exit 1
+    ;;
+esac
+
+
+# default mode is 'ugo'
+mode=ugo
+unset listOpt quietOpt
 
 # parse options
 while [ "$#" -gt 0 ]
@@ -67,12 +139,43 @@ do
         ;;
     -l | -list)
         listOpt=true
+        ;;
+    -m | -mode)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        mode="$2"
+
+        # sanity check:
+        case "$mode" in
+        *u* | *g* | *o* )
+           ;;
+        *)
+           usage "'$1' option with invalid mode '$mode'"
+           ;;
+        esac
+        shift
+        ;;
+    -p | -prefix)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        prefixDir="$2"
         shift
         ;;
     -q | -quiet)
         quietOpt=true
+        ;;
+    -v | -version)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        version="$2"
+        # convert x.y.z -> xyz version (if installation looked like debian)
+        if [ -n "$versionNum" ]
+        then
+            versionNum=$(echo "$version" | sed -e 's@\.@@g')
+        fi
         shift
         ;;
+    --)
+        shift
+        break
+        ;;
     -*)
         usage "unknown option: '$*'"
         ;;
@@ -80,20 +183,52 @@ do
         break
         ;;
     esac
+    shift
 done
 
 
-# Save the essential bits of information:
+# debugging:
+# echo "Installed locations:"
+# for i in projectDir prefixDir projectDirName version versionNum
+# do
+#     eval echo "$i=\$$i"
+# done
+
+
+# Save the essential bits of information
+# silently remove leading ~OpenFOAM/ (used in Foam::findEtcFile)
 nArgs=$#
-fileName="$1"
-
-# The various places to be searched:
-set -- \
-    $HOME/.${WM_PROJECT:-OpenFOAM}/$WM_PROJECT_VERSION \
-    $HOME/.${WM_PROJECT:-OpenFOAM} \
-    $WM_PROJECT_INST_DIR/site/$WM_PROJECT_VERSION \
-    $WM_PROJECT_INST_DIR/site \
-    $WM_PROJECT_DIR/etc
+fileName="${1#~OpenFOAM/}"
+
+# Define the various places to be searched:
+unset dirList
+case "$mode" in
+*u*)  # user
+    dirList="$dirList $HOME/.${WM_PROJECT:-OpenFOAM}/$version"
+    dirList="$dirList $HOME/.${WM_PROJECT:-OpenFOAM}"
+    ;;
+esac
+
+case "$mode" in
+*g*)  # group
+    dirList="$dirList $prefixDir/site/$version"
+    dirList="$dirList $prefixDir/site"
+    ;;
+esac
+
+case "$mode" in
+*o*)  # other (shipped)
+    if [ -n "$versionNum" ]
+    then
+        # debian packaging
+        dirList="$dirList $prefixDir/openfoam$versionNum/etc"
+    else
+        # standard packaging
+        dirList="$dirList $prefixDir/${WM_PROJECT:-OpenFOAM}-$version/etc"
+    fi
+    ;;
+esac
+set -- $dirList
 
 
 #
diff --git a/bin/foamExec b/bin/foamExec
index 17589810..1e1d438d 100755
--- a/bin/foamExec
+++ b/bin/foamExec
@@ -1,11 +1,11 @@
 #!/bin/sh
-#---------------------------------*- sh -*-------------------------------------
+#------------------------------------------------------------------------------
 # =========                 |
 # \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
 #  \\    /   O peration     |
 #   \\  /    A nd           | Copyright (C) 1991-2010 OpenCFD Ltd.
 #    \\/     M anipulation  |
-#------------------------------------------------------------------------------
+#-------------------------------------------------------------------------------
 # License
 #     This file is part of OpenFOAM.
 #
@@ -35,20 +35,19 @@
 #     mpirun -np <nProcs> \
 #         foamExec -v <foamVersion> <foamCommand> ... -parallel
 #
-#     Note: - not consistent with foamEtcFiles - does not search 'site'
-#             directories
-#           - version switch -v will not work with the debian naming
-#             openfoamXXX
+# SeeAlso
+#    foamEtcFile
 #------------------------------------------------------------------------------
 usage() {
     while [ "$#" -ge 1 ]; do echo "$1"; shift; done
     cat<<USAGE
 
-usage: ${0##*/} [OPTION] <application> ...
+Usage: ${0##*/} [OPTION] <application> ...
 
 options:
-  -v ver        specify OpenFOAM version
-  -help         this usage
+  -version <ver>    specify an alternative OpenFOAM version
+                    pass through to foamEtcFile
+  -help             this usage
 
 * run a particular OpenFOAM version of <application>
 
@@ -56,43 +55,14 @@ USAGE
     exit 1
 }
 
-
-# This script should exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
+#
+# This script must exist in <foamInstall>/OpenFOAM-<VERSION>/bin/
 # or <foamInstall>/openfoam<VERSION>/bin/ (for the debian version)
-# extract the <foamInstall> and <version> elements
-# using a function preserves the command args
-getDefaults() {
-    set -- $(echo $0 | sed -e 's@/OpenFOAM-\([^/]*\)/bin/[^/]*$@ \1@')
-    foamInstall=$1
-    foamName='OpenFOAM-'
-    versionFile=$2
-    versionString=$2
-
-    if [ -z "$versionFile" ]
-    then
-        # Try debian package name
-        #echo "Assuming debian naming convention 'openfoam<version>'"
-        set -- $(echo $0 | sed -e 's@/openfoam\([0-9]*\)/bin/[^/]*$@ \1@')
-        foamInstall=$1
-        foamName='openfoam'
-        versionFile=$2
-        versionString=$WM_PROJECT_VERSION
-        #echo "foamInstall=$foamInstall"
-        #echo "foamName=$foamName"
-        #echo "versionFile=$versionFile"
-        #echo "versionString=$versionString"
-    fi
-}
-
-
-foamInstall=''      # path before OpenFOAM-1.7.0
-foamName=''         # OpenFOAM- or openfoam
-versionFile=''      # 170 so what the WM_PROJECT_INST_DIR exists as 
-versionString=''    # 1.7.0
-
-# Get above settings from $0
-getDefaults
+#
+# foamEtcFile is found in the same directory
+#-------------------------------------------------------------------------------
 
+unset etcOpts
 # parse options
 while [ "$#" -gt 0 ]
 do
@@ -100,10 +70,9 @@ do
     -h | -help)
         usage
         ;;
-    -v)
-        shift
-        versionString=$1
-        versionFile=$1
+    -v | -version)
+        [ "$#" -ge 2 ] || usage "'$1' option requires an argument"
+        etcOpts="-version $2"
         shift
         ;;
     --)
@@ -117,46 +86,22 @@ do
         break
         ;;
     esac
+    shift
 done
 
-#echo "Detected version $versionString with path name $foamName$versionFile"
+[ "$#" -ge 1 ] || usage "no application specified"
 
-if [ "$#" -lt 1 ]
-then
-    usage "no application specified"
-fi
+# find OpenFOAM settings (bashrc)
+foamDotFile="$(${0%/*}/foamEtcFile $etcOpts bashrc)" || {
+    echo "Error : bashrc file could not be found for OpenFOAM-$version" 1>&2
+    exit 1
+}
 
-unset foamDotFile
+# preserve arguments (can otherwise get lost when sourcing the foamDotFile)
 args="$*"
+. $foamDotFile
 
-# Check user-specific OpenFOAM bashrc file
-foamDotFile="$HOME/.OpenFOAM/$versionString/bashrc"
-if [ -f $foamDotFile ]
-then
-    . $foamDotFile
-    foamDotFile=okay
-else
-    # Use the FOAM_INST_DIR variable for locating the installed version
-    for FOAM_INST_DIR in $foamInstall $WM_PROJECT_INST_DIR
-    do
-        foamDotFile="$FOAM_INST_DIR/$foamName$versionFile/etc/bashrc"
-        if [ -f $foamDotFile ]
-        then
-            . $foamDotFile
-            foamDotFile=okay
-            break
-        fi
-    done
-fi
-
-
-if [ "$foamDotFile" != okay ]
-then
-    echo "Error : bashrc file could not be found for OpenFOAM-$versionString" 1>&2
-    exit 1
-fi
-
-# Pass on the rest of the arguments
+# execute
 exec $args
 
 #------------------------------------------------------------------------------
diff --git a/doc/changes/debianPackage.txt b/doc/changes/debianPackage.txt
deleted file mode 100644
index aeb94a11..00000000
--- a/doc/changes/debianPackage.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-Debian package.
-
-- install OpenFOAM as usual
-(I installed the 1.7.0 git version:
-    cd ~/OpenFOAM
-    git clone ssh://.../OpenFOAM-1.7.0.git
-)
-- compile: ./Allwmake
-
-Get all your dependencies:
-
-Package building:
-    sudo apt-get install dh-make
-    sudo apt-get install dpkg
-    sudo apt-get install lintian        # contains package checking
-    sudo apt-get install devscripts     # contains debuild package building
-
-OpenFOAM building:
-
-    sudo apt-get install binutils-dev
-    sudo apt-get install flex
-    sudo apt-get install libscotch-dev
-    sudo apt-get install libparmetis-dev
-    sudo apt-get install libopenmpi-dev
-    sudo apt-get install libxt-dev (tecplot360 converter)
-
-Compile all.
-- metis will not compile
-- parmetis will not compile
-- mgridgen will not compile
-
-
-Packaging:
-(- install OpenFOAM-dev)
-- mkdir debian; cd debian; ln -s ../OpenFOAM-dev/debian/* debian
-- make sure openfoamdev is replaced with openfoam170
-- add changes to changelog:
-    dch --increment 'some change'
-- build package:
-    # Clean build
-    fakeroot debian/rules clean
-    # Build : does Allwmake
-    fakeroot debian/rules build
-    # Create .deb from build results
-    fakeroot debian/rules binary
-or in one go:
-    debuild -uc -us
-    (does a dpdg-buildpackage -rfakeroot)
-This will build e.g. a ../openfoam170_0-1ubuntu1_i386.deb
-
-- build rpm:
-    cd ..
-    alien -r openfoam170_0-1ubuntu1_i386.deb
--------------------------------------------------------
diff --git a/etc/bashrc b/etc/bashrc
index e507d448..666de588 100644
--- a/etc/bashrc
+++ b/etc/bashrc
@@ -131,7 +131,7 @@ unset WM_COMPILER_ARCH WM_COMPILER_LIB_ARCH
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 : ${WM_COMPILE_OPTION:=Opt}; export WM_COMPILE_OPTION
 
-# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
+# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | MPI | QSMPI
 : ${WM_MPLIB:=OPENMPI}; export WM_MPLIB
 
 
diff --git a/etc/cshrc b/etc/cshrc
index 87701df1..e6991d44 100644
--- a/etc/cshrc
+++ b/etc/cshrc
@@ -119,7 +119,7 @@ if ( ! $?WM_PRECISION_OPTION ) setenv WM_PRECISION_OPTION DP
 # WM_COMPILE_OPTION = Opt | Debug | Prof
 if ( ! $?WM_COMPILE_OPTION ) setenv WM_COMPILE_OPTION Opt
 
-# WM_MPLIB = | OPENMPI | MPICH | MPICH-GM | HPMPI | GAMMA | MPI | QSMPI
+# WM_MPLIB = SYSTEMOPENMPI | OPENMPI | MPICH | MPICH-GM | HPMPI | MPI | QSMPI
 if ( ! $?WM_MPLIB ) setenv WM_MPLIB OPENMPI
 
 
diff --git a/etc/settings.csh b/etc/settings.csh
index 8b51bb7b..2c182ab4 100644
--- a/etc/settings.csh
+++ b/etc/settings.csh
@@ -281,11 +281,6 @@ case HPMPI:
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/hpmpi
     breaksw
 
-case GAMMA:
-    setenv MPI_ARCH_PATH /usr
-    setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/gamma
-    breaksw
-
 case MPI:
     setenv MPI_ARCH_PATH /opt/mpi
     setenv FOAM_MPI_LIBBIN $FOAM_LIBBIN/mpi
diff --git a/etc/settings.sh b/etc/settings.sh
index aae19a76..52b30443 100644
--- a/etc/settings.sh
+++ b/etc/settings.sh
@@ -307,11 +307,6 @@ HPMPI)
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/hpmpi
     ;;
 
-GAMMA)
-    export MPI_ARCH_PATH=/usr
-    export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/gamma
-    ;;
-
 MPI)
     export MPI_ARCH_PATH=/opt/mpi
     export FOAM_MPI_LIBBIN=$FOAM_LIBBIN/mpi
diff --git a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SKA/SKA.C b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SKA/SKA.C
index 44cba2e3..9a7cc8e3 100644
--- a/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SKA/SKA.C
+++ b/src/dynamicFvMesh/solidBodyMotionFvMesh/solidBodyMotionFunctions/SKA/SKA.C
@@ -118,7 +118,10 @@ bool Foam::solidBodyMotionFunctions::SKA::read(const dictionary& SBMFCoeffs)
 
     // If the timeDataFileName has changed read the file
 
-    fileName newTimeDataFileName(SBMFCoeffs_.lookup("timeDataFileName"));
+    fileName newTimeDataFileName
+    (
+        fileName(SBMFCoeffs_.lookup("timeDataFileName")).expand()
+    );
 
     if (newTimeDataFileName != timeDataFileName_)
     {
diff --git a/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C b/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
index c5e53416..57c3ee4b 100644
--- a/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
+++ b/src/dynamicMesh/motionSmoother/motionSmootherTemplates.C
@@ -245,7 +245,7 @@ Foam::tmp<Foam::GeometricField<Type, Foam::pointPatchField, Foam::pointMesh> >
         else
         {
             res[pointI] /= sumWeight[pointI];
-        }        
+        }
     }
 
     res.correctBoundaryConditions();
diff --git a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
index 3a357601..2f1da5c6 100644
--- a/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
+++ b/src/finiteVolume/cfdTools/general/MRF/MRFZoneTemplates.C
@@ -71,7 +71,7 @@ void Foam::MRFZone::relativeRhoFlux
 
             phi.boundaryField()[patchi][patchFacei] -=
                 rho.boundaryField()[patchi][patchFacei]
-               *(Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin))
+              * (Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin))
               & Sf.boundaryField()[patchi][patchFacei];
         }
     }
@@ -95,7 +95,7 @@ void Foam::MRFZone::absoluteRhoFlux
     forAll(internalFaces_, i)
     {
         label facei = internalFaces_[i];
-        phi[facei] += (Omega ^ (Cf[facei] - origin)) & Sf[facei];
+        phi[facei] += rho[facei]*(Omega ^ (Cf[facei] - origin)) & Sf[facei];
     }
 
     // Included patches
@@ -106,7 +106,8 @@ void Foam::MRFZone::absoluteRhoFlux
             label patchFacei = includedFaces_[patchi][i];
 
             phi.boundaryField()[patchi][patchFacei] +=
-                (Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin))
+                rho.boundaryField()[patchi][patchFacei]
+              * (Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin))
               & Sf.boundaryField()[patchi][patchFacei];
         }
     }
@@ -119,7 +120,8 @@ void Foam::MRFZone::absoluteRhoFlux
             label patchFacei = excludedFaces_[patchi][i];
 
             phi.boundaryField()[patchi][patchFacei] +=
-                (Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin))
+                rho.boundaryField()[patchi][patchFacei]
+              * (Omega ^ (Cf.boundaryField()[patchi][patchFacei] - origin))
               & Sf.boundaryField()[patchi][patchFacei];
         }
     }
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
index c97d5d03..256c0d68 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.C
@@ -35,6 +35,25 @@ namespace Foam
     defineTypeNameAndDebug(alphaContactAngleFvPatchScalarField, 0);
 }
 
+template<>
+const char* Foam::NamedEnum
+<
+    Foam::alphaContactAngleFvPatchScalarField::limitControls,
+    4
+>::names[] =
+{
+    "none",
+    "gradient",
+    "zeroGradient",
+    "alpha"
+};
+
+const Foam::NamedEnum
+<
+    Foam::alphaContactAngleFvPatchScalarField::limitControls,
+    4
+> Foam::alphaContactAngleFvPatchScalarField::limitControlNames_;
+
 
 // * * * * * * * * * * * * * * * * Constructors  * * * * * * * * * * * * * * //
 
@@ -44,19 +63,21 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    zeroGradientFvPatchScalarField(p, iF)
+    fixedGradientFvPatchScalarField(p, iF),
+    limit_(lcZeroGradient)
 {}
 
 
 Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
-    const alphaContactAngleFvPatchScalarField& gcpsf,
+    const alphaContactAngleFvPatchScalarField& acpsf,
     const fvPatch& p,
     const DimensionedField<scalar, volMesh>& iF,
     const fvPatchFieldMapper& mapper
 )
 :
-    zeroGradientFvPatchScalarField(gcpsf, p, iF, mapper)
+    fixedGradientFvPatchScalarField(acpsf, p, iF, mapper),
+    limit_(acpsf.limit_)
 {}
 
 
@@ -67,29 +88,74 @@ Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
     const dictionary& dict
 )
 :
-    zeroGradientFvPatchScalarField(p, iF)
-{
-    evaluate();
-}
+    fixedGradientFvPatchScalarField(p, iF),
+    limit_(limitControlNames_.read(dict.lookup("limit")))
+{}
 
 
 Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
-    const alphaContactAngleFvPatchScalarField& gcpsf
+    const alphaContactAngleFvPatchScalarField& acpsf
 )
 :
-    zeroGradientFvPatchScalarField(gcpsf)
+    fixedGradientFvPatchScalarField(acpsf),
+    limit_(acpsf.limit_)
 {}
 
 
 Foam::alphaContactAngleFvPatchScalarField::alphaContactAngleFvPatchScalarField
 (
-    const alphaContactAngleFvPatchScalarField& gcpsf,
+    const alphaContactAngleFvPatchScalarField& acpsf,
     const DimensionedField<scalar, volMesh>& iF
 )
 :
-    zeroGradientFvPatchScalarField(gcpsf, iF)
+    fixedGradientFvPatchScalarField(acpsf, iF),
+    limit_(acpsf.limit_)
 {}
 
 
+// * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
+
+void Foam::alphaContactAngleFvPatchScalarField::evaluate
+(
+    const Pstream::commsTypes
+)
+{
+    if (limit_ == lcGradient)
+    {
+        gradient() =
+        patch().deltaCoeffs()
+       *(
+           max(min
+           (
+               *this + gradient()/patch().deltaCoeffs(),
+               scalar(1)), scalar(0)
+           ) - *this
+       );
+    }
+    else if (limit_ == lcZeroGradient)
+    {
+        gradient() = 0.0;
+    }
+
+    fixedGradientFvPatchScalarField::evaluate();
+
+    if (limit_ == lcAlpha)
+    {
+        scalarField::operator=(max(min(*this, scalar(1)), scalar(0)));
+    }
+}
+
+
+void Foam::alphaContactAngleFvPatchScalarField::write
+(
+    Ostream& os
+) const
+{
+    fvPatchScalarField::write(os);
+    os.writeKeyword("limit")
+        << limitControlNames_[limit_] << token::END_STATEMENT << nl;
+}
+
+
 // ************************************************************************* //
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
index 91a13c2d..6e2c5720 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/alphaContactAngle/alphaContactAngleFvPatchScalarField.H
@@ -30,6 +30,31 @@ Description
     Derived classes must implement the theta() fuction which returns the
     wall contact angle field.
 
+    The essential entry "limit" controls the gradient of alpha1 on the wall:
+
+    limit none;         // Calculate the gradient from the contact-angle without
+                        // limiter
+
+    limit gradient;     // Limit the wall-gradient such that alpha1 remains
+                        // bounded on the wall
+
+    limit alpha;        // Bound the calculated alpha1 on the wall
+
+    limit zeroGradient; // Set the gradient of alpha1 to 0 on the wall
+                        // i.e. reproduce previous behaviour
+
+    Note that if any of the first three options are used the boundary condition
+    on p_rgh must set to guarantee that the flux is corrected to be zero at the
+    wall e.g.
+
+        walls
+        {
+            type            fixedFluxPressure;
+            adjoint         no;
+        }
+
+    If "limit zeroGradient;" is used the pressure BCs can be left as before.
+
 SourceFiles
     alphaContactAngleFvPatchScalarField.C
 
@@ -38,7 +63,7 @@ SourceFiles
 #ifndef alphaContactAngleFvPatchScalarField_H
 #define alphaContactAngleFvPatchScalarField_H
 
-#include "zeroGradientFvPatchFields.H"
+#include "fixedGradientFvPatchFields.H"
 #include "fvsPatchFields.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -52,7 +77,7 @@ namespace Foam
 
 class alphaContactAngleFvPatchScalarField
 :
-    public zeroGradientFvPatchScalarField
+    public fixedGradientFvPatchScalarField
 {
 
 public:
@@ -60,6 +85,17 @@ public:
     //- Runtime type information
     TypeName("alphaContactAngle");
 
+    //- Alpha limit options
+    enum limitControls
+    {
+        lcNone,
+        lcGradient,
+        lcZeroGradient,
+        lcAlpha
+    };
+
+    static const NamedEnum<limitControls, 4> limitControlNames_;
+    limitControls limit_;
 
     // Constructors
 
@@ -110,6 +146,15 @@ public:
             const fvPatchVectorField& Up,
             const fvsPatchVectorField& nHat
         ) const = 0;
+
+        //- Evaluate the patch field
+        virtual void evaluate
+        (
+            const Pstream::commsTypes commsType=Pstream::blocking
+        );
+
+        //- Write
+        virtual void write(Ostream&) const;
 };
 
 
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
index abe03fcc..c2917b3b 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/constantAlphaContactAngle/constantAlphaContactAngleFvPatchScalarField.C
@@ -64,7 +64,7 @@ constantAlphaContactAngleFvPatchScalarField
     const dictionary& dict
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF, dict),
     theta0_(readScalar(dict.lookup("theta0")))
 {
     evaluate();
@@ -112,7 +112,7 @@ void Foam::constantAlphaContactAngleFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    alphaContactAngleFvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
     writeEntry("value", os);
 }
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
index 37d7e1d1..eaeba417 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/dynamicAlphaContactAngle/dynamicAlphaContactAngleFvPatchScalarField.C
@@ -70,7 +70,7 @@ dynamicAlphaContactAngleFvPatchScalarField
     const dictionary& dict
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF, dict),
     theta0_(readScalar(dict.lookup("theta0"))),
     uTheta_(readScalar(dict.lookup("uTheta"))),
     thetaA_(readScalar(dict.lookup("thetaA"))),
@@ -145,7 +145,7 @@ Foam::dynamicAlphaContactAngleFvPatchScalarField::theta
 
 void Foam::dynamicAlphaContactAngleFvPatchScalarField::write(Ostream& os) const
 {
-    fvPatchScalarField::write(os);
+    alphaContactAngleFvPatchScalarField::write(os);
     os.writeKeyword("theta0") << theta0_ << token::END_STATEMENT << nl;
     os.writeKeyword("uTheta") << uTheta_ << token::END_STATEMENT << nl;
     os.writeKeyword("thetaA") << thetaA_ << token::END_STATEMENT << nl;
diff --git a/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C b/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
index fb6af3d2..a4b55a73 100644
--- a/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
+++ b/src/transportModels/interfaceProperties/alphaContactAngle/timeVaryingAlphaContactAngle/timeVaryingAlphaContactAngleFvPatchScalarField.C
@@ -71,7 +71,7 @@ timeVaryingAlphaContactAngleFvPatchScalarField
     const dictionary& dict
 )
 :
-    alphaContactAngleFvPatchScalarField(p, iF),
+    alphaContactAngleFvPatchScalarField(p, iF, dict),
     t0_(readScalar(dict.lookup("t0"))),
     thetaT0_(readScalar(dict.lookup("thetaT0"))),
     te_(readScalar(dict.lookup("te"))),
@@ -130,7 +130,7 @@ void Foam::timeVaryingAlphaContactAngleFvPatchScalarField::write
     Ostream& os
 ) const
 {
-    fvPatchScalarField::write(os);
+    alphaContactAngleFvPatchScalarField::write(os);
     os.writeKeyword("t0") << t0_ << token::END_STATEMENT << nl;
     os.writeKeyword("thetaT0") << thetaT0_ << token::END_STATEMENT << nl;
     os.writeKeyword("te") << te_ << token::END_STATEMENT << nl;
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.C b/src/transportModels/interfaceProperties/interfaceProperties.C
index 38927e7f..232686b7 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.C
+++ b/src/transportModels/interfaceProperties/interfaceProperties.C
@@ -47,25 +47,31 @@ const Foam::scalar Foam::interfaceProperties::convertToRad =
 
 void Foam::interfaceProperties::correctContactAngle
 (
-    surfaceVectorField::GeometricBoundaryField& nHatb
+    surfaceVectorField::GeometricBoundaryField& nHatb,
+    surfaceVectorField::GeometricBoundaryField& gradAlphaf
 ) const
 {
     const fvMesh& mesh = alpha1_.mesh();
-    const volScalarField::GeometricBoundaryField& gbf = alpha1_.boundaryField();
+    const volScalarField::GeometricBoundaryField& abf = alpha1_.boundaryField();
 
     const fvBoundaryMesh& boundary = mesh.boundary();
 
     forAll(boundary, patchi)
     {
-        if (isA<alphaContactAngleFvPatchScalarField>(gbf[patchi]))
+        if (isA<alphaContactAngleFvPatchScalarField>(abf[patchi]))
         {
-            const alphaContactAngleFvPatchScalarField& gcap =
-                refCast<const alphaContactAngleFvPatchScalarField>
-                (gbf[patchi]);
+            alphaContactAngleFvPatchScalarField& acap =
+                const_cast<alphaContactAngleFvPatchScalarField&>
+                (
+                    refCast<const alphaContactAngleFvPatchScalarField>
+                    (
+                        abf[patchi]
+                    )
+                );
 
             fvsPatchVectorField& nHatp = nHatb[patchi];
             scalarField theta =
-                convertToRad*gcap.theta(U_.boundaryField()[patchi], nHatp);
+                convertToRad*acap.theta(U_.boundaryField()[patchi], nHatp);
 
             vectorField nf = boundary[patchi].nf();
 
@@ -90,6 +96,8 @@ void Foam::interfaceProperties::correctContactAngle
             nHatp = a*nf + b*nHatp;
 
             nHatp /= (mag(nHatp) + deltaN_.value());
+
+            acap.gradient() = (nf & nHatp)*mag(gradAlphaf[patchi]);
         }
     }
 }
@@ -111,7 +119,7 @@ void Foam::interfaceProperties::calculateK()
 
     // Face unit interface normal
     surfaceVectorField nHatfv = gradAlphaf/(mag(gradAlphaf) + deltaN_);
-    correctContactAngle(nHatfv.boundaryField());
+    correctContactAngle(nHatfv.boundaryField(), gradAlphaf.boundaryField());
 
     // Face unit interface normal flux
     nHatf_ = nHatfv & Sf;
diff --git a/src/transportModels/interfaceProperties/interfaceProperties.H b/src/transportModels/interfaceProperties/interfaceProperties.H
index 6cf4d9ec..c91359e1 100644
--- a/src/transportModels/interfaceProperties/interfaceProperties.H
+++ b/src/transportModels/interfaceProperties/interfaceProperties.H
@@ -85,7 +85,8 @@ class interfaceProperties
         //  calculated from the component of U parallel to the wall
         void correctContactAngle
         (
-            surfaceVectorField::GeometricBoundaryField& nHat
+            surfaceVectorField::GeometricBoundaryField& nHat,
+            surfaceVectorField::GeometricBoundaryField& gradAlphaf
         ) const;
 
         //- Re-calculate the interface curvature
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G
new file mode 100644
index 00000000..3fb06e48
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/G
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      G;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 0 -3 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    ".*"
+    {
+        type            MarshakRadiation;
+        T               T;
+        emissivity      1;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault
new file mode 100644
index 00000000..6d86c343
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/IDefault
@@ -0,0 +1,32 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      IDefault;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 0 -3 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    ".*"
+    {
+        type            greyDiffusiveRadiation;
+        T               T;
+        emissivity      1.0;
+        value           uniform 0;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T
new file mode 100755
index 00000000..7f7a55c3
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/T
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    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 300;
+
+boundaryField
+{
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 300;
+        value           uniform 300;
+    }
+    sides
+    {
+        type            inletOutlet;
+        inletValue      uniform 300;
+        value           uniform 300;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 300;
+    }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
new file mode 100755
index 00000000..2bbac44e
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/U
@@ -0,0 +1,52 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    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
+{
+    outlet
+    {
+
+        type            inletOutlet;
+        inletValue      uniform (0 0 0);
+        value           uniform (0 0 0);
+
+    }
+    sides
+    {
+        type            pressureInletOutletVelocity;
+        outletValue     uniform (0 0 0);
+        value           uniform (0 0 0);
+    }
+    base
+    {
+        type            fixedValue;
+        value           uniform (0 0 0);
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform (0 0.05 0);
+    }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphaSgs b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphaSgs
new file mode 100755
index 00000000..02444d8b
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/alphaSgs
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    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
+{
+    outlet
+    {
+        type            zeroGradient;
+    }
+    sides
+    {
+        type            zeroGradient;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            zeroGradient;
+    }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/b b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/b
new file mode 100755
index 00000000..f9b7a942
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/b
@@ -0,0 +1,44 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    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 0;
+
+boundaryField
+{
+    outlet
+    {
+        type            zeroGradient;
+    }
+    sides
+    {
+        type            zeroGradient;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            zeroGradient;
+    }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ft b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ft
new file mode 100755
index 00000000..24ab5a5f
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/ft
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      ft;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    sides
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 1.0;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/fu b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/fu
new file mode 100755
index 00000000..8f2ead73
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/fu
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      fu;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    sides
+    {
+        type            inletOutlet;
+        inletValue      uniform 0;
+        value           uniform 0;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 1.0;
+    }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k
new file mode 100755
index 00000000..0e249ee9
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/k
@@ -0,0 +1,49 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    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 1e-4;
+
+boundaryField
+{
+    outlet
+    {
+        type            inletOutlet;
+        inletValue      uniform 1e-4;
+        value           uniform 1e-4;
+    }
+    sides
+    {
+        type            inletOutlet;
+        inletValue      uniform 1e-4;
+        value           uniform 1e-4;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            fixedValue;
+        value           uniform 1e-4;
+    }
+
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/muSgs b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/muSgs
new file mode 100755
index 00000000..5976eaed
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/muSgs
@@ -0,0 +1,43 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    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
+{
+    outlet
+    {
+        type            zeroGradient;
+    }
+    sides
+    {
+        type            zeroGradient;
+    }
+    base
+    {
+        type            zeroGradient;
+    }
+    inlet
+    {
+        type            zeroGradient;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p
new file mode 100755
index 00000000..7cc1c3ab
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    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 101325;
+
+boundaryField
+{
+    outlet
+    {
+        type           calculated;
+        value          $internalField;
+    }
+
+    sides
+    {
+        type           calculated;
+        value          $internalField;
+    }
+    base
+    {
+        type           calculated;
+        value          $internalField;
+    }
+    inlet
+    {
+        type           calculated;
+        value          $internalField;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
new file mode 100755
index 00000000..1f25f693
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/0/p_rgh
@@ -0,0 +1,48 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    location    "0";
+    object      p_rgh;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [1 -1 -2 0 0 0 0];
+
+internalField   uniform 101325;
+
+boundaryField
+{
+    outlet
+    {
+        type            buoyantPressure;
+        value           $internalField;
+    }
+
+    sides
+    {
+        type            fixedValue;
+        value           $internalField;
+    }
+    base
+    {
+        type            buoyantPressure;
+        value           $internalField;
+    }
+    inlet
+    {
+        type            buoyantPressure;
+        value           $internalField;
+    }
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
new file mode 100755
index 00000000..9ea9e89a
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/Allrun
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+# Source tutorial run functions
+. $WM_PROJECT_DIR/bin/tools/RunFunctions
+
+# Set application name
+application="fireFoam"
+
+runApplication blockMesh
+runApplication setSet -batch makeFaceSet.setSet
+runApplication createPatch -overwrite
+runApplication decomposePar -force
+
+# Run
+runParallel $application 4
+
+# -----------------------------------------------------------------------------
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties
new file mode 100644
index 00000000..cbaf3716
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/LESProperties
@@ -0,0 +1,84 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      binary;
+    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/fireFoam/les/smallPoolFire3D/constant/SpeciesTable b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/SpeciesTable
new file mode 100644
index 00000000..b96d5c07
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/SpeciesTable
@@ -0,0 +1,491 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      SpeciesTable;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+fields
+1
+(
+
+{
+    name            ft;
+    min             0;
+    max             1;
+    N               100;
+}
+
+)
+;
+output
+5
+(
+
+{
+    name            CH4;
+}
+
+
+{
+    name            CO2;
+}
+
+
+{
+    name            H2O;
+}
+
+
+{
+    name            CO;
+}
+
+
+{
+    name            soot;
+}
+
+)
+;
+values
+6
+(
+
+101
+(
+0.001
+0.011
+0.021
+0.031
+0.041
+0.051
+0.061
+0.071
+0.081
+0.091
+0.101
+0.111
+0.121
+0.131
+0.141
+0.151
+0.161
+0.171
+0.181
+0.191
+0.201
+0.211
+0.221
+0.231
+0.241
+0.251
+0.261
+0.271
+0.281
+0.291
+0.301
+0.311
+0.321
+0.331
+0.341
+0.351
+0.361
+0.371
+0.381
+0.391
+0.401
+0.411
+0.421
+0.431
+0.441
+0.451
+0.461
+0.471
+0.481
+0.491
+0.501
+0.511
+0.521
+0.531
+0.541
+0.551
+0.561
+0.571
+0.581
+0.591
+0.601
+0.611
+0.621
+0.631
+0.641
+0.651
+0.661
+0.671
+0.681
+0.691
+0.701
+0.711
+0.721
+0.731
+0.741
+0.751
+0.761
+0.771
+0.781
+0.791
+0.801
+0.811
+0.821
+0.831
+0.841
+0.851
+0.861
+0.871
+0.881
+0.891
+0.901
+0.911
+0.921
+0.931
+0.941
+0.951
+0.961
+0.971
+0.981
+0.991
+0.999
+)
+
+
+101
+(
+0
+0
+0
+0
+0
+0
+0.0105883
+0.0285208
+0.0461843
+0.0635849
+0.0807284
+0.0976204
+0.114266
+0.130672
+0.146842
+0.162782
+0.178496
+0.193989
+0.209266
+0.224332
+0.23919
+0.253845
+0.268301
+0.282563
+0.296633
+0.310517
+0.324216
+0.337736
+0.35108
+0.364251
+0.377252
+0.390087
+0.402759
+0.415271
+0.427625
+0.439826
+0.451876
+0.463777
+0.475532
+0.487144
+0.498616
+0.50995
+0.521148
+0.532214
+0.543149
+0.553955
+0.564635
+0.575191
+0.585626
+0.595941
+0.606138
+0.61622
+0.626187
+0.636044
+0.64579
+0.655428
+0.66496
+0.674387
+0.683712
+0.692935
+0.702059
+0.711085
+0.720014
+0.728849
+0.73759
+0.74624
+0.754799
+0.763269
+0.771652
+0.779948
+0.788159
+0.796287
+0.804332
+0.812297
+0.820181
+0.827987
+0.835715
+0.843367
+0.850943
+0.858445
+0.865875
+0.873232
+0.880518
+0.887735
+0.894882
+0.901961
+0.908974
+0.91592
+0.922802
+0.929619
+0.936373
+0.943064
+0.949694
+0.956263
+0.962772
+0.969222
+0.975614
+0.981948
+0.988226
+0.994448
+0.999385
+)
+
+
+101
+(
+0.00200328
+0.0213922
+0.0396804
+0.0569589
+0.0733092
+0.088804
+0.0940165
+0.0923125
+0.0906341
+0.0889806
+0.0873516
+0.0857465
+0.0841647
+0.0826058
+0.0810693
+0.0795547
+0.0780615
+0.0765893
+0.0751376
+0.073706
+0.0722942
+0.0709016
+0.0695279
+0.0681728
+0.0668357
+0.0655165
+0.0642147
+0.06293
+0.0616621
+0.0604105
+0.0591751
+0.0579555
+0.0567514
+0.0555625
+0.0543885
+0.0532292
+0.0520842
+0.0509534
+0.0498363
+0.0487329
+0.0476428
+0.0465658
+0.0455017
+0.0444503
+0.0434112
+0.0423844
+0.0413695
+0.0403664
+0.0393749
+0.0383948
+0.0374258
+0.0364678
+0.0355206
+0.0345841
+0.033658
+0.0327421
+0.0318364
+0.0309406
+0.0300546
+0.0291781
+0.0283112
+0.0274535
+0.026605
+0.0257655
+0.0249349
+0.024113
+0.0232997
+0.0224948
+0.0216983
+0.0209099
+0.0201297
+0.0193573
+0.0185928
+0.0178361
+0.0170869
+0.0163452
+0.0156108
+0.0148837
+0.0141638
+0.0134509
+0.0127449
+0.0120458
+0.0113535
+0.0106678
+0.00998859
+0.00931588
+0.00864953
+0.00798947
+0.00733558
+0.0066878
+0.00604604
+0.00541021
+0.00478022
+0.00415601
+0.00353749
+0.00292458
+0.00231721
+0.00171531
+0.00111879
+0.000527591
+5.8413e-05
+)
+
+
+101
+(
+0.00400655
+0.0427844
+0.0793607
+0.113918
+0.146618
+0.177608
+0.188033
+0.184625
+0.181268
+0.177961
+0.174703
+0.171493
+0.168329
+0.165212
+0.162139
+0.159109
+0.156123
+0.153179
+0.150275
+0.147412
+0.144588
+0.141803
+0.139056
+0.136346
+0.133671
+0.131033
+0.128429
+0.12586
+0.123324
+0.120821
+0.11835
+0.115911
+0.113503
+0.111125
+0.108777
+0.106458
+0.104168
+0.101907
+0.0996727
+0.0974658
+0.0952856
+0.0931317
+0.0910035
+0.0889006
+0.0868225
+0.0847688
+0.082739
+0.0807328
+0.0787498
+0.0767895
+0.0748516
+0.0729356
+0.0710413
+0.0691682
+0.067316
+0.0654843
+0.0636728
+0.0618812
+0.0601091
+0.0583563
+0.0566223
+0.054907
+0.05321
+0.051531
+0.0498697
+0.0482259
+0.0465993
+0.0449896
+0.0433965
+0.0418198
+0.0402593
+0.0387147
+0.0371857
+0.0356721
+0.0341737
+0.0326903
+0.0312216
+0.0297674
+0.0283276
+0.0269018
+0.0254899
+0.0240917
+0.022707
+0.0213355
+0.0199772
+0.0186318
+0.0172991
+0.0159789
+0.0146712
+0.0133756
+0.0120921
+0.0108204
+0.00956045
+0.00831202
+0.00707498
+0.00584917
+0.00463443
+0.00343062
+0.00223758
+0.00105518
+0.000116826
+)
+
+101{0}
+101{0}
+)
+;
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties
new file mode 100644
index 00000000..ee5ea210
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/combustionProperties
@@ -0,0 +1,31 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      combustionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+combustionModel    infinitelyFastChemistry;
+
+infinitelyFastChemistryCoeffs
+{
+    C       10.0;
+}
+
+noCombustionCoeffs
+{
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g
new file mode 100644
index 00000000..c644d2e7
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/g
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    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 -9.8 0);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/blockMeshDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/blockMeshDict
new file mode 100644
index 00000000..cd41bfad
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/blockMeshDict
@@ -0,0 +1,64 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      blockMeshDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+convertToMeters 1;
+
+vertices
+(
+    (-0.3 0   -0.3)
+    ( 0.3 0   -0.3)
+    ( 0.3 1.0 -0.3)
+    (-0.3 1.0 -0.3)
+    (-0.3 0    0.3)
+    ( 0.3 0    0.3)
+    ( 0.3 1.0  0.3)
+    (-0.3 1.0  0.3)
+
+);
+
+blocks
+(
+    hex (0 1 2 3 4 5 6 7) (70 70 70) simpleGrading (1 1 1)
+);
+
+edges
+(
+);
+
+patches
+(
+    patch base 
+    (
+        (0 1 5 4)
+    )
+    patch outlet
+    (
+        (3 2 6 7)
+    )
+    patch sides
+    (
+        (0 4 7 3)
+        (0 1 2 3)
+        (1 5 6 2)
+        (4 5 6 7)
+    )
+);
+
+mergePatchPairs
+(
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/boundary b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/boundary
new file mode 100644
index 00000000..56cb8082
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/polyMesh/boundary
@@ -0,0 +1,46 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7.x                                 |
+|   \\  /    A nd           | Web:      www.OpenFOAM.com                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       polyBoundaryMesh;
+    location    "constant/polyMesh";
+    object      boundary;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+4
+(
+    base
+    {
+        type            patch;
+        nFaces          4704;
+        startFace       1014300;
+    }
+    outlet
+    {
+        type            patch;
+        nFaces          4900;
+        startFace       1019004;
+    }
+    sides
+    {
+        type            patch;
+        nFaces          19600;
+        startFace       1023904;
+    }
+    inlet
+    {
+        type            patch;
+        nFaces          196;
+        startFace       1043504;
+    }
+)
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
new file mode 100644
index 00000000..80d29a07
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/radiationProperties
@@ -0,0 +1,150 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      radiationProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+radiation       on;
+
+radiationModel  fvDOM;
+
+noRadiation
+{
+}
+
+P1Coeffs
+{
+}
+
+fvDOMCoeffs
+{
+    nPhi    2;          // azimuthal angles in PI/2 on X-Y.(from Y to X)
+    nTheta  2;          // polar angles in PI (from Z to X-Y plane)
+    convergence 1e-3;   // convergence criteria for radiation iteration
+    maxIter 10;         // maximum number of iterations
+}
+
+// Number of flow iterations per radiation iteration
+solverFreq 10;
+
+absorptionEmissionModel constantAbsorptionEmission;
+
+constantAbsorptionEmissionCoeffs
+{
+    a               a [ 0 -1 0 0 0 0 0 ] 0.1;
+    e               e [ 0 -1 0 0 0 0 0 ] 0.1;
+    E               E [ 1 -1 -3 0 0 0 0 ] 0;
+}
+
+greyMeanAbsorptionEmissionCoeffs
+{
+    lookUpTableFileName     "SpeciesTable";
+
+    EhrrCoeff                0.0;
+
+    CO2
+    {
+        Tcommon         300;   //Common Temp
+        invTemp         true;   //Is the polynomio using inverse temperature.
+        Tlow            200;   //Low Temp
+        Thigh           2500;  //High Temp
+
+        loTcoeffs       //coefss for T < Tcommon
+        (
+            0           //  a0            +
+            0           //  a1*T          +
+            0           //  a2*T^(+/-)2   +
+            0           //  a3*T^(+/-)3   +
+            0           //  a4*T^(+/-)4   +
+            0           //  a5*T^(+/-)5   +
+        );
+        hiTcoeffs        //coefss for T > Tcommon
+        (
+            18.741
+            -121.31e3
+            273.5e6
+            -194.05e9
+            56.31e12
+            -5.8169e15
+        );
+
+    }
+
+    H2O
+    {
+        Tcommon         300;
+        invTemp         true;
+        Tlow            200;
+        Thigh           2500;
+
+        loTcoeffs
+        (
+            0
+            0
+            0
+            0
+            0
+            0
+        );
+        hiTcoeffs
+        (
+            -0.23093
+            -1.12390e3
+             9.4153e6
+            -2.99885e9
+             0.51382e12
+            -1.868e10
+        );
+    }
+
+    CH4
+    {
+        Tcommon         300;
+        Tlow            200;
+        Thigh           2500;
+        invTemp         false;
+
+        loTcoeffs
+        (
+            0
+            0
+            0
+            0
+            0
+            0
+        );
+        hiTcoeffs
+        (
+            6.6334
+            -0.0035686
+            1.6682e-8
+            2.5611e-10
+            -2.6558e-14
+            0
+        );
+    }
+
+}
+
+scatterModel    constantScatter;
+
+constantScatterCoeffs
+{
+    sigma           sigma [ 0 -1 0 0 0 0 0 ] 0;
+    C               C [ 0 0 0 0 0 0 0 ] 0;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
new file mode 100644
index 00000000..2625e5b5
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/thermophysicalProperties
@@ -0,0 +1,54 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          thermophysicalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+thermoType hsPsiMixtureThermo<veryInhomogeneousMixture<sutherlandTransport<specieThermo<janafThermo<perfectGas>>>>>;
+
+stoichiometricAirFuelMassRatio stoichiometricAirFuelMassRatio [0 0 0 0 0 0 0] 17.1271;
+stoichiometricOxygenFuelMassRatio stoichiometricOxygenFuelMassRatio [0 0 0 0 0 0 0] 4.0;
+qFuel qFuel [0 2 -2 0 0 0 0] 5.00264e+07;
+
+fuel fuel   1   16.0428
+    200 6000    1000
+    1.63543 0.0100844 -3.36924e-06 5.34973e-10 -3.15528e-14 -10005.6 9.9937
+    5.14988 -0.013671 4.91801e-05 -4.84744e-08 1.66694e-11 -10246.6 -4.64132
+    1.67212e-06 170.672;
+
+oxidant  oxidant   1   28.8504
+    200 6000    1000
+    3.10131 0.00124137 -4.18816e-07 6.64158e-11 -3.91274e-15 -985.266 5.35597
+    3.58378 -0.000727005 1.67057e-06 -1.09203e-10 -4.31765e-13 -1050.53 3.11239
+    1.67212e-06 170.672;
+
+reactants reactants  1   27.6004
+    200 6000    1000
+    2.95825 0.00210441 -7.06762e-07 1.12145e-10 -6.61028e-15 -1865.61 5.80859
+    3.73662 -0.00199028 6.30727e-06 -4.82941e-09 1.23723e-12 -1948.03 2.35566
+    1.67212e-06 170.672;
+
+burntProducts burntProducts  1   27.6334
+    200 6000    1000
+    3.0602 0.00182422 -5.93878e-07 8.93807e-11 -4.97595e-15 -10998.7 5.32209
+    3.54628 0.000378279 2.02797e-07 9.31602e-10 -6.84016e-13 -11102.1 2.90098
+    1.67212e-06 170.672;
+
+products  products  1   27.6004
+    200 6000    1000
+    3.05615 0.0018477 -6.01767e-07 9.06474e-11 -5.05149e-15 -10995.9 5.33537
+    3.55084 0.000338343 3.42018e-07 7.91162e-10 -6.34688e-13 -11099.7 2.87954
+    1.67212e-06 170.672;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties
new file mode 100644
index 00000000..81d4924e
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/constant/turbulenceProperties
@@ -0,0 +1,22 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      binary;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  LESModel;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/makeFaceSet.setSet b/tutorials/combustion/fireFoam/les/smallPoolFire3D/makeFaceSet.setSet
new file mode 100644
index 00000000..042be546
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/makeFaceSet.setSet
@@ -0,0 +1 @@
+faceSet f0 new boxToFace (-0.06 -0.001 -0.06)(0.06 0.005 0.06)
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict
new file mode 100644
index 00000000..cc0d4690
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/controlDict
@@ -0,0 +1,56 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version         2.0;
+    format          ascii;
+    class           dictionary;
+    object          controlDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+application     fireFoam;
+
+startFrom       latestTime;
+
+startTime       0.0;
+
+stopAt          endTime;
+
+endTime         10.0;
+
+deltaT          0.001;
+
+writeControl    adjustableRunTime;
+
+writeInterval   0.1;
+
+purgeWrite      0;
+
+writeFormat     ascii;
+
+writePrecision  6;
+
+writeCompression uncompressed;
+
+timeFormat      general;
+
+timePrecision   6;
+
+graphFormat     raw;
+
+runTimeModifiable yes;
+
+adjustTimeStep  yes;
+
+maxCo           0.25;
+
+maxDeltaT       0.1;
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict
new file mode 100644
index 00000000..29a07934
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/createPatchDict
@@ -0,0 +1,80 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    object      createPatchDict;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+// This application/dictionary controls:
+// - optional: create new patches from boundary faces (either given as
+//   a set of patches or as a faceSet)
+// - always: order faces on coupled patches such that they are opposite. This
+//   is done for all coupled faces, not just for any patches created.
+// - optional: synchronise points on coupled patches.
+
+// 1. Create cyclic:
+// - specify where the faces should come from
+// - specify the type of cyclic. If a rotational specify the rotationAxis
+//   and centre to make matching easier
+// - pointSync true to guarantee points to line up.
+
+// 2. Correct incorrect cyclic:
+// This will usually fail upon loading:
+//  "face 0 area does not match neighbour 2 by 0.0100005%"
+//  " -- possible face ordering problem."
+// - change patch type from 'cyclic' to 'patch' in the polyMesh/boundary file.
+// - loosen match tolerance to get case to load
+// - regenerate cyclic as above
+
+
+// Tolerance used in matching faces. Absolute tolerance is span of
+// face times this factor. To load incorrectly matches meshes set this
+// to a higher value.
+matchTolerance 1E-3;
+
+// Do a synchronisation of coupled points after creation of any patches.
+pointSync true;
+
+// Patches to create.
+patchInfo
+(
+    {
+        // Name of new patch
+        name inlet;
+
+        // Type of new patch
+        dictionary
+        {
+            type patch;
+
+            // Optional: explicitly set transformation tensor.
+            // Used when matching and synchronising points.
+            //transform translational;
+            //separationVector (-2289 0 0);
+            transform rotational;
+            rotationAxis (1 0 0);
+            rotationCentre (0 0 0);
+        }
+
+        // How to construct: either from 'patches' or 'set'
+        constructFrom set;
+
+        // If constructFrom = patches : names of patches. Wildcards allowed.
+        patches ("periodic.*");
+
+        // If constructFrom = set : name of faceSet
+        set f0;
+    }
+);
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict
new file mode 100644
index 00000000..04629781
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/decomposeParDict
@@ -0,0 +1,45 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      decomposeParDict;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+numberOfSubdomains 4;
+
+method          hierarchical;
+
+simpleCoeffs
+{
+    n               ( 1 2 2 );
+    delta           0.001;
+}
+
+hierarchicalCoeffs
+{
+    n               ( 1 2 2 );
+    delta           0.001;
+    order           xyz;
+}
+
+manualCoeffs
+{
+    dataFile        "cellDecomposition";
+}
+
+metisCoeffs
+{
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
new file mode 100644
index 00000000..c347e8dd
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSchemes
@@ -0,0 +1,74 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    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
+{
+    default         none;
+    div(phi,U)      Gauss linearUpwind Gauss linear;
+    div(phi,k)      Gauss upwind;
+    div(phi,ft_b_h) Gauss multivariateSelection
+    {
+        fu              limitedLinear 0.7;
+        ft              limitedLinear 0.7;
+        hs              limitedLinear 0.7;
+    };
+    div((muEff*dev2(grad(U).T()))) Gauss linear;
+    div(phiU,p)     Gauss linear;
+    div(Ji,Ii_h)    Gauss upwind;
+}
+
+laplacianSchemes
+{
+    default         none;
+    laplacian(muEff,U) Gauss linear corrected;
+    laplacian(DkEff,k) Gauss linear corrected;
+    laplacian(alphaEff,hs) Gauss linear corrected;
+    laplacian(alphaEff,fu) Gauss linear corrected;
+    laplacian(alphaEff,ft) Gauss linear corrected;
+    laplacian(interpolate((rho*(1|A(U)))),p_rgh) Gauss linear corrected;
+    laplacian(gammaRad,G) Gauss linear corrected;
+}
+
+interpolationSchemes
+{
+    default         linear;
+}
+
+snGradSchemes
+{
+    default         corrected;
+}
+
+fluxRequired
+{
+    default         no;
+    p_rgh;
+}
+
+
+// ************************************************************************* //
diff --git a/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
new file mode 100644
index 00000000..7febbc73
--- /dev/null
+++ b/tutorials/combustion/fireFoam/les/smallPoolFire3D/system/fvSolution
@@ -0,0 +1,137 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.7                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "system";
+    object      fvSolution;
+}
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+solvers
+{
+    rho
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       0;
+        relTol          0;
+    };
+
+    p_rgh
+    {
+        solver              GAMG;
+        tolerance           1e-7;
+        relTol              0.01;
+        smoother            GaussSeidel;
+        cacheAgglomeration  true;
+        nCellsInCoarsestLevel   10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    };
+
+    p_rghFinal
+    {
+        solver              GAMG;
+        tolerance           1e-7;
+        relTol              0;
+        smoother            GaussSeidel;
+        cacheAgglomeration  true;
+        nCellsInCoarsestLevel 10;
+        agglomerator     faceAreaPair;
+        mergeLevels      1;
+    };
+
+    ft
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-7;
+        relTol          0;
+        nSweeps         1;
+    };
+
+    fu
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-7;
+        relTol          0;
+        nSweeps         1;
+    };
+
+
+    U
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-7;
+        relTol          0.1;
+        nSweeps         1;
+    };
+
+    UFinal
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-7;
+        relTol          0;
+        nSweeps         1;
+    };
+
+    k
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-7;
+        relTol          0;
+        nSweeps         1;
+    };
+
+    hs
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-7;
+        relTol          0;
+    };
+
+    Ii
+    {
+        solver              GAMG;
+        tolerance           1e-5;
+        relTol              0.0;
+        smoother            DILU;
+        cacheAgglomeration  true;
+        nCellsInCoarsestLevel   10;
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
+
+    G
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-05;
+        relTol          0.;
+    }
+
+}
+
+PISO
+{
+    momentumPredictor yes;
+    nOuterCorrectors  1;
+    nCorrectors       2;
+    nNonOrthogonalCorrectors 0;
+}
+
+// ************************************************************************* //
diff --git a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
index 612a7209..0b632e54 100644
--- a/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
+++ b/tutorials/compressible/rhoCentralFoam/biconic25-55Run35/0/U
@@ -32416,7 +32416,7 @@ boundaryField
         Uwall           uniform (0 0 0);
         thermalCreep    on;
         curvature       on;
-        refValue        
+        refValue        nonuniform List<vector>
 255
 (
 (3.37115877925426 1.5719971556227 1.63068197702874e-10)
@@ -32676,7 +32676,7 @@ boundaryField
 (0.103666873607679 0 -6.64100738660639e-16)
 )
 ;
-        valueFraction   
+        valueFraction  nonuniform List<scalar> 
 255
 (
 0.00388739013936794
diff --git a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict
index fb809835..68af7d2d 100644
--- a/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict
+++ b/tutorials/multiphase/interDyMFoam/ras/sloshingTank3D6DoF/constant/dynamicMeshDict
@@ -23,7 +23,7 @@ solidBodyMotionFvMeshCoeffs
     SKACoeffs
     {
         CofG            ( 0 0 0 );
-        timeDataFileName "constant/6DoF.dat";
+        timeDataFileName "$FOAM_CASE/constant/6DoF.dat";
     }
 }