From cf10cbbd6fcfe5f6968de21686b35ce29e5f0589 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 23 Apr 2009 18:22:08 +0100
Subject: [PATCH] Modified nearestFeatureEdge arguments to take standard,
 sample, distSqr, pointHitIndex. Querying object will use the edge index to
 lookup supplementary information.

---
 .../featureEdgeMesh/featureEdgeMesh.C         | 28 ++++---------------
 .../featureEdgeMesh/featureEdgeMesh.H         |  8 ++----
 2 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
index eb893e0b04..f6e6f022df 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.C
@@ -117,6 +117,7 @@ Foam::featureEdgeMesh::featureEdgeMesh(const IOobject& io)
     }
 }
 
+
 Foam::featureEdgeMesh::featureEdgeMesh
 (
     const surfaceFeatures& sFeat,
@@ -618,36 +619,19 @@ Foam::featureEdgeMesh::edgeStatus Foam::featureEdgeMesh::classifyEdge
 void Foam::featureEdgeMesh::nearestFeatureEdge
 (
     const pointField& samples,
-    scalarField searchDistSqr,
-    labelList& edgeLabel,
-    pointField& edgePoint,
-    List<vectorField>& adjacentNormals
+    const scalarField& searchDistSqr,
+    List<pointIndexHit>& info
 ) const
 {
-    edgeLabel.setSize(samples.size());
-    edgePoint.setSize(samples.size());
-    adjacentNormals.setSize(samples.size());
+    info.setSize(samples.size());
 
     forAll(samples, i)
     {
-        const point& sample = samples[i];
-
-        pointIndexHit pHit = edgeTree().findNearest
+        info[i] = edgeTree().findNearest
         (
-            sample,
+            samples[i],
             searchDistSqr[i]
         );
-
-        if (!pHit.hit())
-        {
-            edgeLabel[i] = -1;
-        }
-        else
-        {
-            edgeLabel[i] = pHit.index();
-            edgePoint[i] = pHit.hitPoint();
-            adjacentNormals[i] = edgeNormals(edgeLabel[i]);
-        }
     }
 }
 
diff --git a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
index 8b8c72792a..cc9725d79c 100644
--- a/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
+++ b/src/edgeMesh/featureEdgeMesh/featureEdgeMesh.H
@@ -224,10 +224,8 @@ public:
             void nearestFeatureEdge
             (
                 const pointField& samples,
-                scalarField searchDistSqr,
-                labelList& edgeLabel,
-                pointField& edgePoint,
-                List<vectorField>& adjacentNormals
+                const scalarField& searchDistSqr,
+                List<pointIndexHit>& info
             ) const;
 
         // Access
@@ -279,7 +277,7 @@ public:
         // Write
 
             //- Write all components of the featureEdgeMesh as obj files
-            void writeObj(const fileName& fName) const;
+            void writeObj(const fileName& prefix) const;
 
             // //- ReadData function required for regIOobject read operation
             // virtual bool readData(Istream&);