From 193c90c29dd738e570be030b3e354d667398560b Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Wed, 26 Apr 2017 18:36:31 +0100
Subject: [PATCH] Tutorial update: block solver

---
 .../backwardFacingStepTurbulent/0/epsilon     |  8 +++----
 .../constant/RASProperties                    |  2 +-
 .../backwardFacingStepTurbulent/save/epsilon  |  8 +++----
 .../system/controlDict                        |  9 --------
 .../system/fvSolution                         | 21 +++++++++++++++----
 5 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/0/epsilon b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/0/epsilon
index 6ba02b111..f85430907 100644
--- a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/0/epsilon
+++ b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/0/epsilon
@@ -17,14 +17,14 @@ FoamFile
 
 dimensions      [0 2 -3 0 0 0 0];
 
-internalField   uniform 0.0001;
+internalField   uniform 0.003;
 
 boundaryField
 {
     inlet
     {
         type            fixedValue;
-        value           uniform 0.0001;
+        value           uniform 0.003;
     }
     outlet
     {
@@ -34,7 +34,7 @@ boundaryField
     {
         type            epsilonWallFunction;
         refValue        uniform 0;
-        value           uniform 0.0001;
+        value           uniform 0.003;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -43,7 +43,7 @@ boundaryField
     {
         type            epsilonWallFunction;
         refValue        uniform 0;
-        value           uniform 0.0001;
+        value           uniform 0.003;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/constant/RASProperties b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/constant/RASProperties
index d061e5cce..d521d649c 100644
--- a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/constant/RASProperties
+++ b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/constant/RASProperties
@@ -14,7 +14,7 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-RASModel            kEpsilon;
+RASModel            coupledKEpsilon;
 
 turbulence          on;
 
diff --git a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/save/epsilon b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/save/epsilon
index 6ba02b111..f85430907 100644
--- a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/save/epsilon
+++ b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/save/epsilon
@@ -17,14 +17,14 @@ FoamFile
 
 dimensions      [0 2 -3 0 0 0 0];
 
-internalField   uniform 0.0001;
+internalField   uniform 0.003;
 
 boundaryField
 {
     inlet
     {
         type            fixedValue;
-        value           uniform 0.0001;
+        value           uniform 0.003;
     }
     outlet
     {
@@ -34,7 +34,7 @@ boundaryField
     {
         type            epsilonWallFunction;
         refValue        uniform 0;
-        value           uniform 0.0001;
+        value           uniform 0.003;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
@@ -43,7 +43,7 @@ boundaryField
     {
         type            epsilonWallFunction;
         refValue        uniform 0;
-        value           uniform 0.0001;
+        value           uniform 0.003;
         Cmu             0.09;
         kappa           0.41;
         E               9.8;
diff --git a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/controlDict b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/controlDict
index 4dfb2c537..7a852dbd0 100644
--- a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/controlDict
+++ b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/controlDict
@@ -82,15 +82,6 @@ functions
 
         name epsilon;
     }
-    minMaxOmega
-    {
-        type        minMaxField;
-
-        // Where to load it from (if not already in solver)
-        functionObjectLibs ("libfieldFunctionObjects.so");
-
-        name omega;
-    }
 );
 
 
diff --git a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/fvSolution b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/fvSolution
index 00ac4a9af..6a9b1f1cb 100644
--- a/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/fvSolution
+++ b/tutorials/incompressible/pUCoupledFoam/backwardFacingStepTurbulent/system/fvSolution
@@ -19,11 +19,14 @@ solvers
     Up
     {
         solver          AMG;
-        cycle           V-cycle;
-        coarseningType  AAMG;
-        norm            componentNorm;
+        cycle           W-cycle;
+        coarseningType  cluster;
+        norm            twoNorm;
         normComponent   0;
 
+        minGroupSize    2;
+        maxGroupSize    4;
+        
         nPreSweeps      2;
         nPostSweeps     2;
         groupSize       2;
@@ -32,7 +35,7 @@ solvers
         scale           on;
         smoother
         {
-            smoother    ILUCp;
+            smoother    ILU;
             fillInLevel 1;
         }
 
@@ -41,6 +44,16 @@ solvers
         tolerance       1e-7;
         relTol          0.001;
     }
+    kEpsilon
+    {
+        solver           BiCGStab;
+        preconditioner   Cholesky;
+        tolerance        1e-07;
+        relTol           0.1;
+
+        minIter          1;
+        maxIter          100;
+    }
 
     // Segregated
     p