From 3d5661fe73de92e1f97560cafd35f6a147afc39e Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Mon, 13 Jun 2011 18:14:00 +0100
Subject: [PATCH] BUG: Wrong index specification.

Output tweaks and unused variable removal.
---
 .../conformalVoronoiMesh.C                    | 15 +++++++++---
 .../conformalVoronoiMesh.H                    |  9 ++++++++
 .../conformalVoronoiMeshConformToSurface.C    |  6 +----
 .../conformalVoronoiMeshI.H                   | 23 +++++++++++++++++--
 4 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 36ac69b238..e6710453bd 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -365,7 +365,9 @@ void Foam::conformalVoronoiMesh::insertSurfacePointPairs
         // Each of points generated in this process are pair points, so there
         // is no risk of underflowing type.
 
-        Pout<< "Suface point pair points before " << pts.size() << endl;
+        // Pout<< "Suface point pair points before "
+        //     << pts.size() << " " << indices.size() << " " << types.size()
+        //     << endl;
 
         // Distribute points to their appropriate processor
         autoPtr<mapDistribute> map
@@ -373,12 +375,19 @@ void Foam::conformalVoronoiMesh::insertSurfacePointPairs
             decomposition_().distributePoints(pts)
         );
 
-        Pout<< "Suface point pair points after " << pts.size() << endl;
-
         map().distribute(indices);
         map().distribute(types);
+
+        // Pout<< "Suface point pair points after "
+        //     << pts.size() << " " << indices.size() << " " << types.size()
+        //     << endl;
+
+        // Info<< returnReduce(pts.size(), sumOp<label>())
+        //     << " points generated" << endl;
     }
 
+    Info<< "USING INDEX IS POINTLESS, IT IS ALWAYS ZERO" << endl;
+
     forAll(pts, pI)
     {
         // creation of points and indices is done assuming that it will be
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 9aba1ef477..159ae551f1 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -267,6 +267,15 @@ private:
             bool distribute = true
         );
 
+        //- Insert a point-pair at a ppDist distance either side of
+        //  surface point surfPt, in the direction n
+        inline void insertPointPair
+        (
+            const scalar ppDist,
+            const Foam::point& surfPt,
+            const vector& n
+        );
+
         //- Create a point-pair at a ppDist distance either side of
         //  surface point surfPt, in the direction n
         inline void createPointPair
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
index b54bf8d027..ca400a166b 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshConformToSurface.C
@@ -616,8 +616,6 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceAll
 {
     // Refer all points to all processors
 
-    boolList sendToProc(Pstream::nProcs(), false);
-
     DynamicList<Foam::point> parallelAllPoints;
     DynamicList<label> targetProcessor;
     DynamicList<label> parallelAllIndices;
@@ -684,8 +682,6 @@ void Foam::conformalVoronoiMesh::buildParallelInterfaceIntersection
     const word& outputName
 )
 {
-    boolList sendToProc(Pstream::nProcs(), false);
-
     DynamicList<Foam::point> parallelIntersectionPoints;
     DynamicList<label> targetProcessor;
     DynamicList<label> parallelIntersectionIndices;
@@ -1141,7 +1137,7 @@ void Foam::conformalVoronoiMesh::referVertices
         }
     }
 
-    Info<< "    total " << stageName << " vertices " << totalVertices << endl;
+    Info<< "    Total " << stageName << " vertices " << totalVertices << endl;
 }
 
 
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
index db39ea68dd..85550c10ba 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMeshI.H
@@ -257,6 +257,25 @@ inline void Foam::conformalVoronoiMesh::insertPoint
 }
 
 
+inline void Foam::conformalVoronoiMesh::insertPointPair
+(
+    const scalar ppDist,
+    const Foam::point& surfPt,
+    const vector& n
+)
+{
+    vector ppDistn = ppDist*n;
+
+    label master = insertPoint
+    (
+        surfPt - ppDistn,
+        number_of_vertices() + 1
+    );
+
+    insertPoint(surfPt + ppDistn, master);
+}
+
+
 inline void Foam::conformalVoronoiMesh::createPointPair
 (
     const scalar ppDist,
@@ -276,8 +295,8 @@ inline void Foam::conformalVoronoiMesh::createPointPair
 
     // Slave
     pts.append(surfPt + ppDistn);
-    types.append(1);
-    types.append(0);
+    indices.append(0);
+    types.append(-1);
 }