Merge commit 'OpenCFD/master' into olesenm

This commit is contained in:
Mark Olesen
2008-07-29 09:30:18 +02:00
3 changed files with 19 additions and 8 deletions

View File

@ -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;