mirror of
https://develop.openfoam.com/Development/openfoam.git
synced 2025-11-28 03:28:01 +00:00
Moving cvControls back to be initialised after the geometry and moving
the writeFeatureObj call out to the conformalVoronoiMesh constructor.
This commit is contained in:
@ -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);
|
||||
|
||||
@ -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_;
|
||||
|
||||
|
||||
@ -196,11 +196,6 @@ Foam::conformationSurfaces::conformationSurfaces
|
||||
referenceVolumeTypes_[s] = vTypes[0];
|
||||
}
|
||||
}
|
||||
|
||||
if (cvMesh_.cvMeshControls().objOutput())
|
||||
{
|
||||
writeFeatureObj("cvMesh");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -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
|
||||
|
||||
Reference in New Issue
Block a user