Removed blank-line

applications/solvers/incompressible/potentialFreeSurfaceFoam/resetPhiPatches.H

-FieldField<fvsPatchField, scalar>& phibf = phi.boundaryField();
-const FieldField<fvPatchField, vector>& Ubf = U.boundaryField();
-const FieldField<fvsPatchField, vector>& Sfbf = mesh.Sf().boundaryField();
-
-forAll(phibf, patchI)
-{
-    phibf[patchI] = (Ubf[patchI] & Sfbf[patchI]);
-}

applications/solvers/incompressible/potentialFreeSurfaceFoam/pEqn.H → applications/solvers/multiphase/potentialFreeSurfaceFoam/pEqn.H

-#include "resetPhiPatches.H"
-
 volScalarField rAU(1.0/UEqn().A());
 surfaceScalarField rAUf("Dp", fvc::interpolate(rAU));
 
@@ -22,6 +20,9 @@ adjustPhi(phiHbyA, U, p_gh);
 
 fvOptions.relativeFlux(phiHbyA);
 
+// Update the phi BCs from U before p BCs are updated
+phi.boundaryField() = mesh.Sf().boundaryField() & U.boundaryField();
+
 // Non-orthogonal pressure corrector loop
 while (pimple.correctNonOrthogonal())
 {

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverInterpolate.C

@@ -90,10 +90,6 @@ void Foam::GAMGSolver::interpolate
     {
         corrC[restrictAddressing[celli]] += diagPtr[celli]*psiPtr[celli];
         diagC[restrictAddressing[celli]] += diagPtr[celli];
-        //corrC[restrictAddressing[celli]] += psiPtr[celli]/diagPtr[celli];
-        //diagC[restrictAddressing[celli]] += 1.0/diagPtr[celli];
-        //corrC[restrictAddressing[celli]] += psiPtr[celli];
-        //diagC[restrictAddressing[celli]] += 1.0;
     }
 
     for (register label ccelli=0; ccelli<nCCells; ccelli++)

src/OpenFOAM/matrices/lduMatrix/solvers/GAMG/GAMGSolverSolve.C

@@ -313,7 +313,7 @@ void Foam::GAMGSolver::Vcycle
             scalarField& ACfRef =
                 const_cast<scalarField&>(ACf.operator const scalarField&());
 
-            if (interpolateCorrection_ && leveli < coarsestLevel - 2)
+            if (interpolateCorrection_) //&& leveli < coarsestLevel - 2)
             {
                 interpolate
                 (

tutorials/incompressible/potentialFreeSurfaceFoam/oscillatingBox/extractHeightData → tutorials/multiphase/potentialFreeSurfaceFoam/oscillatingBox/extractHeightData

 #!/bin/sh
 awk '{print $1 " " $4}' postProcessing/poolHeight/0/faceSource.dat > poolHeight_vs_time
-