From 0a25a29422dbab88f92949dbae19572612d4d3f7 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Tue, 26 Mar 2024 17:53:41 +0100 Subject: [PATCH] FEEvaluation: Ensure assertions in get_value/gradient are working --- include/deal.II/matrix_free/fe_evaluation.h | 46 ++++++++++----------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index 913a8418f0..83d3eb462e 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -6636,12 +6636,12 @@ FEEvaluationvalues_quad_initialized = true; - if (evaluation_flag_actual & EvaluationFlags::gradients) - this->gradients_quad_initialized = true; - if (evaluation_flag_actual & EvaluationFlags::hessians) - this->hessians_quad_initialized = true; + this->values_quad_initialized = + evaluation_flag_actual & EvaluationFlags::values; + this->gradients_quad_initialized = + evaluation_flag_actual & EvaluationFlags::gradients; + this->hessians_quad_initialized = + evaluation_flag_actual & EvaluationFlags::hessians; # endif } @@ -7340,12 +7340,12 @@ FEFaceEvaluationvalues_quad_initialized = true; - if (evaluation_flag_actual & EvaluationFlags::gradients) - this->gradients_quad_initialized = true; - if ((evaluation_flag_actual & EvaluationFlags::hessians) != 0u) - this->hessians_quad_initialized = true; + this->values_quad_initialized = + evaluation_flag_actual & EvaluationFlags::values; + this->gradients_quad_initialized = + evaluation_flag_actual & EvaluationFlags::gradients; + this->hessians_quad_initialized = + evaluation_flag_actual & EvaluationFlags::hessians; # endif } @@ -7474,12 +7474,12 @@ FEFaceEvaluationvalues_quad_initialized = true; - if (evaluation_flag_actual & EvaluationFlags::gradients) - this->gradients_quad_initialized = true; - if ((evaluation_flag_actual & EvaluationFlags::hessians) != 0u) - this->hessians_quad_initialized = true; + this->values_quad_initialized = + evaluation_flag_actual & EvaluationFlags::values; + this->gradients_quad_initialized = + evaluation_flag_actual & EvaluationFlags::gradients; + this->hessians_quad_initialized = + evaluation_flag_actual & EvaluationFlags::hessians; # endif } @@ -7821,12 +7821,10 @@ FEFaceEvaluationvalues_quad_initialized = true; - if (evaluation_flag & EvaluationFlags::gradients) - this->gradients_quad_initialized = true; - if (evaluation_flag & EvaluationFlags::hessians) - this->hessians_quad_initialized = true; + this->values_quad_initialized = evaluation_flag & EvaluationFlags::values; + this->gradients_quad_initialized = + evaluation_flag & EvaluationFlags::gradients; + this->hessians_quad_initialized = evaluation_flag & EvaluationFlags::hessians; # endif } -- 2.39.5