From: Daniel Arndt <arndtd@ornl.gov>
Date: Sat, 21 Dec 2019 15:35:20 +0000 (-0500)
Subject: Avoid variable template in hp::Refinement
X-Git-Tag: v9.2.0-rc1~766^2
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=015246507bd6d1f7fa5dc0179e2873b87e856462;p=dealii.git

Avoid variable template in hp::Refinement
---

diff --git a/source/hp/refinement.cc b/source/hp/refinement.cc
index 6004b53780..5d0e02413d 100644
--- a/source/hp/refinement.cc
+++ b/source/hp/refinement.cc
@@ -31,25 +31,6 @@
 
 DEAL_II_NAMESPACE_OPEN
 
-namespace
-{
-  /**
-   * ComparisonFunction returning 'true' or 'false' for any set of parameters.
-   *
-   * These will be used to overwrite user-provided comparison functions whenever
-   * no actual comparison is required in the decision process, i.e. when no or
-   * all cells will be refined or coarsened.
-   */
-  template <typename Number>
-  hp::Refinement::ComparisonFunction<Number> compare_false =
-    [](const Number &, const Number &) { return false; };
-  template <typename Number>
-  hp::Refinement::ComparisonFunction<Number> compare_true =
-    [](const Number &, const Number &) { return true; };
-} // namespace
-
-
-
 namespace hp
 {
   namespace Refinement
@@ -249,6 +230,15 @@ namespace hp
       Assert((p_coarsen_fraction >= 0) && (p_coarsen_fraction <= 1),
              dealii::GridRefinement::ExcInvalidParameterValue());
 
+      // ComparisonFunction returning 'true' or 'false' for any set of
+      // parameters. These will be used to overwrite user-provided comparison
+      // functions whenever no actual comparison is required in the decision
+      // process, i.e. when no or all cells will be refined or coarsened.
+      const ComparisonFunction<Number> compare_false =
+        [](const Number &, const Number &) { return false; };
+      const ComparisonFunction<Number> compare_true =
+        [](const Number &, const Number &) { return true; };
+
       // 1.) First extract from the vector of indicators the ones that
       //     correspond to cells that we locally own.
       unsigned int   n_flags_refinement = 0;
@@ -336,9 +326,9 @@ namespace hp
 
           // 3.) Compute thresholds if necessary.
           if (target_index_refinement == 0)
-            reference_compare_refine = std::cref(compare_false<Number>);
+            reference_compare_refine = std::cref(compare_false);
           else if (target_index_refinement == n_global_flags_refinement)
-            reference_compare_refine = std::cref(compare_true<Number>);
+            reference_compare_refine = std::cref(compare_true);
           else
             threshold_refinement = dealii::internal::parallel::distributed::
               GridRefinement::RefineAndCoarsenFixedNumber::compute_threshold(
@@ -348,9 +338,9 @@ namespace hp
                 mpi_communicator);
 
           if (target_index_coarsening == n_global_flags_coarsening)
-            reference_compare_coarsen = std::cref(compare_false<Number>);
+            reference_compare_coarsen = std::cref(compare_false);
           else if (target_index_coarsening == 0)
-            reference_compare_coarsen = std::cref(compare_true<Number>);
+            reference_compare_coarsen = std::cref(compare_true);
           else
             threshold_coarsening = dealii::internal::parallel::distributed::
               GridRefinement::RefineAndCoarsenFixedNumber::compute_threshold(
@@ -374,9 +364,9 @@ namespace hp
 
           // 3.) Compute thresholds if necessary.
           if (n_p_refine_cells == 0)
-            reference_compare_refine = std::cref(compare_false<Number>);
+            reference_compare_refine = std::cref(compare_false);
           else if (n_p_refine_cells == n_flags_refinement)
-            reference_compare_refine = std::cref(compare_true<Number>);
+            reference_compare_refine = std::cref(compare_true);
           else
             {
               std::nth_element(indicators_refinement.begin(),
@@ -389,9 +379,9 @@ namespace hp
             }
 
           if (n_p_coarsen_cells == 0)
-            reference_compare_coarsen = std::cref(compare_false<Number>);
+            reference_compare_coarsen = std::cref(compare_false);
           else if (n_p_coarsen_cells == n_flags_coarsening)
-            reference_compare_coarsen = std::cref(compare_true<Number>);
+            reference_compare_coarsen = std::cref(compare_true);
           else
             {
               std::nth_element(indicators_coarsening.begin(),