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

applications/solvers/multiphase/twoPhaseEulerFoam/alphaEqn.H

@@ -2,8 +2,8 @@
     word scheme("div(phi,alpha)");
     word schemer("div(phir,alpha)");
 
-    surfaceScalarField phic(phi);
-    surfaceScalarField phir(phia - phib);
+    surfaceScalarField phic("phic", phi);
+    surfaceScalarField phir("phir", phia - phib);
 
     if (g0.value() > 0.0)
     {
@@ -41,7 +41,7 @@
         alphaEqn.relax();
         alphaEqn.solve();
 
-#       include "packingLimiter.H"
+        #include "packingLimiter.H"
 
         beta = scalar(1) - alpha;
 

src/finiteVolume/cfdTools/general/adjustPhi/adjustPhi.C

@@ -40,7 +40,8 @@ bool Foam::adjustPhi
 {
     if (p.needReference())
     {
-        p.boundaryField().updateCoeffs();
+        // p coefficients should not be updated here
+        // p.boundaryField().updateCoeffs();
 
         scalar massIn = 0.0;
         scalar fixedMassOut = 0.0;