From 9782a6e9fa113f82578c29d7c7f058b008486a27 Mon Sep 17 00:00:00 2001
From: andy <andy>
Date: Wed, 15 Jun 2011 15:13:49 +0100
Subject: [PATCH 1/9] ENH: Added defaultCoeffs option to spray break-up models

---
 .../intermediate/submodels/SubModelBase.C     | 17 +++++++++-
 .../intermediate/submodels/SubModelBase.H     |  6 ++--
 .../spray/submodels/BreakupModel/ETAB/ETAB.C  | 32 +++++++++----------
 .../BreakupModel/PilchErdman/PilchErdman.C    | 12 +++++--
 .../BreakupModel/ReitzDiwakar/ReitzDiwakar.C  | 18 ++++++++---
 .../BreakupModel/ReitzKHRT/ReitzKHRT.C        | 31 ++++++++++--------
 .../spray/submodels/BreakupModel/SHF/SHF.C    |  2 +-
 7 files changed, 76 insertions(+), 42 deletions(-)

diff --git a/src/lagrangian/intermediate/submodels/SubModelBase.C b/src/lagrangian/intermediate/submodels/SubModelBase.C
index 527342d174..5f8b988276 100644
--- a/src/lagrangian/intermediate/submodels/SubModelBase.C
+++ b/src/lagrangian/intermediate/submodels/SubModelBase.C
@@ -90,6 +90,21 @@ const Foam::dictionary& Foam::SubModelBase<CloudType>::coeffDict() const
 }
 
 
+template<class CloudType>
+bool Foam::SubModelBase<CloudType>::defaultCoeffs(const bool printMsg) const
+{
+    bool def = coeffDict_.lookupOrDefault<bool>("defaultCoeffs", false);
+    if (printMsg && def)
+    {
+        Info<< incrIndent;
+        Info<< indent << "Employing default coefficients" << endl;
+        Info<< decrIndent;
+    }
+
+    return def;
+}
+
+
 template<class CloudType>
 CloudType& Foam::SubModelBase<CloudType>::owner()
 {
@@ -105,7 +120,7 @@ bool Foam::SubModelBase<CloudType>::active() const
 
 
 template<class CloudType>
-void  Foam::SubModelBase<CloudType>::cacheFields(const bool)
+void Foam::SubModelBase<CloudType>::cacheFields(const bool)
 {
     // do nothing
 }
diff --git a/src/lagrangian/intermediate/submodels/SubModelBase.H b/src/lagrangian/intermediate/submodels/SubModelBase.H
index d5cc8a53bd..c94947e80f 100644
--- a/src/lagrangian/intermediate/submodels/SubModelBase.H
+++ b/src/lagrangian/intermediate/submodels/SubModelBase.H
@@ -63,11 +63,10 @@ protected:
         //- Reference to the cloud dictionary
         const dictionary& dict_;
 
-        //- Reference to the coefficients dictionary
+        //- Coefficients dictionary
         const dictionary& coeffDict_;
 
 
-
 public:
 
     // Constructors
@@ -108,6 +107,9 @@ public:
             //- Return const access to the coefficients dictionary
             const dictionary& coeffDict() const;
 
+            //- Returns true if defaultCoeffs is true and outputs on printMsg
+            bool defaultCoeffs(const bool printMsg) const;
+
             //- Return the model 'active' status - default active = true
             virtual bool active() const;
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
index 1ba28effe1..ce9eb40916 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/ETAB/ETAB.C
@@ -35,24 +35,24 @@ Foam::ETAB<CloudType>::ETAB
 )
 :
     BreakupModel<CloudType>(dict, owner, typeName),
-    Cmu_(this->coeffDict().template lookupOrDefault<scalar>("Cmu", 10.0)),
-    Comega_(this->coeffDict().template lookupOrDefault<scalar>("Comega", 8.0)),
-    k1_(this->coeffDict().template lookupOrDefault<scalar>("k1", 0.2)),
-    k2_(this->coeffDict().template lookupOrDefault<scalar>("k2", 0.2)),
-    WeCrit_
-(
-    this->coeffDict().template lookupOrDefault<scalar>("WeCrit", 12.0)
-),
-    WeTransition_
-    (
-        this->coeffDict().template lookupOrDefault<scalar>
-        (
-            "WeTransition",
-            100.0
-        )
-    ),
+    Cmu_(10.0),
+    Comega_(8.0),
+    k1_(0.2),
+    k2_(0.2),
+    WeCrit_(12.0),
+    WeTransition_(100.0),
     AWe_(0.0)
 {
+    if (!this->defaultCoeffs(true))
+    {
+        this->coeffDict().lookup("Cmu") >> Cmu_;
+        this->coeffDict().lookup("Comega") >> Comega_;
+        this->coeffDict().lookup("k1") >> k1_;
+        this->coeffDict().lookup("k2") >> k2_;
+        this->coeffDict().lookup("WeCrit") >> WeCrit_;
+        this->coeffDict().lookup("WeTransition") >> WeTransition_;
+    }
+
     scalar k21 = k2_/k1_;
     AWe_ = (k21*sqrt(WeTransition_) - 1.0)/pow4(WeTransition_);
 
diff --git a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C
index a3a6cdd2f9..65ba5498ce 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/PilchErdman/PilchErdman.C
@@ -35,9 +35,15 @@ Foam::PilchErdman<CloudType>::PilchErdman
 )
 :
     BreakupModel<CloudType>(dict, owner, typeName),
-    B1_(this->coeffDict().template lookupOrDefault<scalar>("B1", 0.375)),
-    B2_(this->coeffDict().template lookupOrDefault<scalar>("B2", 0.236))
-{}
+    B1_(0.375),
+    B2_(0.236)
+{
+    if (!this->defaultCoeffs(true))
+    {
+        this->coeffDict().lookup("B1") >> B1_;
+        this->coeffDict().lookup("B2") >> B2_;
+    }
+}
 
 
 template <class CloudType>
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C
index 1ff7327986..c9cb30ff2b 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzDiwakar/ReitzDiwakar.C
@@ -35,11 +35,19 @@ Foam::ReitzDiwakar<CloudType>::ReitzDiwakar
 )
 :
     BreakupModel<CloudType>(dict, owner, typeName),
-    Cbag_(this->coeffDict().template lookupOrDefault<scalar>("Cbag", 6.0)),
-    Cb_(this->coeffDict().template lookupOrDefault<scalar>("Cb", 0.785)),
-    Cstrip_(this->coeffDict().template lookupOrDefault<scalar>("Cstrip", 0.5)),
-    Cs_(this->coeffDict().template lookupOrDefault<scalar>("Cs", 10.0))
-{}
+    Cbag_(6.0),
+    Cb_(0.785),
+    Cstrip_(0.5),
+    Cs_(10.0)
+{
+    if (!this->defaultCoeffs(true))
+    {
+        this->coeffDict().lookup("Cbag") >> Cbag_;
+        this->coeffDict().lookup("Cb") >> Cb_;
+        this->coeffDict().lookup("Cstrip") >> Cstrip_;
+        this->coeffDict().lookup("Cs") >> Cs_;
+    }
+}
 
 
 template <class CloudType>
diff --git a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C
index 0e8835c75c..e0bc8b3721 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/ReitzKHRT/ReitzKHRT.C
@@ -35,20 +35,23 @@ Foam::ReitzKHRT<CloudType>::ReitzKHRT
 )
 :
     BreakupModel<CloudType>(dict, owner, typeName),
-    b0_(this->coeffDict().template lookupOrDefault<scalar>("B0", 0.61)),
-    b1_(this->coeffDict().template lookupOrDefault<scalar>("B1", 40.0)),
-    cTau_(this->coeffDict().template lookupOrDefault<scalar>("Ctau", 1.0)),
-    cRT_(this->coeffDict().template lookupOrDefault<scalar>("CRT", 0.1)),
-    msLimit_
-    (
-        this->coeffDict().template lookupOrDefault<scalar>
-        (
-            "msLimit",
-            0.03
-        )
-    ),
-    weberLimit_(readScalar(this->coeffDict().lookup("WeberLimit")))
-{}
+    b0_(0.61),
+    b1_(40.0),
+    cTau_(1.0),
+    cRT_(0.1),
+    msLimit_(0.03),
+    weberLimit_(6.0)
+{
+    if (!this->defaultCoeffs(true))
+    {
+        this->coeffDict().lookup("B0") >> b0_;
+        this->coeffDict().lookup("B1") >> b1_;
+        this->coeffDict().lookup("Ctau") >> cTau_;
+        this->coeffDict().lookup("CRT") >> cRT_;
+        this->coeffDict().lookup("msLimit") >> msLimit_;
+        this->coeffDict().lookup("WeberLimit") >> weberLimit_;
+    }
+}
 
 
 template <class CloudType>
diff --git a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
index 73dd7cc401..a705c37096 100644
--- a/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
+++ b/src/lagrangian/spray/submodels/BreakupModel/SHF/SHF.C
@@ -142,7 +142,7 @@ bool Foam::SHF<CloudType>::update
 {
     bool addChild = false;
 
-    scalar d03 = pow(d, 3);
+    scalar d03 = pow3(d);
     scalar rhopi6 = rho*constant::mathematical::pi/6.0;
     scalar mass0 = nParticle*rhopi6*d03;
     scalar mass = mass0;

From 7412ca8952d7e3db30fc217c8cb0ff40111594a1 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Wed, 15 Jun 2011 16:37:58 +0100
Subject: [PATCH 2/9] ENH: Use range insertion.  Move storeSizesAndAlignments
 out of insertInitialPoints.

---
 .../conformalVoronoiMesh.C                    | 36 ++++++++++---------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 9993162a93..5157f3c580 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -272,18 +272,19 @@ void Foam::conformalVoronoiMesh::insertPoints
 
     label nVert = number_of_vertices();
 
-    Info<< "TEMPORARILY USING INDIVIDUAL INSERTION TO DETECT FAILURE" << endl;
     // using the range insert (faster than inserting points one by one)
-    // insert(points.begin(), points.end());
-    for
-    (
-        std::list<Point>::iterator pit=points.begin();
-        pit != points.end();
-        ++pit
-    )
-    {
-        insertVb(*pit);
-    }
+    insert(points.begin(), points.end());
+
+    // Info<< "USING INDIVIDUAL INSERTION TO DETECT FAILURE" << endl;
+    // for
+    // (
+    //     std::list<Point>::iterator pit=points.begin();
+    //     pit != points.end();
+    //     ++pit
+    // )
+    // {
+    //     insertVb(*pit);
+    // }
 
     label nInserted(number_of_vertices() - preInsertionSize);
 
@@ -1167,12 +1168,6 @@ void Foam::conformalVoronoiMesh::insertInitialPoints()
         writePoints("initialPoints.obj", true);
     }
 
-    Info<< "NEED TO CHANGE storeSizesAndAlignments AFTER DISTRIBUTE" << endl;
-    Info<< "NEED TO MAP FEATURE POINTS AFTER DISTRIBUTE" << endl;
-    Info<< "NEED TO ENSURE THAT FEATURE POINTS ARE INSERTED ON THE "
-        << "CORRECT PRCOESSOR" << endl;
-
-    storeSizesAndAlignments(initPts);
 }
 
 
@@ -1808,6 +1803,13 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
 
     insertFeaturePoints();
 
+    Info<< "NEED TO MAP FEATURE POINTS AFTER DISTRIBUTE" << endl;
+    Info<< "NEED TO ENSURE THAT FEATURE POINTS ARE INSERTED ON THE "
+        << "CORRECT PROCESSOR" << endl;
+
+    Info<< "NEED TO CHANGE storeSizesAndAlignments AFTER DISTRIBUTE" << endl;
+    // storeSizesAndAlignments(initPts);
+
     buildSurfaceConformation(rmCoarse);
 
     // The introduction of the surface conformation may have distorted the

From 1f61715738cf805bbbf9b5c126060aba5c802c22 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 16 Jun 2011 14:57:54 +0100
Subject: [PATCH 3/9] ENH: Distributing and storing feature points, surface
 conformation and sizes.

---
 .../conformalVoronoiMesh.C                    | 178 +++++++++++++-----
 .../conformalVoronoiMesh.H                    |  40 +++-
 .../conformalVoronoiMeshConformToSurface.C    |  51 ++++-
 .../conformalVoronoiMeshI.H                   |  60 +++---
 .../conformalVoronoiMesh/indexedVertex.H      |  67 +++----
 5 files changed, 266 insertions(+), 130 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 5157f3c580..208dba1083 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -283,7 +283,7 @@ void Foam::conformalVoronoiMesh::insertPoints
     //     ++pit
     // )
     // {
-    //     insertVb(*pit);
+    //     insertPoint(topoint(*pit), Vb::ptInternalPoint);
     // }
 
     label nInserted(number_of_vertices() - preInsertionSize);
@@ -318,6 +318,10 @@ void Foam::conformalVoronoiMesh::insertPoints
     bool distribute
 )
 {
+    // The pts, indices and types lists must be intact and up-to-date at the
+    // end of this function as they may also be used by other functions
+    // subsequently.
+
     if (Pstream::parRun() && distribute)
     {
         // The link between vertices that form the boundary via pairs cannot be
@@ -363,7 +367,6 @@ void Foam::conformalVoronoiMesh::insertPoints
         if (type > Vb::ptFarPoint)
         {
             // This is a member of a point pair, don't use the type directly
-
             type += number_of_vertices();
         }
 
@@ -750,6 +753,7 @@ void Foam::conformalVoronoiMesh::insertFeaturePoints()
 
     createMixedFeaturePoints(pts, indices, types);
 
+    // Insert the created points, distributing to the appropriate processor
     insertPoints(pts, indices, types, true);
 
     if(cvMeshControls().objOutput())
@@ -770,27 +774,15 @@ void Foam::conformalVoronoiMesh::insertFeaturePoints()
             << " feature vertices" << endl;
     }
 
-    Info<< "SORT OUT FEATURE POINT DISTRIBUTION AND STORAGE" << endl;
+    featureVertices_.clear();
 
-    // featureVertices_.setSize(number_of_vertices());
-
-    // label featPtI = 0;
-
-    // for
-    // (
-    //     Delaunay::Finite_vertices_iterator vit = finite_vertices_begin();
-    //     vit != finite_vertices_end();
-    //     vit++
-    // )
-    // {
-    //     featureVertices_[featPtI] = Vb(vit->point());
-
-    //     featureVertices_[featPtI].index() = vit->index();
-
-    //     featureVertices_[featPtI].type() = vit->type();
-
-    //     featPtI++;
-    // }
+    forAll(pts, pI)
+    {
+        featureVertices_.push_back
+        (
+            Vb(toPoint(pts[pI]), indices[pI], types[pI])
+        );
+    }
 
     constructFeaturePointLocations();
 }
@@ -1066,14 +1058,72 @@ void Foam::conformalVoronoiMesh::constructFeaturePointLocations()
 }
 
 
-void Foam::conformalVoronoiMesh::reinsertFeaturePoints()
+void Foam::conformalVoronoiMesh::reinsertFeaturePoints(bool distribute)
 {
     Info<< nl << "Reinserting stored feature points" << endl;
 
-    forAll(featureVertices_, f)
+    label preReinsertionSize(number_of_vertices());
+
+    if (distribute)
     {
-        insertVb(featureVertices_[f]);
+        DynamicList<Foam::point> pointsToInsert;
+        DynamicList<label> indices;
+        DynamicList<label> types;
+
+        for
+        (
+            std::list<Vb>::iterator vit=featureVertices_.begin();
+            vit != featureVertices_.end();
+            ++vit
+        )
+        {
+            pointsToInsert.append(topoint(vit->point()));
+            indices.append(vit->index());
+            types.append(vit->type());
+        }
+
+        // Insert distributed points
+        insertPoints(pointsToInsert, indices, types, true);
+
+        // Save points in new distribution
+        featureVertices_.clear();
+
+        forAll(pointsToInsert, pI)
+        {
+            featureVertices_.push_back
+            (
+                Vb(toPoint(pointsToInsert[pI]), indices[pI], types[pI])
+            );
+        }
     }
+    else
+    {
+        for
+        (
+            std::list<Vb>::iterator vit=featureVertices_.begin();
+            vit != featureVertices_.end();
+            ++vit
+        )
+        {
+            // Assuming that all of the reinsertions are pair points, and that
+            // the index and type are relative, i.e. index 0 and type relative
+            // to it.
+            insertPoint
+            (
+                vit->point(),
+                vit->index() + number_of_vertices(),
+                vit->type() + number_of_vertices()
+            );
+        }
+    }
+
+    Info<< "    Reinserted "
+        << returnReduce
+        (
+            label(number_of_vertices()) - preReinsertionSize,
+            sumOp<label>()
+        )
+        << " vertices" << endl;
 }
 
 
@@ -1195,7 +1245,8 @@ bool Foam::conformalVoronoiMesh::distributeBackground()
             vit++
         )
         {
-            if (vit->real())
+            // Only store real vertices that are not feature vertices
+            if (vit->real() && vit->index() >= startOfInternalPoints_)
             {
                 nRealVertices++;
             }
@@ -1259,7 +1310,8 @@ bool Foam::conformalVoronoiMesh::distributeBackground()
             vit++
         )
         {
-            if (vit->real())
+            // Only store real vertices that are not feature vertices
+            if (vit->real() && vit->index() >= startOfInternalPoints_)
             {
                 Foam::point v = topoint(vit->point());
 
@@ -1308,8 +1360,8 @@ bool Foam::conformalVoronoiMesh::distributeBackground()
         // Remove the entire tessellation
         reset();
 
-        Info<< "NEED TO MAP FEATURE POINTS" << endl;
-        // reinsertFeaturePoints();
+        // Reinsert feature points, distributing them as necessary.
+        reinsertFeaturePoints(true);
 
         startOfInternalPoints_ = number_of_vertices();
 
@@ -1326,6 +1378,8 @@ bool Foam::conformalVoronoiMesh::distributeBackground()
             forAll(cellVertices[cI], cVPI)
             {
                 pointsToInsert.append(cellVertices[cI][cVPI]);
+
+                // All insertions relative to index of zero
                 indices.append(0);
 
                 label type = cellVertexTypes[cI][cVPI];
@@ -1369,6 +1423,27 @@ bool Foam::conformalVoronoiMesh::distributeBackground()
 }
 
 
+void Foam::conformalVoronoiMesh::storeSizesAndAlignments()
+{
+    std::list<Point> storePts;
+
+    for
+    (
+        Delaunay::Finite_vertices_iterator vit = finite_vertices_begin();
+        vit != finite_vertices_end();
+        vit++
+    )
+    {
+        if (vit->internalPoint())
+        {
+            storePts.push_back(vit->point());
+        }
+    }
+
+    storeSizesAndAlignments(storePts);
+}
+
+
 void Foam::conformalVoronoiMesh::storeSizesAndAlignments
 (
     const std::list<Point>& storePts
@@ -1427,6 +1502,8 @@ void Foam::conformalVoronoiMesh::updateSizesAndAlignments
     )
     {
         storeSizesAndAlignments(storePts);
+
+        timeCheck("Updated sizes and alignments");
     }
 }
 
@@ -1794,6 +1871,8 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
 
     insertBoundingPoints();
 
+    insertFeaturePoints();
+
     insertInitialPoints();
 
     // Improve the guess that the backgroundMeshDecomposition makes with the
@@ -1801,15 +1880,6 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
     // better balance the surface conformation load.
     distributeBackground();
 
-    insertFeaturePoints();
-
-    Info<< "NEED TO MAP FEATURE POINTS AFTER DISTRIBUTE" << endl;
-    Info<< "NEED TO ENSURE THAT FEATURE POINTS ARE INSERTED ON THE "
-        << "CORRECT PROCESSOR" << endl;
-
-    Info<< "NEED TO CHANGE storeSizesAndAlignments AFTER DISTRIBUTE" << endl;
-    // storeSizesAndAlignments(initPts);
-
     buildSurfaceConformation(rmCoarse);
 
     // The introduction of the surface conformation may have distorted the
@@ -1822,6 +1892,21 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
         buildParallelInterface("rebuild");
     }
 
+    // Do not store the surface conformation until after it has been
+    // (potentially) redistributed.
+    storeSurfaceConformation();
+
+    // Use storeSizesAndAlignments with no feed points because all background
+    // points may have been distributed.  It is a requirement that none of the
+    // preceding functions requires look up of sizes or alignments from the
+    // Delaunay vertices, i.e. setVertexSizeAndAlignment cannot be called
+    // before this point.
+    storeSizesAndAlignments();
+
+    // Report any Delaunay vertices that do not think that they are in the
+    // domain the processor they are on.
+    reportProcessorOccupancy();
+
     if(cvMeshControls().objOutput())
     {
         writePoints("allInitialPoints.obj", false);
@@ -2174,13 +2259,6 @@ void Foam::conformalVoronoiMesh::move()
         }
     }
 
-    // Write the mesh before clearing it.  Beware that writeMesh destroys the
-    // indexing of the tessellation.  Do not filter the dual faces.
-    if (runTime_.outputTime())
-    {
-        writeMesh(runTime_.timeName(), false);
-    }
-
     // Remove the entire tessellation
     reset();
 
@@ -2207,14 +2285,20 @@ void Foam::conformalVoronoiMesh::move()
 
     updateSizesAndAlignments(pointsToInsert);
 
+    buildParallelInterface("move_" + runTime_.timeName());
+
+    // Write the intermediate mesh, do not filter the dual faces.
+    if (runTime_.outputTime())
+    {
+        writeMesh(runTime_.timeName(), false);
+    }
+
     Info<< nl
         << "Total displacement = " << totalDisp << nl
         << "Total distance = " << totalDist << nl
         << "Points added = " << pointsAdded << nl
         << "Points removed = " << pointsRemoved
         << endl;
-
-    timeCheck("Updated sizes and alignments (if required), end of move");
 }
 
 
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index ffc87006d6..8a83f44a41 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -138,7 +138,7 @@ private:
 
         //- Store the feature constraining points to be reinserted after a
         //  triangulation clear
-        List<Vb> featureVertices_;
+        std::list<Vb> featureVertices_;
 
         //- Storing the locations of all of the features to be conformed to.
         //  Single pointField required by the featurePointTree.
@@ -240,17 +240,32 @@ private:
         //- Return the required alignment directions at the given location
         tensor requiredAlignment(const Foam::point& pt) const;
 
-        //- Insert point and return its index
+        //- Insert Foam::point and return its auto-generated index
         inline label insertPoint
         (
-            const Foam::point& pt,
+            const Foam::point& p,
             const label type
         );
 
-        //- Insert point and return its index
+        //- Insert Point and return its auto-generated index
+        inline label insertPoint
+        (
+            const Point& P,
+            const label type
+        );
+
+        //- Insert Foam::point with specified index and type
         inline void insertPoint
         (
-            const Foam::point& pt,
+            const Foam::point& p,
+            const label index,
+            const label type
+        );
+
+        //- Insert Point with specified index and type
+        inline void insertPoint
+        (
+            const Point& P,
             const label index,
             const label type
         );
@@ -295,10 +310,6 @@ private:
             DynamicList<label>& types
         );
 
-        //- Insert a Vb (a typedef of CGAL::indexedVertex<K>) with the
-        //  possibility of an offset for the index and the type
-        inline void insertVb(const Vb& v, label offset = 0);
-
         //- Insert pairs of points on the surface with the given normals, at the
         //  specified spacing
         void insertSurfacePointPairs
@@ -420,7 +431,7 @@ private:
         void constructFeaturePointLocations();
 
         //- Reinsert stored feature point defining points
-        void reinsertFeaturePoints();
+        void reinsertFeaturePoints(bool distribute = false);
 
         //- Demand driven construction of octree for feature points
         const indexedOctree<treeDataPoint>& featurePointTree() const;
@@ -445,6 +456,12 @@ private:
         //  referred vertices, so the parallel interface may need rebuilt.
         bool distributeBackground();
 
+        //- Store data for sizeAndAlignmentLocations_, storedSizes_ and
+        //  storedAlignments_ and initialise the sizeAndAlignmentTreePtr_,
+        //  determining the appropriate sizeAndAlignmentLocations_
+        //  automatically
+        void storeSizesAndAlignments();
+
         //- Store data for sizeAndAlignmentLocations_, storedSizes_ and
         //  storedAlignments_ and initialise the sizeAndAlignmentTreePtr_
         void storeSizesAndAlignments(const std::list<Point>& storePts);
@@ -587,6 +604,9 @@ private:
             label& hitSurfaceLargest
         ) const;
 
+        //- Write out vertex-processor occupancy information for debugging
+        void reportProcessorOccupancy();
+
         //- Write out debugging information about the surface conformation
         //  quality
         void reportSurfaceConformationQuality();
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index 1b88564fa6..e129296adc 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -41,7 +41,11 @@ void Foam::conformalVoronoiMesh::conformToSurface()
     {
         // Rebuild, insert and store new surface conformation
         buildSurfaceConformation(reconfMode);
+
+        storeSurfaceConformation();
     }
+
+    // reportSurfaceConformationQuality();
 }
 
 
@@ -411,10 +415,6 @@ void Foam::conformalVoronoiMesh::buildSurfaceConformation
                 << "), stopping iterations" << endl;
         }
     }
-
-    // reportSurfaceConformationQuality();
-
-    storeSurfaceConformation();
 }
 
 
@@ -620,6 +620,8 @@ void Foam::conformalVoronoiMesh::buildParallelInterface
         receivedVertices,
         outputName
     );
+
+    timeCheck("After buildParallelInterface");
 }
 
 
@@ -1346,6 +1348,27 @@ void Foam::conformalVoronoiMesh::dualCellLargestSurfaceIncursion
 }
 
 
+void Foam::conformalVoronoiMesh::reportProcessorOccupancy()
+{
+    for
+    (
+        Delaunay::Finite_vertices_iterator vit = finite_vertices_begin();
+        vit != finite_vertices_end();
+        vit++
+    )
+    {
+        if (vit->real())
+        {
+            if (!positionOnThisProc(topoint(vit->point())))
+            {
+                Pout<< topoint(vit->point()) << " is not on this processor "
+                    << endl;
+            }
+        }
+    }
+}
+
+
 void Foam::conformalVoronoiMesh::reportSurfaceConformationQuality()
 {
     Info<< nl << "Check surface conformation quality" << endl;
@@ -1605,6 +1628,14 @@ void Foam::conformalVoronoiMesh::buildEdgeLocationTree
 
 void Foam::conformalVoronoiMesh::buildSizeAndAlignmentTree() const
 {
+    if (sizeAndAlignmentLocations_.empty())
+    {
+        FatalErrorIn("buildSizeAndAlignmentTree()")
+            << "sizeAndAlignmentLocations empty, must be populated before "
+            << "sizeAndAlignmentTree can be built."
+            << exit(FatalError);
+    }
+
     treeBoundBox overallBb
     (
         geometryToConformTo_.globalBounds().extend(rndGen_, 1e-4)
@@ -1785,6 +1816,9 @@ void Foam::conformalVoronoiMesh::reinsertSurfaceConformation()
 
     label preReinsertionSize(number_of_vertices());
 
+    // It is assumed that the stored surface conformation is on the correct
+    // processor and does not need distributed
+
     for
     (
         std::list<Vb>::iterator vit=surfaceConformationVertices_.begin();
@@ -1792,7 +1826,14 @@ void Foam::conformalVoronoiMesh::reinsertSurfaceConformation()
         ++vit
     )
     {
-        insertVb(*vit, number_of_vertices());
+        // Assuming that all of the reinsertions are pair points, and that the
+        // index and type are relative, i.e. index 0 and type relative to it.
+        insertPoint
+        (
+            vit->point(),
+            vit->index() + number_of_vertices(),
+            vit->type() + number_of_vertices()
+        );
     }
 
     Info<< "    Reinserted "
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index f620c7cd08..140c1d7070 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -215,14 +215,24 @@ inline Foam::label Foam::conformalVoronoiMesh::insertPoint
     const Foam::point& p,
     const label type
 )
+{
+    return insertPoint(toPoint(p), type);
+}
+
+
+inline Foam::label Foam::conformalVoronoiMesh::insertPoint
+(
+    const Point& P,
+    const label type
+)
 {
     uint nVert = number_of_vertices();
 
-    Vertex_handle vh = insert(toPoint(p));
+    Vertex_handle vh = insert(P);
 
     if (nVert == number_of_vertices())
     {
-        Pout << "Failed to insert point " << p << endl;
+        Pout << "Failed to insert point " << topoint(P) << endl;
     }
     else
     {
@@ -240,14 +250,25 @@ inline void Foam::conformalVoronoiMesh::insertPoint
     const label index,
     const label type
 )
+{
+    insertPoint(toPoint(p), index, type);
+}
+
+
+inline void Foam::conformalVoronoiMesh::insertPoint
+(
+    const Point& P,
+    const label index,
+    const label type
+)
 {
     uint nVert = number_of_vertices();
 
-    Vertex_handle vh = insert(toPoint(p));
+    Vertex_handle vh = insert(P);
 
     if (nVert == number_of_vertices())
     {
-        Pout << "Failed to insert point " << p << endl;
+        Pout << "Failed to insert point " << topoint(P) << endl;
     }
     else
     {
@@ -311,37 +332,6 @@ inline void Foam::conformalVoronoiMesh::createPointPair
 }
 
 
-inline void Foam::conformalVoronoiMesh::insertVb(const Vb& v, label offset)
-{
-    const Point& Pt(v.point());
-
-    uint nVert = number_of_vertices();
-
-    Vertex_handle vh = insert(Pt);
-
-    if (nVert == number_of_vertices())
-    {
-        FatalErrorIn("Foam::conformalVoronoiMesh::insertVb(const Vb& v")
-            << "Failed to reinsert Vb at " << topoint(Pt)
-            << nl
-            << exit(FatalError);
-    }
-    else
-    {
-        vh->index() = v.index() + offset;
-
-        if (v.pairPoint())
-        {
-            vh->type() = v.type() + offset;
-        }
-        else
-        {
-            vh->type() = v.type();
-        }
-    }
-}
-
-
 inline bool Foam::conformalVoronoiMesh::isBoundaryDualFace
 (
     const Delaunay::Finite_edges_iterator& eit
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
index f423d17cf6..492cf10889 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex.H
@@ -342,6 +342,7 @@ public:
         return internalPoint(type) || ppMaster(index, type);
     }
 
+
     //- Is point near the boundary or part of the boundary definition
     inline bool nearOrOnBoundary() const
     {
@@ -349,43 +350,43 @@ public:
     }
 
 
-    //- Do the two given vertices consitute a boundary point-pair
-    inline friend bool pointPair
-    (
-        const indexedVertex& v0,
-        const indexedVertex& v1
-    )
-    {
-        return v0.index_ == v1.type_ || v1.index_ == v0.type_;
-    }
+    // //- Do the two given vertices consitute a boundary point-pair
+    // inline friend bool pointPair
+    // (
+    //     const indexedVertex& v0,
+    //     const indexedVertex& v1
+    // )
+    // {
+    //     return v0.index_ == v1.type_ || v1.index_ == v0.type_;
+    // }
 
 
-    //- Do the three given vertices consitute a boundary triangle
-    inline friend bool boundaryTriangle
-    (
-        const indexedVertex& v0,
-        const indexedVertex& v1,
-        const indexedVertex& v2
-    )
-    {
-        return (v0.pairPoint() && pointPair(v1, v2))
-            || (v1.pairPoint() && pointPair(v2, v0))
-            || (v2.pairPoint() && pointPair(v0, v1));
-    }
+    // //- Do the three given vertices consitute a boundary triangle
+    // inline friend bool boundaryTriangle
+    // (
+    //     const indexedVertex& v0,
+    //     const indexedVertex& v1,
+    //     const indexedVertex& v2
+    // )
+    // {
+    //     return (v0.pairPoint() && pointPair(v1, v2))
+    //         || (v1.pairPoint() && pointPair(v2, v0))
+    //         || (v2.pairPoint() && pointPair(v0, v1));
+    // }
 
 
-    //- Do the three given vertices consitute an outside triangle
-    inline friend bool outsideTriangle
-    (
-        const indexedVertex& v0,
-        const indexedVertex& v1,
-        const indexedVertex& v2
-    )
-    {
-        return (v0.farPoint() || v0.ppSlave())
-            || (v1.farPoint() || v1.ppSlave())
-            || (v2.farPoint() || v2.ppSlave());
-    }
+    // //- Do the three given vertices consitute an outside triangle
+    // inline friend bool outsideTriangle
+    // (
+    //     const indexedVertex& v0,
+    //     const indexedVertex& v1,
+    //     const indexedVertex& v2
+    // )
+    // {
+    //     return (v0.farPoint() || v0.ppSlave())
+    //         || (v1.farPoint() || v1.ppSlave())
+    //         || (v2.farPoint() || v2.ppSlave());
+    // }
 
 
     // inline void operator=(const Delaunay::Finite_vertices_iterator vit)

From 20f7ce99f6fdfebf9a960c4ae8faa8cdb6582257 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 16 Jun 2011 15:44:34 +0100
Subject: [PATCH 4/9] BUG: Do not double build parallel interface.

Do not store feature points with surface.
---
 .../conformalVoronoiMesh/conformalVoronoiMesh.C       |  2 --
 .../conformalVoronoiMeshConformToSurface.C            | 11 ++++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 208dba1083..e03329efee 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -2285,8 +2285,6 @@ void Foam::conformalVoronoiMesh::move()
 
     updateSizesAndAlignments(pointsToInsert);
 
-    buildParallelInterface("move_" + runTime_.timeName());
-
     // Write the intermediate mesh, do not filter the dual faces.
     if (runTime_.outputTime())
     {
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index e129296adc..d16bafe407 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -36,6 +36,8 @@ void Foam::conformalVoronoiMesh::conformToSurface()
     {
         // Reinsert stored surface conformation
         reinsertSurfaceConformation();
+
+        buildParallelInterface("move_" + runTime_.timeName());
     }
     else
     {
@@ -1786,7 +1788,14 @@ void Foam::conformalVoronoiMesh::storeSurfaceConformation()
         vit++
     )
     {
-        if (!vit->referred() && vit->pairPoint())
+        // Store points that are not referred, part of a pair, but not feature
+        // points
+        if
+        (
+            !vit->referred()
+         && vit->pairPoint()
+         && vit->index() >= startOfInternalPoints_
+        )
         {
             surfaceConformationVertices_.push_back
             (

From fcefc8fe6ef4015a3844bff7fae0ba203170bacc Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 16 Jun 2011 15:45:31 +0100
Subject: [PATCH 5/9] ENH: Larger feature angle, more features.

---
 tutorials/mesh/cvMesh/flange/Allrun | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tutorials/mesh/cvMesh/flange/Allrun b/tutorials/mesh/cvMesh/flange/Allrun
index 218de8026c..4514507cc4 100755
--- a/tutorials/mesh/cvMesh/flange/Allrun
+++ b/tutorials/mesh/cvMesh/flange/Allrun
@@ -8,7 +8,7 @@ cd ${0%/*} || exit 1    # run from this directory
 # mesh from that.
 cp system/controlDict-generatePoints system/controlDict
 cp system/cvMeshDict-generatePoints system/cvMeshDict
-runApplication surfaceFeatureExtract constant/triSurface/flange.obj flange -includedAngle 125
+runApplication surfaceFeatureExtract constant/triSurface/flange.obj flange -includedAngle 150
 runApplication cvMesh
 
 # Use pre-generated aligned points (constant/internalDelaunayVertices)

From e3d94e55e4e67bd05e620f56b0c05c2e5bc97e65 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 16 Jun 2011 16:06:11 +0100
Subject: [PATCH 6/9] ENH:  Monitor total point movement.

---
 .../conformalVoronoiMesh/conformalVoronoiMesh.C      | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index e03329efee..ed717bf781 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -262,6 +262,18 @@ void Foam::conformalVoronoiMesh::insertPoints
                 << endl;
         }
 
+        label totalMagSizeChange = returnReduce
+        (
+            mag(sizeChange), sumOp<label>()
+        );
+
+        if (totalMagSizeChange > 0)
+        {
+            Info<< "    distribution points size change total "
+                << totalMagSizeChange/2
+                << endl;
+        }
+
         nPoints = points.size();
 
         reduce(nPoints, sumOp<label>());

From e1d9372431c90ae03d87d71ad338eb487709486d Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 16 Jun 2011 16:44:34 +0100
Subject: [PATCH 7/9] ENH:  Reinstating parallel addPatches.  Using
 addFvPatches for fvMesh.

Reinstating writing out cell size field.
---
 .../conformalVoronoiMeshCalcDualMesh.C        | 108 +++++++++---------
 .../conformalVoronoiMeshIO.C                  |  24 ++--
 2 files changed, 65 insertions(+), 67 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
index a5c8de2a86..092aa0657b 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshCalcDualMesh.C
@@ -1457,65 +1457,65 @@ Foam::labelHashSet Foam::conformalVoronoiMesh::checkPolyMeshQuality
 
     List<polyPatch*> patches(patchStarts.size());
 
-    // label nValidPatches = 0;
-
-    // forAll(patches, p)
-    // {
-    //     if (patchTypes[p] == processorPolyPatch::typeName)
-    //     {
-    //         // Do not create empty processor patches
-
-    //         if (patchSizes[p] > 0)
-    //         {
-    //             patches[nValidPatches] = new processorPolyPatch
-    //             (
-    //                 patchNames[p],
-    //                 patchSizes[p],
-    //                 patchStarts[p],
-    //                 nValidPatches,
-    //                 pMesh.boundaryMesh(),
-    //                 Pstream::myProcNo(),
-    //                 procNeighbours[p]
-    //             );
-
-    //             nValidPatches++;
-    //         }
-    //     }
-    //     else
-    //     {
-    //         patches[nValidPatches] = polyPatch::New
-    //         (
-    //             patchTypes[p],
-    //             patchNames[p],
-    //             patchSizes[p],
-    //             patchStarts[p],
-    //             nValidPatches,
-    //             pMesh.boundaryMesh()
-    //         ).ptr();
-
-    //         nValidPatches++;
-    //     }
-    // }
-
-    // patches.setSize(nValidPatches);
-
-    // pMesh.addPatches(patches);
-
-    Info<< "ADDPATCHES NOT IN PARALLEL" << endl;
+    label nValidPatches = 0;
 
     forAll(patches, p)
     {
-        patches[p] = new polyPatch
-        (
-            patchNames[p],
-            patchSizes[p],
-            patchStarts[p],
-            p,
-            pMesh.boundaryMesh()
-        );
+        if (patchTypes[p] == processorPolyPatch::typeName)
+        {
+            // Do not create empty processor patches
+
+            if (patchSizes[p] > 0)
+            {
+                patches[nValidPatches] = new processorPolyPatch
+                (
+                    patchNames[p],
+                    patchSizes[p],
+                    patchStarts[p],
+                    nValidPatches,
+                    pMesh.boundaryMesh(),
+                    Pstream::myProcNo(),
+                    procNeighbours[p]
+                );
+
+                nValidPatches++;
+            }
+        }
+        else
+        {
+            patches[nValidPatches] = polyPatch::New
+            (
+                patchTypes[p],
+                patchNames[p],
+                patchSizes[p],
+                patchStarts[p],
+                nValidPatches,
+                pMesh.boundaryMesh()
+            ).ptr();
+
+            nValidPatches++;
+        }
     }
 
-    pMesh.addPatches(patches, false);
+    patches.setSize(nValidPatches);
+
+    pMesh.addPatches(patches);
+
+    // Info<< "ADDPATCHES NOT IN PARALLEL" << endl;
+
+    // forAll(patches, p)
+    // {
+    //     patches[p] = new polyPatch
+    //     (
+    //         patchNames[p],
+    //         patchSizes[p],
+    //         patchStarts[p],
+    //         p,
+    //         pMesh.boundaryMesh()
+    //     );
+    // }
+
+    // pMesh.addPatches(patches, false);
 
     // pMesh.overrideCellCentres(cellCentres);
 
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
index 7f20ef5f74..2734640c06 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshIO.C
@@ -26,7 +26,6 @@ License
 #include "conformalVoronoiMesh.H"
 #include "IOstreams.H"
 #include "OFstream.H"
-#include "zeroGradientPointPatchField.H"
 #include "pointMesh.H"
 #include "pointFields.H"
 
@@ -312,7 +311,7 @@ void Foam::conformalVoronoiMesh::writeMesh
         writeObjMesh(points, faces, word(meshName + ".obj"));
     }
 
-    polyMesh mesh
+    fvMesh mesh
     (
         IOobject
         (
@@ -372,9 +371,10 @@ void Foam::conformalVoronoiMesh::writeMesh
 
     patches.setSize(nValidPatches);
 
-    Info<< "ADDPATCHES NOT IN PARALLEL" << endl;
-    // mesh.addPatches(patches);
-    mesh.addPatches(patches, false);
+    mesh.addFvPatches(patches);
+
+    // Info<< "ADDPATCHES NOT IN PARALLEL" << endl;
+    // mesh.addPatches(patches, false);
 
     if (!mesh.write())
     {
@@ -404,11 +404,9 @@ void Foam::conformalVoronoiMesh::writeMesh
 
     // cellCs.write();
 
-    Info<< "DISABLED WRITING OF CELL SIZE AND PROTRUSION SET" << endl;
+    writeCellSizes(mesh);
 
-    // writeCellSizes(mesh);
-
-    // findRemainingProtrusionSet(mesh);
+    findRemainingProtrusionSet(mesh);
 }
 
 
@@ -466,7 +464,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
             ),
             mesh,
             dimensionedScalar("cellSize", dimLength, 0),
-            zeroGradientPointPatchField<scalar>::typeName
+            zeroGradientFvPatchScalarField::typeName
         );
 
         scalarField& cellSize = targetCellSize.internalField();
@@ -492,7 +490,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
         //     ),
         //     mesh,
         //     dimensionedScalar("cellVolume", dimLength, 0),
-        //     zeroGradientPointPatchField<scalar>::typeName
+        //     zeroGradientFvPatchScalarField::typeName
         // );
 
         // targetCellVolume.internalField() = pow3(cellSize);
@@ -511,7 +509,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
         //     ),
         //     mesh,
         //     dimensionedScalar("cellVolume", dimVolume, 0),
-        //     zeroGradientPointPatchField<scalar>::typeName
+        //     zeroGradientFvPatchScalarField::typeName
         // );
 
         // actualCellVolume.internalField() = mesh.cellVolumes();
@@ -530,7 +528,7 @@ void Foam::conformalVoronoiMesh::writeCellSizes
         //     ),
         //     mesh,
         //     dimensionedScalar("cellSize", dimLength, 0),
-        //     zeroGradientPointPatchField<scalar>::typeName
+        //     zeroGradientFvPatchScalarField::typeName
         // );
 
         // equivalentCellSize.internalField() = pow

From a352fa331fc8586228745e63f784670dad70f5e5 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 16 Jun 2011 16:57:42 +0100
Subject: [PATCH 8/9] ENH:  Better motion output.

---
 .../conformalVoronoiMesh.C                    | 26 ++++++-------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index ed717bf781..ce6bf19ff4 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -1996,8 +1996,6 @@ void Foam::conformalVoronoiMesh::move()
 
     std::list<Point> pointsToInsert;
 
-    label pointsAdded = 0;
-
     for
     (
         Delaunay::Finite_edges_iterator eit = finite_edges_begin();
@@ -2005,18 +2003,18 @@ void Foam::conformalVoronoiMesh::move()
         ++eit
     )
     {
+        Cell_handle c = eit->first;
+        Vertex_handle vA = c->vertex(eit->second);
+        Vertex_handle vB = c->vertex(eit->third);
+
         if
         (
-            eit->first->vertex(eit->second)->internalOrBoundaryPoint()
-         && eit->first->vertex(eit->third)->internalOrBoundaryPoint()
+            vA->internalOrBoundaryPoint()
+         && vB->internalOrBoundaryPoint()
         )
         {
             face dualFace = buildDualFace(eit);
 
-            Cell_handle c = eit->first;
-            Vertex_handle vA = c->vertex(eit->second);
-            Vertex_handle vB = c->vertex(eit->third);
-
             Foam::point dVA = topoint(vA->point());
             Foam::point dVB = topoint(vB->point());
 
@@ -2155,7 +2153,6 @@ void Foam::conformalVoronoiMesh::move()
                                 toPoint(0.5*(dVA + dVB))
                             );
 
-                            pointsAdded++;
                         }
                     }
                     else if
@@ -2232,8 +2229,8 @@ void Foam::conformalVoronoiMesh::move()
         }
     }
 
-    vector totalDisp = sum(displacementAccumulator);
-    scalar totalDist = sum(mag(displacementAccumulator));
+    vector totalDisp = gSum(displacementAccumulator);
+    scalar totalDist = gSum(mag(displacementAccumulator));
 
     // Relax the calculated displacement
     displacementAccumulator *= relaxation;
@@ -2284,11 +2281,6 @@ void Foam::conformalVoronoiMesh::move()
 
     insertPoints(pointsToInsert);
 
-    label pointsRemoved =
-        displacementAccumulator.size()
-      - number_of_vertices()
-      + pointsAdded;
-
     timeCheck("Internal points inserted");
 
     conformToSurface();
@@ -2306,8 +2298,6 @@ void Foam::conformalVoronoiMesh::move()
     Info<< nl
         << "Total displacement = " << totalDisp << nl
         << "Total distance = " << totalDist << nl
-        << "Points added = " << pointsAdded << nl
-        << "Points removed = " << pointsRemoved
         << endl;
 }
 

From b63c610b48b85cb9b833c2da17e0e204be961de0 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Thu, 16 Jun 2011 17:02:33 +0100
Subject: [PATCH 9/9] ENH:  Less verbose vertex redistribution.

---
 .../conformalVoronoiMesh/conformalVoronoiMesh.C        | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index ce6bf19ff4..223d12496a 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -256,11 +256,11 @@ void Foam::conformalVoronoiMesh::insertPoints
 
         label sizeChange = preDistributionSize - label(points.size());
 
-        if (mag(sizeChange) > 0)
-        {
-            Pout<< "    distribution points size change " << sizeChange
-                << endl;
-        }
+        // if (mag(sizeChange) > 0)
+        // {
+        //     Pout<< "    distribution points size change " << sizeChange
+        //         << endl;
+        // }
 
         label totalMagSizeChange = returnReduce
         (