From 213ba3527f857bad55b2a7c7d9ee10dad7eedcb8 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Tue, 31 Oct 2023 18:35:16 +0100 Subject: [PATCH] Fix use of flags in CUDAWrappers::MatrixFree --- include/deal.II/matrix_free/cuda_fe_evaluation.h | 4 ++-- tests/performance/timing_matrix_free_kokkos.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/deal.II/matrix_free/cuda_fe_evaluation.h b/include/deal.II/matrix_free/cuda_fe_evaluation.h index f8779fce0b..282fcaf298 100644 --- a/include/deal.II/matrix_free/cuda_fe_evaluation.h +++ b/include/deal.II/matrix_free/cuda_fe_evaluation.h @@ -419,12 +419,12 @@ namespace CUDAWrappers evaluator_tensor_product.integrate_value_and_gradient( shared_data->values, shared_data->gradients); } - else if (integration_flag & EvaluationFlags::gradients) + else if (integration_flag & EvaluationFlags::values) { evaluator_tensor_product.integrate_value(shared_data->values); shared_data->team_member.team_barrier(); } - else if (integration_flag & EvaluationFlags::values) + else if (integration_flag & EvaluationFlags::gradients) { evaluator_tensor_product.template integrate_gradient( shared_data->values, shared_data->gradients); diff --git a/tests/performance/timing_matrix_free_kokkos.cc b/tests/performance/timing_matrix_free_kokkos.cc index eb96827f77..1925f772b0 100644 --- a/tests/performance/timing_matrix_free_kokkos.cc +++ b/tests/performance/timing_matrix_free_kokkos.cc @@ -145,10 +145,10 @@ public: CUDAWrappers::FEEvaluation fe_eval(/*cell,*/ gpu_data, shared_data); fe_eval.read_dof_values(src); - fe_eval.evaluate(false, true); + fe_eval.evaluate(EvaluationFlags::gradients); fe_eval.apply_for_each_quad_point( LaplaceOperatorQuad()); - fe_eval.integrate(false, true); + fe_eval.integrate(EvaluationFlags::gradients); fe_eval.distribute_local_to_global(dst); } static const unsigned int n_dofs_1d = fe_degree + 1; -- 2.39.5