From 16f0970b66a77e1a39e35c546d6622dafde78007 Mon Sep 17 00:00:00 2001 From: David Wells Date: Sat, 4 May 2024 11:54:07 -0400 Subject: [PATCH] Consolidate face_flip() functions. --- .../deal.II/grid/tria_accessor.templates.h | 48 ++++++------------- 1 file changed, 14 insertions(+), 34 deletions(-) diff --git a/include/deal.II/grid/tria_accessor.templates.h b/include/deal.II/grid/tria_accessor.templates.h index 2f6249fce7..d4f5c4722d 100644 --- a/include/deal.II/grid/tria_accessor.templates.h +++ b/include/deal.II/grid/tria_accessor.templates.h @@ -724,38 +724,6 @@ namespace internal } - /** - * Implementation of the function of some name in the mother class. - */ - template - inline static bool - face_flip(const TriaAccessor &, - const unsigned int) - { - /* - * Default implementation used in 1d and 2d - * - * In 1d, face_flip is always false as there is no such concept as - * "flipped" faces in 1d. - * - * In 2d the orientation is a single bit (i.e., the orientation of a - * line) encoded in face_orientation so face_flip is also always false. - */ - return false; - } - - - - inline static bool - face_flip(const TriaAccessor<3, 3, 3> &accessor, const unsigned int face) - { - AssertIndexRange(face, accessor.n_faces()); - return accessor.tria->levels[accessor.present_level] - ->face_orientations.get_flip( - accessor.present_index * GeometryInfo<3>::faces_per_cell + face); - } - - /** * Implementation of the function of some name in the mother class. @@ -1413,9 +1381,21 @@ inline bool TriaAccessor::face_flip(const unsigned int face) const { Assert(used(), TriaAccessorExceptions::ExcCellNotUsed()); + Assert(structdim == dim, + ExcMessage("This function can only be used on objects " + "that are cells, but not on faces or edges " + "that bound cells.")); + AssertIndexRange(face, n_faces()); + // work around a bogus GCC-9 warning which considers face unused except in 3d + (void)face; - return dealii::internal::TriaAccessorImplementation::Implementation:: - face_flip(*this, face); + if constexpr (structdim == 3) + return this->tria->levels[this->present_level]->face_orientations.get_flip( + this->present_index * GeometryInfo<3>::faces_per_cell + face); + else + // In 1d and 2d, face_flip is always false as faces can only be + // 'flipped' in 3d. + return false; } -- 2.39.5