From 386cafd8a765cbd11034a28ca2f5c6e38200e01b Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 3 Oct 2019 10:51:29 +0100
Subject: [PATCH] ENH: patchSet: merge collocated points. Fixes #1453.

---
 .../sampledSet/patchEdge/patchEdgeSet.C       | 54 +++++++++++++++++--
 .../sampledSet/patchEdge/patchEdgeSet.H       |  2 +
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/src/sampling/sampledSet/patchEdge/patchEdgeSet.C b/src/sampling/sampledSet/patchEdge/patchEdgeSet.C
index df3e3fc8b3..69756b4769 100644
--- a/src/sampling/sampledSet/patchEdge/patchEdgeSet.C
+++ b/src/sampling/sampledSet/patchEdge/patchEdgeSet.C
@@ -28,6 +28,7 @@ License
 #include "addToRunTimeSelectionTable.H"
 #include "searchableSurface.H"
 #include "Time.H"
+#include "mergePoints.H"
 
 // * * * * * * * * * * * * * * Static Data Members * * * * * * * * * * * * * //
 
@@ -126,15 +127,58 @@ void Foam::patchEdgeSet::genSamples()
     samplingSegments.shrink();
     samplingCurveDist.shrink();
 
-    setSamples
+
+    labelList pointMap;
+    const label nMerged = mergePoints
     (
         samplingPts,
-        samplingCells,
-        samplingFaces,
-        samplingSegments,
-        samplingCurveDist
+        SMALL,          //const scalar mergeTol,
+        false,          //const bool verbose,
+        pointMap,
+        origin_
     );
 
+    if (nMerged == 0)
+    {
+        setSamples
+        (
+            samplingPts,
+            samplingCells,
+            samplingFaces,
+            samplingSegments,
+            samplingCurveDist
+        );
+    }
+    else
+    {
+        // Compress out duplicates
+
+        List<point> newSamplingPts(nMerged);
+        List<label> newSamplingCells(nMerged);
+        List<label> newSamplingFaces(nMerged);
+        List<label> newSamplingSegments(nMerged);
+        List<scalar> newSamplingCurveDist(nMerged);
+
+        forAll(pointMap, i)
+        {
+            const label newi = pointMap[i];
+            newSamplingPts[newi] = samplingPts[i];
+            newSamplingCells[newi] = samplingCells[i];
+            newSamplingFaces[newi] = samplingFaces[i];
+            newSamplingSegments[newi] = samplingSegments[i];
+            newSamplingCurveDist[newi] = samplingCurveDist[i];
+        }
+
+        setSamples
+        (
+            newSamplingPts,
+            newSamplingCells,
+            newSamplingFaces,
+            newSamplingSegments,
+            newSamplingCurveDist
+        );
+    }
+
     if (debug)
     {
         write(Info);
diff --git a/src/sampling/sampledSet/patchEdge/patchEdgeSet.H b/src/sampling/sampledSet/patchEdge/patchEdgeSet.H
index 91947cd70a..eee1e664ed 100644
--- a/src/sampling/sampledSet/patchEdge/patchEdgeSet.H
+++ b/src/sampling/sampledSet/patchEdge/patchEdgeSet.H
@@ -49,6 +49,8 @@ Usage
                 type        patchEdge;
                 axis        x;
 
+                // List of patches to sample (into single file). Note: supports
+                // wildcards.
                 patches     (movingWall);
 
                 // Surface type