exaFOAM/foam-extend4.1-coherent-io
Archived
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Bugfix: Fixed corrupted point field on stitch

Browse source
This commit is contained in:
Hrvoje Jasak 2015-09-18 12:03:07 +01:00
parent e1b0c33611
commit 9e29f21409
1 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/meshTools/triSurface/triSurface/stitchTriangles.C
View file

@ -46,17 +46,12 @@ bool triSurface::stitchTriangles
pointField newPoints;
bool hasMerged = mergePoints(rawPoints, tol, verbose, pointMap, newPoints);
pointField& ps = storedPoints();
// Set the coordinates to the merged ones
ps.transfer(newPoints);
if (hasMerged)
{
if (verbose)
{
Pout<< "stitchTriangles : Merged from " << rawPoints.size()
<< " points down to " << ps.size() << endl;
<< " points down to " << newPoints.size() << endl;
}
// Reset the triangle point labels to the unique points array
@ -72,7 +67,12 @@ bool triSurface::stitchTriangles
tri.region()
);
if ((newTri[0] != newTri[1]) && (newTri[0] != newTri[2]) && (newTri[1] != newTri[2]))
if
(
(newTri[0] != newTri[1])
&& (newTri[0] != newTri[2])
&& (newTri[1] != newTri[2])
)
{
operator[](newTriangleI++) = newTri;
}
@ -82,11 +82,12 @@ bool triSurface::stitchTriangles
<< "Removing triangle " << i
<< " with non-unique vertices." << endl
<< " vertices :" << newTri << endl
<< " coordinates:" << newTri.points(ps)
<< " coordinates:" << newTri.points(newPoints)
<< endl;
}
}
// If empty triangles are detected, remove them from the list
if (newTriangleI != size())
{
if (verbose)
@ -97,12 +98,12 @@ bool triSurface::stitchTriangles
}
setSize(newTriangleI);
// And possibly compact out any unused points (since used only
// Possibly compact out any unused points (since used only
// by triangles that have just been deleted)
// Done in two passes to save memory (pointField)
// 1. Detect only
PackedBoolList pointIsUsed(ps.size());
PackedBoolList pointIsUsed(newPoints.size());
label nPoints = 0;
@ -120,20 +121,20 @@ bool triSurface::stitchTriangles
}
}
if (nPoints != ps.size())
if (nPoints != newPoints.size())
{
// 2. Compact.
pointMap.setSize(ps.size());
pointMap.setSize(newPoints.size());
label newPointI = 0;
forAll(pointIsUsed, pointI)
{
if (pointIsUsed[pointI])
{
ps[newPointI] = ps[pointI];
newPoints[newPointI] = newPoints[pointI];
pointMap[pointI] = newPointI++;
}
}
ps.setSize(newPointI);
newPoints.setSize(newPointI);
newTriangleI = 0;
forAll(*this, i)
@ -149,6 +150,9 @@ bool triSurface::stitchTriangles
}
}
}
// Set the coordinates to the merged ones
storedPoints().transfer(newPoints);
}
return hasMerged;