Merge branch 'master' of /home/noisy3/OpenFOAM/OpenFOAM-dev

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

@@ -38,12 +38,6 @@ boundaryField
         momentOfInertia (0.08622222 0.08622222 0.144);
         mass            9.6;
         rhoInf          1;                      // for forces calculation
-        // See sixDoFRigidBodyMotionState
-        Q               (1 0 0 0 1 0 0 0 1);
-        v               (0 0 0);
-        a               (0 0 0);
-        pi              (0 0 0);
-        tau             (0 0 0);
         value           uniform (0 0 0);
     }
 }

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

@@ -18,7 +18,7 @@ FoamFile
 solvers
 {
     cellDisplacement
-      {
+    {
         solver          GAMG;
         tolerance       1e-08;
         relTol          0;
@@ -27,7 +27,7 @@ solvers
         nCellsInCoarsestLevel 10;
         agglomerator    faceAreaPair;
         mergeLevels     1;
-      }
+    }
 
     pcorr
     {
@@ -117,7 +117,7 @@ PISO
     nAlphaCorr      1;
     nAlphaSubCycles 1;
     cAlpha          1.5;
-    correctPhi      no;
+    correctPhi      yes;
 }
 
 relaxationFactors