Merged all multiphase developments in OpenFOAM-1.7.x

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/0/p_rgh

@@ -10,7 +10,7 @@ FoamFile
     version     2.0;
     format      ascii;
     class       volScalarField;
-    object      p;
+    object      p_rgh;
 }
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/controlDict

@@ -37,17 +37,18 @@ writeFormat     ascii;
 
 writePrecision  6;
 
-writeCompression off;
+writeCompression compressed;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable true;
+runTimeModifiable yes;
 
 adjustTimeStep  yes;
 
 maxCo           0.5;
+maxAlphaCo      0.5;
 
 maxDeltaT       1;
 
@@ -59,17 +60,15 @@ functions
         functionObjectLibs ("libsampling.so");
         outputControl   timeStep;
         outputInterval  1;
-
-        fields
-        (
-            p
-        );
-
         probeLocations
         (
             ( 0 9.95 19.77 )
             ( 0 -9.95 19.77 )
         );
+        fields
+        (
+            p
+        );
     }
 
     wallPressure
@@ -79,7 +78,6 @@ functions
         outputControl   timeStep;
         outputInterval  10;
         surfaceFormat   raw;
-
         fields
         (
             p
@@ -97,4 +95,5 @@ functions
     }
 }
 
+
 // ************************************************************************* //

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSchemes

@@ -50,7 +50,7 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    p;
+    p_rgh;
     pcorr;
     alpha;
 }

tutorials/multiphase/interDyMFoam/ras/sloshingTank2D/system/fvSolution

@@ -40,7 +40,7 @@ solvers
         maxIter         100;
     }
 
-    p
+    p_rgh
     {
         solver          GAMG;
         tolerance       1e-08;
@@ -55,7 +55,7 @@ solvers
         mergeLevels     1;
     }
 
-    pFinal
+    p_rghFinal
     {
         solver          PCG;
         preconditioner