resolve merge conflict

applications/solvers/incompressible/pimpleDyMFoam/correctPhi.H

 {
+    if (mesh.changing())
+    {
+        forAll(U.boundaryField(), patchi)
+        {
+            if (U.boundaryField()[patchi].fixesValue())
+            {
+                U.boundaryField()[patchi].initEvaluate();
+            }
+        }
+
+        forAll(U.boundaryField(), patchi)
+        {
+            if (U.boundaryField()[patchi].fixesValue())
+            {
+                U.boundaryField()[patchi].evaluate();
+
+                phi.boundaryField()[patchi] =
+                U.boundaryField()[patchi] & mesh.Sf().boundaryField()[patchi];
+            }
+        }
+    }
+
     wordList pcorrTypes
     (
         p.boundaryField().size(),

applications/solvers/multiphase/compressibleInterDyMFoam/correctPhi.H

 {
+    if (mesh.changing())
+    {
+        forAll(U.boundaryField(), patchi)
+        {
+            if (U.boundaryField()[patchi].fixesValue())
+            {
+                U.boundaryField()[patchi].initEvaluate();
+            }
+        }
+
+        forAll(U.boundaryField(), patchi)
+        {
+            if (U.boundaryField()[patchi].fixesValue())
+            {
+                U.boundaryField()[patchi].evaluate();
+
+                phi.boundaryField()[patchi] =
+                U.boundaryField()[patchi] & mesh.Sf().boundaryField()[patchi];
+            }
+        }
+    }
+
     #include "continuityErrs.H"
 
     volScalarField pcorr

applications/solvers/multiphase/interDyMFoam/correctPhi.H

 {
+    if (mesh.changing())
+    {
+        forAll(U.boundaryField(), patchi)
+        {
+            if (U.boundaryField()[patchi].fixesValue())
+            {
+                U.boundaryField()[patchi].initEvaluate();
+            }
+        }
+
+        forAll(U.boundaryField(), patchi)
+        {
+            if (U.boundaryField()[patchi].fixesValue())
+            {
+                U.boundaryField()[patchi].evaluate();
+
+                phi.boundaryField()[patchi] =
+                U.boundaryField()[patchi] & mesh.Sf().boundaryField()[patchi];
+            }
+        }
+    }
+
     #include "continuityErrs.H"
 
     volScalarField pcorr

src/Pstream/mpi/UPstream.C

@@ -177,7 +177,7 @@ void Foam::reduce(scalar& Value, const sumOp<scalar>& bop)
 {
     if (Pstream::debug)
     {
-        Pout<< "UPstream::reduce : value:" << Value << endl;
+        Pout<< "Foam::reduce : value:" << Value << endl;
     }
 
     if (!UPstream::parRun())
@@ -452,7 +452,7 @@ void Foam::reduce(scalar& Value, const sumOp<scalar>& bop)
 
     if (Pstream::debug)
     {
-        Pout<< "UPstream::reduce : reduced value:" << Value << endl;
+        Pout<< "Foam::reduce : reduced value:" << Value << endl;
     }
 }
 

tutorials/multiphase/interDyMFoam/ras/damBreakWithObstacle/constant/dynamicMeshDict

@@ -19,14 +19,23 @@ dynamicFvMesh   dynamicRefineFvMesh;
 
 dynamicRefineFvMeshCoeffs
 {
+    // How often to refine
     refineInterval  1;
+    // Field to be refinement on
     field           alpha1;
+    // Refine field inbetween lower..upper
     lowerRefineLevel 0.001;
     upperRefineLevel 0.999;
+    // If value < unrefineLevel unrefine
     unrefineLevel   10;
+    // Have slower than 2:1 refinement
     nBufferLayers   1;
+    // Refine cells only up to maxRefinement levels
     maxRefinement   2;
+    // Stop refinement if maxCells reached
     maxCells        200000;
+    // Flux field and corresponding velocity field. Fluxes on changed
+    // faces get recalculated by interpolating the velocity.
     correctFluxes
     (
         (
@@ -34,6 +43,7 @@ dynamicRefineFvMeshCoeffs
             U
         )
     );
+    // Write the refinement level as a volScalarField
     dumpLevel       true;
 }