From db6f0c944e0f2bd58c68cb91fc19475dce1a417b Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Tue, 24 Sep 2019 15:50:10 +0100
Subject: [PATCH] Tutorial settings update: simpleSRFFoam mixer

---
 .../incompressible/simpleSRFFoam/mixer/0/Urel |  6 +++--
 .../simpleSRFFoam/mixer/0/epsilon             |  8 +++---
 .../incompressible/simpleSRFFoam/mixer/0/k    |  4 ++-
 .../incompressible/simpleSRFFoam/mixer/0/nut  |  6 ++---
 .../simpleSRFFoam/mixer/0/omega               |  4 ++-
 .../simpleSRFFoam/mixer/system/fvSchemes      |  9 +------
 .../simpleSRFFoam/mixer/system/fvSolution     | 26 ++++---------------
 7 files changed, 21 insertions(+), 42 deletions(-)

diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel b/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel
index b6b646490..fc6ce2e4e 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/Urel
@@ -16,7 +16,7 @@ FoamFile
 
 dimensions      [0 1 -1 0 0 0 0];
 
-internalField   uniform (0 0 0);
+internalField   uniform (-10 0 0);
 
 boundaryField
 {
@@ -30,7 +30,9 @@ boundaryField
 
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform (0 0 -10);
+        value           uniform (0 0 0);
     }
 
     innerWall
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon b/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon
index f4728d29a..26471e38a 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/epsilon
@@ -25,22 +25,20 @@ boundaryField
         type            fixedValue;
         value           uniform 14.855;
     }
-
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 14.855;
+        value           uniform 14.855;
     }
-
     innerWall
     {
         type            zeroGradient;
     }
-
     outerWall
     {
         type            zeroGradient;
     }
-
     cyclic
     {
         type            cyclic;
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/k b/tutorials/incompressible/simpleSRFFoam/mixer/0/k
index 3d76d301c..c599827e6 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/k
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/k
@@ -28,7 +28,9 @@ boundaryField
     }
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 0.375;
+        value           uniform 0.375;
     }
     innerWall
     {
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/nut b/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
index e35ce6a51..b05f18eaf 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/nut
@@ -23,13 +23,11 @@ boundaryField
 {
     inlet
     {
-        type            calculated;
-        value           uniform 0;
+        type            zeroGradient;
     }
     outlet
     {
-        type            calculated;
-        value           uniform 0;
+        type            zeroGradient;
     }
     innerWall
     {
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/0/omega b/tutorials/incompressible/simpleSRFFoam/mixer/0/omega
index 57450edac..85e4bef04 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/0/omega
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/0/omega
@@ -28,7 +28,9 @@ boundaryField
     }
     outlet
     {
-        type            zeroGradient;
+        type            inletOutlet;
+        inletValue      uniform 3.5;
+        value           uniform 3.5;
     }
     innerWall
     {
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes
index 40975d4da..8b729bfd8 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSchemes
@@ -22,8 +22,6 @@ ddtSchemes
 gradSchemes
 {
     default         Gauss linear;
-    grad(p)         Gauss linear;
-    grad(Urel)      Gauss linear;
 }
 
 divSchemes
@@ -33,16 +31,12 @@ divSchemes
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
     div(phi,omega) Gauss upwind;
-    div(phi,R)      Gauss upwind;
-    div(R)          Gauss linear;
-    div(phi,nuTilda) Gauss upwind;
     div((nuEff*dev(T(grad(Urel))))) Gauss linear;
 }
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(nuEff,Urel) Gauss linear corrected;
+    default         Gauss linear corrected;
     laplacian(rAU,p) Gauss linear corrected;
     laplacian(DkEff,k) Gauss linear corrected;
     laplacian(DepsilonEff,epsilon) Gauss linear corrected;
@@ -54,7 +48,6 @@ laplacianSchemes
 interpolationSchemes
 {
     default         linear;
-    interpolate(Urel) linear;
 }
 
 snGradSchemes
diff --git a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution
index 5c63377f9..141f59872 100644
--- a/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution
+++ b/tutorials/incompressible/simpleSRFFoam/mixer/system/fvSolution
@@ -21,12 +21,12 @@ solvers
         solver           PCG;
         preconditioner   DIC;
         tolerance        1e-06;
-        relTol           0.01;
+        relTol           0.0;
     }
     Urel
     {
-        solver           smoothSolver;
-        smoother         GaussSeidel;
+        solver           BiCGStab;
+        preconditioner   DILU;
         tolerance        1e-05;
         relTol           0.1;
     }
@@ -51,20 +51,6 @@ solvers
         tolerance        1e-05;
         relTol           0.1;
     }
-    R
-    {
-        solver           BiCGStab;
-        preconditioner   DILU;
-        tolerance        1e-05;
-        relTol           0.1;
-    }
-    nuTilda
-    {
-        solver           BiCGStab;
-        preconditioner   DILU;
-        tolerance        1e-05;
-        relTol           0.1;
-    }
 }
 
 SIMPLE
@@ -74,13 +60,11 @@ SIMPLE
 
 relaxationFactors
 {
-    p               0.1;
-    Urel            0.5;
+    p               0.3;
+    Urel            0.7;
     k               0.7;
     epsilon         0.7;
     omega           0.7;
-    R               0.7;
-    nuTilda         0.7;
 }