From e0ee9bcf8451d898f93a01de67918824107850b0 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Wed, 2 Feb 2011 12:44:02 +0000
Subject: [PATCH] BUG: stitchTriangles : work on triSurface points

---
 .../triSurface/interfaces/AC3D/readAC.C       |  4 ++--
 .../triSurface/interfaces/STL/readSTLASCII.L  |  8 +++++--
 .../triSurface/interfaces/STL/readSTLBINARY.C |  8 +++++--
 .../triSurface/interfaces/TRI/readTRI.C       |  8 +++++--
 src/triSurface/triSurface/stitchTriangles.C   | 23 +++++++------------
 src/triSurface/triSurface/triSurface.C        |  4 ++--
 src/triSurface/triSurface/triSurface.H        |  1 -
 7 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/src/triSurface/triSurface/interfaces/AC3D/readAC.C b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
index d4e8b0a752..dfe4ae0904 100644
--- a/src/triSurface/triSurface/interfaces/AC3D/readAC.C
+++ b/src/triSurface/triSurface/interfaces/AC3D/readAC.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -331,7 +331,7 @@ bool triSurface::readAC(const fileName& ACfileName)
 
     *this = triSurface(faces, patches, allPoints, true);
 
-    stitchTriangles(allPoints);
+    stitchTriangles();
 
     return true;
 }
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
index 4b33f27f57..9cb9f1d3d1 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLASCII.L
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -422,6 +422,7 @@ bool triSurface::readSTLASCII(const fileName& STLfileName)
     setSize(lexer.nTriangles());
     DynamicList<label>& STLlabels = lexer.STLlabels();
 
+    // Assign triangles
     label pointi = 0;
     forAll(*this, i)
     {
@@ -433,8 +434,11 @@ bool triSurface::readSTLASCII(const fileName& STLfileName)
 
     STLlabels.clear();
 
+    // Assign coordinates
+    storedPoints().transfer(rawPoints);
+
     // Stitch all points within SMALL meters.
-    stitchTriangles(rawPoints);
+    stitchTriangles();
 
     // Convert solidNames into regionNames
     patches_.setSize(lexer.STLsolidNames().size());
diff --git a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
index a0b5b10e03..bfecd779ac 100644
--- a/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
+++ b/src/triSurface/triSurface/interfaces/STL/readSTLBINARY.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -123,7 +123,11 @@ bool Foam::triSurface::readSTLBINARY(const fileName& STLfileName)
 
     //STLfile.close();
 
-    stitchTriangles(rawPoints);
+    // Assign coordinates
+    storedPoints().transfer(rawPoints);
+
+    // Stitch all points within SMALL meters.
+    stitchTriangles();
 
     return true;
 }
diff --git a/src/triSurface/triSurface/interfaces/TRI/readTRI.C b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
index 8b7feddb6a..0c699563ea 100644
--- a/src/triSurface/triSurface/interfaces/TRI/readTRI.C
+++ b/src/triSurface/triSurface/interfaces/TRI/readTRI.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -138,6 +138,7 @@ bool Foam::triSurface::readTRI(const fileName& TRIfileName)
 
     setSize(STLlabels.size());
 
+    // Assign triangles
     pointI = 0;
     SLList<label>::const_iterator iter = STLlabels.begin();
     forAll(*this, i)
@@ -149,7 +150,10 @@ bool Foam::triSurface::readTRI(const fileName& TRIfileName)
         ++iter;
     }
 
-    stitchTriangles(rawPoints);
+    // Assign coordinates
+    storedPoints().transfer(rawPoints);
+    // Merge duplicate points
+    stitchTriangles();
 
     // Convert solidNames into regionNames
     stringList names(STLsolidNames.toc());
diff --git a/src/triSurface/triSurface/stitchTriangles.C b/src/triSurface/triSurface/stitchTriangles.C
index 858f83c961..041d680d9e 100644
--- a/src/triSurface/triSurface/stitchTriangles.C
+++ b/src/triSurface/triSurface/stitchTriangles.C
@@ -31,30 +31,28 @@ License
 
 bool Foam::triSurface::stitchTriangles
 (
-    const pointField& rawPoints,
     const scalar tol,
     bool verbose
 )
 {
+    pointField& ps = storedPoints();
+
     // Merge points
     labelList pointMap;
     pointField newPoints;
-    bool hasMerged = mergePoints(rawPoints, tol, verbose, pointMap, newPoints);
+    bool hasMerged = mergePoints(ps, tol, verbose, pointMap, newPoints);
 
     if (hasMerged)
     {
-        pointField& ps = storedPoints();
+        if (verbose)
+        {
+            Pout<< "stitchTriangles : Merged from " << ps.size()
+                << " points down to " << newPoints.size() << endl;
+        }
 
         // Set the coordinates to the merged ones
         ps.transfer(newPoints);
 
-
-        if (verbose)
-        {
-            Pout<< "stitchTriangles : Merged from " << rawPoints.size()
-                << " points down to " << ps.size() << endl;
-        }
-
         // Reset the triangle point labels to the unique points array
         label newTriangleI = 0;
         forAll(*this, i)
@@ -151,11 +149,6 @@ bool Foam::triSurface::stitchTriangles
             }
         }
     }
-    else
-    {
-        // Can happen for e.g. single triangle or cloud of unconnected triangles
-        storedPoints() = rawPoints;
-    }
 
     return hasMerged;
 }
diff --git a/src/triSurface/triSurface/triSurface.C b/src/triSurface/triSurface/triSurface.C
index 0075bf9b51..538d10c0eb 100644
--- a/src/triSurface/triSurface/triSurface.C
+++ b/src/triSurface/triSurface/triSurface.C
@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2004-2010 OpenCFD Ltd.
+    \\  /    A nd           | Copyright (C) 2004-2011 OpenCFD Ltd.
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License
@@ -809,7 +809,7 @@ void Foam::triSurface::scalePoints(const scalar scaleFactor)
 void Foam::triSurface::cleanup(const bool verbose)
 {
     // Merge points (already done for STL, TRI)
-    stitchTriangles(points(), SMALL, verbose);
+    stitchTriangles(SMALL, verbose);
 
     // Merging points might have changed geometric factors
     clearOut();
diff --git a/src/triSurface/triSurface/triSurface.H b/src/triSurface/triSurface/triSurface.H
index 838c4acc4d..0cb3cb33a5 100644
--- a/src/triSurface/triSurface/triSurface.H
+++ b/src/triSurface/triSurface/triSurface.H
@@ -112,7 +112,6 @@ class triSurface
         //  Returns true if any points merged
         bool stitchTriangles
         (
-            const pointField& rawPoints,
             const scalar tol = SMALL,
             const bool verbose = false
         );