From 1fe72a81322b875ad6ae27d5853259753dc1904d Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 22 Jan 2014 19:19:50 +0000
Subject: [PATCH] ENH: lagrangian tutorial updates

---
 .../lagrangian/DPMFoam/Goldschmidt/system/fvSolution |  8 ++++----
 .../counterFlowFlame2D/system/fvSchemes              |  4 ++--
 .../counterFlowFlame2D/system/fvSolution             |  4 ++--
 .../MPPICFoam/Goldschmidt/system/controlDict         |  2 +-
 .../MPPICFoam/Goldschmidt/system/fvSolution          | 12 ++++++------
 .../lagrangian/MPPICFoam/column/system/fvSolution    | 12 ++++++------
 .../MPPICFoam/injectionChannel/system/fvSolution     |  4 ++--
 .../simplifiedSiwek/system/fvSolution                | 11 ++++-------
 .../cylinder/system/fvSolution                       |  6 ++++--
 .../cylinder/system/wallFilmRegion/fvSolution        |  8 ++++----
 .../hotBoxes/system/fvSolution                       |  6 +++---
 .../rivuletPanel/system/fvSolution                   |  4 ++--
 .../rivuletPanel/system/wallFilmRegion/fvSolution    |  8 ++++----
 .../splashPanel/system/fvSolution                    |  4 ++--
 .../splashPanel/system/wallFilmRegion/fvSolution     |  8 ++++----
 .../reactingParcelFoam/filter/system/fvSolution      |  4 ++--
 .../reactingParcelFoam/parcelInBox/system/fvSolution |  4 ++--
 .../verticalChannel/system/fvSolution                |  4 ++--
 .../sprayFoam/aachenBomb/system/fvSolution           |  4 ++--
 19 files changed, 58 insertions(+), 59 deletions(-)

diff --git a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
index 984e70bf688..b78de15ced5 100644
--- a/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
+++ b/tutorials/lagrangian/DPMFoam/Goldschmidt/system/fvSolution
@@ -43,16 +43,16 @@ solvers
 
     "(U.air|k|omega)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-05;
         relTol          0.1;
     }
 
     "(U.air|k|omega)Final"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-05;
         relTol          0;
     }
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
index 1e91b43fba1..73cdf5dcaae 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSchemes
@@ -29,12 +29,12 @@ divSchemes
 {
     default         none;
 
-    div(phi,U)      Gauss limitedLinearV 1;
+    div(phi,U)      Gauss limitedLinear 1;
     div(phi,Yi_h)   Gauss limitedLinear 1;
     div(phi,K)      Gauss limitedLinear 1;
     div(phid,p)     Gauss limitedLinear 1;
     div(phi,epsilon) Gauss limitedLinear 1;
-    div(phi,k) Gauss limitedLinear 1;
+    div(phi,k)      Gauss limitedLinear 1;
 
     div((muEff*dev2(T(grad(U))))) Gauss linear;
 }
diff --git a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution
index cf6feec2474..2edbfb9c4ec 100644
--- a/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution
+++ b/tutorials/lagrangian/LTSReactingParcelFoam/counterFlowFlame2D/system/fvSolution
@@ -38,8 +38,8 @@ solvers
 
     "(U|h|k|epsilon)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-6;
         relTol          0.1;
     }
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
index 808ac7e71c4..073b1ed8868 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/controlDict
@@ -23,7 +23,7 @@ startTime       0;
 
 stopAt          endTime;
 
-endTime         10;
+endTime         5;
 
 deltaT          2e-4;
 
diff --git a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
index e1353a6e33d..96583c91105 100644
--- a/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/Goldschmidt/system/fvSolution
@@ -43,24 +43,24 @@ solvers
 
     "(U.air|k|omega)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-05;
         relTol          0.1;
     }
 
     "(U.air|k|omega)Final"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-05;
         relTol          0;
     }
 
     kinematicCloud:alpha
     {
-        solver          PCG; //PBiCG;
-        preconditioner  DIC; //DILU;
+        solver          PCG;
+        preconditioner  DIC;
         tolerance       1e-06;
         relTol          0;
     }
diff --git a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
index d52e9d19e98..1fc9953c00e 100644
--- a/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/column/system/fvSolution
@@ -33,24 +33,24 @@ solvers
 
     U.air
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-05;
         relTol          0.1;
     }
 
     U.airFinal
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-05;
         relTol          0;
     }
 
     kinematicCloud:alpha
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-06;
         relTol          0;
     }
diff --git a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
index b79164acae3..e53bc1e5155 100644
--- a/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
+++ b/tutorials/lagrangian/MPPICFoam/injectionChannel/system/fvSolution
@@ -43,8 +43,8 @@ solvers
 
     "(U|k|omega).*"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-05;
         relTol          0.1;
     }
diff --git a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
index 8294bbda048..b30a44e775f 100644
--- a/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
+++ b/tutorials/lagrangian/coalChemistryFoam/simplifiedSiwek/system/fvSolution
@@ -56,8 +56,8 @@ solvers
 
     "(U|h|R|k|epsilon)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-05;
         relTol          0.1;
     }
@@ -71,16 +71,12 @@ solvers
 
     "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
-        tolerance       1e-06;
-        relTol          0.1;
+        $h;
     }
 
     "(Yi|CO2|O2|N2|CH4|H2|H2O|CO)Final"
     {
         $Yi;
-        preconditioner  DILU;
         tolerance       1e-06;
         relTol          0;
     }
@@ -107,4 +103,5 @@ relaxationFactors
     }
 }
 
+
 // ************************************************************************* //
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
index b05dd58db6c..656cf19996f 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/fvSolution
@@ -34,8 +34,8 @@ solvers
 
     "(U|h)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       0;
         relTol          0.1;
     }
@@ -73,6 +73,7 @@ solvers
     }
 }
 
+
 PIMPLE
 {
     nCorrectors     2;
@@ -80,6 +81,7 @@ PIMPLE
     momentumPredictor yes;
 }
 
+
 relaxationFactors
 {
     fields
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
index eedbd097d3d..e52ac35a057 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/cylinder/system/wallFilmRegion/fvSolution
@@ -19,15 +19,15 @@ solvers
 {
     "(Uf|hf|deltaf\*rhof)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-10;
         relTol          0;
     }
     deltaf
     {
-        solver          PBiCG; // PCG;
-        preconditioner  DILU; // DIC;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-10;
         relTol          0;
     }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
index fcce5dd225b..331f1752d75 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/hotBoxes/system/fvSolution
@@ -34,8 +34,8 @@ solvers
 
     "(U|h|k|epsilon)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       0;
         relTol          0.1;
     }
@@ -49,7 +49,7 @@ solvers
 
     p_rgh
     {
-        solver          GAMG;
+        solver           GAMG;
         tolerance        0;
         relTol           0.1;
         smoother         DICGaussSeidel;
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution
index b05dd58db6c..ec5c3dec0e5 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/fvSolution
@@ -34,8 +34,8 @@ solvers
 
     "(U|h)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       0;
         relTol          0.1;
     }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
index 86cdc388bf5..1d67d6d2598 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/rivuletPanel/system/wallFilmRegion/fvSolution
@@ -19,15 +19,15 @@ solvers
 {
     "(Uf|hf|deltaf\*rhof)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-10;
         relTol          0;
     }
     deltaf
     {
-        solver          PBiCG; // PCG;
-        preconditioner  DILU; // DIC;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-10;
         relTol          0;
     }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
index b05dd58db6c..ec5c3dec0e5 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/fvSolution
@@ -34,8 +34,8 @@ solvers
 
     "(U|h)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       0;
         relTol          0.1;
     }
diff --git a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
index eedbd097d3d..e52ac35a057 100644
--- a/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFilmFoam/splashPanel/system/wallFilmRegion/fvSolution
@@ -19,15 +19,15 @@ solvers
 {
     "(Uf|hf|deltaf\*rhof)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-10;
         relTol          0;
     }
     deltaf
     {
-        solver          PBiCG; // PCG;
-        preconditioner  DILU; // DIC;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-10;
         relTol          0;
     }
diff --git a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
index 7af9d07faef..85d0e7b998e 100644
--- a/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/filter/system/fvSolution
@@ -34,8 +34,8 @@ solvers
 
     "(U|h|k|epsilon)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-06;
         relTol          0.1;
     }
diff --git a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
index 50950087e39..a42e10c1b58 100644
--- a/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/parcelInBox/system/fvSolution
@@ -34,8 +34,8 @@ solvers
 
     "(U|h|k|epsilon)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-05;
         relTol          0.1;
     }
diff --git a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
index f52df1d2f81..d77e5f75e98 100644
--- a/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
+++ b/tutorials/lagrangian/reactingParcelFoam/verticalChannel/system/fvSolution
@@ -34,8 +34,8 @@ solvers
 
     "(U|h|k|omega)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-06;
         relTol          0.1;
     }
diff --git a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
index 9cff5583eb3..a8d892dbdc0 100644
--- a/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
+++ b/tutorials/lagrangian/sprayFoam/aachenBomb/system/fvSolution
@@ -34,8 +34,8 @@ solvers
 
     "(U|h)"
     {
-        solver          PBiCG;
-        preconditioner  DILU;
+        solver          smoothSolver;
+        smoother        symGaussSeidel;
         tolerance       1e-05;
         relTol          0.1;
     }
-- 
GitLab