diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/U b/tutorials/multiphase/settlingFoam/ras/dahl/0/U
index 1559025ce3..a0a0043af1 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/U
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/U
@@ -20,35 +20,35 @@ internalField   uniform (0.0191 0 0);
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform (0.0191 0 0);
     }
 
-    outlet          
+    outlet
     {
         type            zeroGradient;
     }
 
-    bottomWall      
+    bottomWall
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    endWall         
+    endWall
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    top             
+    top
     {
-        type            symmetryPlane;
+        type            slip;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha b/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
index bf0cc9d206..ca6b9f8f7a 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
@@ -20,33 +20,33 @@ internalField   uniform 0.001;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform 0.001;
     }
 
-    outlet          
+    outlet
     {
         type            zeroGradient;
     }
 
-    bottomWall      
+    bottomWall
     {
         type            zeroGradient;
     }
 
-    endWall         
+    endWall
     {
         type            zeroGradient;
     }
 
-    top             
+    top
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon b/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
index 3e878bfecc..27b4ba3c1f 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/epsilon
@@ -20,33 +20,33 @@ internalField   uniform 1.50919e-06;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform 1.50919e-06;
     }
 
-    outlet          
+    outlet
     {
         type            zeroGradient;
     }
 
-    bottomWall      
+    bottomWall
     {
         type            zeroGradient;
     }
 
-    endWall         
+    endWall
     {
         type            zeroGradient;
     }
 
-    top             
+    top
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/k b/tutorials/multiphase/settlingFoam/ras/dahl/0/k
index 152c9e06dc..6bd1a6b416 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/k
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/k
@@ -20,33 +20,33 @@ internalField   uniform 0.00015;
 
 boundaryField
 {
-    inlet           
+    inlet
     {
         type            fixedValue;
         value           uniform 0.00015;
     }
 
-    outlet          
+    outlet
     {
         type            zeroGradient;
     }
 
-    bottomWall      
+    bottomWall
     {
         type            zeroGradient;
     }
 
-    endWall         
+    endWall
     {
         type            zeroGradient;
     }
 
-    top             
+    top
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    frontAndBack    
+    frontAndBack
     {
         type            empty;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/p b/tutorials/multiphase/settlingFoam/ras/dahl/0/p
index 21283df64a..fa58407df2 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/p
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/p
@@ -39,13 +39,13 @@ boundaryField
 
     endWall
     {
-        type            buoyantPressure;
-        value           uniform 0;
+        type            zeroGradient;
     }
 
     top
     {
-        type            symmetryPlane;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     frontAndBack
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
index 27d4d32488..8a9ae72772 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/g
@@ -16,7 +16,7 @@ FoamFile
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 dimensions      [0 1 -2 0 0 0 0];
-value           ( 0 -9.81 0 );
+value           (0 -9.81 0);
 
 
 // ************************************************************************* //
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
index aca4ffd37c..28b3bb25fe 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/blockMeshDict
@@ -16,7 +16,7 @@ FoamFile
 
 convertToMeters 1;
 
-vertices        
+vertices
 (
     (0 0 -0.1)
     (8.65 0 -0.1)
@@ -32,40 +32,40 @@ vertices
     (0 1 0.1)
 );
 
-blocks          
+blocks
 (
     hex (0 1 2 3 6 7 8 9) (200 4 1) simpleGrading (1 1 1)
     hex (3 2 4 5 9 8 10 11) (200 36 1) simpleGrading (1 1 1)
 );
 
-edges           
+edges
 (
 );
 
-patches         
+patches
 (
-    patch inlet 
+    patch inlet
     (
         (0 6 9 3)
         (3 9 11 5)
     )
-    patch outlet 
+    patch outlet
     (
         (1 2 8 7)
     )
-    patch bottomWall 
+    patch bottomWall
     (
         (0 1 7 6)
     )
-    wall endWall 
+    wall endWall
     (
         (2 4 10 8)
     )
-    symmetryPlane top 
+    patch top
     (
         (5 11 10 4)
     )
-    empty frontAndBack 
+    empty frontAndBack
     (
         (0 3 2 1)
         (6 7 8 9)
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
index 15a60bdd6a..03af5cc61a 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
@@ -1,7 +1,7 @@
 /*--------------------------------*- C++ -*----------------------------------*\
 | =========                 |                                                 |
 | \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox           |
-|  \\    /   O peration     | Version:  1.6                                   |
+|  \\    /   O peration     | Version:  1.6.x                                 |
 |   \\  /    A nd           | Web:      www.OpenFOAM.org                      |
 |    \\/     M anipulation  |                                                 |
 \*---------------------------------------------------------------------------*/
@@ -43,7 +43,7 @@ FoamFile
     }
     top
     {
-        type            symmetryPlane;
+        type            patch;
         nFaces          200;
         startFace       16040;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
index 02a73ebf91..ef409e071a 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/controlDict
@@ -25,7 +25,7 @@ stopAt          endTime;
 
 endTime         6400;
 
-deltaT          0.2;
+deltaT          0.1;
 
 writeControl    runTime;
 
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
index 631ac4e0c5..148cdcddc5 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    "(p|rho)"
+    p
     {
         solver          PCG;
         preconditioner  DIC;
@@ -25,7 +25,39 @@ solvers
         relTol          0;
     }
 
-    "(U|k|epsilon|Alpha)"
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-07;
+        relTol          0;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-07;
+        relTol          0;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-07;
+        relTol          0;
+    }
+
+    rho
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-07;
+        relTol          0;
+    }
+
+    Alpha
     {
         solver          PBiCG;
         preconditioner  DILU;
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/U b/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
index 709c50ae80..34520705ad 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/U
@@ -20,120 +20,120 @@ internalField   uniform (0 0 0);
 
 boundaryField
 {
-    SYMP3           
+    SYMP3
     {
-        type            symmetryPlane;
+        type            slip;
     }
 
-    INLE1           
+    INLE1
     {
         type            fixedValue;
         value           uniform (0.1315 0 0);
     }
 
-    OUTL9           
+    OUTL9
     {
         type            fixedValue;
         value           uniform (0 0.0177 0);
     }
 
-    OUTL10          
+    OUTL10
     {
         type            fixedValue;
         value           uniform (0 0.0177 0);
     }
 
-    OUTL11          
+    OUTL11
     {
         type            fixedValue;
         value           uniform (0 0.0177 0);
     }
 
-    OUTL12          
+    OUTL12
     {
         type            fixedValue;
         value           uniform (0 0.0177 0);
     }
 
-    WALL6           
+    WALL6
     {
         type            fixedValue;
         value           uniform (-0.003 0 0);
     }
 
-    WALL8           
+    WALL8
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL61          
+    WALL61
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL62          
+    WALL62
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL63          
+    WALL63
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL64          
+    WALL64
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL65          
+    WALL65
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL66          
+    WALL66
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL67          
+    WALL67
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL68          
+    WALL68
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL69          
+    WALL69
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL7           
+    WALL7
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    WALL70          
+    WALL70
     {
         type            fixedValue;
         value           uniform (0 0 0);
     }
 
-    OUTL15          
+    OUTL15
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha b/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
index 1f11257066..18e136580a 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
@@ -20,103 +20,103 @@ internalField   uniform 0;
 
 boundaryField
 {
-    SYMP3           
+    SYMP3
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    INLE1           
+    INLE1
     {
         type            fixedValue;
         value           uniform 0.002;
     }
 
-    OUTL9           
+    OUTL9
     {
         type            zeroGradient;
     }
 
-    OUTL10          
+    OUTL10
     {
         type            zeroGradient;
     }
 
-    OUTL11          
+    OUTL11
     {
         type            zeroGradient;
     }
 
-    OUTL12          
+    OUTL12
     {
         type            zeroGradient;
     }
 
-    WALL6           
+    WALL6
     {
         type            zeroGradient;
     }
 
-    WALL8           
+    WALL8
     {
         type            zeroGradient;
     }
 
-    WALL61          
+    WALL61
     {
         type            zeroGradient;
     }
 
-    WALL62          
+    WALL62
     {
         type            zeroGradient;
     }
 
-    WALL63          
+    WALL63
     {
         type            zeroGradient;
     }
 
-    WALL64          
+    WALL64
     {
         type            zeroGradient;
     }
 
-    WALL65          
+    WALL65
     {
         type            zeroGradient;
     }
 
-    WALL66          
+    WALL66
     {
         type            zeroGradient;
     }
 
-    WALL67          
+    WALL67
     {
         type            zeroGradient;
     }
 
-    WALL68          
+    WALL68
     {
         type            zeroGradient;
     }
 
-    WALL69          
+    WALL69
     {
         type            zeroGradient;
     }
 
-    WALL7           
+    WALL7
     {
         type            zeroGradient;
     }
 
-    WALL70          
+    WALL70
     {
         type            zeroGradient;
     }
 
-    OUTL15          
+    OUTL15
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon b/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
index e1f67f23eb..634512f951 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/epsilon
@@ -20,103 +20,103 @@ internalField   uniform 1.973e-07;
 
 boundaryField
 {
-    SYMP3           
+    SYMP3
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    INLE1           
+    INLE1
     {
         type            fixedValue;
         value           uniform 1.973e-07;
     }
 
-    OUTL9           
+    OUTL9
     {
         type            zeroGradient;
     }
 
-    OUTL10          
+    OUTL10
     {
         type            zeroGradient;
     }
 
-    OUTL11          
+    OUTL11
     {
         type            zeroGradient;
     }
 
-    OUTL12          
+    OUTL12
     {
         type            zeroGradient;
     }
 
-    WALL6           
+    WALL6
     {
         type            zeroGradient;
     }
 
-    WALL8           
+    WALL8
     {
         type            zeroGradient;
     }
 
-    WALL61          
+    WALL61
     {
         type            zeroGradient;
     }
 
-    WALL62          
+    WALL62
     {
         type            zeroGradient;
     }
 
-    WALL63          
+    WALL63
     {
         type            zeroGradient;
     }
 
-    WALL64          
+    WALL64
     {
         type            zeroGradient;
     }
 
-    WALL65          
+    WALL65
     {
         type            zeroGradient;
     }
 
-    WALL66          
+    WALL66
     {
         type            zeroGradient;
     }
 
-    WALL67          
+    WALL67
     {
         type            zeroGradient;
     }
 
-    WALL68          
+    WALL68
     {
         type            zeroGradient;
     }
 
-    WALL69          
+    WALL69
     {
         type            zeroGradient;
     }
 
-    WALL7           
+    WALL7
     {
         type            zeroGradient;
     }
 
-    WALL70          
+    WALL70
     {
         type            zeroGradient;
     }
 
-    OUTL15          
+    OUTL15
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/k b/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
index b3899fb1d7..5bc3ea2d51 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/k
@@ -20,103 +20,103 @@ internalField   uniform 0.000259;
 
 boundaryField
 {
-    SYMP3           
+    SYMP3
     {
-        type            symmetryPlane;
+        type            zeroGradient;
     }
 
-    INLE1           
+    INLE1
     {
         type            fixedValue;
         value           uniform 0.000259;
     }
 
-    OUTL9           
+    OUTL9
     {
         type            zeroGradient;
     }
 
-    OUTL10          
+    OUTL10
     {
         type            zeroGradient;
     }
 
-    OUTL11          
+    OUTL11
     {
         type            zeroGradient;
     }
 
-    OUTL12          
+    OUTL12
     {
         type            zeroGradient;
     }
 
-    WALL6           
+    WALL6
     {
         type            zeroGradient;
     }
 
-    WALL8           
+    WALL8
     {
         type            zeroGradient;
     }
 
-    WALL61          
+    WALL61
     {
         type            zeroGradient;
     }
 
-    WALL62          
+    WALL62
     {
         type            zeroGradient;
     }
 
-    WALL63          
+    WALL63
     {
         type            zeroGradient;
     }
 
-    WALL64          
+    WALL64
     {
         type            zeroGradient;
     }
 
-    WALL65          
+    WALL65
     {
         type            zeroGradient;
     }
 
-    WALL66          
+    WALL66
     {
         type            zeroGradient;
     }
 
-    WALL67          
+    WALL67
     {
         type            zeroGradient;
     }
 
-    WALL68          
+    WALL68
     {
         type            zeroGradient;
     }
 
-    WALL69          
+    WALL69
     {
         type            zeroGradient;
     }
 
-    WALL7           
+    WALL7
     {
         type            zeroGradient;
     }
 
-    WALL70          
+    WALL70
     {
         type            zeroGradient;
     }
 
-    OUTL15          
+    OUTL15
     {
         type            zeroGradient;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
index b73d22a823..0a61164085 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/p
@@ -22,7 +22,8 @@ boundaryField
 {
     SYMP3
     {
-        type            symmetryPlane;
+        type            buoyantPressure;
+        value           uniform 0;
     }
 
     INLE1
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun b/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
deleted file mode 100755
index 231be44262..0000000000
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/Allrun
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-# Source tutorial run functions
-. $WM_PROJECT_DIR/bin/tools/RunFunctions
-
-application=`getApplication`
-
-#runApplication blockMesh
-runApplication $application
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
index 40f8d8e84b..5d48248b2e 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/constant/polyMesh/boundary
@@ -17,7 +17,7 @@ FoamFile
 (
     SYMP3
     {
-        type            symmetryPlane;
+        type            patch;
         startFace       53708;
         nFaces          3191;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
index 631ac4e0c5..148cdcddc5 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/system/fvSolution
@@ -17,7 +17,7 @@ FoamFile
 
 solvers
 {
-    "(p|rho)"
+    p
     {
         solver          PCG;
         preconditioner  DIC;
@@ -25,7 +25,39 @@ solvers
         relTol          0;
     }
 
-    "(U|k|epsilon|Alpha)"
+    U
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-07;
+        relTol          0;
+    }
+
+    k
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-07;
+        relTol          0;
+    }
+
+    epsilon
+    {
+        solver          PBiCG;
+        preconditioner  DILU;
+        tolerance       1e-07;
+        relTol          0;
+    }
+
+    rho
+    {
+        solver          PCG;
+        preconditioner  DIC;
+        tolerance       1e-07;
+        relTol          0;
+    }
+
+    Alpha
     {
         solver          PBiCG;
         preconditioner  DILU;