ENH: snappyHexMesh: updated directional refinement

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMesh.C

@@ -1087,28 +1087,6 @@ int main(int argc, char *argv[])
     }
 
 
-    // Optionally read directional refinement shells
-    // ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-    const dictionary dirRefDict
-    (
-        refineDict.subOrEmptyDict("directionalRefinementRegions")
-    );
-
-    if (!dirRefDict.empty())
-    {
-        Info<< "Reading directional refinement shells." << endl;
-    }
-
-    shellSurfaces dirShells(allGeometry, dirRefDict);
-
-    if (!dirRefDict.empty())
-    {
-        Info<< "Read directional refinement shells in = "
-            << mesh.time().cpuTimeIncrement() << " s" << nl << endl;
-    }
-
-
 
     // Read feature meshes
     // ~~~~~~~~~~~~~~~~~~~
@@ -1141,7 +1119,6 @@ int main(int argc, char *argv[])
         surfaces,           // for surface intersection refinement
         features,           // for feature edges/point based refinement
         shells,             // for volume (inside/outside) refinement
-        dirShells,          // vol volume directional refinement
         limitShells         // limit of volume refinement
     );
     Info<< "Calculated surface intersections in = "

applications/utilities/mesh/generation/snappyHexMesh/snappyHexMeshDict

@@ -50,7 +50,7 @@ geometry
     }
 
     // Shell for directional refinement
-    refinementBox
+    wakeBox
     {
         type searchableBox;
         min (1.5 1 -0.5);
@@ -283,20 +283,29 @@ castellatedMeshControls
         //    //           whilst doing the gap-level refinement.
         //    //gapMode inside;  // inside/outside/mixed
         //}
-    }
 
-
+        //wakeBox
-    directionalRefinementRegions
+        //{
-    {
+        //    mode        inside;
-        refinementBox       // Closed surface
+        //    // Dummy base level
-        {
+        //    levels      ((10000 0));
-            mode inside;
+        //
-            levelIncrement  // Specification of additional refinement
+        //    // Optional directional refinement (after all other refinement)
-            (
+        //    // Directional refinement
-                (0 (1 0 0)) // For level 0 cells: add one level refinement in x
+        //    // for all cells according to 'mode' ('inside' or 'outside';
-                (1 (1 0 0)) // For level 1 cells: add one level refinement in x
+        //    // 'distance' not supported) and within certain range. E.g.
-            );
+        //    //  - for all cells with level 2-5
-        }
+        //    //  - do one split in x direction
+        //    levelIncrement  (2 5 (1 0 0));
+        //
+        //    // Note
+        //    // - ignores 'levels' and gap* settings.
+        //    // - the cellLevel/pointLevels files are no longer consistent
+        //    //   with the mesh, the resulting mesh is no longer compatible
+        //    //   with e.g. dynamic refinement/unrefinement.
+        //    // - cellLevel will include any directional refinement
+        //    //   (i.e. it will be the maximum of all three directions)
+        //}
     }
 
 

src/mesh/snappyHexMesh/meshRefinement/meshRefinement.C

@@ -1222,7 +1222,6 @@ Foam::meshRefinement::meshRefinement
     const refinementSurfaces& surfaces,
     const refinementFeatures& features,
     const shellSurfaces& shells,
-    const shellSurfaces& dirShells,
     const shellSurfaces& limitShells
 )
 :
@@ -1233,7 +1232,6 @@ Foam::meshRefinement::meshRefinement
     surfaces_(surfaces),
     features_(features),
     shells_(shells),
-    dirShells_(dirShells),
     limitShells_(limitShells),
     meshCutter_
     (

src/mesh/snappyHexMesh/meshRefinement/meshRefinement.H

@@ -161,9 +161,6 @@ private:
         //- All shell-refinement interaction
         const shellSurfaces& shells_;
 
-        //- All directional shell-refinement interaction
-        const shellSurfaces& dirShells_;
-
         //- All limit-refinement interaction
         const shellSurfaces& limitShells_;
 
@@ -811,7 +808,6 @@ public:
             const refinementSurfaces&,
             const refinementFeatures&,
             const shellSurfaces&,   // omnidirectional refinement
-            const shellSurfaces&,   // directional refinement
             const shellSurfaces&    // limit refinement
         );
 
@@ -865,12 +861,6 @@ public:
                 return shells_;
             }
 
-            //- Reference to directional shell-refinement shells
-            const shellSurfaces& dirShells() const
-            {
-                return dirShells_;
-            }
-
             //- Reference to meshcutting engine
             const hexRef8& meshCutter() const
             {

src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.C

@@ -619,8 +619,29 @@ Foam::shellSurfaces::shellSurfaces
             // Directional refinement
             // ~~~~~~~~~~~~~~~~~~~~~~
 
-            if (dict.readIfPresent("levelIncrement", dirLevels_[shellI]))
+            dirLevels_[shellI] = Tuple2<labelPair,labelVector>
+            (
+                labelPair(labelMax, labelMin),
+                labelVector::zero
+            );
+            const entry* levelPtr = dict.lookupEntryPtr
+            (
+                "levelIncrement",
+                false,
+                true
+            );
+            if (levelPtr)
             {
+                // Do reading ourselves since using labelPair would require
+                // additional bracket pair
+                Istream& is = levelPtr->stream();
+
+                is.readBegin("levelIncrement");
+                is  >> dirLevels_[shellI].first().first()
+                    >> dirLevels_[shellI].first().second()
+                    >> dirLevels_[shellI].second();
+                is.readEnd("levelIncrement");
+
                 if (modes_[shellI] == INSIDE)
                 {
                     Info<< "Additional directional refinement level"
@@ -771,6 +792,17 @@ Foam::labelList Foam::shellSurfaces::maxGapLevel() const
 }
 
 
+Foam::labelPairList Foam::shellSurfaces::directionalSelectLevel() const
+{
+    labelPairList levels(dirLevels_.size());
+    forAll(dirLevels_, shelli)
+    {
+        levels[shelli] = dirLevels_[shelli].first();
+    }
+    return levels;
+}
+
+
 void Foam::shellSurfaces::findHigherLevel
 (
     const pointField& pt,
@@ -871,33 +903,31 @@ void Foam::shellSurfaces::findDirectionalLevel
     {
         if (modes_[shelli] == INSIDE || modes_[shelli] == OUTSIDE)
         {
-            const LevelAndDirList& shellLevels = dirLevels_[shelli];
+            const labelPair& selectLevels = dirLevels_[shelli].first();
+            const label addLevel = dirLevels_[shelli].second()[dir];
 
             // Collect the cells that are of the right original level
             candidateMap.clear();
             forAll(ptLevel, celli)
             {
                 label level = ptLevel[celli];
-                forAll(shellLevels, leveli)
-                {
-                    label selectLevel = shellLevels[leveli].first();
-                    label addLevel = shellLevels[leveli].second()[dir];
 
                 if
                 (
-                        level == selectLevel
+                    level >= selectLevels.first()
+                 && level <= selectLevels.second()
                  && dirLevel[celli] < level+addLevel
                 )
                 {
                     candidateMap.append(celli);
-                        break;
-                    }
                 }
             }
 
+            // Do geometric test
             pointField candidatePt(pt, candidateMap);
             allGeometry_[shells_[shelli]].getVolumeType(candidatePt, volType);
 
+            // Extract selected cells
             forAll(candidateMap, i)
             {
                 if

src/mesh/snappyHexMesh/shellSurfaces/shellSurfaces.H

@@ -46,10 +46,6 @@ SourceFiles
 namespace Foam
 {
 
-typedef Tuple2<label,labelVector> LevelAndDir;
-typedef List<LevelAndDir> LevelAndDirList;
-typedef List<LevelAndDirList> LevelAndDirListList;
-
 class searchableSurfaces;
 
 /*---------------------------------------------------------------------------*\
@@ -90,8 +86,8 @@ private:
         //- Per shell per distance the refinement level
         labelListList levels_;
 
-        //- Per shell, per refinement level additional directional refinement
+        //- Per shell any additional directional refinement
-        LevelAndDirListList dirLevels_;
+        List<Tuple2<labelPair,labelVector>> dirLevels_;
 
 
         // Gap level refinement
@@ -179,14 +175,6 @@ public:
                 return shells_;
             }
 
-            //- Raw access to directional refinement
-            //  Per shell a list of (level + additional level)
-            const LevelAndDirListList& dirLevels() const
-            {
-                return dirLevels_;
-            }
-
-
         // Query
 
             //- Highest shell level
@@ -195,6 +183,9 @@ public:
             //- Highest shell gap level
             labelList maxGapLevel() const;
 
+            //- Min and max cell level for directional refinement
+            labelPairList directionalSelectLevel() const;
+
             //- Find shell level higher than ptLevel
             void findHigherLevel
             (

src/mesh/snappyHexMesh/snappyHexMeshDriver/snappyRefineDriver.C

@@ -1766,7 +1766,7 @@ Foam::label Foam::snappyRefineDriver::directionalShellRefine
 {
     addProfiling(shell, "snappyHexMesh::refine::directionalShell");
     const fvMesh& mesh = meshRefiner_.mesh();
-    const shellSurfaces& shells = meshRefiner_.dirShells();
+    const shellSurfaces& shells = meshRefiner_.shells();
 
     labelList& cellLevel =
         const_cast<labelIOList&>(meshRefiner_.meshCutter().cellLevel());
@@ -1774,19 +1774,13 @@ Foam::label Foam::snappyRefineDriver::directionalShellRefine
 
     // Determine the minimum and maximum cell levels that are candidates for
     // directional refinement
+    const labelPairList dirSelect(shells.directionalSelectLevel());
     label overallMinLevel = labelMax;
     label overallMaxLevel = labelMin;
+    forAll(dirSelect, shelli)
     {
-        const LevelAndDirListList& dirLevels = shells.dirLevels();
+        overallMinLevel = min(dirSelect[shelli].first(), overallMinLevel);
-        forAll(dirLevels, shelli)
+        overallMaxLevel = max(dirSelect[shelli].second(), overallMaxLevel);
-        {
-            const LevelAndDirList& dirLevel = dirLevels[shelli];
-            forAll(dirLevel, i)
-            {
-                overallMinLevel = min(dirLevel[i].first(), overallMinLevel);
-                overallMaxLevel = max(dirLevel[i].first(), overallMaxLevel);
-            }
-        }
     }
 
     if (overallMinLevel > overallMaxLevel)
@@ -1889,13 +1883,11 @@ Foam::label Foam::snappyRefineDriver::directionalShellRefine
             // iterations and not enough cells to refine.
             if (nCellsToRefine == 0)
             {
-                Info<< "Not refining direction " << dir
+                //Info<< "Not refining direction " << dir
-                    << " since too few cells selected."
+                //    << " since too few cells selected." << nl << endl;
-                    << nl << endl;
-                break;
             }
-
+            else
-
+            {
                 if (debug)
                 {
                     const_cast<Time&>(mesh.time())++;
@@ -1914,6 +1906,9 @@ Foam::label Foam::snappyRefineDriver::directionalShellRefine
                     )
                 );
 
+                Info<< "Refined mesh in = "
+                    << mesh.time().cpuTimeIncrement() << " s" << endl;
+
                 meshRefinement::updateList
                 (
                     map().cellMap(),
@@ -1929,6 +1924,7 @@ Foam::label Foam::snappyRefineDriver::directionalShellRefine
                     }
                 }
             }
+        }
 
 
         if (nAllRefine == 0)
@@ -1946,8 +1942,8 @@ Foam::label Foam::snappyRefineDriver::directionalShellRefine
 
         if (debug&meshRefinement::MESH)
         {
-            Pout<< "Writing directional refinement iteration " + name(iter)
+            Pout<< "Writing directional refinement iteration "
-                << " mesh to time " << meshRefiner_.timeName() << endl;
+                << iter << " mesh to time " << meshRefiner_.timeName() << endl;
             meshRefiner_.write
             (
                 meshRefinement::debugType(debug),
@@ -1961,8 +1957,16 @@ Foam::label Foam::snappyRefineDriver::directionalShellRefine
         }
     }
 
-    // Adjust cellLevel from dirLevel?
+    // Adjust cellLevel from dirLevel? As max? Or the min?
-    // Is cellLevel the max of dirLevel? Or the min?
+    // For now: use max. The idea is that if there is a wall
+    // any directional refinement is likely to be aligned with
+    // the wall (wall layers) so any snapping/layering would probably
+    // want to use this highest refinement level.
+
+    forAll(cellLevel, celli)
+    {
+        cellLevel[celli] = cmptMax(dirCellLevel[celli]);
+    }
 
     return iter;
 }