Remove deprecated MatrixFree::FE[Face]::Evaluation functions taking bools

diff --git a/doc/news/changes/incompatibilities/20230702DanielArndt-5 b/doc/news/changes/incompatibilities/20230702DanielArndt-5
new file mode 100644 (file)
index 0000000..704b2db
--- /dev/null
+++ b/doc/news/changes/incompatibilities/20230702DanielArndt-5
@@ -0,0 +1,5 @@
+Removed: The deprecated MatrixFree::FEEvaluation
+and MatrixFreeFaceEvaluation member function taking
+bools instead of EvaluationFlags have been removed.
+<br>
+(Daniel Arndt, 2023/07/02)

diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h
index a47e64c23d24a29945b30c37ca0c3edcaa6213ec..51ae971c61b7ab759db2c027e4c034d20f278fa4 100644 (file)
--- a/include/deal.II/matrix_free/fe_evaluation.h
+++ b/include/deal.II/matrix_free/fe_evaluation.h
@@ -2677,15 +2677,6 @@ public:
   gather_evaluate(const VectorType &                     input_vector,
                   const EvaluationFlags::EvaluationFlags evaluation_flag);
 
-  /**
-   * @deprecated Please use the gather_evaluate() function with the EvaluationFlags argument.
-   */
-  template <typename VectorType>
-  DEAL_II_DEPRECATED void
-  gather_evaluate(const VectorType &input_vector,
-                  const bool        evaluate_values,
-                  const bool        evaluate_gradients);
-
   /**
    * This function takes the values and/or gradients that are stored on
    * quadrature points, tests them by all the basis functions/gradients on the
@@ -2698,12 +2689,6 @@ public:
   void
   integrate(const EvaluationFlags::EvaluationFlags integration_flag);
 
-  /**
-   * @deprecated Please use the integrate() function with the EvaluationFlags argument.
-   */
-  DEAL_II_DEPRECATED void
-  integrate(const bool integrate_values, const bool integrate_gradients);
-
   /**
    * This function takes the values and/or gradients that are stored on
    * quadrature points, tests them by all the basis functions/gradients on the
@@ -2716,14 +2701,6 @@ public:
   integrate(const EvaluationFlags::EvaluationFlags integration_flag,
             VectorizedArrayType *                  values_array);
 
-  /**
-   * @deprecated Please use the integrate() function with the EvaluationFlags argument.
-   */
-  DEAL_II_DEPRECATED void
-  integrate(const bool           integrate_values,
-            const bool           integrate_gradients,
-            VectorizedArrayType *values_array);
-
   /**
    * This function takes the values and/or gradients that are stored on
    * quadrature points, tests them by all the basis functions/gradients on the
@@ -8847,57 +8824,6 @@ FEFaceEvaluation<dim,
 
 
 
-template <int dim,
-          int fe_degree,
-          int n_q_points_1d,
-          int n_components_,
-          typename Number,
-          typename VectorizedArrayType>
-inline void
-FEFaceEvaluation<dim,
-                 fe_degree,
-                 n_q_points_1d,
-                 n_components_,
-                 Number,
-                 VectorizedArrayType>::integrate(const bool integrate_values,
-                                                 const bool integrate_gradients)
-{
-  integrate(integrate_values, integrate_gradients, this->values_dofs);
-
-#  ifdef DEBUG
-  this->dof_values_initialized = true;
-#  endif
-}
-
-
-
-template <int dim,
-          int fe_degree,
-          int n_q_points_1d,
-          int n_components_,
-          typename Number,
-          typename VectorizedArrayType>
-inline void
-FEFaceEvaluation<dim,
-                 fe_degree,
-                 n_q_points_1d,
-                 n_components_,
-                 Number,
-                 VectorizedArrayType>::integrate(const bool integrate_values,
-                                                 const bool integrate_gradients,
-                                                 VectorizedArrayType
-                                                   *values_array)
-{
-  const EvaluationFlags::EvaluationFlags flag =
-    ((integrate_values) ? EvaluationFlags::values : EvaluationFlags::nothing) |
-    ((integrate_gradients) ? EvaluationFlags::gradients :
-                             EvaluationFlags::nothing);
-
-  integrate(flag, values_array);
-}
-
-
-
 template <int dim,
           int fe_degree,
           int n_q_points_1d,
@@ -8971,34 +8897,6 @@ FEFaceEvaluation<dim,
 
 
 
-template <int dim,
-          int fe_degree,
-          int n_q_points_1d,
-          int n_components_,
-          typename Number,
-          typename VectorizedArrayType>
-template <typename VectorType>
-inline void
-FEFaceEvaluation<
-  dim,
-  fe_degree,
-  n_q_points_1d,
-  n_components_,
-  Number,
-  VectorizedArrayType>::gather_evaluate(const VectorType &input_vector,
-                                        const bool        evaluate_values,
-                                        const bool        evaluate_gradients)
-{
-  const EvaluationFlags::EvaluationFlags flag =
-    ((evaluate_values) ? EvaluationFlags::values : EvaluationFlags::nothing) |
-    ((evaluate_gradients) ? EvaluationFlags::gradients :
-                            EvaluationFlags::nothing);
-
-  gather_evaluate(input_vector, flag);
-}
-
-
-
 template <int dim,
           int fe_degree,
           int n_q_points_1d,

diff --git a/tests/matrix_free/ecl.h b/tests/matrix_free/ecl.h
index 8f239879a86868b3eb82689665428a064d2b4480..74c7dda29eb07afa9ca074488bb8fa42878592b7 100644 (file)
--- a/tests/matrix_free/ecl.h
+++ b/tests/matrix_free/ecl.h
@@ -186,9 +186,9 @@ test(const unsigned int geometry      = 0,
               phi_m.submit_value(average_valgrad, q);
               phi_p.submit_value(-average_valgrad, q);
             }
-          phi_m.integrate(true, true);
+          phi_m.integrate(EvaluationFlags::values | EvaluationFlags::gradients);
           phi_m.distribute_local_to_global(dst);
-          phi_p.integrate(true, true);
+          phi_p.integrate(EvaluationFlags::values | EvaluationFlags::gradients);
           phi_p.distribute_local_to_global(dst);
         }
     },

diff --git a/tests/matrix_free/interpolate_quadrature_01.cc b/tests/matrix_free/interpolate_quadrature_01.cc
index b051701bd51520bb1237a2d2fda9477b73adfa15..3311107579c9d4fbce347e0d51dc99402e55349a 100644 (file)
--- a/tests/matrix_free/interpolate_quadrature_01.cc
+++ b/tests/matrix_free/interpolate_quadrature_01.cc
@@ -110,7 +110,7 @@ test(const unsigned int n_refinements = 1)
                face++)
             {
               phi_m.reinit(cell, face);
-              phi_m.gather_evaluate(src, true, false);
+              phi_m.gather_evaluate(src, EvaluationFlags::values);
 
               AlignedVector<VectorizedArrayType> temp(
                 phi_m.static_dofs_per_cell);

diff --git a/tests/matrix_free/pbc_orientation_01.cc b/tests/matrix_free/pbc_orientation_01.cc
index 22c895bda28092516d46b28a67b51c28af1fcc73..cf0e9fd30e7ccb90e1e46c26ac34e08754bd9928 100644 (file)
--- a/tests/matrix_free/pbc_orientation_01.cc
+++ b/tests/matrix_free/pbc_orientation_01.cc
@@ -177,9 +177,9 @@ test()
                face++)
             {
               eval_minus.reinit(face);
-              eval_minus.gather_evaluate(src, true, false);
+              eval_minus.gather_evaluate(src, EvaluationFlags::values);
               eval_plus.reinit(face);
-              eval_plus.gather_evaluate(src, true, false);
+              eval_plus.gather_evaluate(src, EvaluationFlags::values);
 
               for (unsigned int q = 0; q < eval_minus.n_q_points; ++q)
                 {

diff --git a/tests/matrix_free/pbc_orientation_02.cc b/tests/matrix_free/pbc_orientation_02.cc
index 1b5f150c19b4fce2ec3203ec0705af2d64471235..958d6efc5bd771ef94373c3852197976b3d4d281 100644 (file)
--- a/tests/matrix_free/pbc_orientation_02.cc
+++ b/tests/matrix_free/pbc_orientation_02.cc
@@ -186,9 +186,9 @@ test()
                   continue;
 
                 eval_minus.reinit(cell, face);
-                eval_minus.gather_evaluate(src, true, false);
+                eval_minus.gather_evaluate(src, EvaluationFlags::values);
                 eval_plus.reinit(cell, face);
-                eval_plus.gather_evaluate(src, true, false);
+                eval_plus.gather_evaluate(src, EvaluationFlags::values);
 
                 for (unsigned int q = 0; q < eval_minus.n_q_points; ++q)
                   {

diff --git a/tests/simplex/step-12c.cc b/tests/simplex/step-12c.cc
index 8c80046ec0f1aea23f6b0e79c37de28d53570d59..187073125acf3031135eaad1039ddc5026a65e40 100644 (file)
--- a/tests/simplex/step-12c.cc
+++ b/tests/simplex/step-12c.cc
@@ -804,9 +804,9 @@ public:
              ++cell)
           {
             phi_m.reinit(cell);
-            phi_m.gather_evaluate(src, true, false);
+            phi_m.gather_evaluate(src, EvaluationFlags::values);
             phi_p.reinit(cell);
-            phi_p.gather_evaluate(src, true, false);
+            phi_p.gather_evaluate(src, EvaluationFlags::values);
             for (unsigned int q = 0; q < phi_m.n_q_points; ++q)
               {
                 const auto beta_n = this->beta(phi_m.quadrature_point(q)) *