From 2f1e1f013a894b64f235e23aca2a593144af84c7 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 3 May 2013 17:48:17 +0100
Subject: [PATCH 1/2] interFoam: Updated tutorials

---
 .../cfdTools/general/include/alphaControls.H           |  2 +-
 .../interFoam/laminar/capillaryRise/system/fvSolution  | 10 +++++++---
 .../interFoam/laminar/damBreak/system/fvSolution       | 10 +++++++---
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/finiteVolume/cfdTools/general/include/alphaControls.H b/src/finiteVolume/cfdTools/general/include/alphaControls.H
index b5ae1f94d8..c172904f4f 100644
--- a/src/finiteVolume/cfdTools/general/include/alphaControls.H
+++ b/src/finiteVolume/cfdTools/general/include/alphaControls.H
@@ -1,7 +1,7 @@
 const dictionary& alphaControls = mesh.solverDict(alpha1.name());
 label nAlphaCorr(readLabel(alphaControls.lookup("nAlphaCorr")));
 label nAlphaSubCycles(readLabel(alphaControls.lookup("nAlphaSubCycles")));
-Switch MULESCorr(alphaControls.lookup("MULESCorr"));
+Switch MULESCorr(alphaControls.lookupOrDefault<Switch>("MULESCorr", false));
 
 if (nAlphaSubCycles > 1 && pimple.nCorrPIMPLE() != 1)
 {
diff --git a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
index 569a58a340..6bea572056 100644
--- a/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/capillaryRise/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
 
 solvers
 {
+    alpha1
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 2;
+        cAlpha          1;
+    }
+
     pcorr
     {
         solver          PCG;
@@ -54,9 +61,6 @@ PIMPLE
     momentumPredictor no;
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
-    nAlphaCorr      1;
-    nAlphaSubCycles 2;
-    cAlpha          1;
 }
 
 
diff --git a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
index 569a58a340..6bea572056 100644
--- a/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interFoam/laminar/damBreak/system/fvSolution
@@ -17,6 +17,13 @@ FoamFile
 
 solvers
 {
+    alpha1
+    {
+        nAlphaCorr      1;
+        nAlphaSubCycles 2;
+        cAlpha          1;
+    }
+
     pcorr
     {
         solver          PCG;
@@ -54,9 +61,6 @@ PIMPLE
     momentumPredictor no;
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
-    nAlphaCorr      1;
-    nAlphaSubCycles 2;
-    cAlpha          1;
 }
 
 

From 7310d0911db5f33593ce5d2192bc4f294c89f504 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Fri, 3 May 2013 17:58:16 +0100
Subject: [PATCH 2/2] interMixingFoam: updated tutorials

---
 .../threePhaseInterfaceProperties.C                        | 6 ++++--
 .../interMixingFoam/laminar/damBreak/system/fvSolution     | 7 ++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
index e16f83bd2e..f7edec6415 100644
--- a/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
+++ b/applications/solvers/multiphase/interFoam/interMixingFoam/threePhaseInterfaceProperties/threePhaseInterfaceProperties.C
@@ -174,8 +174,10 @@ Foam::threePhaseInterfaceProperties::threePhaseInterfaceProperties
     (
         readScalar
         (
-            mixture.U().mesh().solutionDict().subDict("PIMPLE").
-                lookup("cAlpha")
+            mixture.U().mesh().solverDict
+            (
+                mixture_.alpha1().name()
+            ).lookup("cAlpha")
         )
     ),
     sigma12_(mixture.lookup("sigma12")),
diff --git a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
index d4ae062a47..235c7014d0 100644
--- a/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
+++ b/tutorials/multiphase/interMixingFoam/laminar/damBreak/system/fvSolution
@@ -19,6 +19,10 @@ solvers
 {
     "alpha."
     {
+        nAlphaCorr      1;
+        nAlphaSubCycles 2;
+        cAlpha          1;
+
         solver          smoothSolver;
         smoother        GaussSeidel;
         tolerance       1e-06;
@@ -64,9 +68,6 @@ PIMPLE
     momentumPredictor no;
     nCorrectors     3;
     nNonOrthogonalCorrectors 0;
-    nAlphaCorr      1;
-    nAlphaSubCycles 2;
-    cAlpha          1;
 }