From fd59a3d590a9a233c9762d6deefc40fe3e19c67b Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 20 Dec 2010 11:47:09 +0000
Subject: [PATCH] Revert "ENH:  Adding deltaCoeff comparison code - requires
 fvMesh."

This reverts commit 53529c1112a778fa5331acf9e786195a38ef3f4b.
---
 .../conformalVoronoiMesh.H                    |  1 -
 .../conformalVoronoiMeshCalcDualMesh.C        | 40 +++++++------------
 2 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 1d4f591c3a..f14a5e67bb 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -59,7 +59,6 @@ SourceFiles
 #include "unitConversion.H"
 #include "transform.H"
 #include "volFields.H"
-#include "surfaceFields.H"
 #include "fvMesh.H"
 #include "Histogram.H"
 #include "labelPair.H"
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index df9041c73b..f1b35ff9a7 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -1405,11 +1405,11 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
 
     removeUnusedCells(owner, neighbour, cellCentres);
 
-    fvMesh mesh
+    polyMesh pMesh
     (
         IOobject
         (
-            Foam::polyMesh::defaultRegion,
+            "cvMesh_temporary",
             runTime_.timeName(),
             runTime_,
             IOobject::NO_READ,
@@ -1431,33 +1431,23 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
             patchSizes[p],
             patchStarts[p],
             p,
-            mesh.boundaryMesh()
+            pMesh.boundaryMesh()
         );
     }
 
-    mesh.addPatches(patches);
+    pMesh.addPatches(patches);
 
-    surfaceScalarField preCellCentreShiftDeltaCoeffs = mesh.deltaCoeffs();
-
-    mesh.clearOut();
-
-    surfaceScalarField postCellCentreShiftDeltaCoeffs = mesh.deltaCoeffs();
-
-    surfaceScalarField deltaCoeffRatio =
-        postCellCentreShiftDeltaCoeffs/preCellCentreShiftDeltaCoeffs;
-
-    Info<< "deltaCoeffRatio min " << min(deltaCoeffRatio) << nl
-        << "deltaCoeffRatio max " << max(deltaCoeffRatio) << endl;
+    pMesh.overrideCellCentres(cellCentres);
 
     timeCheck();
 
-    labelHashSet wrongFaces(mesh.nFaces()/100);
+    labelHashSet wrongFaces(pMesh.nFaces()/100);
 
     Info << endl;
 
-    DynamicList<label> checkFaces(mesh.nFaces());
+    DynamicList<label> checkFaces(pMesh.nFaces());
 
-    const vectorField& fAreas = mesh.faceAreas();
+    const vectorField& fAreas = pMesh.faceAreas();
 
     scalar faceAreaLimit = SMALL;
 
@@ -1478,7 +1468,7 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
     motionSmoother::checkMesh
     (
         false,
-        mesh,
+        pMesh,
         cvMeshControls().cvMeshDict().subDict("meshQualityControls"),
         checkFaces,
         wrongFaces
@@ -1486,7 +1476,7 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
 
     label nInvalidPolyhedra = 0;
 
-    const cellList& cells = mesh.cells();
+    const cellList& cells = pMesh.cells();
 
     forAll(cells, cI)
     {
@@ -1512,7 +1502,7 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
 
     forAllConstIter(labelHashSet, wrongFaces, iter)
     {
-        const face f = mesh.faces()[iter.key()];
+        const face f = pMesh.faces()[iter.key()];
 
         forAll(f, fPtI)
         {
@@ -1522,13 +1512,13 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
 
     // // Limit connected cells
 
-    // labelHashSet limitCells(mesh.nCells()/100);
+    // labelHashSet limitCells(pMesh.nCells()/100);
 
-    // const labelListList& ptCells = mesh.pointCells();
+    // const labelListList& ptCells = pMesh.pointCells();
 
     // forAllConstIter(labelHashSet, wrongFaces, iter)
     // {
-    //     const face f = mesh.faces()[iter.key()];
+    //     const face f = pMesh.faces()[iter.key()];
 
     //     forAll(f, fPtI)
     //     {
@@ -1543,7 +1533,7 @@ Foam::label Foam::conformalVoronoiMesh::checkPolyMeshQuality
     //     }
     // }
 
-    // const labelListList& cellPts = mesh.cellPoints();
+    // const labelListList& cellPts = pMesh.cellPoints();
 
     // forAllConstIter(labelHashSet, limitCells, iter)
     // {