From 0ce6bc13e4ac760bac2baa2d1379f5a51f540f1d Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Tue, 21 Jul 2009 10:05:20 +0100
Subject: [PATCH] Tweak to addSurfaceAndEdgeHits to add surface conformations
 within the feature point exclusion zone to pin down the remaining
 near-feature surface protrusions, but can lead to feature point corruption -
 will need to revisit.

---
 .../conformalVoronoiMesh/conformalVoronoiMesh.C       | 11 ++++++++++-
 .../conformalVoronoiMesh/conformalVoronoiMesh.H       |  1 +
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 2735a8f404..90cbcd6804 100644
--- a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -1124,6 +1124,7 @@ void Foam::conformalVoronoiMesh::buildEdgeLocationTree
 
 void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
 (
+    const Triangulation::Finite_vertices_iterator& vit,
     const point& vert,
     const pointIndexHit& surfHit,
     label hitSurface,
@@ -1143,6 +1144,13 @@ void Foam::conformalVoronoiMesh::addSurfaceAndEdgeHits
     if (nearFeaturePt(surfHit.hitPoint()))
     {
         keepSurfacePoint = false;
+
+        if (vit->index() < startOfInternalPoints_)
+        {
+            surfaceHits.append(surfHit);
+
+            hitSurfaces.append(hitSurface);
+        }
     }
 
     List<pointIndexHit> edHits;
@@ -1892,6 +1900,7 @@ void Foam::conformalVoronoiMesh::conformToSurface()
                     {
                         addSurfaceAndEdgeHits
                         (
+                            vit,
                             vert,
                             surfHit,
                             hitSurface,
@@ -1976,6 +1985,7 @@ void Foam::conformalVoronoiMesh::conformToSurface()
                 {
                     addSurfaceAndEdgeHits
                     (
+                        vit,
                         vert,
                         surfHit,
                         hitSurface,
@@ -2415,4 +2425,3 @@ void Foam::conformalVoronoiMesh::move()
 
 // ************************************************************************* //
 
-//  LocalWords:  edHit
diff --git a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 6b3ddd1662..6568a46b32 100644
--- a/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -324,6 +324,7 @@ class conformalVoronoiMesh
         //  and edge conformation locations to add.
         void addSurfaceAndEdgeHits
         (
+            const Triangulation::Finite_vertices_iterator& vit,
             const point& vert,
             const pointIndexHit& surfHit,
             label hitSurface,