From: Wolfgang Bangerth Date: Fri, 21 Feb 2025 19:04:35 +0000 (-0700) Subject: Some code clean-ups. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f123337240a20fa69b01e9b6c949d51cba3a8fa2;p=dealii.git Some code clean-ups. --- diff --git a/source/fe/mapping_q.cc b/source/fe/mapping_q.cc index 40e4b358a1..6b00d4aa19 100644 --- a/source/fe/mapping_q.cc +++ b/source/fe/mapping_q.cc @@ -1702,8 +1702,8 @@ MappingQ<2, 3>::add_quad_support_points( for (unsigned int q = 0, q2 = 0; q2 < polynomial_degree - 1; ++q2) for (unsigned int q1 = 0; q1 < polynomial_degree - 1; ++q1, ++q) { - Point<2> point(line_support_points[q1 + 1][0], - line_support_points[q2 + 1][0]); + const Point<2> point(line_support_points[q1 + 1][0], + line_support_points[q2 + 1][0]); for (const unsigned int i : GeometryInfo<2>::vertex_indices()) weights(q, i) = GeometryInfo<2>::d_linear_shape_function(point, i); } diff --git a/source/grid/tria_accessor.cc b/source/grid/tria_accessor.cc index c7378ccfdc..e15de30584 100644 --- a/source/grid/tria_accessor.cc +++ b/source/grid/tria_accessor.cc @@ -1411,30 +1411,6 @@ namespace } - template - Point - get_new_point_on_object(const TriaAccessor<1, dim, spacedim> &obj) - { - TriaIterator> it(obj); - return obj.get_manifold().get_new_point_on_line(it); - } - - template - Point - get_new_point_on_object(const TriaAccessor<2, dim, spacedim> &obj) - { - TriaIterator> it(obj); - return obj.get_manifold().get_new_point_on_quad(it); - } - - template - Point - get_new_point_on_object(const TriaAccessor<3, dim, spacedim> &obj) - { - TriaIterator> it(obj); - return obj.get_manifold().get_new_point_on_hex(it); - } - template Point get_new_point_on_object(const TriaAccessor &obj, @@ -1442,7 +1418,7 @@ namespace { if (use_interpolation) { - TriaRawIterator> it(obj); + const TriaRawIterator> it(obj); const auto points_and_weights = Manifolds::get_default_points_and_weights(it, use_interpolation); return obj.get_manifold().get_new_point( @@ -1453,7 +1429,17 @@ namespace } else { - return get_new_point_on_object(obj); + const TriaIterator> it(obj); + if constexpr (structdim == 1) + return obj.get_manifold().get_new_point_on_line(it); + else if constexpr (structdim == 2) + return obj.get_manifold().get_new_point_on_quad(it); + else if constexpr (structdim == 3) + return obj.get_manifold().get_new_point_on_hex(it); + else + DEAL_II_ASSERT_UNREACHABLE(); + + return {}; } } } // namespace