From 1d93f171ad1831691962172ae45dd3b0b705805e Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 2 Mar 2012 12:34:24 +0000
Subject: [PATCH 1/2] COMP: Correct Make/options for SloanRenumber and the CGAL
 rules

---
 src/renumber/SloanRenumber/Make/options | 2 +-
 wmake/rules/General/CGAL                | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/renumber/SloanRenumber/Make/options b/src/renumber/SloanRenumber/Make/options
index 431c883479..492a3ae10f 100644
--- a/src/renumber/SloanRenumber/Make/options
+++ b/src/renumber/SloanRenumber/Make/options
@@ -1,6 +1,6 @@
 EXE_INC = \
     /* -DFULLDEBUG -g -O0 */ \
-    -I$BOOST_ARCH_PATH/include \
+    -I$(BOOST_ARCH_PATH)/include \
     -I$(LIB_SRC)/meshTools/lnInclude \
     -I$(LIB_SRC)/parallel/decompose/decompositionMethods/lnInclude \
     -I$(LIB_SRC)/renumber/renumberMethods/lnInclude
diff --git a/wmake/rules/General/CGAL b/wmake/rules/General/CGAL
index 3586a1de38..126640dc0c 100644
--- a/wmake/rules/General/CGAL
+++ b/wmake/rules/General/CGAL
@@ -9,5 +9,4 @@ CGAL_LIBS = \
     -L$(MPFR_ARCH_PATH)/lib \
     -L$(BOOST_ARCH_PATH)/lib \
     -lmpfr \
-    -I/usr/lib64 \
-    -lboost_thread-mt
+    -lboost_thread

From 14594f2ee123439b1a41fe026086457c0ceca796 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 2 Mar 2012 16:19:03 +0000
Subject: [PATCH 2/2] BUG: cvMesh: Change == to = in buildParallelInterface

---
 .../conformalVoronoiMeshConformToSurface.C                  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 7f4c7abb6e..79a79c3883 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -1465,6 +1465,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence
     label cIInner = 0;
     label cIOuter = 0;
 
+//    seedProcessorBoundarySurfaces(true);
 
     label cellIndexCount = 0;
     for
@@ -1477,6 +1478,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence
         cit->cellIndex() = cellIndexCount++;
     }
 
+
     timeCheck("End of cell Indexing");
 
     labelList testCellInfluence(number_of_cells(), 0);
@@ -1505,7 +1507,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence
         )
         {
             nQuickRejections++;
-            testCellInfluence[cit->cellIndex()] = -1;
+            //testCellInfluence[cit->cellIndex()] = -1;
         }
     }
 
@@ -1528,7 +1530,7 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceInfluence
         if
         (
             (testCellInfluence[cit->cellIndex()] == 0)
-         && (cit->real() || cit->hasFarPoint())
+         //&& (cit->real() || cit->hasFarPoint())
         )
         {
             const Foam::point& cc = cit->dual();