From: Martin Kronbichler <kronbichler@lnm.mw.tum.de>
Date: Sat, 23 Oct 2021 08:05:16 +0000 (+0200)
Subject: Merge pull request #12868 from bangerth/read-2
X-Git-Tag: v9.4.0-rc1~905
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b06b61cad0332da1a738e00ce1e76fa6b9562be;p=dealii.git

Merge pull request #12868 from bangerth/read-2

Make code a bit more readable.
---

6b06b61cad0332da1a738e00ce1e76fa6b9562be
diff --cc include/deal.II/numerics/data_out_dof_data.templates.h
index 9ac6602d83,5e8c6eb1e7..0a279c1e97
--- a/include/deal.II/numerics/data_out_dof_data.templates.h
+++ b/include/deal.II/numerics/data_out_dof_data.templates.h
@@@ -319,17 -319,12 +318,11 @@@ namespace interna
            if (needs_pyramid_setup)
              {
                Assert(n_subdivisions == 1, ExcNotImplemented());
 +
                quadrature_pyramid = std::make_unique<Quadrature<dim>>(
 -                FE_PyramidP<dim, spacedim>(
 -                  1 /*note: vtk only supports linear wedges*/)
 -                  .get_unit_support_points());
 +                ReferenceCells::Pyramid.get_nodal_type_quadrature<dim>());
              }
  
-           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)
              {