From d37f72cc86a38f84aafc9cd87e59127ca9047fcc Mon Sep 17 00:00:00 2001
From: Hrvoje Jasak <h.jasak@wikki.co.uk>
Date: Thu, 16 Nov 2017 15:24:55 +0000
Subject: [PATCH] Clean-up immersedBoundary

---
 .../system/controlDict                         | 11 +++++++----
 .../system/fvSchemes                           | 13 ++-----------
 .../system/fvSolution                          | 14 +++++++-------
 .../system/decomposeParDict                    | 18 ++++--------------
 4 files changed, 20 insertions(+), 36 deletions(-)

diff --git a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/controlDict b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/controlDict
index c198aec17..12428737a 100644
--- a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/controlDict
+++ b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/controlDict
@@ -16,9 +16,15 @@ FoamFile
 
 libs
 (
+    "libimmersedBoundary.so"
     "liblduSolvers.so"
 )
 
+DebugSwitches
+{
+    immersedBoundary 1;
+}
+
 application icoDyMFoam;
 
 startFrom       startTime;
@@ -32,10 +38,7 @@ endTime         50;
 deltaT          0.002;
 
 writeControl    runTime;
-writeInterval   0.2;
-
-// writeControl    timeStep;
-// writeInterval   1;
+writeInterval   0.1;
 
 purgeWrite      0;
 
diff --git a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSchemes b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSchemes
index 751f82e4d..1d5cc63d2 100644
--- a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSchemes
+++ b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSchemes
@@ -17,32 +17,23 @@ FoamFile
 ddtSchemes
 {
     default Euler;
-    ddt(U)  backward;
 }
 
 gradSchemes
 {
     default         Gauss linear;
-    grad(p)         Gauss linear;
 }
 
 divSchemes
 {
     default         none;
 //     div(phi,U)      Gauss upwind;
-    div(phi,U)      Gauss linear;
-//     div(phi,U)      Gauss linearUpwind Gauss linear;
-//     div(phi,U)      Gauss vanLeer;
-//     div(phi,U)      Gauss GammaV 0.2;
+    div(phi,U)      Gauss linearUpwind Gauss linear;
 }
 
 laplacianSchemes
 {
-    default         none;
-    laplacian(nu,U) Gauss linear corrected;
-    laplacian((1|A(U)),p) Gauss linear corrected;
-
-    laplacian(1,p) Gauss linear corrected;
+    default         Gauss linear corrected;
 }
 
 interpolationSchemes
diff --git a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution
index cb6270878..b5babaf19 100644
--- a/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution
+++ b/tutorials/immersedBoundary/cylinderInChannelFineIcoIbFoam/system/fvSolution
@@ -19,7 +19,7 @@ solvers
     p
     {
         solver          amgSolver;
-        cycle           W-cycle;
+        cycle           V-cycle;
         policy          cluster;
         nPreSweeps      2;
         nPostSweeps     2;
@@ -27,7 +27,7 @@ solvers
         minCoarseEqns   4;
         nMaxLevels      100;
         scale           on;
-        smoother        symGaussSeidel;
+        smoother        ILUC0;
 
         minIter         1;
         maxIter         100;
@@ -38,7 +38,7 @@ solvers
     pFinal
     {
         solver          amgSolver;
-        cycle           W-cycle;
+        cycle           V-cycle;
         policy          cluster;
         nPreSweeps      2;
         nPostSweeps     2;
@@ -46,12 +46,12 @@ solvers
         minCoarseEqns   4;
         nMaxLevels      100;
         scale           on;
-        smoother        symGaussSeidel;
+        smoother        ILUC0;
 
         minIter         1;
         maxIter         100;
         tolerance       1e-7;
-        relTol          0.0;
+        relTol          0.01;
     }
 
     U
@@ -60,8 +60,8 @@ solvers
         preconditioner   ILU0;
 
         minIter          1;
-        maxIter          1000;
-        tolerance        1e-08;
+        maxIter          100;
+        tolerance        1e-07;
         relTol           0;
     }
 }
diff --git a/tutorials/immersedBoundary/cylinderInSquarePotential/system/decomposeParDict b/tutorials/immersedBoundary/cylinderInSquarePotential/system/decomposeParDict
index 565de69c7..a1f04cec7 100644
--- a/tutorials/immersedBoundary/cylinderInSquarePotential/system/decomposeParDict
+++ b/tutorials/immersedBoundary/cylinderInSquarePotential/system/decomposeParDict
@@ -14,9 +14,11 @@ FoamFile
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-numberOfSubdomains 2;
+// numberOfSubdomains 2;
+// method simple;
 
-method manual;
+numberOfSubdomains 7;
+method scotch;
 
 simpleCoeffs
 {
@@ -24,18 +26,6 @@ simpleCoeffs
     delta           0.001;
 }
 
-hierarchicalCoeffs
-{
-    n               (1 1 1);
-    delta           0.001;
-    order           xyz;
-}
-
-metisCoeffs
-{
-    processorWeights 4(1 1 1 1);
-}
-
 manualCoeffs
 {
     dataFile        "cellDecomposition";