From fd9d0993b9653240aeee6b74eab6fb3400c9bb11 Mon Sep 17 00:00:00 2001
From: Graham <graham@hunt.opencfd.co.uk>
Date: Fri, 20 Mar 2009 13:42:38 +0000
Subject: [PATCH] Modifying boost library include location.  Commenting out
 hacks to allow dangermouse to run.

---
 .../mesh/generation/CV3DMesher/CV3D.C         | 55 ++++++++++---------
 .../mesh/generation/CV3DMesher/Make/options   |  2 +-
 .../insertSurfaceNearestPointPairs.C          | 16 +++---
 3 files changed, 38 insertions(+), 35 deletions(-)

diff --git a/applications/utilities/mesh/generation/CV3DMesher/CV3D.C b/applications/utilities/mesh/generation/CV3DMesher/CV3D.C
index 2ad4c607b2..da4b7abceb 100644
--- a/applications/utilities/mesh/generation/CV3DMesher/CV3D.C
+++ b/applications/utilities/mesh/generation/CV3DMesher/CV3D.C
@@ -1097,6 +1097,7 @@ void Foam::CV3D::relaxPoints(const scalar relaxation)
 
                 scalar targetCellSizeB = targetCellSize;
 
+                // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
                 // if
                 // (
                 //     vA->indexOfClosestPatch() == 1
@@ -1123,33 +1124,35 @@ void Foam::CV3D::relaxPoints(const scalar relaxation)
                 //     targetCellSizeB *= 2;
                 // }
 
-                if
-                (
-                    vA->indexOfClosestPatch() == 1
-                 && vA->distanceToClosestSurface() < 0.04
-                )
-                {
-                    targetCellSizeA *=
-                    (43.75*vA->distanceToClosestSurface() + 0.25);
-                }
-                else
-                {
-                    targetCellSizeA *= 2;
-                }
+                // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+                // if
+                // (
+                //     vA->indexOfClosestPatch() == 1
+                //  && vA->distanceToClosestSurface() < 0.04
+                // )
+                // {
+                //     targetCellSizeA *=
+                //     (43.75*vA->distanceToClosestSurface() + 0.25);
+                // }
+                // else
+                // {
+                //     targetCellSizeA *= 2;
+                // }
 
-                if
-                (
-                    vB->indexOfClosestPatch() == 1
-                 && vB->distanceToClosestSurface() < 0.04
-                )
-                {
-                    targetCellSizeB *=
-                    (43.75*vB->distanceToClosestSurface() + 0.25);
-                }
-                else
-                {
-                    targetCellSizeB *= 2;
-                }
+                // if
+                // (
+                //     vB->indexOfClosestPatch() == 1
+                //  && vB->distanceToClosestSurface() < 0.04
+                // )
+                // {
+                //     targetCellSizeB *=
+                //     (43.75*vB->distanceToClosestSurface() + 0.25);
+                // }
+                // else
+                // {
+                //     targetCellSizeB *= 2;
+                // }
+                // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
                 targetCellSize = sqrt(targetCellSizeA * targetCellSizeB);
 
diff --git a/applications/utilities/mesh/generation/CV3DMesher/Make/options b/applications/utilities/mesh/generation/CV3DMesher/Make/options
index 5408a92d35..b72bd2a65e 100644
--- a/applications/utilities/mesh/generation/CV3DMesher/Make/options
+++ b/applications/utilities/mesh/generation/CV3DMesher/Make/options
@@ -15,7 +15,7 @@ EXE_INC = \
     -I$(LIB_SRC)/triSurface/lnInclude
 
 EXE_LIBS = \
-    -L$(BOOST_SRC)/libs \
+    -L$(BOOST_SRC)/lib \
     -lmeshTools \
     -ltriSurface \
     -ldynamicMesh \
diff --git a/applications/utilities/mesh/generation/CV3DMesher/insertSurfaceNearestPointPairs.C b/applications/utilities/mesh/generation/CV3DMesher/insertSurfaceNearestPointPairs.C
index 4f2f48a0a2..97a32c1e7a 100644
--- a/applications/utilities/mesh/generation/CV3DMesher/insertSurfaceNearestPointPairs.C
+++ b/applications/utilities/mesh/generation/CV3DMesher/insertSurfaceNearestPointPairs.C
@@ -888,16 +888,16 @@ void Foam::CV3D::insertSurfaceNearestPointPairs()
 
         if (edgePoints.size())
         {
-            Warning<< "Edge point insertion disabled." << endl;
+            //Warning<< "Edge point insertion disabled." << endl;
 
-            // smoothEdgePositions(edgePoints, edgeLabels);
+            smoothEdgePositions(edgePoints, edgeLabels);
 
-            // insertEdgePointGroups
-            // (
-            //     edgePoints,
-            //     edgeLabels,
-            //     "surfaceNearestEdgePoints.obj"
-            // );
+            insertEdgePointGroups
+            (
+                edgePoints,
+                edgeLabels,
+                "surfaceNearestEdgePoints.obj"
+            );
         }
     }