Adjusted thresholds for refine_and_coarsen_fixed_number() for both GridRefinement...

diff --git a/doc/news/changes/incompatibilities/20191205Fehling1 b/doc/news/changes/incompatibilities/20191205Fehling1
new file mode 100644 (file)
index 0000000..a1e1352
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20191205Fehling1
@@ -0,0 +1,6 @@
+Changed: Adjusted threshold for fixed number adaptation: The last qualifying
+cells for refinement and coarsening now specify their respective threshold.
+This affects both GridRefinement::fixed_number_refinement() and
+parallel::distributed::GridRefinement::fixed_number_refinement().
+<br>
+(Marc Fehling, 12/05/2019)

diff --git a/source/distributed/grid_refinement.cc b/source/distributed/grid_refinement.cc
index 8a89ceb141778131eb10d66459b0c2328fa13621..47e9d439d2278dd6054a7198bec5190ce0536b87 100644 (file)
--- a/source/distributed/grid_refinement.cc
+++ b/source/distributed/grid_refinement.cc
@@ -481,8 +481,8 @@ namespace parallel
           bottom_threshold = RefineAndCoarsenFixedNumber::compute_threshold(
             locally_owned_indicators,
             global_min_and_max,
-            static_cast<unsigned int>((1 - adjusted_fractions.second) *
-                                      tria.n_global_active_cells()),
+            static_cast<unsigned int>(std::ceil(
+              (1 - adjusted_fractions.second) * tria.n_global_active_cells())),
             mpi_communicator);
         else
           {

diff --git a/source/grid/grid_refinement.cc b/source/grid/grid_refinement.cc
index 0c6af2b6cc22c760425d3087eb2eda3215fa51ca..d60f062b7d00fe4228c368db5e8f380677de2d5d 100644 (file)
--- a/source/grid/grid_refinement.cc
+++ b/source/grid/grid_refinement.cc
@@ -231,10 +231,10 @@ GridRefinement::refine_and_coarsen_fixed_number(
           else
             {
               std::nth_element(tmp.begin(),
-                               tmp.begin() + refine_cells,
+                               tmp.begin() + refine_cells - 1,
                                tmp.end(),
                                std::greater<double>());
-              refine(tria, criteria, *(tmp.begin() + refine_cells));
+              refine(tria, criteria, *(tmp.begin() + refine_cells - 1));
             }
         }