From 2ad1a75e2a3c1c6d22024e4754da2a87ecfa5f39 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Fri, 20 Nov 2009 17:48:37 +0000
Subject: [PATCH] Moving cvControls back to be initialised after the geometry
 and moving the writeFeatureObj call out to the conformalVoronoiMesh
 constructor.

---
 .../conformalVoronoiMesh/conformalVoronoiMesh.C          | 7 ++++++-
 .../conformalVoronoiMesh/conformalVoronoiMesh.H          | 6 +++---
 .../conformationSurfaces/conformationSurfaces.C          | 5 -----
 src/mesh/conformalVoronoiMesh/cvControls/cvControls.H    | 9 +++++++++
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 1fd19420bbf..ed57396f327 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -39,7 +39,6 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
 :
     HTriangulation(),
     runTime_(runTime),
-    cvMeshControls_(*this, cvMeshDict),
     allGeometry_
     (
         IOobject
@@ -65,6 +64,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
         allGeometry_,
         cvMeshDict.subDict("motionControl")
     ),
+    cvMeshControls_(*this, cvMeshDict),
     startOfInternalPoints_(0),
     startOfSurfacePointPairs_(0),
     featureVertices_(),
@@ -102,6 +102,11 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
 {
     createFeaturePoints();
 
+    if (cvMeshControls().objOutput())
+    {
+        geometryToConformTo_.writeFeatureObj("cvMesh");
+    }
+
     insertInitialPoints();
 
     buildSurfaceConformation(rmCoarse);
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 1f0e86194ac..6c8d8003017 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -100,9 +100,6 @@ private:
         //- The time registry of the application
         const Time& runTime_;
 
-        //- Controls for the conformal Voronoi meshing process
-        cvControls cvMeshControls_;
-
         //- All geometry of the meshing process, including surfaces to be
         //  conformed to and those to be used for refinement
         searchableSurfaces allGeometry_;
@@ -113,6 +110,9 @@ private:
         //- The cell size control object
         cellSizeControlSurfaces cellSizeControl_;
 
+        //- Controls for the conformal Voronoi meshing process
+        cvControls cvMeshControls_;
+
         //- Keep track of the start of the internal points
         label startOfInternalPoints_;
 
diff --git a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index 9ec4af43ffe..4ce635bc0b5 100644
--- a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -196,11 +196,6 @@ Foam::conformationSurfaces::conformationSurfaces
             referenceVolumeTypes_[s] = vTypes[0];
         }
     }
-
-    if (cvMesh_.cvMeshControls().objOutput())
-    {
-        writeFeatureObj("cvMesh");
-    }
 }
 
 
diff --git a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H
index 0f859dab4ea..b2abf1ff7e1 100644
--- a/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H
+++ b/src/mesh/conformalVoronoiMesh/cvControls/cvControls.H
@@ -152,6 +152,15 @@ class cvControls
         scalar minimumEdgeLengthCoeff_;
 
 
+    // Private Member Functions
+
+        //- Disallow default bitwise copy construct
+        cvControls(const cvControls&);
+
+        //- Disallow default bitwise assignment
+        void operator=(const cvControls&);
+
+
 public:
 
    // Constructors
-- 
GitLab