From 10042d2a0ab69b7c08a449ffd100c076b39260e9 Mon Sep 17 00:00:00 2001
From: laurence <laurence>
Date: Fri, 8 Feb 2013 15:45:24 +0000
Subject: [PATCH] ENH: cvMesh: Add option to print vertex info

---
 .../controlMeshRefinement.C                   | 56 ++++++++++++++++++-
 .../linearDistance/linearDistance.C           |  4 +-
 .../linearSpatial/linearSpatial.C             |  2 +-
 .../surfaceOffsetLinearDistance.C             |  8 +--
 .../uniformDistance/uniformDistance.C         |  2 +-
 .../automatic/automatic.C                     |  2 +-
 .../nonUniformField/nonUniformField.C         |  2 +-
 .../uniformValue/uniformValue.C               |  2 +-
 .../conformalVoronoiMesh.C                    | 16 ++++--
 .../conformalVoronoiMeshIO.C                  |  5 +-
 .../cvControls/cvControls.C                   |  5 ++
 .../cvControls/cvControls.H                   |  6 ++
 .../cvControls/cvControlsI.H                  |  6 ++
 13 files changed, 94 insertions(+), 22 deletions(-)

diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
index 3c9ea35c94..294512e60b 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C
@@ -168,8 +168,8 @@ Foam::pointHit Foam::controlMeshRefinement::findDiscontinuities
 {
     pointHit p(point::max);
 
-    const scalar tolSqr = sqr(1e-3);
-    const scalar secondDerivTolSqr = sqr(1e-3);
+    const scalar tolSqr = sqr(1e-1);
+    const scalar secondDerivTolSqr = sqr(1e-1);
 
     detectEdge
     (
@@ -373,6 +373,54 @@ void Foam::controlMeshRefinement::initialMeshPopulation
             << "/" << returnReduce(vertices.size(), sumOp<label>())
             << endl;
     }
+
+    // Change cell size function of bounding points to be consistent
+    // with their nearest neighbours
+//    for
+//    (
+//        CellSizeDelaunay::Finite_vertices_iterator vit =
+//            mesh_.finite_vertices_begin();
+//        vit != mesh_.finite_vertices_end();
+//        ++vit
+//    )
+//    {
+//        if (vit->uninitialised())
+//        {
+//            // Get its adjacent vertices
+//            std::list<CellSizeDelaunay::Vertex_handle> adjacentVertices;
+//
+//            mesh_.adjacent_vertices
+//            (
+//                vit,
+//                std::back_inserter(adjacentVertices)
+//            );
+//
+//            scalar totalCellSize = 0;
+//            label nVerts = 0;
+//
+//            for
+//            (
+//                std::list<CellSizeDelaunay::Vertex_handle>::iterator avit =
+//                    adjacentVertices.begin();
+//                avit != adjacentVertices.end();
+//                ++avit
+//            )
+//            {
+//                if (!(*avit)->uninitialised())
+//                {
+//                    totalCellSize += (*avit)->targetCellSize();
+//                    nVerts++;
+//                }
+//            }
+//
+//            Pout<< "Changing " << vit->info();
+//
+//            vit->targetCellSize() = totalCellSize/nVerts;
+//            vit->type() = Vb::vtInternalNearBoundary;
+//
+//            Pout<< "to " << vit->info() << endl;
+//        }
+//    }
 }
 
 
@@ -381,7 +429,9 @@ Foam::label Foam::controlMeshRefinement::refineMesh
     const autoPtr<backgroundMeshDecomposition>& decomposition
 )
 {
-    Info<< "Iterate over cell size mesh edges" << endl;
+    Info<< "Iterate over "
+        << returnReduce(label(mesh_.number_of_finite_edges()), sumOp<label>())
+        << " cell size mesh edges" << endl;
 
     DynamicList<Vb> verts(mesh_.number_of_vertices());
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
index fe385ace4c..419a2f2afa 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearDistance/linearDistance.C
@@ -52,11 +52,11 @@ linearDistance::linearDistance
     distanceCellSize_
     (
         readScalar(coeffsDict().lookup("distanceCellSizeCoeff"))
-       *defaultCellSize_
+       *defaultCellSize
     ),
     distance_
     (
-        readScalar(coeffsDict().lookup("distanceCoeff"))*defaultCellSize_
+        readScalar(coeffsDict().lookup("distanceCoeff"))*defaultCellSize
     ),
     distanceSqr_(sqr(distance_))
 {}
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
index 2012e42231..a260be4241 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/linearSpatial/linearSpatial.C
@@ -51,7 +51,7 @@ linearSpatial::linearSpatial
     referenceCellSize_
     (
         readScalar(coeffsDict().lookup("referenceCellSizeCoeff"))
-       *defaultCellSize_
+       *defaultCellSize
     ),
     direction_(coeffsDict().lookup("direction")),
     cellSizeGradient_(readScalar(coeffsDict().lookup("cellSizeGradient")))
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
index a2ca0c17f1..3b0c3b9b93 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/surfaceOffsetLinearDistance/surfaceOffsetLinearDistance.C
@@ -54,11 +54,11 @@ surfaceOffsetLinearDistance::surfaceOffsetLinearDistance
     distanceCellSize_
     (
         readScalar(coeffsDict().lookup("distanceCellSizeCoeff"))
-       *defaultCellSize_
+       *defaultCellSize
     ),
     surfaceOffset_
     (
-        readScalar(coeffsDict().lookup("surfaceOffsetCoeff"))*defaultCellSize_
+        readScalar(coeffsDict().lookup("surfaceOffsetCoeff"))*defaultCellSize
     ),
     totalDistance_(),
     totalDistanceSqr_()
@@ -93,13 +93,13 @@ surfaceOffsetLinearDistance::surfaceOffsetLinearDistance
         {
             totalDistance_ =
                 readScalar(coeffsDict().lookup("totalDistanceCoeff"))
-               *defaultCellSize_;
+               *defaultCellSize;
         }
         else
         {
             totalDistance_ =
                 readScalar(coeffsDict().lookup("linearDistanceCoeff"))
-               *defaultCellSize_
+               *defaultCellSize
               + surfaceOffset_;
         }
     }
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
index 46739cf190..e7811d798c 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/cellSizeFunction/uniformDistance/uniformDistance.C
@@ -49,7 +49,7 @@ uniformDistance::uniformDistance
     cellSizeFunction(typeName, initialPointsDict, surface, defaultCellSize),
     distance_
     (
-        readScalar(coeffsDict().lookup("distanceCoeff"))*defaultCellSize_
+        readScalar(coeffsDict().lookup("distanceCoeff"))*defaultCellSize
     ),
     distanceSqr_(sqr(distance_))
 {}
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
index 6c90245c0b..9140d7fa94 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/cellSizeCalculationType/automatic/automatic.C
@@ -121,7 +121,7 @@ Foam::automatic::automatic
     ),
     maximumCellSize_
     (
-        readScalar(coeffsDict_.lookup("maximumCellSizeCoeff"))*defaultCellSize_
+        readScalar(coeffsDict_.lookup("maximumCellSizeCoeff"))*defaultCellSize
     )
 {}
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
index f610bfd4ef..d872454a97 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/nonUniformField/nonUniformField.C
@@ -81,7 +81,7 @@ Foam::nonUniformField::nonUniformField
         (
             coeffsDict(),
             surfaceTriMesh_,
-            defaultCellSize_
+            defaultCellSize
         )
     ),
     pointCellSize_(),
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C
index b30e217e61..646a8c0ade 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellSizeControlSurfaces/surfaceCellSizeFunction/uniformValue/uniformValue.C
@@ -58,7 +58,7 @@ Foam::uniformValue::uniformValue
     ),
     surfaceCellSize_
     (
-        readScalar(coeffsDict().lookup("surfaceCellSizeCoeff"))*defaultCellSize_
+        readScalar(coeffsDict().lookup("surfaceCellSizeCoeff"))*defaultCellSize
     )
 {}
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 2cdc128b56..d28e131f3d 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -734,7 +734,6 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh()
     if (Pstream::parRun())
     {
         distributeBackground(cellSizeMesh);
-//        cellSizeMesh.distribute(decomposition_);
     }
 
     label nMaxIter = readLabel
@@ -790,7 +789,10 @@ void Foam::conformalVoronoiMesh::buildCellSizeAndAlignmentMesh()
         cellSizeMesh.write();
     }
 
-    cellSizeMesh.printVertexInfo(Info);
+    if (cvMeshControls().printVertexInfo())
+    {
+        cellSizeMesh.printVertexInfo(Info);
+    }
 }
 
 
@@ -1311,7 +1313,10 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
 
     cellSizeMeshOverlapsBackground();
 
-    printVertexInfo(Info);
+    if (cvMeshControls().printVertexInfo())
+    {
+        printVertexInfo(Info);
+    }
 
     if (cvMeshControls().objOutput())
     {
@@ -1878,7 +1883,10 @@ void Foam::conformalVoronoiMesh::move()
 
     timeCheck("After conformToSurface");
 
-    printVertexInfo(Info);
+    if (cvMeshControls().printVertexInfo())
+    {
+        printVertexInfo(Info);
+    }
 
     // Write the intermediate mesh, do not filter the dual faces.
     if (runTime_.outputTime())
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 76b44f4f31..c764e35d08 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -328,7 +328,7 @@ void Foam::conformalVoronoiMesh::writeMesh(const fileName& instance)
     labelList cellToDelaunayVertex;
     // Per patch, per face the Delaunay vertex
     labelListList patchToDelaunayVertex;
-    // Per patch the start of the dual faces
+
     labelList dualPatchStarts;
 
     {
@@ -771,9 +771,6 @@ void Foam::conformalVoronoiMesh::reorderProcessorPatches
     const wordList& patchTypes,
     const wordList& patchNames,
     const PtrList<dictionary>& patchDicts
-//    const labelList& patchSizes,
-//    const labelList& patchStarts,
-//    const labelList& procNeighbours
 ) const
 {
     Info<< incrIndent << indent << "Reordering processor patches" << endl;
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
index 93d1f89403..85657ae25d 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.C
@@ -137,6 +137,11 @@ Foam::cvControls::cvControls
         motionDict.lookupOrDefault<Switch>("timeChecks", false)
     );
 
+    printVertexInfo_ = Switch
+    (
+        motionDict.lookupOrDefault<Switch>("printVertexInfo", false)
+    );
+
     if (Pstream::parRun())
     {
         maxLoadUnbalance_ = readScalar(motionDict.lookup("maxLoadUnbalance"));
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
index 884845e307..12348599b5 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControls.H
@@ -142,6 +142,9 @@ class cvControls
         //- Switch to control the reporting of detailed timeChecks
         Switch timeChecks_;
 
+        //- Switch to control the reporting of detailed vertex information
+        Switch printVertexInfo_;
+
         //- Allowed relative load unbalance
         scalar maxLoadUnbalance_;
 
@@ -277,6 +280,9 @@ public:
             //- Return the timeChecks Switch
             inline Switch timeChecks() const;
 
+            //- Return the printVertexInfo Switch
+            inline Switch printVertexInfo() const;
+
             //- Return the maxLoadUnbalance
             inline scalar maxLoadUnbalance() const;
 
diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
index 6cccc292ed..889e58ee47 100644
--- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
+++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cvControls/cvControlsI.H
@@ -136,6 +136,12 @@ inline Foam::Switch Foam::cvControls::timeChecks() const
 }
 
 
+inline Foam::Switch Foam::cvControls::printVertexInfo() const
+{
+    return printVertexInfo_;
+}
+
+
 inline Foam::scalar Foam::cvControls::maxLoadUnbalance() const
 {
     return maxLoadUnbalance_;