zhyang-dev/openfoam
1
0
Fork 0
mirror of https://develop.openfoam.com/Development/openfoam.git synced 2025-11-28 03:28:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'OpenCFD/master' into olesenm

Browse Source
This commit is contained in:
Mark Olesen
2008-10-27 17:01:53 +01:00
parent 11f35fe00f 606516d88b
commit 20430a8586
2 changed files with 54 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,12 +284,28 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
*this *this
); );
pointZones_.setSize(newPointZones.size()); label oldSize = pointZones_.size();
forAll (pointZones_, pzI)
if (newPointZones.size() <= pointZones_.size())
{ {
pointZones_[pzI] = newPointZones[pzI]; pointZones_.setSize(newPointZones.size());
} }
// Reset existing ones
forAll (pointZones_, czI)
{
pointZones_[czI] = newPointZones[czI];
}
// Extend with extra ones
pointZones_.setSize(newPointZones.size());
for (label czI = oldSize; czI < newPointZones.size(); czI++)
{
pointZones_.set(czI, newPointZones[czI].clone(pointZones_));
}
faceZoneMesh newFaceZones faceZoneMesh newFaceZones
( (
IOobject IOobject
@ -305,7 +321,14 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
*this *this
); );
faceZones_.setSize(newFaceZones.size()); oldSize = faceZones_.size();
if (newFaceZones.size() <= faceZones_.size())
{
faceZones_.setSize(newFaceZones.size());
}
// Reset existing ones
forAll (faceZones_, fzI) forAll (faceZones_, fzI)
{ {
faceZones_[fzI].resetAddressing faceZones_[fzI].resetAddressing
@ -315,6 +338,15 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
); );
} }
// Extend with extra ones
faceZones_.setSize(newFaceZones.size());
for (label fzI = oldSize; fzI < newFaceZones.size(); fzI++)
{
faceZones_.set(fzI, newFaceZones[fzI].clone(faceZones_));
}
cellZoneMesh newCellZones cellZoneMesh newCellZones
( (
IOobject IOobject
@ -330,12 +362,28 @@ Foam::polyMesh::readUpdateState Foam::polyMesh::readUpdate()
*this *this
); );
cellZones_.setSize(newCellZones.size()); oldSize = cellZones_.size();
if (newCellZones.size() <= cellZones_.size())
{
cellZones_.setSize(newCellZones.size());
}
// Reset existing ones
forAll (cellZones_, czI) forAll (cellZones_, czI)
{ {
cellZones_[czI] = newCellZones[czI]; cellZones_[czI] = newCellZones[czI];
} }
// Extend with extra ones
cellZones_.setSize(newCellZones.size());
for (label czI = oldSize; czI < newCellZones.size(); czI++)
{
cellZones_.set(czI, newCellZones[czI].clone(cellZones_));
}
if (boundaryChanged) if (boundaryChanged)
{ {
return polyMesh::TOPO_PATCH_CHANGE; return polyMesh::TOPO_PATCH_CHANGE;

2
src/meshTools/searchableSurface/distributedTriSurfaceMesh.C
View File

@ -1904,8 +1904,8 @@ void Foam::distributedTriSurfaceMesh::distribute
} }
else else
{ {
dict_.set("bounds", procBb_[Pstream::myProcNo()]);
procBb_.transfer(newProcBb); procBb_.transfer(newProcBb);
dict_.set("bounds", procBb_[Pstream::myProcNo()]);
} }
} }