From 27e9485e960172d4eb7195c01ca43ab9c7649f2c Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Mon, 12 Sep 2011 18:05:09 +0100
Subject: [PATCH] BUG: Continuation of partial revert in commit b6fafa7

---
 .../multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas  | 2 +-
 .../multiphaseEulerFoam/bubbleColumn/system/fvSchemes     | 8 ++++----
 .../multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p | 8 ++++----
 .../multiphaseEulerFoam/damBreak4phase/system/fvSchemes   | 8 ++++----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas
index fc0a0cff80..833c25f034 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/0/alphas
@@ -17,7 +17,7 @@ FoamFile
 
 dimensions      [0 0 0 0 0 0 0];
 
-internalField   nonuniform List<scalar>
+internalField   nonuniform List<scalar> 
 1875
 (
 1
diff --git a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
index fe3f1e6de4..feb67860ae 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/bubbleColumn/system/fvSchemes
@@ -29,8 +29,8 @@ divSchemes
 {
     default         none;
 
-    div(phi,alpha)          Gauss upwind; //limitedLinear01 1;
-    div(phirb,alpha)        Gauss upwind;
+    "div\(phi,alpha.*\)"    Gauss vanLeer;
+    "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
 
     "div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1;
     div(Rc)                 Gauss linear;
@@ -39,7 +39,7 @@ divSchemes
 
 laplacianSchemes
 {
-    default         Gauss linear uncorrected;
+    default         Gauss linear corrected;
 }
 
 interpolationSchemes
@@ -49,7 +49,7 @@ interpolationSchemes
 
 snGradSchemes
 {
-    default         uncorrected;
+    default         corrected;
 }
 
 fluxRequired
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p
index 318a5d779c..7d12a33956 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/0.org/p
@@ -22,25 +22,25 @@ boundaryField
 {
     leftWall
     {
-        type            buoyantPressure;
+        type            multiphaseFixedFluxPressure;
         value           uniform 0;
     }
 
     rightWall
     {
-        type            buoyantPressure;
+        type            multiphaseFixedFluxPressure;
         value           uniform 0;
     }
 
     lowerWall
     {
-        type            buoyantPressure;
+        type            multiphaseFixedFluxPressure;
         value           uniform 0;
     }
 
     atmosphere
     {
-        type            fixedValue; //totalPressure;
+        type            totalPressure;
         p0              uniform 0;
         U               Uair;
         phi             phiair;
diff --git a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
index cd9e871aaf..5a4bb79d96 100644
--- a/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
+++ b/tutorials/multiphase/multiphaseEulerFoam/damBreak4phase/system/fvSchemes
@@ -27,12 +27,12 @@ gradSchemes
 
 divSchemes
 {
-    div(phi,alpha)          Gauss vanLeer;
-    div(phirb,alpha)        Gauss vanLeer;
+    "div\(phi,alpha.*\)"    Gauss vanLeer;
+    "div\(phir,alpha.*,alpha.*\)"   Gauss vanLeer;
 
-    "div\(phiAlpha.*,U.*\)" Gauss upwind;
+    "div\(phiAlpha.*,U.*\)" Gauss limitedLinearV 1;
     div(Rc)                 Gauss linear;
-    "div\(phi.*,U.*\)"      Gauss upwind;
+    "div\(phi.*,U.*\)"      Gauss limitedLinearV 1;
 }
 
 laplacianSchemes