From cbb473c59ddf6cac152fb4ecc6762c3d4ed2a5a5 Mon Sep 17 00:00:00 2001 From: David Wells Date: Mon, 12 Jun 2017 11:13:37 -0400 Subject: [PATCH] Inline GeometryInfo::line_to_cell_vertices. This provides about a 5% speed boost in TransfiniteInterpolationManifold since the compiler can rewrite the loop over the line vertices. --- include/deal.II/base/geometry_info.h | 64 +++++++++++++++++++++++++++ source/base/geometry_info.cc | 65 ++-------------------------- 2 files changed, 67 insertions(+), 62 deletions(-) diff --git a/include/deal.II/base/geometry_info.h b/include/deal.II/base/geometry_info.h index f33c90400c..36e369d848 100644 --- a/include/deal.II/base/geometry_info.h +++ b/include/deal.II/base/geometry_info.h @@ -2804,6 +2804,70 @@ GeometryInfo<3>::is_inside_unit_cell (const Point<3> &p, } + +template <> +inline +unsigned int +GeometryInfo<1>::line_to_cell_vertices (const unsigned int line, + const unsigned int vertex) +{ + (void)line; + Assert (line +inline +unsigned int +GeometryInfo<2>::line_to_cell_vertices (const unsigned int line, + const unsigned int vertex) +{ + static const unsigned int cell_vertices[4][2] = {{0,2},{1,3},{0,1},{2,3}}; + return cell_vertices[line][vertex]; +} + + + +template <> +inline +unsigned int +GeometryInfo<3>::line_to_cell_vertices (const unsigned int line, + const unsigned int vertex) +{ + Assert (line +inline +unsigned int +GeometryInfo<4>::line_to_cell_vertices (const unsigned int, + const unsigned int) +{ + Assert(false, ExcNotImplemented()); + return numbers::invalid_unsigned_int; +} + #endif // DOXYGEN DEAL_II_NAMESPACE_CLOSE diff --git a/source/base/geometry_info.cc b/source/base/geometry_info.cc index 875d5e6bc4..919b5669a0 100644 --- a/source/base/geometry_info.cc +++ b/source/base/geometry_info.cc @@ -1106,16 +1106,16 @@ GeometryInfo<2>::child_cell_on_face (const RefinementCase<2> &ref_case, subcells[2][RefinementCase<2>::isotropic_refinement][faces_per_cell][max_children_per_face] = { { - // Normal orientation (face_filp = false) + // Normal orientation (face_flip = false) {{0,0},{1,1},{0,1},{0,1}}, // cut_x {{0,1},{0,1},{0,0},{1,1}}, // cut_y - {{0,2},{1,3},{0,1},{2,3}} // cut_z + {{0,2},{1,3},{0,1},{2,3}} // cut_xy, i.e., isotropic }, { // Flipped orientation (face_flip = true) {{0,0},{1,1},{1,0},{1,0}}, // cut_x {{1,0},{1,0},{0,0},{1,1}}, // cut_y - {{2,0},{3,1},{1,0},{3,2}} // cut_z + {{2,0},{3,1},{1,0},{3,2}} // cut_xy, i.e., isotropic } }; @@ -1410,65 +1410,6 @@ GeometryInfo<4>::child_cell_on_face (const RefinementCase<4> &, -template <> -unsigned int -GeometryInfo<1>::line_to_cell_vertices (const unsigned int line, - const unsigned int vertex) -{ - (void)line; - Assert (line -unsigned int -GeometryInfo<2>::line_to_cell_vertices (const unsigned int line, - const unsigned int vertex) -{ - return child_cell_on_face(RefinementCase<2>::isotropic_refinement, line, vertex); -} - - - -template <> -unsigned int -GeometryInfo<3>::line_to_cell_vertices (const unsigned int line, - const unsigned int vertex) -{ - Assert (line -unsigned int -GeometryInfo<4>::line_to_cell_vertices (const unsigned int, - const unsigned int) -{ - Assert(false, ExcNotImplemented()); - return invalid_unsigned_int; -} - - template <> unsigned int GeometryInfo<1>::face_to_cell_lines (const unsigned int face, -- 2.39.5