From 00fbaf627a860d1130786ab8e8ac01cf296bdde3 Mon Sep 17 00:00:00 2001
From: andy <a.heather@opencfd.co.uk>
Date: Fri, 13 Feb 2009 18:31:15 +0000
Subject: [PATCH] more updates...

---
 .../damBreakWithObstacle/0-orig/alpha1        |   2 +-
 .../0-orig/{alpah1.org => alpha1.org}         |   2 +-
 .../damBreakWithObstacle/0/alpha1             |   2 +-
 .../damBreakWithObstacle/0/alpha1.org         |   2 +-
 .../damBreakWithObstacle/system/fvSchemes     |   2 +-
 .../damBreakWithObstacle/system/setFieldsDict |   2 +-
 .../sloshingTank2D/0/{gamma.org => alpha1}    |   2 +-
 .../gamma.org => sloshingTank2D/0/alpha1.org} |   2 +-
 .../interDyMFoam/sloshingTank2D/Allclean      |   2 +-
 .../interDyMFoam/sloshingTank2D/Allrun        |   2 +-
 .../constant/turbulenceProperties             |  21 +++
 .../sloshingTank2D/system/fvSchemes           |   8 +-
 .../sloshingTank2D/system/fvSolution          |  16 ++-
 .../sloshingTank2D/system/setFieldsDict       |  14 +-
 .../interDyMFoam/sloshingTank2D3DoF/0/alpha1  |  37 ++++++
 .../sloshingTank2D3DoF/0/alpha1.org           |  37 ++++++
 .../interDyMFoam/sloshingTank2D3DoF/Allclean  |   2 +-
 .../interDyMFoam/sloshingTank2D3DoF/Allrun    |   2 +-
 .../constant/turbulenceProperties             |  21 +++
 .../sloshingTank2D3DoF/system/fvSchemes       |   8 +-
 .../sloshingTank2D3DoF/system/fvSolution      |  16 ++-
 .../sloshingTank2D3DoF/system/setFieldsDict   |  14 +-
 .../gamma.org => sloshingTank3D/0/alpha1.org} |   2 +-
 .../interDyMFoam/sloshingTank3D/Allclean      |   2 +-
 .../interDyMFoam/sloshingTank3D/Allrun        |   2 +-
 .../constant/turbulenceProperties             |  21 +++
 .../sloshingTank3D/system/fvSchemes           |   8 +-
 .../sloshingTank3D/system/fvSolution          |  16 ++-
 .../sloshingTank3D/system/setFieldsDict       |  14 +-
 .../0/alpha1.org}                             |   2 +-
 .../interDyMFoam/sloshingTank3D3DoF/Allclean  |   2 +-
 .../interDyMFoam/sloshingTank3D3DoF/Allrun    |   2 +-
 .../constant/turbulenceProperties             |  21 +++
 .../sloshingTank3D3DoF/system/fvSchemes       |   8 +-
 .../sloshingTank3D3DoF/system/fvSolution      |  16 ++-
 .../sloshingTank3D3DoF/system/setFieldsDict   |  14 +-
 .../0/alpha1.org}                             |   2 +-
 .../interDyMFoam/sloshingTank3D6DoF/Allclean  |   2 +-
 .../interDyMFoam/sloshingTank3D6DoF/Allrun    |   2 +-
 .../constant/turbulenceProperties             |  21 +++
 .../sloshingTank3D6DoF/system/fvSchemes       |   8 +-
 .../sloshingTank3D6DoF/system/fvSolution      |  16 ++-
 .../sloshingTank3D6DoF/system/setFieldsDict   |  14 +-
 .../damBreak4phase/0/alphas                   |   4 +-
 .../constant/environmentalProperties          |  21 +++
 .../constant/environmentalProperties.gz       | Bin 453 -> 0 bytes
 .../damBreak4phase/constant/motionProperties  |  21 +++
 .../constant/motionProperties.gz              | Bin 424 -> 0 bytes
 .../constant/transportProperties              |  45 +------
 .../constant/turbulenceProperties             |  21 +++
 .../damBreak4phase/system/controlDict         |   7 +-
 .../damBreak4phase/system/decomposeParDict    |  20 +--
 .../damBreak4phase/system/fvSchemes           |  10 +-
 .../damBreak4phase/system/fvSolution          | 120 ++++++++++--------
 .../damBreak4phase/system/setFieldsDict       |  17 +--
 .../damBreak4phaseFine/0/alphas               |   4 +-
 .../constant/environmentalProperties          |  21 +++
 .../constant/environmentalProperties.gz       | Bin 453 -> 0 bytes
 .../constant/motionProperties                 |  21 +++
 .../constant/motionProperties.gz              | Bin 424 -> 0 bytes
 .../constant/polyMesh/boundary                |  69 +++++-----
 .../constant/transportProperties              |  45 +------
 .../constant/turbulenceProperties             |  21 +++
 .../damBreak4phaseFine/system/controlDict     |   7 +-
 .../system/decomposeParDict                   |  20 +--
 .../damBreak4phaseFine/system/fvSchemes       |  10 +-
 .../damBreak4phaseFine/system/fvSolution      | 120 ++++++++++--------
 .../damBreak4phaseFine/system/fvSolution.par  |  75 -----------
 .../damBreak4phaseFine/system/setFieldsDict   |  19 ++-
 .../twoPhaseEulerFoam/bed/system/controlDict  |  37 +++++-
 .../twoPhaseEulerFoam/bed2/system/controlDict |  37 +++++-
 .../bubbleColumn/system/controlDict           |  37 +++++-
 72 files changed, 797 insertions(+), 443 deletions(-)
 rename tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/{alpah1.org => alpha1.org} (97%)
 rename tutorials/multiphase/interDyMFoam/sloshingTank2D/0/{gamma.org => alpha1} (97%)
 rename tutorials/multiphase/interDyMFoam/{sloshingTank2D3DoF/0/gamma.org => sloshingTank2D/0/alpha1.org} (97%)
 create mode 100644 tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/turbulenceProperties
 create mode 100644 tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1
 create mode 100644 tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1.org
 create mode 100644 tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/turbulenceProperties
 rename tutorials/multiphase/interDyMFoam/{sloshingTank3D3DoF/0/gamma.org => sloshingTank3D/0/alpha1.org} (97%)
 create mode 100644 tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/turbulenceProperties
 rename tutorials/multiphase/interDyMFoam/{sloshingTank3D6DoF/0/gamma.org => sloshingTank3D3DoF/0/alpha1.org} (97%)
 create mode 100644 tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/turbulenceProperties
 rename tutorials/multiphase/interDyMFoam/{sloshingTank3D/0/gamma.org => sloshingTank3D6DoF/0/alpha1.org} (97%)
 create mode 100644 tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/turbulenceProperties
 create mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties
 delete mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz
 create mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties
 delete mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz
 create mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/turbulenceProperties
 create mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties
 delete mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz
 create mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties
 delete mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz
 create mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/turbulenceProperties
 delete mode 100644 tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par

diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1 b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1
index 2e2bf16c3c..07881e9c0c 100644
--- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpah1.org b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpah1.org
rename to tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1.org
index 2e2bf16c3c..07881e9c0c 100644
--- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpah1.org
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0-orig/alpha1.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1 b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1
index 678ced5d4e..c6e0907e27 100644
--- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1
@@ -11,7 +11,7 @@ FoamFile
     format      ascii;
     class       volScalarField;
     location    "0";
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1.org b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1.org
index 2e2bf16c3c..07881e9c0c 100644
--- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1.org
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/0/alpha1.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes
index ffc5cd12c4..c563a4cd8f 100644
--- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/fvSchemes
@@ -24,7 +24,7 @@ gradSchemes
 {
     default         Gauss linear;
     grad(U)         Gauss linear;
-    grad(gamma)     Gauss linear;
+    grad(alpha)     Gauss linear;
 }
 
 divSchemes
diff --git a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict
index 21ee9f3f58..52522fe9a9 100644
--- a/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/damBreakWithObstacle/system/setFieldsDict
@@ -28,7 +28,7 @@ regions
         box ( 0 0 0 ) ( 0.6 0.1875 0.75 );
         fieldValues 
         (
-            volScalarFieldValue gamma 1
+            volScalarFieldValue alpha1 1
         );
     }
  );
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/sloshingTank2D/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1
index e7fbe1d082..8e28c332b7 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1.org
index e7fbe1d082..8e28c332b7 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/0/alpha1.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allclean b/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allclean
index 2ffbd01add..20c2a63671 100755
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allclean
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 foamCleanTutorials cases
-rm -rf 0/gamma.gz probes wallPressure pRefProbe
+rm -rf 0/alpha1.gz probes wallPressure pRefProbe
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allrun b/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allrun
index df799d7732..0d2a8c8222 100755
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/Allrun
@@ -4,6 +4,6 @@
 
 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
 runApplication blockMesh
-cp 0/gamma.org 0/gamma
+cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/turbulenceProperties
new file mode 100644
index 0000000000..886d34bdef
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes
index a6a73ef77f..3a940dbe40 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSchemes
@@ -24,14 +24,14 @@ gradSchemes
 {
     default         Gauss linear;
     grad(U)         Gauss linear;
-    grad(gamma)     Gauss linear;
+    grad(alpha1)     Gauss linear;
 }
 
 divSchemes
 {
     div(rho*phi,U)  Gauss vanLeerV;
-    div(phi,gamma)  Gauss vanLeer;
-    div(phirb,gamma) Gauss vanLeer;
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss vanLeer;
 }
 
 laplacianSchemes
@@ -54,7 +54,7 @@ fluxRequired
     default         no;
     pd              ;
     pcorr           ;
-    gamma           ;
+    alpha           ;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution
index a4dc358cda..2688ec1f98 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/fvSolution
@@ -94,14 +94,20 @@ PISO
     momentumPredictor no;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
-    nGammaCorr      1;
-    nGammaSubCycles 3;
-    cGamma          1.5;
+    nAlphaCorr      1;
+    nAlphaSubCycles 3;
+    cAlpha          1.5;
     correctPhi      no;
     pRefProbe
     {
-        fields          ( p );
-        probeLocations  ( ( 0 0 0.15 ) );
+        fields          
+        (
+            p
+        );
+        probeLocations
+        (
+            ( 0 0 0.15 )
+        );
     }
 
     pRefValue       100000;
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict
index 7c6f106504..7ff571c6d1 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D/system/setFieldsDict
@@ -15,9 +15,19 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defaultFieldValues ( volScalarFieldValue gamma 0 );
+defaultFieldValues
+(
+    volScalarFieldValue alpha1 0
+);
 
-regions         ( boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } );
+regions
+(
+    boxToCell
+    {
+        box ( -100 -100 -100 ) ( 100 100 0 );
+        fieldValues ( volScalarFieldValue alpha1 1 );
+    }
+);
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1 b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1
new file mode 100644
index 0000000000..8e28c332b7
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alpha1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    front
+    {
+        type            empty;
+    }
+    back
+    {
+        type            empty;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1.org b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1.org
new file mode 100644
index 0000000000..8e28c332b7
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/0/alpha1.org
@@ -0,0 +1,37 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       volScalarField;
+    object      alpha1;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+dimensions      [0 0 0 0 0 0 0];
+
+internalField   uniform 0;
+
+boundaryField
+{
+    front
+    {
+        type            empty;
+    }
+    back
+    {
+        type            empty;
+    }
+    walls
+    {
+        type            zeroGradient;
+    }
+}
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allclean
index 2ffbd01add..20c2a63671 100755
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allclean
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 foamCleanTutorials cases
-rm -rf 0/gamma.gz probes wallPressure pRefProbe
+rm -rf 0/alpha1.gz probes wallPressure pRefProbe
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allrun
index df799d7732..0d2a8c8222 100755
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/Allrun
@@ -4,6 +4,6 @@
 
 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
 runApplication blockMesh
-cp 0/gamma.org 0/gamma
+cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/turbulenceProperties
new file mode 100644
index 0000000000..886d34bdef
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes
index a6a73ef77f..d4eb5a1966 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSchemes
@@ -24,14 +24,14 @@ gradSchemes
 {
     default         Gauss linear;
     grad(U)         Gauss linear;
-    grad(gamma)     Gauss linear;
+    grad(alpha)     Gauss linear;
 }
 
 divSchemes
 {
     div(rho*phi,U)  Gauss vanLeerV;
-    div(phi,gamma)  Gauss vanLeer;
-    div(phirb,gamma) Gauss vanLeer;
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss vanLeer;
 }
 
 laplacianSchemes
@@ -54,7 +54,7 @@ fluxRequired
     default         no;
     pd              ;
     pcorr           ;
-    gamma           ;
+    alpha           ;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution
index a4dc358cda..ce22769b82 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/fvSolution
@@ -94,14 +94,20 @@ PISO
     momentumPredictor no;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
-    nGammaCorr      1;
-    nGammaSubCycles 3;
-    cGamma          1.5;
+    nAlphaCorr      1;
+    nAlphaSubCycles 3;
+    cAlpha          1.5;
     correctPhi      no;
     pRefProbe
     {
-        fields          ( p );
-        probeLocations  ( ( 0 0 0.15 ) );
+        fields
+        (
+            p
+        );
+        probeLocations
+        (
+            ( 0 0 0.15 )
+        );
     }
 
     pRefValue       100000;
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict
index 7c6f106504..7ff571c6d1 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank2D3DoF/system/setFieldsDict
@@ -15,9 +15,19 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defaultFieldValues ( volScalarFieldValue gamma 0 );
+defaultFieldValues
+(
+    volScalarFieldValue alpha1 0
+);
 
-regions         ( boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } );
+regions
+(
+    boxToCell
+    {
+        box ( -100 -100 -100 ) ( 100 100 0 );
+        fieldValues ( volScalarFieldValue alpha1 1 );
+    }
+);
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/alpha1.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D/0/alpha1.org
index f1c22f9741..4bf9e5b171 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/alpha1.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allclean b/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allclean
index 2ffbd01add..20c2a63671 100755
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allclean
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allclean
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 foamCleanTutorials cases
-rm -rf 0/gamma.gz probes wallPressure pRefProbe
+rm -rf 0/alpha1.gz probes wallPressure pRefProbe
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allrun b/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allrun
index df799d7732..0d2a8c8222 100755
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allrun
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/Allrun
@@ -4,6 +4,6 @@
 
 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
 runApplication blockMesh
-cp 0/gamma.org 0/gamma
+cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/turbulenceProperties
new file mode 100644
index 0000000000..886d34bdef
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes
index a6a73ef77f..d4eb5a1966 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSchemes
@@ -24,14 +24,14 @@ gradSchemes
 {
     default         Gauss linear;
     grad(U)         Gauss linear;
-    grad(gamma)     Gauss linear;
+    grad(alpha)     Gauss linear;
 }
 
 divSchemes
 {
     div(rho*phi,U)  Gauss vanLeerV;
-    div(phi,gamma)  Gauss vanLeer;
-    div(phirb,gamma) Gauss vanLeer;
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss vanLeer;
 }
 
 laplacianSchemes
@@ -54,7 +54,7 @@ fluxRequired
     default         no;
     pd              ;
     pcorr           ;
-    gamma           ;
+    alpha           ;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution
index a4dc358cda..ce22769b82 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/fvSolution
@@ -94,14 +94,20 @@ PISO
     momentumPredictor no;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
-    nGammaCorr      1;
-    nGammaSubCycles 3;
-    cGamma          1.5;
+    nAlphaCorr      1;
+    nAlphaSubCycles 3;
+    cAlpha          1.5;
     correctPhi      no;
     pRefProbe
     {
-        fields          ( p );
-        probeLocations  ( ( 0 0 0.15 ) );
+        fields
+        (
+            p
+        );
+        probeLocations
+        (
+            ( 0 0 0.15 )
+        );
     }
 
     pRefValue       100000;
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict
index 7c6f106504..2f947e6241 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D/system/setFieldsDict
@@ -15,9 +15,19 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defaultFieldValues ( volScalarFieldValue gamma 0 );
+defaultFieldValues
+(
+    volScalarFieldValue alpha1 0
+);
 
-regions         ( boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } );
+regions
+( 
+    boxToCell
+    {
+        box ( -100 -100 -100 ) ( 100 100 0 );
+        fieldValues ( volScalarFieldValue alpha1 1 );
+    }
+);
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/alpha1.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/alpha1.org
index f1c22f9741..4bf9e5b171 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/0/alpha1.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allclean b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allclean
index 2ffbd01add..20c2a63671 100755
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allclean
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 foamCleanTutorials cases
-rm -rf 0/gamma.gz probes wallPressure pRefProbe
+rm -rf 0/alpha1.gz probes wallPressure pRefProbe
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allrun b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allrun
index df799d7732..0d2a8c8222 100755
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/Allrun
@@ -4,6 +4,6 @@
 
 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
 runApplication blockMesh
-cp 0/gamma.org 0/gamma
+cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/turbulenceProperties
new file mode 100644
index 0000000000..886d34bdef
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes
index a6a73ef77f..d4eb5a1966 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSchemes
@@ -24,14 +24,14 @@ gradSchemes
 {
     default         Gauss linear;
     grad(U)         Gauss linear;
-    grad(gamma)     Gauss linear;
+    grad(alpha)     Gauss linear;
 }
 
 divSchemes
 {
     div(rho*phi,U)  Gauss vanLeerV;
-    div(phi,gamma)  Gauss vanLeer;
-    div(phirb,gamma) Gauss vanLeer;
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss vanLeer;
 }
 
 laplacianSchemes
@@ -54,7 +54,7 @@ fluxRequired
     default         no;
     pd              ;
     pcorr           ;
-    gamma           ;
+    alpha           ;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution
index a4dc358cda..ce22769b82 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/fvSolution
@@ -94,14 +94,20 @@ PISO
     momentumPredictor no;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
-    nGammaCorr      1;
-    nGammaSubCycles 3;
-    cGamma          1.5;
+    nAlphaCorr      1;
+    nAlphaSubCycles 3;
+    cAlpha          1.5;
     correctPhi      no;
     pRefProbe
     {
-        fields          ( p );
-        probeLocations  ( ( 0 0 0.15 ) );
+        fields
+        (
+            p
+        );
+        probeLocations
+        (
+            ( 0 0 0.15 )
+        );
     }
 
     pRefValue       100000;
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict
index 7c6f106504..7ff571c6d1 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D3DoF/system/setFieldsDict
@@ -15,9 +15,19 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defaultFieldValues ( volScalarFieldValue gamma 0 );
+defaultFieldValues
+(
+    volScalarFieldValue alpha1 0
+);
 
-regions         ( boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } );
+regions
+(
+    boxToCell
+    {
+        box ( -100 -100 -100 ) ( 100 100 0 );
+        fieldValues ( volScalarFieldValue alpha1 1 );
+    }
+);
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/gamma.org b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/alpha1.org
similarity index 97%
rename from tutorials/multiphase/interDyMFoam/sloshingTank3D/0/gamma.org
rename to tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/alpha1.org
index f1c22f9741..4bf9e5b171 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D/0/gamma.org
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/0/alpha1.org
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      gamma;
+    object      alpha1;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allclean b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allclean
index 2ffbd01add..20c2a63671 100755
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allclean
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allclean
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 foamCleanTutorials cases
-rm -rf 0/gamma.gz probes wallPressure pRefProbe
+rm -rf 0/alpha1.gz probes wallPressure pRefProbe
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allrun b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allrun
index df799d7732..0d2a8c8222 100755
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allrun
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/Allrun
@@ -4,6 +4,6 @@
 
 m4 constant/polyMesh/blockMeshDict.m4 > constant/polyMesh/blockMeshDict
 runApplication blockMesh
-cp 0/gamma.org 0/gamma
+cp 0/alpha1.org 0/alpha1
 runApplication setFields
 runApplication interDyMFoam
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/turbulenceProperties b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/turbulenceProperties
new file mode 100644
index 0000000000..886d34bdef
--- /dev/null
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes
index a6a73ef77f..d4eb5a1966 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSchemes
@@ -24,14 +24,14 @@ gradSchemes
 {
     default         Gauss linear;
     grad(U)         Gauss linear;
-    grad(gamma)     Gauss linear;
+    grad(alpha)     Gauss linear;
 }
 
 divSchemes
 {
     div(rho*phi,U)  Gauss vanLeerV;
-    div(phi,gamma)  Gauss vanLeer;
-    div(phirb,gamma) Gauss vanLeer;
+    div(phi,alpha)  Gauss vanLeer;
+    div(phirb,alpha) Gauss vanLeer;
 }
 
 laplacianSchemes
@@ -54,7 +54,7 @@ fluxRequired
     default         no;
     pd              ;
     pcorr           ;
-    gamma           ;
+    alpha           ;
 }
 
 
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution
index a4dc358cda..ce22769b82 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/fvSolution
@@ -94,14 +94,20 @@ PISO
     momentumPredictor no;
     nCorrectors     2;
     nNonOrthogonalCorrectors 0;
-    nGammaCorr      1;
-    nGammaSubCycles 3;
-    cGamma          1.5;
+    nAlphaCorr      1;
+    nAlphaSubCycles 3;
+    cAlpha          1.5;
     correctPhi      no;
     pRefProbe
     {
-        fields          ( p );
-        probeLocations  ( ( 0 0 0.15 ) );
+        fields
+        (
+            p
+        );
+        probeLocations
+        (
+            ( 0 0 0.15 )
+        );
     }
 
     pRefValue       100000;
diff --git a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict
index 7c6f106504..7ff571c6d1 100644
--- a/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict
+++ b/tutorials/multiphase/interDyMFoam/sloshingTank3D6DoF/system/setFieldsDict
@@ -15,9 +15,19 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-defaultFieldValues ( volScalarFieldValue gamma 0 );
+defaultFieldValues
+(
+    volScalarFieldValue alpha1 0
+);
 
-regions         ( boxToCell { box ( -100 -100 -100 ) ( 100 100 0 ) ; fieldValues ( volScalarFieldValue gamma 1 ) ; } );
+regions
+(
+    boxToCell
+    {
+        box ( -100 -100 -100 ) ( 100 100 0 );
+        fieldValues ( volScalarFieldValue alpha1 1 );
+    }
+);
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphas b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphas
index cf02a7c746..4d7076770a 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/0/alphas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alphas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -2314,4 +2315,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties
new file mode 100644
index 0000000000..a866ff549f
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/environmentalProperties.gz
deleted file mode 100644
index 31adad952e844b111b333a99dde33c8526515d6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 453
zcmV;$0XqI4iwFom=F36=17&V@X>xCFZDnqBVQf%xZ*XODbZKRC0IgF^Z`3dlz57=@
z?Fm-eI9)EVD<lduCrUYRK%yL`j<aj(*u{1#Rh0kEI8JwiP;WcFMDym&y!nWf_`26<
zuFfy<CHS9OB}j?JSiOOE_a=DPYnR9}dZ$A&ItsZItJ9jm+b6@5J)$)#8Sf}O2wYzm
zubklmll$mo?`P^+JDydK!kTfI)KG8i!v>9~{u`8co!Je6a(Q$-jLc%%oKyq=4UD$!
zJXap(y$+Gd8?38WW7ri~KuK7_SW-LixP8ZxZ!F<cYO68y9OT;n>Rhtd+zoch@ra9_
zjNRbE{TfW*&fbk_D&?!;_T&p%N|Enk9M1=e8XphKsf5V>d^6(rD0OQ7(80Q@w<FN`
z&{I0LMo}5F6(bhBpCQ0P?tQOiOw5sLA54@Tmnok-RT%~+)4;GH8>Mkchpb~!N~tVz
zp01_-eb96};l{;8P90(vy!7lz6K=gCJLfMZoyt;-GvIioh3Id_zvy7k+~HRI5qYG`
vlRYVg*x_H>;d_lUtk$T@`+*lVR&T1;XQ*FtN27#OS(fk@-4#xXQUm}1A-m#C

diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties
new file mode 100644
index 0000000000..f1a454040c
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      motionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+movingFvMesh    staticFvMesh;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/motionProperties.gz
deleted file mode 100644
index 9a00803de5076734e3004994938dd844e9e67365..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 424
zcmV;Z0ayMXiwFom=F36=18r|~X>V>&a&K^Da&&2Ba{#SVJx{|h5Z(PNP8}-|BiLFY
z@tKJN0|Nug;W+fbA7DF`5b)nQ+o6qM?PW>c-Mjbh>_`dsYYpw~*$VE0f6*#|l+cpV
z3$Q+scMQMjkVr=%=i*?$A>iaU;5WXYBbAjgd<b}atf-vi1&r_xWb_6tn}+|kp_WgI
zxw=J5=3@b^NBaQEyPlqhfSC$CkDpmgo06(BKntWzH|>?zx6vUoc>zbwaVfh6Hc%VZ
zGPcwWykOt6*C&H;ow}x!o&mb<pU#R=dK=8x;|s1Vl3Bo&dmkw9WT&M~qkJ>G?)_xu
zQskRZ)^mYT!{zo=8X+>CZ;ALUR>$GD6C5>%%aZ7Qu$XqEVN^s*QF6iiNd{mh*WPLw
z6LX|m2a2+1nfl6Gm0@r)4V)%4QIbnKWFNCCrLxIsyAJJn(D*v$$;E_DZEI$H=ov|4
z-gt#(%AbusmBAP%iQV<AME_L&n{E8PfJ^Z$@-F9ld!!V?`VG0~cC*rPomF|1M5=zX
S@glgd$bvt{5swio1ONcmanfx7

diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/transportProperties
index a9fcefae0d..99ccf063b9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,51 +10,16 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases
-(
-    water
-    {
-        transportModel  Newtonian;
-        nu              nu [0 2 -1 0 0 0 0] 1e-06;
-        rho             rho [1 -3 0 0 0 0 0] 1000;
-    }
+phases          ( water { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 1000 ; } oil { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 500 ; } mercury { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07 ; rho rho [ 1 -3 0 0 0 0 0 ] 13529 ; } air { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05 ; rho rho [ 1 -3 0 0 0 0 0 ] 1 ; } );
 
-    oil
-    {
-        transportModel  Newtonian;
-        nu              nu [0 2 -1 0 0 0 0] 1e-06;
-        rho             rho [1 -3 0 0 0 0 0] 500;
-    }
+refPhase        air;
 
-    mercury
-    {
-        transportModel  Newtonian;
-        nu              nu [0 2 -1 0 0 0 0] 0.1125e-06;
-        rho             rho [1 -3 0 0 0 0 0] 13529;
-    }
+sigmas          ( ( air water ) 0.07 ( air oil ) 0.07 ( air mercury ) 0.07 ( water oil ) 0.07 ( water mercury ) 0.07 ( oil mercury ) 0.07 );
 
-    air
-    {
-        transportModel  Newtonian;
-        nu              nu [0 2 -1 0 0 0 0] 1.48e-05;
-        rho             rho [1 -3 0 0 0 0 0] 1;
-    }
-);
-
-refPhase air;
-
-sigmas
-(
-    (air water) 0.07
-    (air oil)   0.07
-    (air mercury)   0.07
-    (water oil) 0.07
-    (water mercury) 0.07
-    (oil mercury) 0.07
-);
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/turbulenceProperties
new file mode 100644
index 0000000000..886d34bdef
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/controlDict
index 03b8dd3bef..7a68f62840 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 startFrom       latestTime;
 
 startTime       0;
@@ -47,6 +47,7 @@ adjustTimeStep  yes;
 
 maxCo           0.5;
 
-maxDeltaT       1.0;
+maxDeltaT       1;
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/decomposeParDict
index cf0067afd3..bf8dffb737 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      decomposeParDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method          simple;
 
 simpleCoeffs
 {
-    n               (2 2 1);
+    n               ( 2 2 1 );
     delta           0.001;
 }
 
 hierarchicalCoeffs
 {
-    n               (1 1 1);
+    n               ( 1 1 1 );
     delta           0.001;
     order           xyz;
 }
 
 metisCoeffs
 {
-    processorWeights 
-    (
-        1
-        1
-        1
-        1
-    );
+    processorWeights ( 1 1 1 1 );
 }
 
 manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
 
 distributed     no;
 
-roots           
-(
-);
+roots           ( );
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSchemes
index 8f44bf9fcd..6443d5f3d9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,13 +10,14 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 ddtSchemes
 {
-    default Euler;
+    default         Euler;
 }
 
 gradSchemes
@@ -29,8 +30,8 @@ gradSchemes
 divSchemes
 {
     div(rho*phi,U)  Gauss upwind;
-    div(phi,alpha)  Gauss limitedLimitedLinear 1.0 -0.00001 1.00001;
-    div(phic,alpha) Gauss interfaceCompression; //upwind;
+    div(phi,alpha)  Gauss limitedLimitedLinear 1 -1e-05 1.00001;
+    div(phic,alpha) Gauss interfaceCompression;
 }
 
 laplacianSchemes
@@ -53,4 +54,5 @@ fluxRequired
     default         yes;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSolution
index 78c0ce45be..8c303f9540 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,83 +10,92 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 solvers
 {
-    pcorr PCG
+    pcorr
     {
-        preconditioner   GAMG
+        solver          PCG;
+        preconditioner
         {
-            tolerance        1e-5;
-            relTol           0;
-
-            smoother         GaussSeidel;
-            nPreSweeps       0;
-            nPostSweeps      2;
-            nBottomSweeps    2;
-
+            preconditioner  GAMG;
+            tolerance       1e-05;
+            relTol          0;
+            smoother        GaussSeidel;
+            nPreSweeps      0;
+            nPostSweeps     2;
+            nBottomSweeps   2;
             cacheAgglomeration off;
             nCellsInCoarsestLevel 10;
-            agglomerator     faceAreaPair;
-            mergeLevels      2;
-        };
+            agglomerator    faceAreaPair;
+            mergeLevels     2;
+        }
 
-        tolerance        1e-5;
-        relTol           0;
-        maxIter          100;
-    };
+        tolerance       1e-05;
+        relTol          0;
+        maxIter         100;
+    }
 
-    pd GAMG
+    pd
     {
-        tolerance        1e-7;
-        relTol           0.05;
-
-        smoother         GaussSeidel;
-        nPreSweeps       0;
-        nPostSweeps      2;
-        nFinestSweeps    2;
-
+        solver          GAMG;
+        tolerance       1e-07;
+        relTol          0.05;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        nFinestSweeps   2;
         cacheAgglomeration on;
         nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
-    };
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
 
-    pdFinal PCG
+    pdFinal
     {
-        preconditioner GAMG
+        solver          PCG;
+        preconditioner
         {
-            tolerance        1e-7;
-            relTol           0;
-
-            nVcycles         2;
-
-            smoother         GaussSeidel;
-            nPreSweeps       0;
-            nPostSweeps      2;
-            nFinestSweeps    2;
-
+            preconditioner  GAMG;
+            tolerance       1e-07;
+            relTol          0;
+            nVcycles        2;
+            smoother        GaussSeidel;
+            nPreSweeps      0;
+            nPostSweeps     2;
+            nFinestSweeps   2;
             cacheAgglomeration on;
             nCellsInCoarsestLevel 10;
-            agglomerator     faceAreaPair;
-            mergeLevels      1;
-        };
+            agglomerator    faceAreaPair;
+            mergeLevels     1;
+        }
 
-        tolerance        1e-7;
-        relTol           0;
-        maxIter          20;
-    };
+        tolerance       1e-07;
+        relTol          0;
+        maxIter         20;
+    }
 
-    alpha smoothSolver
+    U
     {
-        smoother         GaussSeidel;
-        tolerance        1e-8;
-        relTol           0;
-        nSweeps          1;
-    };
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-08;
+        relTol          0;
+        nSweeps         1;
+    }
+
+    alpha
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-08;
+        relTol          0;
+        nSweeps         1;
+    }
 }
 
 PISO
@@ -99,4 +108,5 @@ PISO
     cAlpha          4;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/setFieldsDict
index 664126f092..45ec79a508 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phase/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,15 +21,14 @@ defaultFieldValues
     volScalarFieldValue alphaWater 0
     volScalarFieldValue alphaOil 0
     volScalarFieldValue alphaMercury 0
-    volVectorFieldValue U (0 0 0)
+    volVectorFieldValue U ( 0 0 0 )
 );
 
 regions
 (
     boxToCell
     {
-        box (0 0 -1) (0.1461 0.292 1);
-
+        box ( 0 0 -1 ) ( 0.1461 0.292 1 );
         fieldValues
         (
             volScalarFieldValue alphaWater 1
@@ -37,11 +37,9 @@ regions
             volScalarFieldValue alphaAir 0
         );
     }
-
     boxToCell
     {
-        box (0.1461 0 -1) (0.2922 0.292 1);
-
+        box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 );
         fieldValues
         (
             volScalarFieldValue alphaWater 0
@@ -50,11 +48,9 @@ regions
             volScalarFieldValue alphaAir 0
         );
     }
-
     boxToCell
     {
-        box (0 0 -1) (0.1461 0.1 1);
-
+        box ( 0 0 -1 ) ( 0.1461 0.1 1 );
         fieldValues
         (
             volScalarFieldValue alphaWater 0
@@ -65,4 +61,5 @@ regions
     }
 );
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphas b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphas
index 2e89a3f614..99b42c75e4 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphas
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/0/alphas
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
+    location    "0";
     object      alphas;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -34246,4 +34247,5 @@ boundaryField
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties
new file mode 100644
index 0000000000..a866ff549f
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      environmentalProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+g               g [ 0 1 -2 0 0 0 0 ] ( 0 -9.81 0 );
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/environmentalProperties.gz
deleted file mode 100644
index 6453a0d982a113f7bc9d762741d6959824aae3bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 453
zcmV;$0XqI4iwFpkh0;O*17&V@X>xCFZDnqBVQf%xZ*XODbZKRC0IgF^Z`3dlz57=@
z?Fm-eI9)EVD<lduCrUYRK%yL`j<aj(*u{1#Rh0kEI8JwiP;WcFMDym&y!nWf_`26<
zuFfy<CHS9OB}j?JSiOOE_a=DPYnR9}dZ$A&ItsZItJ9jm+b6@5J)$)#8Sf}O2wYzm
zubklmll$mo?`P^+JDydK!kTfI)KG8i!v>9~{u`8co!Je6a(Q$-jLc%%oKyq=4UD$!
zJXap(y$+Gd8?38WW7ri~KuK7_SW-LixP8ZxZ!F<cYO68y9OT;n>Rhtd+zoch@ra9_
zjNRbE{TfW*&fbk_D&?!;_T&p%N|Enk9M1=e8XphKsf5V>d^6(rD0OQ7(80Q@w<FN`
z&{I0LMo}5F6(bhBpCQ0P?tQOiOw5sLA54@Tmnok-RT%~+)4;GH8>Mkchpb~!N~tVz
zp01_-eb96};l{;8P90(vy!7lz6K=gCJLfMZoyt;-GvIioh3Id_zvy7k+~HRI5qYG`
vlRYVg*x_H>;d_lUtk$T@`+*lVR&T1;XQ*FtN27#OS(fk@-4#xXQUm}1702R5

diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties
new file mode 100644
index 0000000000..f1a454040c
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      motionProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+movingFvMesh    staticFvMesh;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/motionProperties.gz
deleted file mode 100644
index 32e8c0015a4e4735b3242dd2249e4ade10ce2207..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 424
zcmV;Z0ayMXiwFpkh0;O*18r|~X>V>&a&K^Da&&2Ba{#SVJx{|h5Z(PNP8}-|BiLFY
z@tKJN0|Nug;W+fbA7DF`5b)nQ+o6qM?PW>c-Mjbh>_`dsYYpw~*$VE0f6*#|l+cpV
z3$Q+scMQMjkVr=%=i*?$A>iaU;5WXYBbAjgd<b}atf-vi1&r_xWb_6tn}+|kp_WgI
zxw=J5=3@b^NBaQEyPlqhfSC$CkDpmgo06(BKntWzH|>?zx6vUoc>zbwaVfh6Hc%VZ
zGPcwWykOt6*C&H;ow}x!o&mb<pU#R=dK=8x;|s1Vl3Bo&dmkw9WT&M~qkJ>G?)_xu
zQskRZ)^mYT!{zo=8X+>CZ;ALUR>$GD6C5>%%aZ7Qu$XqEVN^s*QF6iiNd{mh*WPLw
z6LX|m2a2+1nfl6Gm0@r)4V)%4QIbnKWFNCCrLxIsyAJJn(D*v$$;E_DZEI$H=ov|4
z-gt#(%AbusmBAP%iQV<AME_L&n{E8PfJ^Z$@-F9ld!!V?`VG0~cC*rPomF|1M5=zX
S@glgd$bvt{5swio1ONcbNYZ8i

diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary
index aed2dc2055..04429b16df 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/polyMesh/boundary
@@ -1,8 +1,8 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|  \\    /   O peration     | Version:  dev                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,46 +10,43 @@ FoamFile
     version     2.0;
     format      ascii;
     class       polyBoundaryMesh;
+    location    "constant/polyMesh";
     object      boundary;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 5
 (
-leftWall
-{
-    type wall;
-    nFaces 195;
-    startFace 68014;
-}
-
-rightWall
-{
-    type wall;
-    nFaces 195;
-    startFace 68209;
-}
-
-lowerWall
-{
-    type wall;
-    nFaces 206;
-    startFace 68404;
-}
-
-atmosphere
-{
-    type patch;
-    nFaces 176;
-    startFace 68610;
-}
-
-defaultFaces
-{
-    type empty;
-    nFaces 68400;
-    startFace 68786;
-}
+    leftWall
+    {
+        type            wall;
+        nFaces          195;
+        startFace       68014;
+    }
+    rightWall
+    {
+        type            wall;
+        nFaces          195;
+        startFace       68209;
+    }
+    lowerWall
+    {
+        type            wall;
+        nFaces          206;
+        startFace       68404;
+    }
+    atmosphere
+    {
+        type            patch;
+        nFaces          176;
+        startFace       68610;
+    }
+    defaultFaces
+    {
+        type            empty;
+        nFaces          68400;
+        startFace       68786;
+    }
 )
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties
index a9fcefae0d..99ccf063b9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/transportProperties
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,51 +10,16 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "constant";
     object      transportProperties;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-phases
-(
-    water
-    {
-        transportModel  Newtonian;
-        nu              nu [0 2 -1 0 0 0 0] 1e-06;
-        rho             rho [1 -3 0 0 0 0 0] 1000;
-    }
+phases          ( water { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 1000 ; } oil { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1e-06 ; rho rho [ 1 -3 0 0 0 0 0 ] 500 ; } mercury { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.125e-07 ; rho rho [ 1 -3 0 0 0 0 0 ] 13529 ; } air { transportModel Newtonian ; nu nu [ 0 2 -1 0 0 0 0 ] 1.48e-05 ; rho rho [ 1 -3 0 0 0 0 0 ] 1 ; } );
 
-    oil
-    {
-        transportModel  Newtonian;
-        nu              nu [0 2 -1 0 0 0 0] 1e-06;
-        rho             rho [1 -3 0 0 0 0 0] 500;
-    }
+refPhase        air;
 
-    mercury
-    {
-        transportModel  Newtonian;
-        nu              nu [0 2 -1 0 0 0 0] 0.1125e-06;
-        rho             rho [1 -3 0 0 0 0 0] 13529;
-    }
+sigmas          ( ( air water ) 0.07 ( air oil ) 0.07 ( air mercury ) 0.07 ( water oil ) 0.07 ( water mercury ) 0.07 ( oil mercury ) 0.07 );
 
-    air
-    {
-        transportModel  Newtonian;
-        nu              nu [0 2 -1 0 0 0 0] 1.48e-05;
-        rho             rho [1 -3 0 0 0 0 0] 1;
-    }
-);
-
-refPhase air;
-
-sigmas
-(
-    (air water) 0.07
-    (air oil)   0.07
-    (air mercury)   0.07
-    (water oil) 0.07
-    (water mercury) 0.07
-    (oil mercury) 0.07
-);
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/turbulenceProperties b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/turbulenceProperties
new file mode 100644
index 0000000000..886d34bdef
--- /dev/null
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/constant/turbulenceProperties
@@ -0,0 +1,21 @@
+/*--------------------------------*- C++ -*----------------------------------*\
+| =========                 |                                                 |
+| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
+|  \\    /   O peration     | Version:  1.5                                   |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
+|    \\/     M anipulation  |                                                 |
+\*---------------------------------------------------------------------------*/
+FoamFile
+{
+    version     2.0;
+    format      ascii;
+    class       dictionary;
+    location    "constant";
+    object      turbulenceProperties;
+}
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+simulationType  laminar;
+
+
+// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/controlDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/controlDict
index 03b8dd3bef..7a68f62840 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/controlDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/controlDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,11 +10,11 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      controlDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-
 startFrom       latestTime;
 
 startTime       0;
@@ -47,6 +47,7 @@ adjustTimeStep  yes;
 
 maxCo           0.5;
 
-maxDeltaT       1.0;
+maxDeltaT       1;
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict
index cf0067afd3..bf8dffb737 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/decomposeParDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      decomposeParDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,26 +21,20 @@ method          simple;
 
 simpleCoeffs
 {
-    n               (2 2 1);
+    n               ( 2 2 1 );
     delta           0.001;
 }
 
 hierarchicalCoeffs
 {
-    n               (1 1 1);
+    n               ( 1 1 1 );
     delta           0.001;
     order           xyz;
 }
 
 metisCoeffs
 {
-    processorWeights 
-    (
-        1
-        1
-        1
-        1
-    );
+    processorWeights ( 1 1 1 1 );
 }
 
 manualCoeffs
@@ -49,8 +44,7 @@ manualCoeffs
 
 distributed     no;
 
-roots           
-(
-);
+roots           ( );
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes
index ace8adce3f..6443d5f3d9 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSchemes
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,13 +10,14 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      fvSchemes;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 ddtSchemes
 {
-    default Euler;
+    default         Euler;
 }
 
 gradSchemes
@@ -28,8 +29,8 @@ gradSchemes
 
 divSchemes
 {
-    div(rho*phi,U)  Gauss upwind; //limitedLinearV 1.0;
-    div(phi,alpha)  Gauss limitedLimitedLinear 1.0 -0.00001 1.00001;
+    div(rho*phi,U)  Gauss upwind;
+    div(phi,alpha)  Gauss limitedLimitedLinear 1 -1e-05 1.00001;
     div(phic,alpha) Gauss interfaceCompression;
 }
 
@@ -53,4 +54,5 @@ fluxRequired
     default         yes;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution
index 78c0ce45be..8c303f9540 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,83 +10,92 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      fvSolution;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 solvers
 {
-    pcorr PCG
+    pcorr
     {
-        preconditioner   GAMG
+        solver          PCG;
+        preconditioner
         {
-            tolerance        1e-5;
-            relTol           0;
-
-            smoother         GaussSeidel;
-            nPreSweeps       0;
-            nPostSweeps      2;
-            nBottomSweeps    2;
-
+            preconditioner  GAMG;
+            tolerance       1e-05;
+            relTol          0;
+            smoother        GaussSeidel;
+            nPreSweeps      0;
+            nPostSweeps     2;
+            nBottomSweeps   2;
             cacheAgglomeration off;
             nCellsInCoarsestLevel 10;
-            agglomerator     faceAreaPair;
-            mergeLevels      2;
-        };
+            agglomerator    faceAreaPair;
+            mergeLevels     2;
+        }
 
-        tolerance        1e-5;
-        relTol           0;
-        maxIter          100;
-    };
+        tolerance       1e-05;
+        relTol          0;
+        maxIter         100;
+    }
 
-    pd GAMG
+    pd
     {
-        tolerance        1e-7;
-        relTol           0.05;
-
-        smoother         GaussSeidel;
-        nPreSweeps       0;
-        nPostSweeps      2;
-        nFinestSweeps    2;
-
+        solver          GAMG;
+        tolerance       1e-07;
+        relTol          0.05;
+        smoother        GaussSeidel;
+        nPreSweeps      0;
+        nPostSweeps     2;
+        nFinestSweeps   2;
         cacheAgglomeration on;
         nCellsInCoarsestLevel 10;
-        agglomerator     faceAreaPair;
-        mergeLevels      1;
-    };
+        agglomerator    faceAreaPair;
+        mergeLevels     1;
+    }
 
-    pdFinal PCG
+    pdFinal
     {
-        preconditioner GAMG
+        solver          PCG;
+        preconditioner
         {
-            tolerance        1e-7;
-            relTol           0;
-
-            nVcycles         2;
-
-            smoother         GaussSeidel;
-            nPreSweeps       0;
-            nPostSweeps      2;
-            nFinestSweeps    2;
-
+            preconditioner  GAMG;
+            tolerance       1e-07;
+            relTol          0;
+            nVcycles        2;
+            smoother        GaussSeidel;
+            nPreSweeps      0;
+            nPostSweeps     2;
+            nFinestSweeps   2;
             cacheAgglomeration on;
             nCellsInCoarsestLevel 10;
-            agglomerator     faceAreaPair;
-            mergeLevels      1;
-        };
+            agglomerator    faceAreaPair;
+            mergeLevels     1;
+        }
 
-        tolerance        1e-7;
-        relTol           0;
-        maxIter          20;
-    };
+        tolerance       1e-07;
+        relTol          0;
+        maxIter         20;
+    }
 
-    alpha smoothSolver
+    U
     {
-        smoother         GaussSeidel;
-        tolerance        1e-8;
-        relTol           0;
-        nSweeps          1;
-    };
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-08;
+        relTol          0;
+        nSweeps         1;
+    }
+
+    alpha
+    {
+        solver          smoothSolver;
+        smoother        GaussSeidel;
+        tolerance       1e-08;
+        relTol          0;
+        nSweeps         1;
+    }
 }
 
 PISO
@@ -99,4 +108,5 @@ PISO
     cAlpha          4;
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par
deleted file mode 100644
index 2e036f4cad..0000000000
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/fvSolution.par
+++ /dev/null
@@ -1,75 +0,0 @@
-/*--------------------------------*- C++ -*----------------------------------*\
-| =========                 |                                                 |
-| \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
-|    \\/     M anipulation  |                                                 |
-\*---------------------------------------------------------------------------*/
-FoamFile
-{
-    version     2.0;
-    format      ascii;
-    class       dictionary;
-    object      fvSolution;
-}
-// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-
-solvers
-{
-    pcorr PCG
-    {
-        preconditioner   GAMG
-        {
-            tolerance        1e-5;
-            relTol           0;
-
-            smoother         GaussSeidel;
-            nPreSweeps       0;
-            nPostSweeps      2;
-            nBottomSweeps    2;
-
-            cacheAgglomeration off;
-            nCellsInCoarsestLevel 10;
-            agglomerator     faceAreaPair;
-            mergeLevels      2;
-        };
-
-        tolerance        1e-5;
-        relTol           0;
-        maxIter          100;
-    };
-
-    pd PCG
-    {
-        preconditioner   DIC;
-        tolerance        1e-7;
-        relTol           0.05;
-    };
-
-    pdFinal PCG
-    {
-        preconditioner   DIC;
-        tolerance        1e-7;
-        relTol           0;
-    };
-
-    alpha smoothSolver
-    {
-        smoother         GaussSeidel;
-        tolerance        1e-8;
-        relTol           0;
-        nSweeps          1;
-    };
-}
-
-PISO
-{
-    nCorrectors     4;
-    nNonOrthogonalCorrectors 0;
-    nAlphaCorr      4;
-    nAlphaSubCycles 4;
-    cycleAlpha      yes;
-    cAlpha          4;
-}
-
-// ************************************************************************* //
diff --git a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict
index 664126f092..94f35f9d93 100644
--- a/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict
+++ b/tutorials/multiphase/multiphaseInterFoam/damBreak4phaseFine/system/setFieldsDict
@@ -2,7 +2,7 @@
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
 |  \\    /   O peration     | Version:  1.5                                   |
-|   \\  /    A nd           | Web:      http://www.OpenFOAM.org               |
+|   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
 FoamFile
@@ -10,6 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       dictionary;
+    location    "system";
     object      setFieldsDict;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
@@ -20,15 +21,14 @@ defaultFieldValues
     volScalarFieldValue alphaWater 0
     volScalarFieldValue alphaOil 0
     volScalarFieldValue alphaMercury 0
-    volVectorFieldValue U (0 0 0)
+    volVectorFieldValue U ( 0 0 0 )
 );
 
 regions
 (
     boxToCell
     {
-        box (0 0 -1) (0.1461 0.292 1);
-
+        box ( 0 0 -1 ) ( 0.1461 0.292 1 );
         fieldValues
         (
             volScalarFieldValue alphaWater 1
@@ -37,11 +37,9 @@ regions
             volScalarFieldValue alphaAir 0
         );
     }
-
     boxToCell
     {
-        box (0.1461 0 -1) (0.2922 0.292 1);
-
+        box ( 0.1461 0 -1 ) ( 0.2922 0.292 1 );
         fieldValues
         (
             volScalarFieldValue alphaWater 0
@@ -50,11 +48,9 @@ regions
             volScalarFieldValue alphaAir 0
         );
     }
-
     boxToCell
     {
-        box (0 0 -1) (0.1461 0.1 1);
-
+        box ( 0 0 -1 ) ( 0.1461 0.1 1 );
         fieldValues
         (
             volScalarFieldValue alphaWater 0
@@ -63,6 +59,7 @@ regions
             volScalarFieldValue alphaAir 0
         );
     }
-);
+ );
+
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
index 8b29ef416e..766cb87595 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed/system/controlDict
@@ -49,7 +49,42 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-functions       ( fieldAverage1 { type fieldAverage ; functionObjectLibs ( "libfieldFunctionObjects.so" ) ; fields ( Ua { mean on ; prime2Mean off ; base time ; } Ub { mean on ; prime2Mean off ; base time ; } alpha { mean on ; prime2Mean off ; base time ; } p { mean on ; prime2Mean off ; base time ; } ) ; } );
+functions
+(
+    fieldAverage1
+    {
+        type fieldAverage;
+        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        outputControl     outputTime;
+        fields
+        (
+            Ua
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+            Ub
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+            alpha
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+            p
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+        );
+    }
+);
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
index 2a969d4d7a..e4d35359ad 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bed2/system/controlDict
@@ -49,7 +49,42 @@ maxCo           0.9;
 
 maxDeltaT       1e-05;
 
-functions       ( fieldAverage1 { type fieldAverage ; functionObjectLibs ( "libfieldFunctionObjects.so" ) ; outputControl outputTime ; fields ( Ua { mean on ; prime2Mean off ; base time ; } Ub { mean on ; prime2Mean off ; base time ; } alpha { mean on ; prime2Mean off ; base time ; } p { mean on ; prime2Mean off ; base time ; } ) ; } );
+functions
+(
+    fieldAverage1
+    {
+        type fieldAverage;
+        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        outputControl     outputTime;
+        fields
+        (
+            Ua
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+            Ub
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+            alpha
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+            p
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+        );
+    }
+);
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
index 342ea403e6..d0f78bb505 100644
--- a/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
+++ b/tutorials/multiphase/twoPhaseEulerFoam/bubbleColumn/system/controlDict
@@ -49,7 +49,42 @@ maxCo           0.5;
 
 maxDeltaT       1;
 
-functions       ( fieldAverage1 { type fieldAverage ; functionObjectLibs ( "libfieldFunctionObjects.so" ) ; fields ( Ua { mean on ; prime2Mean off ; base time ; } Ub { mean on ; prime2Mean off ; base time ; } alpha { mean on ; prime2Mean off ; base time ; } p { mean on ; prime2Mean off ; base time ; } ) ; } );
+functions
+(
+    fieldAverage1
+    {
+        type fieldAverage;
+        functionObjectLibs ( "libfieldFunctionObjects.so" );
+        outputControl     outputTime;
+        fields
+        (
+            Ua
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+            Ub
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+            alpha
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+            p
+            {
+                 mean on;
+                 prime2Mean off;
+                 base time;
+            }
+        );
+    }
+);
 
 
 // ************************************************************************* //