Merged all multiphase developments in OpenFOAM-1.7.x

tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/p_rgh

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

tutorials/multiphase/interDyMFoam/ras/floatingObject/0.org/pointDisplacement

@@ -37,6 +37,7 @@ boundaryField
         centreOfMass    (0.5 0.5 0.5);
         momentOfInertia (0.08622222 0.08622222 0.144);
         mass            9.6;
+        rhoInf          1;  // needed only for solvers solving for kinematic pressure
         report          on;
         value           uniform (0 0 0);
     }

tutorials/multiphase/interDyMFoam/ras/floatingObject/system/controlDict

@@ -37,22 +37,23 @@ writeFormat     ascii;
 
 writePrecision  12;
 
-writeCompression off;
+writeCompression uncompressed;
 
 timeFormat      general;
 
 timePrecision   6;
 
-runTimeModifiable true;
+runTimeModifiable yes;
 
 adjustTimeStep  yes;
 
 maxCo           0.5;
-
+maxAlphaCo      0.5;
 maxDeltaT       0.01;
 
 libs
 (
+    "libOpenFOAM.so"
     "libincompressibleRASModels.so"
     "libfvMotionSolvers.so"
     "libforces.so"

tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSchemes

@@ -29,7 +29,7 @@ divSchemes
 {
     div(rho*phi,U)  Gauss vanLeerV;
     div(phi,alpha)  Gauss vanLeer;
-    div(phirb,alpha) Gauss vanLeer;
+    div(phirb,alpha) Gauss interfaceCompression;
     div(phi,k)      Gauss upwind;
     div(phi,epsilon) Gauss upwind;
 }
@@ -52,7 +52,7 @@ snGradSchemes
 fluxRequired
 {
     default         no;
-    p;
+    p_rgh;
     pcorr;
     alpha;
 }

tutorials/multiphase/interDyMFoam/ras/floatingObject/system/fvSolution

@@ -52,7 +52,7 @@ solvers
         maxIter         100;
     }
 
-    p
+    p_rgh
     {
         solver          GAMG;
         tolerance       1e-8;
@@ -67,7 +67,7 @@ solvers
         mergeLevels     1;
     }
 
-    pFinal
+    p_rghFinal
     {
         solver          PCG;
         preconditioner

tutorials/multiphase/interDyMFoam/ras/floatingObject/system/topoSetDict

@@ -18,20 +18,20 @@ FoamFile
 actions
 (
     {
-        name c0;
-        type cellSet;
-        action new;
-        source boxToCell;
+        name    c0;
+        type    cellSet;
+        action  new;
+        source  boxToCell;
         sourceInfo
         {
-           box   (0.35 0.35 0.44) (0.65 0.65 0.56);
+            box (0.35 0.35 0.44) (0.65 0.65 0.56);
         }
     }
 
     {
-        name c0;
-        type cellSet;
-        action invert;
+        name    c0;
+        type    cellSet;
+        action  invert;
     }
 );