From a9356b8823df80661f7186c0f8dc3e67f47eda8f Mon Sep 17 00:00:00 2001 From: Wolfgang Bangerth Date: Mon, 9 Jan 2023 21:00:17 -0700 Subject: [PATCH] Rename functions to better reflect their functionality. --- include/deal.II/grid/connectivity.h | 92 +++++++++++++++-------------- 1 file changed, 47 insertions(+), 45 deletions(-) diff --git a/include/deal.II/grid/connectivity.h b/include/deal.II/grid/connectivity.h index 0f0481a560..4c258efa57 100644 --- a/include/deal.II/grid/connectivity.h +++ b/include/deal.II/grid/connectivity.h @@ -997,7 +997,7 @@ namespace internal */ template void - build_entity_templated( + build_face_entities_templated( const unsigned int face_dimensionality, const std::vector> &cell_types, const std::vector & cell_types_index, @@ -1188,14 +1188,15 @@ namespace internal */ template void - build_entity(const unsigned int face_dimensionality, - const std::vector> &cell_types, - const std::vector &cell_types_index, - const CRS & crs, - CRS & crs_d, - CRS & crs_0, - TriaObjectsOrientations & orientations, - const FU & second_key_function) + build_face_entities( + const unsigned int face_dimensionality, + const std::vector> &cell_types, + const std::vector & cell_types_index, + const CRS & crs, + CRS & crs_d, + CRS & crs_0, + TriaObjectsOrientations & orientations, + const FU & second_key_function) { std::size_t max_n_vertices = 0; @@ -1212,32 +1213,32 @@ namespace internal } if (max_n_vertices == 2) - build_entity_templated<2>(face_dimensionality, - cell_types, - cell_types_index, - crs, - crs_d, - crs_0, - orientations, - second_key_function); + build_face_entities_templated<2>(face_dimensionality, + cell_types, + cell_types_index, + crs, + crs_d, + crs_0, + orientations, + second_key_function); else if (max_n_vertices == 3) - build_entity_templated<3>(face_dimensionality, - cell_types, - cell_types_index, - crs, - crs_d, - crs_0, - orientations, - second_key_function); + build_face_entities_templated<3>(face_dimensionality, + cell_types, + cell_types_index, + crs, + crs_d, + crs_0, + orientations, + second_key_function); else if (max_n_vertices == 4) - build_entity_templated<4>(face_dimensionality, - cell_types, - cell_types_index, - crs, - crs_d, - crs_0, - orientations, - second_key_function); + build_face_entities_templated<4>(face_dimensionality, + cell_types, + cell_types_index, + crs, + crs_d, + crs_0, + orientations, + second_key_function); else AssertThrow(false, dealii::StandardExceptions::ExcNotImplemented()); } @@ -1382,22 +1383,23 @@ namespace internal { TriaObjectsOrientations dummy; - build_entity(1, - cell_t, - connectivity.entity_types(dim), - con_cv, - dim == 2 ? connectivity.entity_to_entities(2, 1) : temp1, - connectivity.entity_to_entities(1, 0), - dim == 2 ? connectivity.entity_orientations(1) : dummy, - [](auto key, const auto &, const auto &, const auto &) { - // to ensure same enumeration as in deal.II - return key; - }); + build_face_entities( + 1, + cell_t, + connectivity.entity_types(dim), + con_cv, + dim == 2 ? connectivity.entity_to_entities(2, 1) : temp1, + connectivity.entity_to_entities(1, 0), + dim == 2 ? connectivity.entity_orientations(1) : dummy, + [](auto key, const auto &, const auto &, const auto &) { + // to ensure same enumeration as in deal.II + return key; + }); } if (dim == 3) // build quads { - build_entity( + build_face_entities( 2, cell_t, connectivity.entity_types(3), -- 2.39.5