From: Peter Munch Date: Sun, 6 Feb 2022 06:52:04 +0000 (+0100) Subject: Make FEEval more consistent with FEValues X-Git-Tag: v9.4.0-rc1~313^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5c2b8eea9376ff622a85c07d85cda2602227a3ab;p=dealii.git Make FEEval more consistent with FEValues --- diff --git a/doc/news/changes/minor/20220206Munch b/doc/news/changes/minor/20220206Munch new file mode 100644 index 0000000000..e78837613b --- /dev/null +++ b/doc/news/changes/minor/20220206Munch @@ -0,0 +1,6 @@ +Improved: To be consistent with the FEValues classes, one can now +loop over all DoF and quadrature-point indices in a +range-based loop with the help of the new functions dof_indices() and +quadrature_point_indices(). +
+(Peter Munch, 2022/02/06) diff --git a/include/deal.II/matrix_free/fe_evaluation.h b/include/deal.II/matrix_free/fe_evaluation.h index b4c4ab72ff..16e236948b 100644 --- a/include/deal.II/matrix_free/fe_evaluation.h +++ b/include/deal.II/matrix_free/fe_evaluation.h @@ -2302,6 +2302,14 @@ public: const bool integrate_gradients, VectorType &output_vector); + /** + * Return an object that can be thought of as an array containing all indices + * from zero to @p dofs_per_cell. This allows to write code using + * range-based for loops. + */ + std_cxx20::ranges::iota_view + dof_indices() const; + /** * The number of degrees of freedom of a single component on the cell for * the underlying evaluation object. Usually close to @@ -2700,6 +2708,14 @@ public: const bool integrate_gradients, VectorType &output_vector); + /** + * Return an object that can be thought of as an array containing all indices + * from zero to @p dofs_per_cell. This allows to write code using + * range-based for loops. + */ + std_cxx20::ranges::iota_view + dof_indices() const; + /** * The number of degrees of freedom of a single component on the cell for * the underlying evaluation object. Usually close to @@ -7552,6 +7568,25 @@ FEEvaluation +inline std_cxx20::ranges::iota_view +FEEvaluation::dof_indices() const +{ + return {0U, dofs_per_cell}; +} + + + /*-------------------------- FEFaceEvaluation ---------------------------*/ @@ -8351,6 +8386,25 @@ FEFaceEvaluation +inline std_cxx20::ranges::iota_view +FEFaceEvaluation::dof_indices() const +{ + return {0U, dofs_per_cell}; +} + + + template + quadrature_point_indices() const; + //@} /** @@ -1582,6 +1590,15 @@ FEEvaluationData::is_interior_face() const +template +inline std_cxx20::ranges::iota_view +FEEvaluationData::quadrature_point_indices() const +{ + return {0U, n_quadrature_points}; +} + + + namespace internal { template (phi_m.begin_dof_values()[i][0]) << ' '; deallog << std::endl; phi_m.gather_evaluate(src, EvaluationFlags::values); - for (unsigned int i = 0; i < phi_m.static_n_q_points; ++i) - deallog << static_cast(phi_m.begin_values()[i][0]) << ' '; + for (const auto q : phi_p.quadrature_point_indices()) + deallog << static_cast(phi_m.begin_values()[q][0]) << " "; deallog << std::endl; phi_p.read_dof_values(src); - for (unsigned int i = 0; i < phi_p.static_dofs_per_component; ++i) + for (const auto i : phi_p.dof_indices()) deallog << static_cast(phi_p.begin_dof_values()[i][0]) << ' '; deallog << std::endl; phi_p.gather_evaluate(src, EvaluationFlags::values); - for (unsigned int i = 0; i < phi_p.static_n_q_points; ++i) - deallog << static_cast(phi_p.begin_values()[i][0]) << ' '; + for (const auto q : phi_p.quadrature_point_indices()) + deallog << static_cast(phi_p.begin_values()[q][0]) << " "; deallog << std::endl << std::endl; } }