From d0233ed83191b4be9cbb5d28cb1146c45cbbd684 Mon Sep 17 00:00:00 2001 From: Martin Kronbichler Date: Mon, 13 Dec 2021 13:33:03 +0100 Subject: [PATCH] Select correct number of quadrature points and skip assertion --- include/deal.II/matrix_free/fe_evaluation_data.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/include/deal.II/matrix_free/fe_evaluation_data.h b/include/deal.II/matrix_free/fe_evaluation_data.h index 711a1500a6..436288bd90 100644 --- a/include/deal.II/matrix_free/fe_evaluation_data.h +++ b/include/deal.II/matrix_free/fe_evaluation_data.h @@ -936,7 +936,9 @@ inline FEEvaluationData::FEEvaluationData( , active_fe_index(initialization_data.active_fe_index) , active_quad_index(initialization_data.active_quad_index) , descriptor(initialization_data.descriptor) - , n_quadrature_points(is_face ? data->n_q_points_face : data->n_q_points) + , n_quadrature_points(descriptor == nullptr ? + (is_face ? data->n_q_points_face : data->n_q_points) : + descriptor->n_q_points) , jacobian(nullptr) , J_value(nullptr) , normal_vectors(nullptr) @@ -963,11 +965,7 @@ inline FEEvaluationData::FEEvaluationData( , face_orientation(0) , subface_index(0) , cell_type(internal::MatrixFreeFunctions::general) -{ - // TODO: This currently fails for simplex/matrix_free_face_integral_01 - // if (descriptor != nullptr) - // AssertDimension(n_quadrature_points, descriptor->n_q_points); -} +{} -- 2.39.5