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

BUG: sortPointEdges: Break out of loop if cannot get back to starting edge. Print Warning.

Browse Source
This commit is contained in:
laurence
2013-08-01 17:16:34 +01:00
parent 3615248b8f
commit d7963e6496
1 changed files with 39 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/OpenFOAM/meshes/primitiveMesh/PatchTools/PatchToolsSortPoints.C
View File

@ -49,7 +49,7 @@ Foam::PatchTools::sortedPointEdges
const labelListList& faceEdges = p.faceEdges(); const labelListList& faceEdges = p.faceEdges();
// create the lists for the various results. (resized on completion) // create the lists for the various results. (resized on completion)
labelListList sortedPointEdges(pointEdges.size()); labelListList sortedPointEdges(pointEdges);
DynamicList<label> newEdgeList; DynamicList<label> newEdgeList;
@ -57,12 +57,16 @@ Foam::PatchTools::sortedPointEdges
{ {
const labelList& pEdges = pointEdges[pointI]; const labelList& pEdges = pointEdges[pointI];
label nPointEdges = pEdges.size();
label edgeI = pEdges[0]; label edgeI = pEdges[0];
label prevFaceI = edgeFaces[edgeI][0]; label prevFaceI = edgeFaces[edgeI][0];
newEdgeList.clear(); newEdgeList.clear();
newEdgeList.setCapacity(pEdges.size()); newEdgeList.setCapacity(nPointEdges);
label nVisitedEdges = 0;
do do
{ {
@ -103,10 +107,42 @@ Foam::PatchTools::sortedPointEdges
prevFaceI = faceI; prevFaceI = faceI;
nVisitedEdges++;
if (nVisitedEdges > nPointEdges)
{
WarningIn("Foam::PatchTools::sortedPointEdges()")
<< "Unable to order pointEdges as the face connections "
<< "are not circular" << nl
<< " Original pointEdges = " << pEdges << nl
<< " New pointEdges = " << newEdgeList
<< endl;
newEdgeList = pEdges;
break;
}
} while (edgeI != pEdges[0]); } while (edgeI != pEdges[0]);
if (newEdgeList.size() == pEdges.size()) if (newEdgeList.size() == nPointEdges)
{ {
forAll(pEdges, eI)
{
if (findIndex(newEdgeList, pEdges[eI]) == -1)
{
WarningIn("Foam::PatchTools::sortedPointEdges()")
<< "Cannot find all original edges in the new list"
<< nl
<< " Original pointEdges = " << pEdges << nl
<< " New pointEdges = " << newEdgeList
<< endl;
newEdgeList = pEdges;
break;
}
}
sortedPointEdges[pointI] = newEdgeList; sortedPointEdges[pointI] = newEdgeList;
} }
} }