From 63a9c592be9f91f45a8f60c7fb8f32995d5a3202 Mon Sep 17 00:00:00 2001
From: mattijs <mattijs>
Date: Thu, 24 May 2012 19:02:06 +0100
Subject: [PATCH] BUG: cellSizeControl: start off with low priority so single
 control surface works

---
 .../cellSizeControlSurfaces/cellSizeControlSurfaces.C        | 5 +++--
 .../conformalVoronoiMeshConformToSurface.C                   | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
index 92cf26b0c4..0b6acc5ca0 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
@@ -96,8 +96,9 @@ bool Foam::cellSizeControlSurfaces::evalCellSizeFunctions
 
     if (cellSizeFunctions_.size())
     {
-        // Initialise to the last (lowest) priority
-        label previousPriority = cellSizeFunctions_.last().priority();
+        // Maintain priority of current hit. Initialise so it always goes
+        // through at least once.
+        label previousPriority = -1;
 
         forAll(cellSizeFunctions_, i)
         {
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index bf077cece0..2d850aff09 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -196,7 +196,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
     {
         if (vit->internalPoint() && !vit->nearBoundary())
         {
-            const Foam::point& pt = topoint(vit->point());
+            pointFromPoint pt = topoint(vit->point());
             const scalar range = sqr(2.0*targetCellSize(pt));
 
             pointIndexHit pHit;