songtianlun/openfoam
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

Browse Source
This commit is contained in:
henry 2008-07-29 08:46:33 +01:00
commit 5301bf1ce7
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
applications/utilities/mesh/manipulation/mergeMeshes/mergePolyMesh.C
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()) if (faceI < m.nInternalFaces() || faceI >= m.nFaces())
{ {
newPatch = -1; newPatch = -1;
@ -330,6 +324,20 @@ void Foam::mergePolyMesh::addMesh(const polyMesh& m)
newPatch = patchIndices[bm.whichPatch(faceI)]; 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); newZone = fz.whichZone(faceI);
newZoneFlip = false; newZoneFlip = false;

3
src/OpenFOAM/meshes/polyMesh/polyMeshIO.C
View File

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