Updated block assembly of MRF and porous zones

applications/solvers/coupled/MRFPorousFoam/UEqn.H

@@ -5,6 +5,9 @@
         fvc::div(phi)
     );
 
+    // Update boundary velocity for consistency with the flux
+    mrfZones.correctBoundaryVelocity(U);
+
     // Momentum equation
     fvVectorMatrix UEqn
     (
@@ -67,11 +70,20 @@
 
         const scalarField& V = mesh.V().field();
 
-        // Note: this insertion should only happen in porous cell zones
-        // A rewrite of the porousZones class interface is needed.
+        // Note: insertion should only happen in porous cell zones
         // HJ, 14/Mar/2016
-        forAll (TUIn, cellI)
+
+        register label cellI;
+
+        forAll (pZones, pZoneI)
         {
+            const labelList& curZoneCells = pZones[pZoneI].zone();
+
+            // Loop over all cells in the zone
+            forAll (curZoneCells, zcI)
+            {
+                cellI = curZoneCells[zcI];
+
                 const scalar& cellV = V[cellI];
 
                 const tensor& cellTU = TUIn[cellI];
@@ -91,4 +103,5 @@
                 cellDD(2, 2) += cellV*cellTU.zz();
             }
         }
+    }
 }