ENH: mergePoints: new API, now templated

This commit is contained in:
mattijs
2011-12-08 16:32:46 +00:00
parent 735dd36124
commit 17a38cff7c
6 changed files with 22 additions and 31 deletions

View File

@ -49,19 +49,17 @@ void Foam::meshDualiser::checkPolyTopoChange(const polyTopoChange& meshMod)
}
labelList oldToNew;
pointField newPoints;
bool hasMerged = mergePoints
label nUnique = mergePoints
(
points,
1E-6,
false,
oldToNew,
newPoints
oldToNew
);
if (hasMerged)
if (nUnique < points.size())
{
labelListList newToOld(invertOneToMany(newPoints.size(), oldToNew));
labelListList newToOld(invertOneToMany(nUnique, oldToNew));
forAll(newToOld, newI)
{
@ -225,17 +223,15 @@ Foam::label Foam::meshDualiser::addInternalFace
pointField facePoints(meshMod.points(), newFace);
labelList oldToNew;
pointField newPoints;
bool hasMerged = mergePoints
label nUnique = mergePoints
(
facePoints,
1E-6,
false,
oldToNew,
newPoints
oldToNew
);
if (hasMerged)
if (nUnique < facePoints.size())
{
FatalErrorIn("addInternalFace(..)")
<< "verts:" << verts << " newFace:" << newFace