From 86f955dab0867c308416d744cb1949d0a7c340b9 Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Fri, 22 Oct 2021 17:27:13 -0600 Subject: [PATCH] Make code a bit more readable. --- .../numerics/data_out_dof_data.templates.h | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/include/deal.II/numerics/data_out_dof_data.templates.h b/include/deal.II/numerics/data_out_dof_data.templates.h index 763083b353..5e8c6eb1e7 100644 --- a/include/deal.II/numerics/data_out_dof_data.templates.h +++ b/include/deal.II/numerics/data_out_dof_data.templates.h @@ -282,7 +282,6 @@ namespace internal ReferenceCells::Pyramid); })); - unsigned int n_q_points = 0; if (use_face_values == false) { std::unique_ptr> quadrature_simplex; @@ -326,12 +325,6 @@ namespace internal .get_unit_support_points()); } - n_q_points = - std::max({needs_wedge_setup ? quadrature_wedge->size() : 0, - needs_simplex_setup ? quadrature_simplex->size() : 0, - needs_hypercube_setup ? quadrature_hypercube->size() : 0, - needs_pyramid_setup ? quadrature_pyramid->size() : 0}); - x_fe_values.resize(finite_elements.size()); for (unsigned int i = 0; i < finite_elements.size(); ++i) { @@ -379,12 +372,19 @@ namespace internal update_flags); } } + + // Return maximal number of evaluation points: + return std::max( + {needs_wedge_setup ? quadrature_wedge->size() : 0, + needs_simplex_setup ? quadrature_simplex->size() : 0, + needs_hypercube_setup ? quadrature_hypercube->size() : 0, + needs_pyramid_setup ? quadrature_pyramid->size() : 0}); } else // build FEFaceValues objects instead { dealii::hp::QCollection quadrature( QIterated(QTrapezoid<1>(), n_subdivisions)); - n_q_points = quadrature[0].size(); + x_fe_face_values.resize(finite_elements.size()); for (unsigned int i = 0; i < finite_elements.size(); ++i) { @@ -404,9 +404,10 @@ namespace internal quadrature, update_flags); } - } - return n_q_points; + // Return maximal number of evaluation points: + return quadrature[0].size(); + } } -- 2.39.5