Remove deprecations in MatrixFree

diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h
index 51ae971c61b7ab759db2c027e4c034d20f278fa4..da493cab3594aa9e81674e76bffa4bd64fb202a9 100644 (file)
--- a/include/deal.II/matrix_free/fe_evaluation.h
+++ b/include/deal.II/matrix_free/fe_evaluation.h
@@ -2200,15 +2200,6 @@ public:
   void
   evaluate(const EvaluationFlags::EvaluationFlags evaluation_flag);
 
-  /**
-   * Like above but with separate bool flags.
-   * @deprecated use evaluate() with the EvaluationFlags argument.
-   */
-  DEAL_II_DEPRECATED void
-  evaluate(const bool evaluate_values,
-           const bool evaluate_gradients,
-           const bool evaluate_hessians = false);
-
   /**
    * Evaluate the function values, the gradients, and the Hessians of the
    * polynomial interpolation from the DoF values in the input array @p
@@ -2225,16 +2216,6 @@ public:
   evaluate(const VectorizedArrayType *            values_array,
            const EvaluationFlags::EvaluationFlags evaluation_flag);
 
-  /**
-   * Like above but using separate bool flags.
-   * @deprecated use evaluate() with the EvaluationFlags argument.
-   */
-  DEAL_II_DEPRECATED void
-  evaluate(const VectorizedArrayType *values_array,
-           const bool                 evaluate_values,
-           const bool                 evaluate_gradients,
-           const bool                 evaluate_hessians = false);
-
   /**
    * Read from the input vector and evaluates the function values, the
    * gradients, and the Hessians of the polynomial interpolation of the vector
@@ -2253,16 +2234,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,
-                  const bool        evaluate_hessians = false);
-
   /**
    * This function takes the values and/or gradients that are stored on
    * quadrature points, tests them by all the basis functions/gradients on the
@@ -2276,12 +2247,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
@@ -2298,14 +2263,6 @@ public:
             VectorizedArrayType *                  values_array,
             const bool                             sum_into_values = false);
 
-  /**
-   * @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
@@ -2324,15 +2281,6 @@ public:
   integrate_scatter(const EvaluationFlags::EvaluationFlags integration_flag,
                     VectorType &                           output_vector);
 
-  /**
-   * @deprecated Please use the integrate_scatter() function with the EvaluationFlags argument.
-   */
-  template <typename VectorType>
-  DEAL_II_DEPRECATED void
-  integrate_scatter(const bool  integrate_values,
-                    const bool  integrate_gradients,
-                    VectorType &output_vector);
-
   /**
    * Return an object that can be thought of as an array containing all indices
    * from zero to @p dofs_per_cell. This allows to write code using
@@ -2631,12 +2579,6 @@ public:
   void
   evaluate(const EvaluationFlags::EvaluationFlags evaluation_flag);
 
-  /**
-   * @deprecated Please use the evaluate() function with the EvaluationFlags argument.
-   */
-  DEAL_II_DEPRECATED void
-  evaluate(const bool evaluate_values, const bool evaluate_gradients);
-
   /**
    * Evaluates the function values, the gradients, and the Laplacians of the
    * FE function given at the DoF values in the input array `values_array` at
@@ -2653,14 +2595,6 @@ public:
   evaluate(const VectorizedArrayType *            values_array,
            const EvaluationFlags::EvaluationFlags evaluation_flag);
 
-  /**
-   * @deprecated Please use the evaluate() function with the EvaluationFlags argument.
-   */
-  DEAL_II_DEPRECATED void
-  evaluate(const VectorizedArrayType *values_array,
-           const bool                 evaluate_values,
-           const bool                 evaluate_gradients);
-
   /**
    * Reads from the input vector and evaluates the function values, the
    * gradients, and the Laplacians of the FE function at the quadrature points
@@ -7815,33 +7749,6 @@ FEEvaluation<dim,
 
 
 
-template <int dim,
-          int fe_degree,
-          int n_q_points_1d,
-          int n_components_,
-          typename Number,
-          typename VectorizedArrayType>
-inline void
-FEEvaluation<dim,
-             fe_degree,
-             n_q_points_1d,
-             n_components_,
-             Number,
-             VectorizedArrayType>::evaluate(const bool evaluate_values,
-                                            const bool evaluate_gradients,
-                                            const bool evaluate_hessians)
-{
-#  ifdef DEBUG
-  Assert(this->dof_values_initialized == true,
-         internal::ExcAccessToUninitializedField());
-#  endif
-  evaluate(this->values_dofs,
-           evaluate_values,
-           evaluate_gradients,
-           evaluate_hessians);
-}
-
-
 template <int dim,
           int fe_degree,
           int n_q_points_1d,
@@ -7866,36 +7773,6 @@ FEEvaluation<dim,
 
 
 
-template <int dim,
-          int fe_degree,
-          int n_q_points_1d,
-          int n_components_,
-          typename Number,
-          typename VectorizedArrayType>
-inline void
-FEEvaluation<dim,
-             fe_degree,
-             n_q_points_1d,
-             n_components_,
-             Number,
-             VectorizedArrayType>::evaluate(const VectorizedArrayType
-                                              *        values_array,
-                                            const bool evaluate_values,
-                                            const bool evaluate_gradients,
-                                            const bool evaluate_hessians)
-{
-  const EvaluationFlags::EvaluationFlags flag =
-    ((evaluate_values) ? EvaluationFlags::values : EvaluationFlags::nothing) |
-    ((evaluate_gradients) ? EvaluationFlags::gradients :
-                            EvaluationFlags::nothing) |
-    ((evaluate_hessians) ? EvaluationFlags::hessians :
-                           EvaluationFlags::nothing);
-
-  evaluate(values_array, flag);
-}
-
-
-
 template <int dim,
           int fe_degree,
           int n_q_points_1d,
@@ -7950,37 +7827,6 @@ FEEvaluation<dim,
 }
 
 
-
-template <int dim,
-          int fe_degree,
-          int n_q_points_1d,
-          int n_components_,
-          typename Number,
-          typename VectorizedArrayType>
-template <typename VectorType>
-inline void
-FEEvaluation<
-  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 bool        evaluate_hessians)
-{
-  const EvaluationFlags::EvaluationFlags flag =
-    ((evaluate_values) ? EvaluationFlags::values : EvaluationFlags::nothing) |
-    ((evaluate_gradients) ? EvaluationFlags::gradients :
-                            EvaluationFlags::nothing) |
-    ((evaluate_hessians) ? EvaluationFlags::hessians :
-                           EvaluationFlags::nothing);
-
-  gather_evaluate(input_vector, flag);
-}
-
-
 namespace internal
 {
   /**
@@ -8085,30 +7931,6 @@ FEEvaluation<dim,
 
 
 
-template <int dim,
-          int fe_degree,
-          int n_q_points_1d,
-          int n_components_,
-          typename Number,
-          typename VectorizedArrayType>
-inline void
-FEEvaluation<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,
@@ -8133,31 +7955,6 @@ FEEvaluation<dim,
 
 
 
-template <int dim,
-          int fe_degree,
-          int n_q_points_1d,
-          int n_components_,
-          typename Number,
-          typename VectorizedArrayType>
-inline void
-FEEvaluation<dim,
-             fe_degree,
-             n_q_points_1d,
-             n_components_,
-             Number,
-             VectorizedArrayType>::integrate(const bool integrate_values,
-                                             const bool integrate_gradients,
-                                             VectorizedArrayType *values_array)
-{
-  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,
@@ -8260,34 +8057,6 @@ FEEvaluation<dim,
 
 
 
-template <int dim,
-          int fe_degree,
-          int n_q_points_1d,
-          int n_components_,
-          typename Number,
-          typename VectorizedArrayType>
-template <typename VectorType>
-inline void
-FEEvaluation<
-  dim,
-  fe_degree,
-  n_q_points_1d,
-  n_components_,
-  Number,
-  VectorizedArrayType>::integrate_scatter(const bool  integrate_values,
-                                          const bool  integrate_gradients,
-                                          VectorType &destination)
-{
-  const EvaluationFlags::EvaluationFlags flag =
-    ((integrate_values) ? EvaluationFlags::values : EvaluationFlags::nothing) |
-    ((integrate_gradients) ? EvaluationFlags::gradients :
-                             EvaluationFlags::nothing);
-
-  integrate_scatter(flag, destination);
-}
-
-
-
 template <int dim,
           int fe_degree,
           int n_q_points_1d,
@@ -8668,30 +8437,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>::evaluate(const bool evaluate_values,
-                                                const bool evaluate_gradients)
-{
-#  ifdef DEBUG
-  Assert(this->dof_values_initialized, ExcNotInitialized());
-#  endif
-
-  evaluate(this->values_dofs, evaluate_values, evaluate_gradients);
-}
-
-
-
 template <int dim,
           int fe_degree,
           int n_q_points_1d,
@@ -8716,33 +8461,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>::evaluate(const VectorizedArrayType
-                                                  *        values_array,
-                                                const bool evaluate_values,
-                                                const bool evaluate_gradients)
-{
-  const EvaluationFlags::EvaluationFlags flag =
-    ((evaluate_values) ? EvaluationFlags::values : EvaluationFlags::nothing) |
-    ((evaluate_gradients) ? EvaluationFlags::gradients :
-                            EvaluationFlags::nothing);
-
-  evaluate(values_array, flag);
-}
-
-
-
 template <int dim,
           int fe_degree,
           int n_q_points_1d,

diff --git a/tests/matrix_free/compute_diagonal_01.cc b/tests/matrix_free/compute_diagonal_01.cc
index 8df8881a98ea417e8f3fa93b40dc850b5beff34e..685838d8a72305c2c8028037edbaaf6be800ae4c 100644 (file)
--- a/tests/matrix_free/compute_diagonal_01.cc
+++ b/tests/matrix_free/compute_diagonal_01.cc
@@ -76,10 +76,10 @@ test()
                          n_components,
                          Number,
                          VectorizedArrayType> &phi) {
-           phi.evaluate(false, true);
+           phi.evaluate(EvaluationFlags::gradients);
            for (unsigned int q = 0; q < phi.n_q_points; ++q)
              phi.submit_gradient(phi.get_gradient(q), q);
-           phi.integrate(false, true);
+           phi.integrate(EvaluationFlags::gradients);
          });
 
   test.do_test();

diff --git a/tests/matrix_free/compute_diagonal_02.cc b/tests/matrix_free/compute_diagonal_02.cc
index caeb3f2de1eb086189e350f116c38b0b64aba808..dc0bb290aba7a7e09c089001ac04ff82cb98bf72 100644 (file)
--- a/tests/matrix_free/compute_diagonal_02.cc
+++ b/tests/matrix_free/compute_diagonal_02.cc
@@ -111,14 +111,14 @@ test()
                          n_components,
                          Number,
                          VectorizedArrayType> &phi) {
-           phi.evaluate(false, true, false);
+           phi.evaluate(EvaluationFlags::gradients);
            for (unsigned int q = 0; q < phi.n_q_points; ++q)
              {
                phi.submit_symmetric_gradient(2.0 *
                                                phi.get_symmetric_gradient(q),
                                              q);
              }
-           phi.integrate(false, true);
+           phi.integrate(EvaluationFlags::gradients);
          });
 
   test.do_test();

diff --git a/tests/matrix_free/compute_diagonal_03.cc b/tests/matrix_free/compute_diagonal_03.cc
index 013ab7d0a83a6be468b0f5f9105b528f4256452f..bb966d946606717a3515b704cdca30cc8e7490a3 100644 (file)
--- a/tests/matrix_free/compute_diagonal_03.cc
+++ b/tests/matrix_free/compute_diagonal_03.cc
@@ -70,7 +70,7 @@ test()
                          n_components,
                          Number,
                          VectorizedArrayType> &phi) {
-           phi.evaluate(false, true);
+           phi.evaluate(EvaluationFlags::gradients);
            for (unsigned int q = 0; q < phi.n_q_points; ++q)
              {
                auto                quadrature_point = phi.quadrature_point(q);
@@ -86,7 +86,7 @@ test()
 
                phi.submit_gradient(coefficient * phi.get_gradient(q), q);
              }
-           phi.integrate(false, true);
+           phi.integrate(EvaluationFlags::gradients);
          });
 
   test.do_test();

diff --git a/tests/matrix_free/compute_diagonal_04.cc b/tests/matrix_free/compute_diagonal_04.cc
index 8762a14058d1742c3200803bd8b74b672137328f..cb82cfa56a0a4249a7e393f474051d7671b7e9bc 100644 (file)
--- a/tests/matrix_free/compute_diagonal_04.cc
+++ b/tests/matrix_free/compute_diagonal_04.cc
@@ -74,10 +74,10 @@ test()
     constraint,
     [](FEEvaluation<dim, -1, 0, n_components, Number, VectorizedArrayType>
          &phi) {
-      phi.evaluate(false, true);
+      phi.evaluate(EvaluationFlags::gradients);
       for (unsigned int q = 0; q < phi.n_q_points; ++q)
         phi.submit_gradient(phi.get_gradient(q), q);
-      phi.integrate(false, true);
+      phi.integrate(EvaluationFlags::gradients);
     });
 
   test.do_test();

diff --git a/tests/matrix_free/compute_diagonal_05.cc b/tests/matrix_free/compute_diagonal_05.cc
index a1d5069d11dfcc15e0f9aade6dc9360b643251f4..1275bf81a55fce1863b3eb84d4cb703464f74e8c 100644 (file)
--- a/tests/matrix_free/compute_diagonal_05.cc
+++ b/tests/matrix_free/compute_diagonal_05.cc
@@ -74,10 +74,10 @@ test()
     constraint,
     [](FEEvaluation<dim, -1, 0, n_components, Number, VectorizedArrayType>
          &phi) {
-      phi.evaluate(false, true);
+      phi.evaluate(EvaluationFlags::gradients);
       for (unsigned int q = 0; q < phi.n_q_points; ++q)
         phi.submit_gradient(phi.get_gradient(q), q);
-      phi.integrate(false, true);
+      phi.integrate(EvaluationFlags::gradients);
     });
 
   test.do_test();

diff --git a/tests/matrix_free/compute_diagonal_06.cc b/tests/matrix_free/compute_diagonal_06.cc
index 4ff19ff58c0c07a7bf6bcf8fcb8e0238234855b7..83dd50bcb4280cba68a4b62fa1e9dba49a7d262e 100644 (file)
--- a/tests/matrix_free/compute_diagonal_06.cc
+++ b/tests/matrix_free/compute_diagonal_06.cc
@@ -62,10 +62,10 @@ test(const std::vector<std::shared_ptr<Triangulation<dim>>> &trias)
                              n_components,
                              Number,
                              VectorizedArrayType> &phi) {
-               phi.evaluate(false, true);
+               phi.evaluate(EvaluationFlags::gradients);
                for (unsigned int q = 0; q < phi.n_q_points; ++q)
                  phi.submit_gradient(phi.get_gradient(q), q);
-               phi.integrate(false, true);
+               phi.integrate(EvaluationFlags::gradients);
              });
 
       test.do_test();

diff --git a/tests/matrix_free/compute_diagonal_07.cc b/tests/matrix_free/compute_diagonal_07.cc
index 64397d9a3f86fdd31ff7edae1a53c841c059d825..63f92306eaa61fd25f6802cbad3117490737ac91 100644 (file)
--- a/tests/matrix_free/compute_diagonal_07.cc
+++ b/tests/matrix_free/compute_diagonal_07.cc
@@ -82,12 +82,12 @@ test()
                                       n_components,
                                       Number,
                                       VectorizedArrayType> &phi) {
-    phi.evaluate(false, true, false);
+    phi.evaluate(EvaluationFlags::gradients);
     for (unsigned int q = 0; q < phi.n_q_points; ++q)
       {
         phi.submit_symmetric_gradient(2.0 * phi.get_symmetric_gradient(q), q);
       }
-    phi.integrate(false, true);
+    phi.integrate(EvaluationFlags::gradients);
   };
 
   LinearAlgebra::distributed::Vector<Number> diagonal_global;

diff --git a/tests/matrix_free/ecl.h b/tests/matrix_free/ecl.h
index 74c7dda29eb07afa9ca074488bb8fa42878592b7..d0906f29ec7249f0f556aeb938e3286a4514f813 100644 (file)
--- a/tests/matrix_free/ecl.h
+++ b/tests/matrix_free/ecl.h
@@ -149,10 +149,10 @@ test(const unsigned int geometry      = 0,
         {
           phi.reinit(cell);
           phi.read_dof_values(src);
-          phi.evaluate(false, true, false);
+          phi.evaluate(EvaluationFlags::gradients);
           for (unsigned int q = 0; q < phi.n_q_points; ++q)
             phi.submit_gradient(phi.get_gradient(q), q);
-          phi.integrate(false, true);
+          phi.integrate(EvaluationFlags::gradients);
           phi.set_dof_values(dst);
         }
     },
@@ -163,9 +163,9 @@ test(const unsigned int geometry      = 0,
           phi_p.reinit(face);
 
           phi_m.read_dof_values(src);
-          phi_m.evaluate(true, true);
+          phi_m.evaluate(EvaluationFlags::values | EvaluationFlags::gradients);
           phi_p.read_dof_values(src);
-          phi_p.evaluate(true, true);
+          phi_p.evaluate(EvaluationFlags::values | EvaluationFlags::gradients);
           VectorizedArrayType sigmaF =
             (std::abs(
                (phi_m.normal_vector(0) * phi_m.inverse_jacobian(0))[dim - 1]) +
@@ -240,10 +240,10 @@ test(const unsigned int geometry      = 0,
         {
           phi.reinit(cell);
           phi.read_dof_values(src);
-          phi.evaluate(false, true, false);
+          phi.evaluate(EvaluationFlags::gradients);
           for (unsigned int q = 0; q < phi.n_q_points; ++q)
             phi.submit_gradient(phi.get_gradient(q), q);
-          phi.integrate(false, true);
+          phi.integrate(EvaluationFlags::gradients);
 
           for (unsigned int face = 0; face < GeometryInfo<dim>::faces_per_cell;
                ++face)

diff --git a/tests/matrix_free/interpolate_quadrature_01.cc b/tests/matrix_free/interpolate_quadrature_01.cc
index 3311107579c9d4fbce347e0d51dc99402e55349a..d4223de62235c89b33f5b560ce86c88a16621489 100644 (file)
--- a/tests/matrix_free/interpolate_quadrature_01.cc
+++ b/tests/matrix_free/interpolate_quadrature_01.cc
@@ -104,7 +104,7 @@ test(const unsigned int n_refinements = 1)
         {
           phi.reinit(cell);
 
-          phi.gather_evaluate(src, true, false);
+          phi.gather_evaluate(src, EvaluationFlags::values);
 
           for (unsigned int face = 0; face < GeometryInfo<dim>::faces_per_cell;
                face++)

diff --git a/tests/matrix_free/poisson_dg_hp.cc b/tests/matrix_free/poisson_dg_hp.cc
index 7907f023868e0c8e84d2733934b8d935045dc0e4..f2e45cb7aa05709f9bc251d14f92b4a7263a75fb 100644 (file)
--- a/tests/matrix_free/poisson_dg_hp.cc
+++ b/tests/matrix_free/poisson_dg_hp.cc
@@ -125,7 +125,7 @@ public:
             for (unsigned int q = 0; q < phi.n_q_points; ++q)
               phi.submit_value(1.0, q);
 
-            phi.integrate_scatter(true, false, dst);
+            phi.integrate_scatter(EvaluationFlags::values, dst);
           }
       },
       vec,

diff --git a/tests/simplex/matrix_free_01.cc b/tests/simplex/matrix_free_01.cc
index 004c4464dd1647de3f6e92af5183c31d5e18ac81..37771aeed6b39f97eb3275c133f3e4c854f95072 100644 (file)
--- a/tests/simplex/matrix_free_01.cc
+++ b/tests/simplex/matrix_free_01.cc
@@ -85,7 +85,7 @@ public:
             for (unsigned int q = 0; q < phi.n_q_points; ++q)
               phi.submit_value(1.0, q);
 
-            phi.integrate_scatter(true, false, dst);
+            phi.integrate_scatter(EvaluationFlags::values, dst);
           }
       },
       vec,
@@ -100,10 +100,14 @@ public:
     matrix_free.template cell_loop<VectorType, VectorType>(
       [&](const auto &, auto &dst, const auto &src, const auto cells) {
         FEEvaluation<dim, -1, 0, 1, double> phi(matrix_free);
+        EvaluationFlags::EvaluationFlags    fe_eval_flags =
+          EvaluationFlags::gradients;
+        if (do_helmholtz)
+          fe_eval_flags |= EvaluationFlags::values;
         for (unsigned int cell = cells.first; cell < cells.second; ++cell)
           {
             phi.reinit(cell);
-            phi.gather_evaluate(src, do_helmholtz, true);
+            phi.gather_evaluate(src, fe_eval_flags);
 
             for (unsigned int q = 0; q < phi.n_q_points; ++q)
               {
@@ -113,7 +117,7 @@ public:
                 phi.submit_gradient(phi.get_gradient(q), q);
               }
 
-            phi.integrate_scatter(do_helmholtz, true, dst);
+            phi.integrate_scatter(fe_eval_flags, dst);
           }
       },
       dst,

diff --git a/tests/simplex/matrix_free_02.cc b/tests/simplex/matrix_free_02.cc
index e5a522e654c481d63bc13d6d1da655dd9ffce77e..ed29a62f821fa3f6443ee9f47ab9e412bba4b0ef 100644 (file)
--- a/tests/simplex/matrix_free_02.cc
+++ b/tests/simplex/matrix_free_02.cc
@@ -88,7 +88,7 @@ public:
             for (unsigned int q = 0; q < phi.n_q_points; ++q)
               phi.submit_value(1.0, q);
 
-            phi.integrate_scatter(true, false, dst);
+            phi.integrate_scatter(EvaluationFlags::values, dst);
           }
       },
       vec,
@@ -102,12 +102,16 @@ public:
   {
     matrix_free.template cell_loop<VectorType, VectorType>(
       [&](const auto &data, auto &dst, const auto &src, const auto range) {
-        FECellIntegrator phi(matrix_free, range);
+        FECellIntegrator                 phi(matrix_free, range);
+        EvaluationFlags::EvaluationFlags fe_eval_flags =
+          EvaluationFlags::gradients;
+        if (do_helmholtz)
+          fe_eval_flags |= EvaluationFlags::values;
 
         for (unsigned int cell = range.first; cell < range.second; ++cell)
           {
             phi.reinit(cell);
-            phi.gather_evaluate(src, do_helmholtz, true);
+            phi.gather_evaluate(src, fe_eval_flags);
 
             for (unsigned int q = 0; q < phi.n_q_points; ++q)
               {
@@ -117,7 +121,7 @@ public:
                 phi.submit_gradient(phi.get_gradient(q), q);
               }
 
-            phi.integrate_scatter(do_helmholtz, true, dst);
+            phi.integrate_scatter(fe_eval_flags, dst);
           }
       },
       dst,

diff --git a/tests/simplex/matrix_free_03.cc b/tests/simplex/matrix_free_03.cc
index d781cdad5922f59adea4f4e36fa2fd2dc0a581a2..57d3adbb6f17b982e9ca619d64b2e22683965343 100644 (file)
--- a/tests/simplex/matrix_free_03.cc
+++ b/tests/simplex/matrix_free_03.cc
@@ -138,7 +138,7 @@ public:
             for (unsigned int q = 0; q < phi.n_q_points; ++q)
               phi.submit_value(1.0, q);
 
-            phi.integrate_scatter(true, false, dst);
+            phi.integrate_scatter(EvaluationFlags::values, dst);
           }
       },
       vec,

diff --git a/tests/simplex/matrix_free_04.cc b/tests/simplex/matrix_free_04.cc
index 5277b5c3922384a16554f8cb4a86a71121357f96..4d95f9a677d4fe36e7fffb51d6c428a2d612bb61 100644 (file)
--- a/tests/simplex/matrix_free_04.cc
+++ b/tests/simplex/matrix_free_04.cc
@@ -127,7 +127,7 @@ public:
             for (unsigned int q = 0; q < phi.n_q_points; ++q)
               phi.submit_value(1.0, q);
 
-            phi.integrate_scatter(true, false, dst);
+            phi.integrate_scatter(EvaluationFlags::values, dst);
           }
       },
       vec,

diff --git a/tests/simplex/step-12c.cc b/tests/simplex/step-12c.cc
index 187073125acf3031135eaad1039ddc5026a65e40..5f233e4b4b7fd2a4cd94ea61a6d99c91ccb5ff3f 100644 (file)
--- a/tests/simplex/step-12c.cc
+++ b/tests/simplex/step-12c.cc
@@ -746,7 +746,7 @@ public:
             for (unsigned int q = 0; q < phi.n_q_points; ++q)
               phi.submit_value(0.0, q);
 
-            phi.integrate_scatter(true, false, dst);
+            phi.integrate_scatter(EvaluationFlags::values, dst);
           }
       },
       [&](const auto &data, auto &dst, const auto &src, const auto face_range) {
@@ -771,7 +771,7 @@ public:
                                  q);
               }
 
-            phi.integrate_scatter(true, false, dst);
+            phi.integrate_scatter(EvaluationFlags::values, dst);
           }
       },
       vec,
@@ -789,12 +789,12 @@ public:
              ++cell)
           {
             phi.reinit(cell);
-            phi.gather_evaluate(src, true, false);
+            phi.gather_evaluate(src, EvaluationFlags::values);
             for (unsigned int q = 0; q < phi.n_q_points; ++q)
               phi.submit_gradient(-this->beta(phi.quadrature_point(q)) *
                                     phi.get_value(q),
                                   q);
-            phi.integrate_scatter(false, true, dst);
+            phi.integrate_scatter(EvaluationFlags::gradients, dst);
           }
       },
       [&](const auto &data, auto &dst, const auto &src, const auto face_range) {
@@ -831,7 +831,7 @@ public:
              ++cell)
           {
             phi.reinit(cell);
-            phi.gather_evaluate(src, true, false);
+            phi.gather_evaluate(src, EvaluationFlags::values);
             for (unsigned int q = 0; q < phi.n_q_points; ++q)
               {
                 const auto beta_n =