From 378b557cd374639aa5cfe34647d1f16a19c917a6 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Fri, 26 Feb 2010 16:11:30 +0000
Subject: [PATCH] BUG: cellSizeFunction.  Bad logic for triggering warning for
 bothSides default whern surface does not support volumeType.

BUG: conformalVoronoiMesh.  Making test "totalHits >= hitLimit" rather than
"totalHits = hitLimit" to be strictly consistent and always trigger
the iteration termination message.
---
 .../utilities/mesh/generation/cvMesh/Make/options |  2 +-
 .../utilities/mesh/generation/cvMesh/cvMesh.C     |  2 +-
 src/mesh/conformalVoronoiMesh/Make/options        |  2 +-
 .../cellSizeFunction/cellSizeFunction.C           | 15 +++++++++------
 .../conformalVoronoiMeshConformToSurface.C        |  2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/Make/options b/applications/utilities/mesh/generation/cvMesh/Make/options
index 8de2c59a4b..3c44ec39f1 100644
--- a/applications/utilities/mesh/generation/cvMesh/Make/options
+++ b/applications/utilities/mesh/generation/cvMesh/Make/options
@@ -1,4 +1,4 @@
-//EXE_DEBUG = -DFULLDEBUG -g -O0
+EXE_DEBUG = -DFULLDEBUG -g -O0
 EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
diff --git a/applications/utilities/mesh/generation/cvMesh/cvMesh.C b/applications/utilities/mesh/generation/cvMesh/cvMesh.C
index 5d1f86bfd8..7d3a2a88f2 100644
--- a/applications/utilities/mesh/generation/cvMesh/cvMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/cvMesh.C
@@ -68,7 +68,7 @@ int main(int argc, char *argv[])
             << nl << endl;
     }
 
-    mesh.writeMesh();
+    mesh.writeMesh(runTime.constant());
 
     Info<< nl << "ExecutionTime = " << runTime.elapsedCpuTime() << " s"
         << "  ClockTime = " << runTime.elapsedClockTime() << " s"
diff --git a/src/mesh/conformalVoronoiMesh/Make/options b/src/mesh/conformalVoronoiMesh/Make/options
index 013eba536d..c5190e2bfd 100644
--- a/src/mesh/conformalVoronoiMesh/Make/options
+++ b/src/mesh/conformalVoronoiMesh/Make/options
@@ -1,4 +1,4 @@
-//EXE_DEBUG = -DFULLDEBUG -g -O0
+EXE_DEBUG = -DFULLDEBUG -g -O0
 EXE_FROUNDING_MATH = -frounding-math
 EXE_NDEBUG = -DNDEBUG
 
diff --git a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
index 8e79265269..fe380f42a5 100644
--- a/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
+++ b/src/mesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/cellSizeFunction/cellSizeFunction.C
@@ -76,16 +76,19 @@ cellSizeFunction::cellSizeFunction
         else
         {
             FatalErrorIn("cellSizeFunction::cellSizeFunction")
-            << "Unknown mode, expected: inside, outside or bothSides" << nl
+                << "Unknown mode, expected: inside, outside or bothSides" << nl
                 << exit(FatalError);
         }
     }
-    else if (mode != rmBothsides)
+    else
     {
-        WarningIn("cellSizeFunction::cellSizeFunction")
-            << "surface does not support volumeType, defaulting mode to "
-            << "bothSides."
-            << endl;
+        if (mode != "bothSides")
+        {
+            WarningIn("cellSizeFunction::cellSizeFunction")
+                << "surface does not support volumeType, defaulting mode to "
+                << "bothSides."
+                << endl;
+        }
 
         sideMode_ = rmBothsides;
     }
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 0a0c24178a..fbfdf5307b 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -230,7 +230,7 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
     while
     (
         totalHits > 0
-     && totalHits > hitLimit
+     && totalHits >= hitLimit
      && iterationNo < maxIterations
     )
     {