diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H index e5b5509ed3..e4f6e6c2de 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H +++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl/cellSizeAndAlignmentControl.H @@ -156,6 +156,8 @@ public: // Query + virtual label maxPriority() const = 0; + virtual void cellSizeFunctionVertices ( DynamicList& pts, diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C index ca9fb1a720..3214bf4d67 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C +++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.C @@ -72,9 +72,11 @@ Foam::fileControl::fileControl ), pointsFile_(controlFunctionDict.lookup("pointsFile")), sizesFile_(controlFunctionDict.lookup("sizesFile")), - alignmentsFile_(controlFunctionDict.lookup("alignmentsFile")) + alignmentsFile_(controlFunctionDict.lookup("alignmentsFile")), + maxPriority_(readLabel(controlFunctionDict.lookup("priority"))) { Info<< indent << "Loading " << name << " from file:" << nl + << indent << " priority : " << maxPriority_ << nl << indent << " points : " << pointsFile_ << nl << indent << " sizes : " << sizesFile_ << nl << indent << " alignments : " << alignmentsFile_ diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H index 776a9e0419..7353ab2697 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H +++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/cellSizeAndAlignmentControl/fileControl/fileControl.H @@ -58,6 +58,8 @@ class fileControl const fileName alignmentsFile_; + label maxPriority_; + // Private Member Functions @@ -112,20 +114,25 @@ public: // ) const; + virtual label maxPriority() const + { + return maxPriority_; + } + // Edit - virtual void cellSizeFunctionVertices - ( - DynamicList& pts, - DynamicList& sizes - ) const; + virtual void cellSizeFunctionVertices + ( + DynamicList& pts, + DynamicList& sizes + ) const; - virtual void initialVertices - ( - pointField& pts, - scalarField& sizes, - triadField& alignments - ) const; + virtual void initialVertices + ( + pointField& pts, + scalarField& sizes, + triadField& alignments + ) const; }; diff --git a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C index de809cb25d..682b34ef50 100644 --- a/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C +++ b/applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C @@ -245,6 +245,8 @@ void Foam::controlMeshRefinement::initialMeshPopulation // ); } + Map