From 63a406e935a4b1869159bc343e7a924e5359ff03 Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Wed, 14 Nov 2012 15:44:23 +0000
Subject: [PATCH] settlingFoam: Changed from reading alpha to reading Alpha to
 support more complex BCs for Alpha

---
 .../multiphase/settlingFoam/createFields.H        | 15 +++++++--------
 .../settlingFoam/ras/dahl/0/{alpha => Alpha}      |  2 +-
 .../ras/dahl/constant/polyMesh/boundary           |  1 +
 .../settlingFoam/ras/tank3D/0/{alpha => Alpha}    |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename tutorials/multiphase/settlingFoam/ras/dahl/0/{alpha => Alpha} (98%)
 rename tutorials/multiphase/settlingFoam/ras/tank3D/0/{alpha => Alpha} (98%)

diff --git a/applications/solvers/multiphase/settlingFoam/createFields.H b/applications/solvers/multiphase/settlingFoam/createFields.H
index 8d161edd82..9a9fdee2df 100644
--- a/applications/solvers/multiphase/settlingFoam/createFields.H
+++ b/applications/solvers/multiphase/settlingFoam/createFields.H
@@ -12,12 +12,12 @@
         mesh
     );
 
-    Info<< "Reading field alpha\n" << endl;
-    volScalarField alpha
+    Info<< "Reading field Alpha\n" << endl;
+    volScalarField Alpha
     (
         IOobject
         (
-            "alpha",
+            "Alpha",
             runTime.timeName(),
             mesh,
             IOobject::MUST_READ,
@@ -100,21 +100,20 @@
             IOobject::NO_READ,
             IOobject::NO_WRITE
         ),
-        (scalar(1) - alpha)*rhoc + alpha*rhod
+        rhoc/(scalar(1) + (rhoc/rhod - 1.0)*Alpha)
     );
 
-    volScalarField Alpha
+    volScalarField alpha
     (
         IOobject
         (
-            "Alpha",
+            "alpha",
             runTime.timeName(),
             mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE
         ),
-        alpha*rhod/rho,
-        alpha.boundaryField().types()
+        rho*Alpha/rhod
     );
 
     #include "compressibleCreatePhi.H"
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha b/tutorials/multiphase/settlingFoam/ras/dahl/0/Alpha
similarity index 98%
rename from tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
rename to tutorials/multiphase/settlingFoam/ras/dahl/0/Alpha
index 807802b1d1..2ed64edd59 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/0/Alpha
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      Alpha;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
diff --git a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
index 35adf2fb7d..f460b43a07 100644
--- a/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
+++ b/tutorials/multiphase/settlingFoam/ras/dahl/constant/polyMesh/boundary
@@ -50,6 +50,7 @@ FoamFile
     frontAndBack
     {
         type            empty;
+        inGroups        1(empty);
         nFaces          16000;
         startFace       16240;
     }
diff --git a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha b/tutorials/multiphase/settlingFoam/ras/tank3D/0/Alpha
similarity index 98%
rename from tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
rename to tutorials/multiphase/settlingFoam/ras/tank3D/0/Alpha
index 67aa1fa666..6bbcf6c93b 100644
--- a/tutorials/multiphase/settlingFoam/ras/tank3D/0/alpha
+++ b/tutorials/multiphase/settlingFoam/ras/tank3D/0/Alpha
@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      alpha;
+    object      Alpha;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //