From 2dc9f59810e00082adfc11a8929a52e6d569fbe9 Mon Sep 17 00:00:00 2001 From: Peter Munch Date: Fri, 24 Apr 2020 12:32:18 +0200 Subject: [PATCH] Make coarse_cell_id_to_coarse_cell_index and coarse_cell_index_to_coarse_cell_id private --- .../distributed/fully_distributed_tria.h | 2 +- include/deal.II/grid/tria.h | 62 ++++++++++--------- 2 files changed, 33 insertions(+), 31 deletions(-) diff --git a/include/deal.II/distributed/fully_distributed_tria.h b/include/deal.II/distributed/fully_distributed_tria.h index 6d98768c2c..9c1d8ee36b 100644 --- a/include/deal.II/distributed/fully_distributed_tria.h +++ b/include/deal.II/distributed/fully_distributed_tria.h @@ -233,6 +233,7 @@ namespace parallel virtual bool is_multilevel_hierarchy_constructed() const override; + private: virtual unsigned int coarse_cell_id_to_coarse_cell_index( const types::coarse_cell_id coarse_cell_id) const override; @@ -241,7 +242,6 @@ namespace parallel coarse_cell_index_to_coarse_cell_id( const unsigned int coarse_cell_index) const override; - private: /** * store the Settings. */ diff --git a/include/deal.II/grid/tria.h b/include/deal.II/grid/tria.h index 3dc59c6bfc..e6e56432cf 100644 --- a/include/deal.II/grid/tria.h +++ b/include/deal.II/grid/tria.h @@ -3310,36 +3310,6 @@ public: std::pair, std::bitset<3>>> & get_periodic_face_map() const; - /** - * Translate the unique id of a coarse cell to its index. See the glossary - * entry on @ref GlossCoarseCellId "coarse cell IDs" for more information. - * - * @note For serial and shared triangulation both id and index are the same. - * For distributed triangulations setting both might differ, since the - * id might correspond to a global id and the index to a local id. - * - * @param coarse_cell_id Unique id of the coarse cell. - * @return Index of the coarse cell within the current triangulation. - */ - virtual unsigned int - coarse_cell_id_to_coarse_cell_index( - const types::coarse_cell_id coarse_cell_id) const; - - - /** - * Translate the index of coarse cell to its unique id. See the glossary - * entry on @ref GlossCoarseCellId "coarse cell IDs" for more information. - * - * @note See the note of the method - * coarse_cell_id_to_coarse_cell_index(). - * - * @param coarse_cell_index Index of the coarse cell. - * @return Id of the coarse cell. - */ - virtual types::coarse_cell_id - coarse_cell_index_to_coarse_cell_id( - const unsigned int coarse_cell_index) const; - #ifdef DOXYGEN /** * Write and read the data of this object from a stream for the purpose @@ -3821,6 +3791,36 @@ private: void fix_coarsen_flags(); + /** + * Translate the unique id of a coarse cell to its index. See the glossary + * entry on @ref GlossCoarseCellId "coarse cell IDs" for more information. + * + * @note For serial and shared triangulation both id and index are the same. + * For distributed triangulations setting both might differ, since the + * id might correspond to a global id and the index to a local id. + * + * @param coarse_cell_id Unique id of the coarse cell. + * @return Index of the coarse cell within the current triangulation. + */ + virtual unsigned int + coarse_cell_id_to_coarse_cell_index( + const types::coarse_cell_id coarse_cell_id) const; + + + /** + * Translate the index of coarse cell to its unique id. See the glossary + * entry on @ref GlossCoarseCellId "coarse cell IDs" for more information. + * + * @note See the note of the method + * coarse_cell_id_to_coarse_cell_index(). + * + * @param coarse_cell_index Index of the coarse cell. + * @return Id of the coarse cell. + */ + virtual types::coarse_cell_id + coarse_cell_index_to_coarse_cell_id( + const unsigned int coarse_cell_index) const; + /** * Array of pointers pointing to the objects storing the cell data on the * different levels. @@ -3936,6 +3936,8 @@ private: template friend class dealii::internal::TriangulationImplementation::TriaObjects; + friend class CellId; + // explicitly check for sensible template arguments, but not on windows // because MSVC creates bogus warnings during normal compilation #ifndef DEAL_II_MSVC -- 2.39.5