Merge commit 'OpenCFD/master' into olesenm

applications/solvers/incompressible/icoFoam/icoFoam.C

-/*---------------------------------------------------------------------------* \
+/*---------------------------------------------------------------------------*\
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
@@ -71,7 +71,7 @@ int main(int argc, char *argv[])
             volScalarField rUA = 1.0/UEqn.A();
 
             U = rUA*UEqn.H();
-            phi = (fvc::interpolate(U) & mesh.Sf()) 
+            phi = (fvc::interpolate(U) & mesh.Sf())
                 + fvc::ddtPhiCorr(rUA, U, phi);
 
             adjustPhi(phi, U, p);

applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C

@@ -315,12 +315,6 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
             }
         }
 
-        newOwn = own[faceI];
-        if (newOwn > -1) newOwn = renumberCells[newOwn];
-
-        newNei = nei[faceI];
-        if (newNei > -1) newNei = renumberCells[newNei];
-
         if (faceI < m.nInternalFaces() || faceI >= m.nFaces())
         {
             newPatch = -1;
@@ -330,6 +324,20 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
             newPatch = patchIndices[bm.whichPatch(faceI)];
         }
 
+        newOwn = own[faceI];
+        if (newOwn > -1) newOwn = renumberCells[newOwn];
+
+        if (newPatch > -1) 
+        {
+            newNei = -1;
+        } 
+        else 
+        {
+            newNei = nei[faceI];
+            newNei = renumberCells[newNei];
+        }
+
+
         newZone = fz.whichZone(faceI);
         newZoneFlip = false;
 

src/OpenFOAM/meshes/polyMesh/polyMeshIO.C

@@ -284,6 +284,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             *this
         );
 
+        pointZones_.setSize(newPointZones.size());
         forAll (pointZones_, pzI)
         {
             pointZones_[pzI] = newPointZones[pzI];
@@ -304,6 +305,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             *this
         );
 
+        faceZones_.setSize(newFaceZones.size());
         forAll (faceZones_, fzI)
         {
             faceZones_[fzI].resetAddressing
@@ -328,6 +330,7 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
             *this
         );
 
+        cellZones_.setSize(newCellZones.size());
         forAll (cellZones_, czI)
         {
             cellZones_[czI] = newCellZones[czI];