From b00911ac05531a7bc8d1b4e4c47f2672eb064aa9 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 23 Jun 2011 16:33:21 +0100
Subject: [PATCH 1/4] ENH: move startOfInternal points out of
 insertInitialPoints.

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

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 52177d155b..0e24ff017d 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -1211,8 +1211,6 @@ void Foam::conformalVoronoiMesh::insertBoundingPoints()
 
 void Foam::conformalVoronoiMesh::insertInitialPoints()
 {
-    startOfInternalPoints_ = number_of_vertices();
-
     Info<< nl << "Inserting initial points" << endl;
 
     timeCheck("Before initial points call");
@@ -1894,6 +1892,8 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
 
     insertFeaturePoints();
 
+    startOfInternalPoints_ = number_of_vertices();
+
     insertInitialPoints();
 
     // Improve the guess that the backgroundMeshDecomposition makes with the

From c095eb4c36715b47a7c433be7705b8cbb52c71f6 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Fri, 24 Jun 2011 14:17:04 +0100
Subject: [PATCH 2/4] ENH: Use reduce to ensure parallel filtering is
 synchronised.

---
 .../conformalVoronoiMeshCalcDualMesh.C             | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index 9a54c1361a..fb10902af7 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -82,6 +82,8 @@ void Foam::conformalVoronoiMesh::calcDualMesh
     {
         label nInitialBadQualityFaces = checkPolyMeshQuality(points).size();
 
+        reduce(nInitialBadQualityFaces, sumOp<label>());
+
         Info<< nl << "Initial check before face collapse, found "
             << nInitialBadQualityFaces << " bad quality faces"
             << endl;
@@ -145,10 +147,16 @@ void Foam::conformalVoronoiMesh::calcDualMesh
 
                 nBadQualityFaces = wrongFaces.size();
 
+                reduce(nBadQualityFaces, sumOp<label>());
+
                 Info<< nl << "Found " << nBadQualityFaces
                     << " bad quality faces" << endl;
 
-                if (lastWrongFaces == wrongFaces)
+                bool sameFacesAsLastTime(lastWrongFaces == wrongFaces);
+
+                reduce(sameFacesAsLastTime, andOp<bool>());
+
+                if (sameFacesAsLastTime)
                 {
                     Info<< nl << "Consecutive iterations found the same set "
                         << "of bad quality faces." << endl;
@@ -523,6 +531,8 @@ void Foam::conformalVoronoiMesh::smoothSurface
             dualPtIndexMap
         );
 
+        reduce(nCollapsedFaces, sumOp<label>());
+
         reindexDualVertices(dualPtIndexMap);
 
         mergeCloseDualVertices(pts, boundaryPts);
@@ -759,6 +769,8 @@ void Foam::conformalVoronoiMesh::collapseFaces
             deferredCollapseFaces
         );
 
+        reduce(nCollapsedFaces, sumOp<label>());
+
         reindexDualVertices(dualPtIndexMap);
 
         mergeCloseDualVertices(pts, boundaryPts);

From 25a9330090dcbb5850eff0dd31247fc8d67961bd Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Fri, 24 Jun 2011 14:17:46 +0100
Subject: [PATCH 3/4] ENH: Prevent face filtering on any cell comprising any
 dual vertex with any Delaunay vertex of its tet that is non-real, i.e. don't
 filter near the parallel interface.

E# Please enter the commit message for your changes. Lines starting
---
 .../conformalVoronoiMeshCalcDualMesh.C        | 63 ++++++++++++++++++-
 1 file changed, 62 insertions(+), 1 deletion(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index fb10902af7..a993aacdaf 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -58,9 +58,70 @@ void Foam::conformalVoronoiMesh::calcDualMesh
         ++cit
     )
     {
-        cit->filterCount() = 0;
+        if
+        (
+               !cit->vertex(0)->real()
+            || !cit->vertex(1)->real()
+            || !cit->vertex(2)->real()
+            || !cit->vertex(3)->real()
+        )
+        {
+            cit->filterCount() = 100;
+        }
+        else
+        {
+            cit->filterCount() = 0;
+        }
     }
 
+    for
+    (
+        Delaunay::Finite_vertices_iterator vit = finite_vertices_begin();
+        vit != finite_vertices_end();
+        vit++
+    )
+    {
+        std::list<Cell_handle> cells;
+        incident_cells(vit, std::back_inserter(cells));
+
+        bool hasProcPt = false;
+
+        for
+        (
+            std::list<Cell_handle>::iterator cit=cells.begin();
+            cit != cells.end();
+            ++cit
+        )
+        {
+            if
+            (
+                !(*cit)->vertex(0)->real()
+             || !(*cit)->vertex(1)->real()
+             || !(*cit)->vertex(2)->real()
+             || !(*cit)->vertex(3)->real()
+            )
+            {
+                hasProcPt = true;
+
+                break;
+            }
+        }
+
+        if (hasProcPt)
+        {
+            for
+            (
+                std::list<Cell_handle>::iterator cit=cells.begin();
+                cit != cells.end();
+                ++cit
+            )
+            {
+                (*cit)->filterCount() = 100;
+            }
+        }
+    }
+
+
     PackedBoolList boundaryPts(number_of_cells(), false);
 
     indexDualVertices(points, boundaryPts);

From ee24b31987ffb127cb595eece878cc02ce225f52 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Fri, 24 Jun 2011 16:00:46 +0100
Subject: [PATCH 4/4] ENH: removing isSurfacePoint.

It was conceptually broken.  The idea was that in certain cases, you knew that
you were on the surface of the geometry (point pair distance queries for
example) so didn't need to do a nearest-point-on-surface query.  This was fine
for a single surface, but when there were multiple surfaces, the first
high-priority surface would return a size, even if the query point was miles
away.  To fix this would need a distance check, removing the point of the check
altogether.
---
 .../cellSizeControlSurfaces.C                 | 58 +++----------------
 .../cellSizeControlSurfaces.H                 | 15 +----
 .../cellSizeFunction/cellSizeFunction.H       |  3 +-
 .../linearDistance/linearDistance.C           | 10 +---
 .../linearDistance/linearDistance.H           |  3 +-
 .../linearSpatial/linearSpatial.C             |  5 +-
 .../linearSpatial/linearSpatial.H             |  3 +-
 .../surfaceOffsetLinearDistance.C             | 10 +---
 .../surfaceOffsetLinearDistance.H             |  3 +-
 .../cellSizeFunction/uniform/uniform.C        |  5 +-
 .../cellSizeFunction/uniform/uniform.H        |  3 +-
 .../uniformDistance/uniformDistance.C         | 10 +---
 .../uniformDistance/uniformDistance.H         |  3 +-
 .../conformalVoronoiMesh.C                    |  5 +-
 .../conformalVoronoiMesh.H                    |  6 +-
 .../conformalVoronoiMeshI.H                   | 20 ++-----
 .../autoDensity/autoDensity.C                 | 15 +----
 .../bodyCentredCubic/bodyCentredCubic.C       |  6 +-
 .../faceCentredCubic/faceCentredCubic.C       |  6 +-
 .../initialPointsMethod/pointFile/pointFile.C |  6 +-
 .../uniformGrid/uniformGrid.C                 |  6 +-
 21 files changed, 39 insertions(+), 162 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
index 84e472c5db..f454fd131a 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.C
@@ -42,8 +42,7 @@ defineTypeNameAndDebug(cellSizeControlSurfaces, 0);
 bool Foam::cellSizeControlSurfaces::evalCellSizeFunctions
 (
     const point& pt,
-    scalar& minSize,
-    bool isSurfacePoint
+    scalar& minSize
 ) const
 {
     bool anyFunctionFound = false;
@@ -71,7 +70,7 @@ bool Foam::cellSizeControlSurfaces::evalCellSizeFunctions
 
     //         scalar sizeI;
 
-    //         if (cSF.cellSize(pt, sizeI, isSurfacePoint))
+    //         if (cSF.cellSize(pt, sizeI))
     //         {
     //             anyFunctionFound = true;
 
@@ -119,7 +118,7 @@ bool Foam::cellSizeControlSurfaces::evalCellSizeFunctions
 
             scalar sizeI;
 
-            if (cSF.cellSize(pt, sizeI, isSurfacePoint))
+            if (cSF.cellSize(pt, sizeI))
             {
                 anyFunctionFound = true;
 
@@ -280,18 +279,12 @@ Foam::cellSizeControlSurfaces::~cellSizeControlSurfaces()
 
 Foam::scalar Foam::cellSizeControlSurfaces::cellSize
 (
-    const point& pt,
-    bool isSurfacePoint
+    const point& pt
 ) const
 {
-    if (isSurfacePoint)
-    {
-        // Pout<< "WARNING: isSurfacePoint is broken!" << endl;
-    }
-
     scalar size = defaultCellSize_;
 
-    bool anyFunctionFound = evalCellSizeFunctions(pt, size, isSurfacePoint);
+    bool anyFunctionFound = evalCellSizeFunctions(pt, size);
 
     if (!anyFunctionFound)
     {
@@ -317,30 +310,12 @@ Foam::scalar Foam::cellSizeControlSurfaces::cellSize
                 (
                     "Foam::scalar Foam::cellSizeControlSurfaces::cellSize"
                     "("
-                        "const point& pt, "
-                        "bool isSurfacePoint"
+                        "const point& pt"
                     ") const"
                 )
                     << "Point " << pt << " did not find a nearest surface point"
                     << nl << exit(FatalError) << endl;
             }
-            else
-            {
-                // FatalErrorIn
-                // (
-                //     "Foam::scalar Foam::cellSizeControlSurfaces::cellSize"
-                //     "("
-                //         "const point& pt, "
-                //         "bool isSurfacePoint"
-                //     ") const"
-                // )
-                //     << "Point " << pt
-                //     << " Cannot use isSurfacePoint here, or at all!"
-                //     << nl << exit(FatalError) << endl;
-
-                // Evaluating the cell size at the nearest surface
-                evalCellSizeFunctions(surfHit.hitPoint(), size, true);
-            }
         }
     }
 
@@ -350,31 +325,14 @@ Foam::scalar Foam::cellSizeControlSurfaces::cellSize
 
 Foam::scalarField Foam::cellSizeControlSurfaces::cellSize
 (
-    const pointField& pts,
-    const List<bool>& isSurfacePoint
+    const pointField& pts
 ) const
 {
-    if (pts.size() != isSurfacePoint.size())
-    {
-        FatalErrorIn
-        (
-            "Foam::cellSizeControlSurfaces::cellSizeControlSurfaces \
-             ( \
-                 const pointField& pts, \
-                 const List<bool>& isSurfacePoint \
-             ) \
-             const"
-        )   << "Size of pointField (" << pts.size()
-            << ") and List<bool> (" << isSurfacePoint.size()
-            << ") do not match." << nl
-            << exit(FatalError);
-    }
-
     scalarField cellSizes(pts.size());
 
     forAll(pts, i)
     {
-        cellSizes[i] = cellSize(pts[i], isSurfacePoint[i]);
+        cellSizes[i] = cellSize(pts[i]);
     }
 
     return cellSizes;
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
index 206e374ab2..612fe8fd5e 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeControlSurfaces.H
@@ -84,8 +84,7 @@ class cellSizeControlSurfaces
         bool evalCellSizeFunctions
         (
             const point& pt,
-            scalar& minSize,
-            bool isSurfacePoint
+            scalar& minSize
         ) const;
 
         //- Disallow default bitwise copy construct
@@ -130,18 +129,10 @@ public:
         // Query
 
             //- Return the cell size at the given location
-            scalar cellSize
-            (
-                const point& pt,
-                bool isSurfacePoint = false
-            ) const;
+            scalar cellSize(const point& pt) const;
 
             //- Return the cell size at the given locations
-            scalarField cellSize
-            (
-                const pointField& pts,
-                const List<bool>& isSurfacePoint
-            ) const;
+            scalarField cellSize(const pointField& pts) const;
 };
 
 
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
index d6d5288780..05f1445884 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.H
@@ -174,8 +174,7 @@ public:
         virtual bool cellSize
         (
             const point& pt,
-            scalar& size,
-            bool isSurfacePoint = false
+            scalar& size
         ) const = 0;
 };
 
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
index 181d112180..2f198179c5 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
@@ -68,17 +68,9 @@ scalar linearDistance::sizeFunction(scalar d) const
 bool linearDistance::cellSize
 (
     const point& pt,
-    scalar& size,
-    bool isSurfacePoint
+    scalar& size
 ) const
 {
-    if (isSurfacePoint)
-    {
-        size = surfaceCellSize_;
-
-        return true;
-    }
-
     size = 0;
 
     List<pointIndexHit> hits;
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
index 0ea5da3102..07e032ba29 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.H
@@ -106,8 +106,7 @@ public:
         virtual bool cellSize
         (
             const point& pt,
-            scalar& size,
-            bool isSurfacePoint = false
+            scalar& size
         ) const;
 };
 
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
index 6839e28837..45039e702c 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
@@ -71,11 +71,10 @@ scalar linearSpatial::sizeFunction(const point& pt) const
 bool linearSpatial::cellSize
 (
     const point& pt,
-    scalar& size,
-    bool isSurfacePoint
+    scalar& size
 ) const
 {
-    if (sideMode_ == rmBothsides || isSurfacePoint)
+    if (sideMode_ == rmBothsides)
     {
         size = sizeFunction(pt);
 
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
index 5488ec6942..d42b042dbf 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.H
@@ -104,8 +104,7 @@ public:
         virtual bool cellSize
         (
             const point& pt,
-            scalar& size,
-            bool isSurfacePoint = false
+            scalar& size
         ) const;
 };
 
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
index 1228c9607f..e38d03a4af 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
@@ -139,17 +139,9 @@ scalar surfaceOffsetLinearDistance::sizeFunction(scalar d) const
 bool surfaceOffsetLinearDistance::cellSize
 (
     const point& pt,
-    scalar& size,
-    bool isSurfacePoint
+    scalar& size
 ) const
 {
-    if (isSurfacePoint)
-    {
-        size = surfaceCellSize_;
-
-        return true;
-    }
-
     size = 0;
 
     List<pointIndexHit> hits;
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
index 4f644362f4..0a32432de0 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.H
@@ -113,8 +113,7 @@ public:
         virtual bool cellSize
         (
             const point& pt,
-            scalar& size,
-            bool isSurfacePoint = false
+            scalar& size
         ) const;
 };
 
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
index f3cc25d0f0..333c6ad4ad 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.C
@@ -55,11 +55,10 @@ uniform::uniform
 bool uniform::cellSize
 (
     const point& pt,
-    scalar& size,
-    bool isSurfacePoint
+    scalar& size
 ) const
 {
-    if (sideMode_ == rmBothsides || isSurfacePoint)
+    if (sideMode_ == rmBothsides)
     {
         size = cellSize_;
 
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
index 6703435c34..5fd6e5a327 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniform/uniform.H
@@ -88,8 +88,7 @@ public:
         virtual bool cellSize
         (
             const point& pt,
-            scalar& size,
-            bool isSurfacePoint = false
+            scalar& size
         ) const;
 };
 
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
index f478babba6..8f758a5aa0 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
@@ -57,17 +57,9 @@ uniformDistance::uniformDistance
 bool uniformDistance::cellSize
 (
     const point& pt,
-    scalar& size,
-    bool isSurfacePoint
+    scalar& size
 ) const
 {
-    if (isSurfacePoint)
-    {
-        size = cellSize_;
-
-        return true;
-    }
-
     size = 0;
 
     List<pointIndexHit> hits;
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
index fdce7581c4..f133f029c7 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.H
@@ -94,8 +94,7 @@ public:
         virtual bool cellSize
         (
             const point& pt,
-            scalar& size,
-            bool isSurfacePoint = false
+            scalar& size
         ) const;
 };
 
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 0e24ff017d..b257ca86d9 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -1483,8 +1483,7 @@ void Foam::conformalVoronoiMesh::storeSizesAndAlignments
 
         storedSizes_[i] = cellSizeControl().cellSize
         (
-            sizeAndAlignmentLocations_[i],
-            false
+            sizeAndAlignmentLocations_[i]
         );
 
         storedAlignments_[i] = requiredAlignment(sizeAndAlignmentLocations_[i]);
@@ -1576,7 +1575,7 @@ void Foam::conformalVoronoiMesh::setVertexSizeAndAlignment()
 
                 vit->alignment() = requiredAlignment(pt);
 
-                vit->targetCellSize() = cellSizeControl().cellSize(pt, false);
+                vit->targetCellSize() = cellSizeControl().cellSize(pt);
             }
         }
     }
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index ce69696d6a..a93ddd7cf0 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -181,11 +181,7 @@ private:
         //- Return the local target cell size at the given location.  Takes
         //  boolean argument to allow speed-up of queries if the point is going
         //  to be on a surface.
-        inline scalar targetCellSize
-        (
-            const Foam::point& pt,
-            bool isSurfacePoint = false
-        ) const;
+        inline scalar targetCellSize(const Foam::point& pt) const;
 
         //- Return the target cell size from that stored on a pair of
         //  Delaunay vertices, using a mean function.
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index 0648084f89..179c7e0c4a 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -27,11 +27,10 @@ License
 
 inline Foam::scalar Foam::conformalVoronoiMesh::targetCellSize
 (
-    const Foam::point& pt,
-    bool isSurfacePoint
+    const Foam::point& pt
 ) const
 {
-    return cellSizeControl().cellSize(pt, isSurfacePoint);
+    return cellSizeControl().cellSize(pt);
 }
 
 
@@ -139,10 +138,7 @@ inline Foam::scalar Foam::conformalVoronoiMesh::pointPairDistance
     const Foam::point& pt
 ) const
 {
-    // Point pair distances are always going to be at the surface, so the
-    // targetCellSize can be told to do a quick, surface only check.
-
-    return targetCellSize(pt, true)*cvMeshControls().pointPairDistanceCoeff();
+    return targetCellSize(pt)*cvMeshControls().pointPairDistanceCoeff();
 }
 
 
@@ -162,13 +158,10 @@ inline Foam::scalar Foam::conformalVoronoiMesh::featurePointExclusionDistanceSqr
     const Foam::point& pt
 ) const
 {
-    // Exclusion distance tests are always going to be at the surface, so the
-    // targetCellSize can be told to do a quick, surface only check.
-
     return
         sqr
         (
-            targetCellSize(pt, true)
+            targetCellSize(pt)
            *cvMeshControls().featurePointExclusionDistanceCoeff()
         );
 }
@@ -179,13 +172,10 @@ inline Foam::scalar Foam::conformalVoronoiMesh::featureEdgeExclusionDistanceSqr
     const Foam::point& pt
 ) const
 {
-    // Exclusion distance tests are always going to be at the surface, so the
-    // targetCellSize can be told to do a quick, surface only check.
-
     return
         sqr
         (
-            targetCellSize(pt, true)
+            targetCellSize(pt)
            *cvMeshControls().featureEdgeExclusionDistanceCoeff()
         );
 }
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C b/src/mesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
index c1b1dc334c..bbe01b72f4 100644
--- a/src/mesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
+++ b/src/mesh/conformalVoronoiMesh/initialPointsMethod/autoDensity/autoDensity.C
@@ -339,11 +339,7 @@ bool Foam::autoDensity::fillBox
 
         pointField corners(bb.points());
 
-        scalarField cornerSizes = cvMesh_.cellSizeControl().cellSize
-        (
-            corners,
-            List<bool>(8, false)
-        );
+        scalarField cornerSizes = cvMesh_.cellSizeControl().cellSize(corners);
 
         Field<bool> insideCorners = combinedWellInside(corners, cornerSizes);
 
@@ -452,11 +448,7 @@ bool Foam::autoDensity::fillBox
                         );
                 }
 
-                lineSizes = cvMesh_.cellSizeControl().cellSize
-                (
-                    linePoints,
-                    List<bool>(nLine, false)
-                );
+                lineSizes = cvMesh_.cellSizeControl().cellSize(linePoints);
 
                 Field<bool> insideLines = combinedWellInside
                 (
@@ -557,8 +549,7 @@ bool Foam::autoDensity::fillBox
 
         scalarField sampleSizes = cvMesh_.cellSizeControl().cellSize
         (
-            samplePoints,
-            List<bool>(samplePoints.size(), false)
+            samplePoints
         );
 
         Field<bool> insidePoints = combinedWellInside
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C b/src/mesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
index d1d37be9ba..d9b985dd3a 100644
--- a/src/mesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
+++ b/src/mesh/conformalVoronoiMesh/initialPointsMethod/bodyCentredCubic/bodyCentredCubic.C
@@ -167,11 +167,7 @@ std::list<Vb::Point> bodyCentredCubic::initialPoints() const
                 minimumSurfaceDistanceCoeffSqr_
                *sqr
                 (
-                    cvMesh_.cellSizeControl().cellSize
-                    (
-                        points,
-                        List<bool>(points.size(), false)
-                    )
+                    cvMesh_.cellSizeControl().cellSize(points)
                 )
             );
 
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C b/src/mesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
index df61890c40..d82d14c04a 100644
--- a/src/mesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
+++ b/src/mesh/conformalVoronoiMesh/initialPointsMethod/faceCentredCubic/faceCentredCubic.C
@@ -228,11 +228,7 @@ std::list<Vb::Point> faceCentredCubic::initialPoints() const
                 minimumSurfaceDistanceCoeffSqr_
                *sqr
                 (
-                    cvMesh_.cellSizeControl().cellSize
-                    (
-                        points,
-                        List<bool>(points.size(), false)
-                    )
+                    cvMesh_.cellSizeControl().cellSize(points)
                 )
             );
 
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C b/src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
index 8b03748564..406cca57a6 100644
--- a/src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
+++ b/src/mesh/conformalVoronoiMesh/initialPointsMethod/pointFile/pointFile.C
@@ -134,11 +134,7 @@ std::list<Vb::Point> pointFile::initialPoints() const
         minimumSurfaceDistanceCoeffSqr_
        *sqr
         (
-            cvMesh_.cellSizeControl().cellSize
-            (
-                points,
-                List<bool>(points.size(), false)
-            )
+            cvMesh_.cellSizeControl().cellSize(points)
         )
     );
 
diff --git a/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C b/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
index 23d903005c..20cf0f44ee 100644
--- a/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
+++ b/src/mesh/conformalVoronoiMesh/initialPointsMethod/uniformGrid/uniformGrid.C
@@ -143,11 +143,7 @@ std::list<Vb::Point> uniformGrid::initialPoints() const
                 minimumSurfaceDistanceCoeffSqr_
                *sqr
                 (
-                    cvMesh_.cellSizeControl().cellSize
-                    (
-                        points,
-                        List<bool>(points.size(), false)
-                    )
+                    cvMesh_.cellSizeControl().cellSize(points)
                 )
             );