ENH: Insert background cell size mesh using the cell size functions

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<Foam::point>& pts,

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_

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
+            virtual void cellSizeFunctionVertices
-        (
+            (
-            DynamicList<Foam::point>& pts,
+                DynamicList<Foam::point>& pts,
-            DynamicList<scalar>& sizes
+                DynamicList<scalar>& sizes
-        ) const;
+            ) const;
 
-        virtual void initialVertices
+            virtual void initialVertices
-        (
+            (
-            pointField& pts,
+                pointField& pts,
-            scalarField& sizes,
+                scalarField& sizes,
-            triadField& alignments
+                triadField& alignments
-        ) const;
+            ) const;
 };
 
 

applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/cellShapeControl/controlMeshRefinement/controlMeshRefinement.C

@@ -245,6 +245,8 @@ void Foam::controlMeshRefinement::initialMeshPopulation
 //        );
     }
 
+    Map<label> priorityMap;
+
     const PtrList<cellSizeAndAlignmentControl>& controlFunctions =
         sizeControls_.controlFunctions();
 
@@ -377,13 +379,24 @@ void Foam::controlMeshRefinement::initialMeshPopulation
 
             if (forceInsertion || insertPoint)
             {
-                mesh_.insert
+                const label oldSize = mesh_.vertexCount();
+
+                cellShapeControlMesh::Vertex_handle insertedVert = mesh_.insert
                 (
                     pt,
                     calculatedCellSize,
                     vertices[vI].alignment(),
                     Vb::vtInternalNearBoundary
                 );
+
+                if (oldSize == mesh_.vertexCount() - 1)
+                {
+                    priorityMap.insert
+                    (
+                        insertedVert->index(),
+                        controlFunction.maxPriority()
+                    );
+                }
             }
         }
 
@@ -506,19 +519,53 @@ void Foam::controlMeshRefinement::initialMeshPopulation
 
             if (forceInsertion || insertPoint)
             {
-                mesh_.insert
+                // Check the priority
-                (
+
-                    pt,
+                cellShapeControlMesh::Cell_handle ch =
-                    calculatedCellSize,
+                    mesh_.locate(toPoint<cellShapeControlMesh::Point>(pt));
-                    vertices[vI].alignment(),
+
-                    Vb::vtInternal
+                const label newPtPriority = controlFunction.maxPriority();
-                );
+
+                label highestPriority = -1;
+                for (label cI = 0; cI < 4; ++cI)
+                {
+                    const label vertPriority =
+                        priorityMap[ch->vertex(cI)->index()];
+
+                    if (vertPriority > highestPriority)
+                    {
+                        highestPriority = vertPriority;
+                    }
+                }
+
+                if (newPtPriority >= highestPriority)
+                {
+                    const label oldSize = mesh_.vertexCount();
+
+                    cellShapeControlMesh::Vertex_handle insertedVert =
+                        mesh_.insert
+                        (
+                            pt,
+                            calculatedCellSize,
+                            vertices[vI].alignment(),
+                            Vb::vtInternal
+                        );
+
+                    if (oldSize == mesh_.vertexCount() - 1)
+                    {
+                        priorityMap.insert
+                        (
+                            insertedVert->index(),
+                            newPtPriority
+                        );
+                    }
+                }
             }
         }
 
        //mesh_.rangeInsertWithInfo(vertices.begin(), vertices.end());
 
-        Info<< "    Inserted "
+        Info<< "    Inserted extra points "
             << returnReduce
                (
                    label(mesh_.number_of_vertices()) - preInsertedSize,

applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertex.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License

applications/utilities/mesh/generation/cvMesh/conformalVoronoiMesh/conformalVoronoiMesh/indexedVertex/indexedVertexI.H

@@ -2,7 +2,7 @@
   =========                 |
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
-    \\  /    A nd           | Copyright (C) 2012 OpenFOAM Foundation
+    \\  /    A nd           | Copyright (C) 2012-2013 OpenFOAM Foundation
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
 License