From 0db5a335bbc6d24143baa4d084497d39ec1a2d98 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 24 Feb 2014 16:34:42 +0000
Subject: [PATCH] driftFluxFoam: combined diffusion into implicit MULES
 predictor

---
 .../solvers/multiphase/driftFluxFoam/alphaEqn.H   | 15 +++++++++------
 .../multiphase/driftFluxFoam/alphaEqnSubCycle.H   | 13 +++++++------
 .../multiphase/driftFluxFoam/driftFluxFoam.C      |  2 ++
 .../driftFluxFoam/ras/dahl/system/fvSchemes       |  2 +-
 .../driftFluxFoam/ras/dahl/system/fvSolution      |  4 ++--
 .../ras/mixerVessel2D/system/fvSchemes            |  2 +-
 .../ras/mixerVessel2D/system/fvSolution           |  2 +-
 tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U |  4 ++--
 .../driftFluxFoam/ras/tank3D/system/controlDict   |  2 +-
 .../driftFluxFoam/ras/tank3D/system/fvSchemes     |  2 +-
 .../driftFluxFoam/ras/tank3D/system/fvSolution    |  6 +++---
 11 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
index e72a625fae..817a0c9124 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqn.H
@@ -17,7 +17,12 @@
                 phi,
                 upwind<scalar>(mesh, phi)
             ).fvmDiv(phi, alpha1)
-          - fvm::laplacian(mut/rho, alpha1)
+          - fv::gaussLaplacianScheme<scalar, scalar>
+            (
+                mesh,
+                linear<scalar>(mesh),
+                fv::uncorrectedSnGrad<scalar>(mesh)
+            ).fvmLaplacian(fvc::interpolate(mut/rho), alpha1)
         );
 
         alpha1Eqn.solve();
@@ -33,7 +38,7 @@
 
         if (alphaApplyPrevCorr && tphiAlphaCorr0.valid())
         {
-            Info<< "Applying the previous iteration compression flux" << endl;
+            Info<< "Applying the previous iteration correction flux" << endl;
             #ifdef LTSSOLVE
             MULES::LTScorrect(alpha1, phiAlpha, tphiAlphaCorr0(), 1, 0);
             #else
@@ -45,8 +50,6 @@
 
         // Cache the upwind-flux
         tphiAlphaCorr0 = tphiAlphaUD;
-
-        alpha2 = 1.0 - alpha1;
     }
 
     for (int aCorr=0; aCorr<nAlphaCorr; aCorr++)
@@ -99,8 +102,6 @@
             MULES::explicitSolve(alpha1, phi, phiAlpha, 1, 0);
             #endif
         }
-
-        alpha2 = 1.0 - alpha1;
     }
 
     if (alphaApplyPrevCorr && MULESCorr)
@@ -108,6 +109,8 @@
         tphiAlphaCorr0 = phiAlpha - tphiAlphaCorr0;
     }
 
+    alpha2 = 1.0 - alpha1;
+
     Info<< "Phase-1 volume fraction = "
         << alpha1.weightedAverage(mesh.Vsc()).value()
         << "  Min(alpha1) = " << min(alpha1).value()
diff --git a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
index 824314a03c..f134702c68 100644
--- a/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
+++ b/applications/solvers/multiphase/driftFluxFoam/alphaEqnSubCycle.H
@@ -61,13 +61,14 @@
         alpha1Eqn.solve(mesh.solver("alpha1Diffusion"));
 
         phiAlpha += alpha1Eqn.flux();
-    }
+        alpha2 = 1.0 - alpha1;
 
-    Info<< "Phase-1 volume fraction = "
-        << alpha1.weightedAverage(mesh.Vsc()).value()
-        << "  Min(alpha1) = " << min(alpha1).value()
-        << "  Max(alpha1) = " << max(alpha1).value()
-        << endl;
+        Info<< "Phase-1 volume fraction = "
+            << alpha1.weightedAverage(mesh.Vsc()).value()
+            << "  Min(alpha1) = " << min(alpha1).value()
+            << "  Max(alpha1) = " << max(alpha1).value()
+            << endl;
+    }
 
     rhoPhi = phiAlpha*(rho1 - rho2) + phi*rho2;
     rho == alpha1*rho1 + alpha2*rho2;
diff --git a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
index d0aafc6eab..00e80087b8 100644
--- a/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
+++ b/applications/solvers/multiphase/driftFluxFoam/driftFluxFoam.C
@@ -45,6 +45,8 @@ Description
 #include "pimpleControl.H"
 #include "fvIOoptionList.H"
 #include "fixedFluxPressureFvPatchScalarField.H"
+#include "gaussLaplacianScheme.H"
+#include "uncorrectedSnGrad.H"
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
index c6186ffac4..98e6fa16c9 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(rhoPhi,U)       Gauss linearUpwind grad(U);
     div(phiVdj,Vdj)     Gauss linear;
     div(phi,alpha)      Gauss vanLeer;
-    div(phirb,alpha)    Gauss vanLeer;
+    div(phirb,alpha)    Gauss linear;
     div(rhoPhi,k)       Gauss limitedLinear 1;
     div(rhoPhi,epsilon) Gauss limitedLinear 1;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
index fbe0f240f9..b78a4821e4 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/dahl/system/fvSolution
@@ -19,11 +19,11 @@ solvers
 {
     "alpha1.*"
     {
-        nAlphaCorr      3;
+        nAlphaCorr      2;
         nAlphaSubCycles 1;
 
         MULESCorr       yes;
-        nLimiterIter    5;
+        nLimiterIter    3;
         alphaApplyPrevCorr  yes;
 
         solver          smoothSolver;
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
index c6186ffac4..98e6fa16c9 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(rhoPhi,U)       Gauss linearUpwind grad(U);
     div(phiVdj,Vdj)     Gauss linear;
     div(phi,alpha)      Gauss vanLeer;
-    div(phirb,alpha)    Gauss vanLeer;
+    div(phirb,alpha)    Gauss linear;
     div(rhoPhi,k)       Gauss limitedLinear 1;
     div(rhoPhi,epsilon) Gauss limitedLinear 1;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
index fe17af4e50..3fa09bb4f5 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/mixerVessel2D/system/fvSolution
@@ -23,7 +23,7 @@ solvers
         nAlphaSubCycles 1;
 
         MULESCorr       yes;
-        nLimiterIter    5;
+        nLimiterIter    3;
         alphaApplyPrevCorr  yes;
 
         solver          smoothSolver;
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
index 1c824278e6..da99a43dd3 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/0/U
@@ -136,8 +136,8 @@ boundaryField
 
     OUTL15
     {
-        type            inletOutlet;
-        inletValue      uniform (0 0 0);
+        type            pressureInletOutletVelocity;
+        value           uniform (0 0 0);
     }
 }
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
index 6a0cd39d3d..dd41af85ba 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/controlDict
@@ -25,7 +25,7 @@ stopAt          endTime;
 
 endTime         8000;
 
-deltaT          0.1;
+deltaT          0.5;
 
 writeControl    runTime;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
index 6c665ca46c..8809a091d2 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSchemes
@@ -32,7 +32,7 @@ divSchemes
     div(rhoPhi,U)       Gauss linearUpwind grad(U);
     div(phiVdj,Vdj)     Gauss linear;
     div(phi,alpha)      Gauss vanLeer;
-    div(phirb,alpha)    Gauss vanLeer;
+    div(phirb,alpha)    Gauss linear;
     div(rhoPhi,k)       Gauss limitedLinear 1;
     div(rhoPhi,epsilon) Gauss limitedLinear 1;
 
diff --git a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
index cb5f5e8897..f6f1b18e53 100644
--- a/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
+++ b/tutorials/multiphase/driftFluxFoam/ras/tank3D/system/fvSolution
@@ -19,11 +19,11 @@ solvers
 {
     "alpha1.*"
     {
-        nAlphaCorr      5;
+        nAlphaCorr      2;
         nAlphaSubCycles 1;
 
-        MULESCorr       no; //yes;
-        nLimiterIter    5;
+        MULESCorr       yes;
+        nLimiterIter    3;
         alphaApplyPrevCorr  yes;
 
         solver          smoothSolver;