From 49f0fe5261c4413da78cf671714608c95b522612 Mon Sep 17 00:00:00 2001 From: Daniel Arndt Date: Sun, 2 Jul 2023 11:20:26 -0400 Subject: [PATCH] Remove deprecated MatrixFree::FE[Face]::Evaluation functions taking bools --- .../incompatibilities/20230702DanielArndt-5 | 5 + include/deal.II/matrix_free/fe_evaluation.h | 102 ------------------ tests/matrix_free/ecl.h | 4 +- .../matrix_free/interpolate_quadrature_01.cc | 2 +- tests/matrix_free/pbc_orientation_01.cc | 4 +- tests/matrix_free/pbc_orientation_02.cc | 4 +- tests/simplex/step-12c.cc | 4 +- 7 files changed, 14 insertions(+), 111 deletions(-) create mode 100644 doc/news/changes/incompatibilities/20230702DanielArndt-5 diff --git a/doc/news/changes/incompatibilities/20230702DanielArndt-5 b/doc/news/changes/incompatibilities/20230702DanielArndt-5 new file mode 100644 index 0000000000..704b2db346 --- /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. +
+(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 a47e64c23d..51ae971c61 100644 --- 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 - 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 -inline void -FEFaceEvaluation::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 -inline void -FEFaceEvaluation::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 -template -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 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 22c895bda2..cf0e9fd30e 100644 --- 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 1b5f150c19..958d6efc5b 100644 --- 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 8c80046ec0..187073125a 100644 --- 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)) * -- 2.39.5