From cff638a7da8fdc445b83da778cf0197a745d38a0 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Mon, 5 Sep 2011 19:09:32 +0100
Subject: [PATCH] multiphaseInterFoam: No need for refPhase with MULES

---
 .../multiphaseMixture/multiphaseMixture.C     | 19 +++++++++++++++----
 .../multiphaseMixture/multiphaseMixture.H     |  4 ----
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
index 8608c60148..fb6283d1ef 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.C
@@ -64,7 +64,6 @@ Foam::multiphaseMixture::multiphaseMixture
 :
     transportModel(U, phi),
     phases_(lookup("phases"), phase::iNew(U, phi)),
-    refPhase_(*phases_.lookup(word(lookup("refPhase")))),
 
     mesh_(U.mesh()),
     U_(U),
@@ -335,7 +334,7 @@ void Foam::multiphaseMixture::correctContactAngle
 ) const
 {
     const volScalarField::GeometricBoundaryField& gbf
-        = refPhase_.boundaryField();
+        = alpha1.boundaryField();
 
     const fvBoundaryMesh& boundary = mesh_.boundary();
 
@@ -549,8 +548,20 @@ void Foam::multiphaseMixture::solveAlphas
 
     MULES::limitSum(phiAlphaCorrs);
 
-    rhoPhi_ = 0.0*phi_*refPhase_.rho();
-    volScalarField sumAlpha("sumAlpha", 0.0*refPhase_);
+    rhoPhi_ = dimensionedScalar("0", dimensionSet(1, 0, -1, 0, 0), 0);
+
+    volScalarField sumAlpha
+    (
+        IOobject
+        (
+            "sumAlpha",
+            mesh_.time().timeName(),
+            mesh_
+        ),
+        mesh_,
+        dimensionedScalar("sumAlpha", dimless, 0)
+    );
+
     phasei = 0;
 
     forAllIter(PtrDictionary<phase>, phases_, iter)
diff --git a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
index ae15dc7ed0..19b436ef2a 100644
--- a/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
+++ b/applications/solvers/multiphase/multiphaseInterFoam/multiphaseMixture/multiphaseMixture.H
@@ -136,10 +136,6 @@ private:
         //- Dictionary of phases
         PtrDictionary<phase> phases_;
 
-        //- The phase chosen as reference, the one which is derived from
-        //  the others such thatr they sum to 1
-        phase& refPhase_;
-
         const fvMesh& mesh_;
         const volVectorField& U_;
         const surfaceScalarField& phi_;