From 0f73d80cf0fa3002da76bdd7ba6456a1d0f09f48 Mon Sep 17 00:00:00 2001
From: Vuko Vukcevic <v.vukcevic@wikki.co.uk>
Date: Wed, 23 Jan 2019 09:39:20 +0100
Subject: [PATCH] Added minimum protected level to protectedInitialRefinement

---
 .../protectedInitialRefinement.C              | 33 +++++++++----------
 .../protectedInitialRefinement.H              |  3 ++
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/refinementSelection/protectedInitialRefinement/protectedInitialRefinement.C b/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/refinementSelection/protectedInitialRefinement/protectedInitialRefinement.C
index ee408b1a0..f5b975908 100644
--- a/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/refinementSelection/protectedInitialRefinement/protectedInitialRefinement.C
+++ b/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/refinementSelection/protectedInitialRefinement/protectedInitialRefinement.C
@@ -105,8 +105,16 @@ Foam::protectedInitialRefinement::protectedInitialRefinement
             IOobject::AUTO_WRITE
         ),
         cellLevelAsField()()
+    ),
+    // Note: conversion from label to scalar
+    minProtectedLevel_
+    (
+        coeffDict().lookupOrDefault<label>("minProtectedLevel", 0)
     )
-{}
+{
+    Info<< "Will not allow initial refinement below level: "
+        << minProtectedLevel_ << endl;
+}
 
 
 // * * * * * * * * * * * * * * * * Destructor* * * * * * * * * * * * * * * * //
@@ -163,9 +171,13 @@ Foam::protectedInitialRefinement::unrefinementPointCandidates() const
     forAll (initialCellLevelIn, cellI)
     {
         const scalar& cl = initialCellLevelIn[cellI];
-        const scalar curcl = curCellLevel[cellI];
+        const scalar& curcl = curCellLevel[cellI];
 
-        if ((cl > SMALL) && equal(cl, curcl))
+        if
+        (
+            (cl > SMALL)
+         && (curcl - minProtectedLevel_ < 0.5)
+        )
         {
             // Cell has been refined during meshing and the original level is
             // equal to the current level, mark all of its points
@@ -185,21 +197,6 @@ Foam::protectedInitialRefinement::unrefinementPointCandidates() const
                 }
             }
         }
-        else if (cl > (curcl + SMALL))
-        {
-            FatalErrorIn
-            (
-                "Xfer<labelList>\n"
-                "protectedInitialRefinement::unrefinementPointCandidates()"
-                " const"
-            )   << "Detected a cell with initial refinement level greater"
-                << " than current refinement level." << nl
-                << "cellI: " << cellI << nl
-                << "current level: " << curcl << nl
-                << "initial level: " << cl << nl
-                << "This should not happen."
-                << abort(FatalError);
-        }
     }
 
     // Create the list for unrefinement candidates
diff --git a/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/refinementSelection/protectedInitialRefinement/protectedInitialRefinement.H b/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/refinementSelection/protectedInitialRefinement/protectedInitialRefinement.H
index d182a7df7..4337b0a80 100644
--- a/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/refinementSelection/protectedInitialRefinement/protectedInitialRefinement.H
+++ b/src/dynamicMesh/topoChangerFvMesh/dynamicPolyRefinementFvMesh/refinementSelection/protectedInitialRefinement/protectedInitialRefinement.H
@@ -70,6 +70,9 @@ class protectedInitialRefinement
         //  transfer for dynamic load balancing
         volScalarField initialCellLevel_;
 
+        //- Minimum refinement level to protect
+        scalar minProtectedLevel_;
+
 
     // Private Member Functions