diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C index 1fd19420bbf873671e996b474a9cd76e88d97707..ed57396f3271338b80131a8523ba91add18ad72a 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 1f0e86194ac8f93b84526faa36d2e8acdd81de60..6c8d8003017f9426fc5f0b077e33f3811c016280 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 9ec4af43ffe32a68cd50bd2a0044b8f72db5333b..4ce635bc0b5093b5c39740ede14fdd7543f177fc 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 0f859dab4ea1fcf5f257d1efb047480a040d0259..b2abf1ff7e15e0edfc3bcdb432d586f13d7b5cdc 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