From ff5a07a5a4c68ea13d14d98571f75149424a5fe1 Mon Sep 17 00:00:00 2001
From: graham <g.macpherson@opencfd.co.uk>
Date: Fri, 20 Nov 2009 12:21:30 +0000
Subject: [PATCH] Moving the declaration and construction of the
cvMeshControls_ object before any other members are constructed, as the
geometry members can use controls.
Removing unused null constructor declaration.
---
.../conformalVoronoiMesh/conformalVoronoiMesh.C | 2 +-
.../conformalVoronoiMesh/conformalVoronoiMesh.H | 9 +++------
.../conformationSurfaces/conformationSurfaces.C | 2 +-
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
index 09d2eb3c3aa..1fd19420bbf 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.C
@@ -39,6 +39,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
:
HTriangulation(),
runTime_(runTime),
+ cvMeshControls_(*this, cvMeshDict),
allGeometry_
(
IOobject
@@ -64,7 +65,6 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
allGeometry_,
cvMeshDict.subDict("motionControl")
),
- cvMeshControls_(*this, cvMeshDict),
startOfInternalPoints_(0),
startOfSurfacePointPairs_(0),
featureVertices_(),
diff --git a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
index 37d9ad10152..1f0e86194ac 100644
--- a/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
+++ b/src/mesh/conformalVoronoiMesh/conformalVoronoiMesh/conformalVoronoiMesh.H
@@ -100,6 +100,9 @@ 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_;
@@ -110,9 +113,6 @@ 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_;
@@ -518,9 +518,6 @@ public:
// Constructors
- //- Construct null
- conformalVoronoiMesh();
-
//- Construct from Time and cvMeshDict
conformalVoronoiMesh
(
diff --git a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
index e00e9cad57e..9ec4af43ffe 100644
--- a/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
+++ b/src/mesh/conformalVoronoiMesh/conformationSurfaces/conformationSurfaces.C
@@ -197,7 +197,7 @@ Foam::conformationSurfaces::conformationSurfaces
}
}
- if(cvMesh_.cvMeshControls().objOutput())
+ if (cvMesh_.cvMeshControls().objOutput())
{
writeFeatureObj("cvMesh");
}
--
GitLab