From df5854379913c42219adf49c6fb57f02d4ae74ef Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 14 Oct 2010 18:02:22 +0100
Subject: [PATCH] ENH:  Writing cellCentres to polyMesh dir and optional
 reading.

---
 .../mesh/manipulation/checkMesh/checkMesh.C          | 12 ++++++++----
 .../mesh/manipulation/checkMesh/checkTopology.C      |  4 ++--
 .../conformalVoronoiMeshCalcDualMesh.C               |  7 +++----
 .../conformalVoronoiMesh/conformalVoronoiMeshIO.C    |  3 ++-
 4 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
index 6340010ace..4457a6b2c8 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkMesh.C
@@ -96,16 +96,20 @@ int main(int argc, char *argv[])
                 IOobject
                 (
                     "cellCentres",
-                    runTime.constant(),
+                    mesh.pointsInstance(),
+                    polyMesh::meshSubDir,
                     runTime,
-                    IOobject::MUST_READ,
+                    IOobject::READ_IF_PRESENT,
                     IOobject::NO_WRITE
                 )
             );
 
-            Info<< "Read " << overrideCCs.size() << " cell centres" << endl;
+            if (overrideCCs.headerOk())
+            {
+                Info<< "Read " << overrideCCs.size() << " cell centres" << endl;
 
-            mesh.overrideCellCentres(overrideCCs);
+                mesh.overrideCellCentres(overrideCCs);
+            }
 
             // Reconstruct globalMeshData
             mesh.globalData();
diff --git a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
index 09fb5484e9..2204336ac7 100644
--- a/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
+++ b/applications/utilities/mesh/manipulation/checkMesh/checkTopology.C
@@ -167,7 +167,7 @@ Foam::label Foam::checkTopology
         if (nOneCells > 0)
         {
             Info<< "  <<Writing " << nOneCells
-                << " cells with with single non-boundary face to set "
+                << " cells with with zero or one non-boundary face to set "
                 << oneCells.name()
                 << endl;
             oneCells.instance() = mesh.pointsInstance();
@@ -179,7 +179,7 @@ Foam::label Foam::checkTopology
         if (nTwoCells > 0)
         {
             Info<< "  <<Writing " << nTwoCells
-                << " cells with with single non-boundary face to set "
+                << " cells with with two non-boundary faces to set "
                 << twoCells.name()
                 << endl;
             twoCells.instance() = mesh.pointsInstance();
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index da91e1bcda..442cdd9528 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -96,14 +96,13 @@ void Foam::conformalVoronoiMesh::calcDualMesh
     indexDualVertices(points, boundaryPts);
 
     {
-        // No-risk face filtering to get rid of zero area faces and
-        // establish if the mesh can be produced at all to the
+        // Ideally requires a no-risk face filtering to get rid of zero area
+        // faces and establish if the mesh can be produced at all to the
         // specified criteria
 
         Info<< nl << "Merging close points" << endl;
 
-        // There is no guarantee that a merge of close points is
-        // no-risk, but it seems to work using 1e-4 as the mergeClosenessCoeff
+        // There is no guarantee that a merge of close points is no-risk
         mergeCloseDualVertices(points, boundaryPts);
     }
 
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index cddacd4e94..938a5c6487 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -275,7 +275,8 @@ void Foam::conformalVoronoiMesh::writeMesh
         IOobject
         (
             "cellCentres",
-            instance,
+            mesh.pointsInstance(),
+            fvMesh::meshSubDir,
             mesh,
             IOobject::NO_READ,
             IOobject::AUTO_WRITE