Moving cvControls back to be initialised after the geometry and moving

the writeFeatureObj call out to the conformalVoronoiMesh constructor.
This commit is contained in:
graham
2009-11-20 17:48:37 +00:00
parent dba76cae37
commit 2ad1a75e2a
4 changed files with 18 additions and 9 deletions

View File

@ -39,7 +39,6 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
: :
HTriangulation(), HTriangulation(),
runTime_(runTime), runTime_(runTime),
cvMeshControls_(*this, cvMeshDict),
allGeometry_ allGeometry_
( (
IOobject IOobject
@ -65,6 +64,7 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
allGeometry_, allGeometry_,
cvMeshDict.subDict("motionControl") cvMeshDict.subDict("motionControl")
), ),
cvMeshControls_(*this, cvMeshDict),
startOfInternalPoints_(0), startOfInternalPoints_(0),
startOfSurfacePointPairs_(0), startOfSurfacePointPairs_(0),
featureVertices_(), featureVertices_(),
@ -102,6 +102,11 @@ Foam::conformalVoronoiMesh::conformalVoronoiMesh
{ {
createFeaturePoints(); createFeaturePoints();
if (cvMeshControls().objOutput())
{
geometryToConformTo_.writeFeatureObj("cvMesh");
}
insertInitialPoints(); insertInitialPoints();
buildSurfaceConformation(rmCoarse); buildSurfaceConformation(rmCoarse);

View File

@ -100,9 +100,6 @@ private:
//- The time registry of the application //- The time registry of the application
const Time& runTime_; const Time& runTime_;
//- Controls for the conformal Voronoi meshing process
cvControls cvMeshControls_;
//- All geometry of the meshing process, including surfaces to be //- All geometry of the meshing process, including surfaces to be
// conformed to and those to be used for refinement // conformed to and those to be used for refinement
searchableSurfaces allGeometry_; searchableSurfaces allGeometry_;
@ -113,6 +110,9 @@ private:
//- The cell size control object //- The cell size control object
cellSizeControlSurfaces cellSizeControl_; cellSizeControlSurfaces cellSizeControl_;
//- Controls for the conformal Voronoi meshing process
cvControls cvMeshControls_;
//- Keep track of the start of the internal points //- Keep track of the start of the internal points
label startOfInternalPoints_; label startOfInternalPoints_;

View File

@ -196,11 +196,6 @@ Foam::conformationSurfaces::conformationSurfaces
referenceVolumeTypes_[s] = vTypes[0]; referenceVolumeTypes_[s] = vTypes[0];
} }
} }
if (cvMesh_.cvMeshControls().objOutput())
{
writeFeatureObj("cvMesh");
}
} }

View File

@ -152,6 +152,15 @@ class cvControls
scalar minimumEdgeLengthCoeff_; scalar minimumEdgeLengthCoeff_;
// Private Member Functions
//- Disallow default bitwise copy construct
cvControls(const cvControls&);
//- Disallow default bitwise assignment
void operator=(const cvControls&);
public: public:
// Constructors // Constructors