Move implementation of exchange_refinement_flags() to DistributedTria…

…ngulationBase.
dealii · Apr 12, 2024 · e8c04c8 · e8c04c8
1 parent b4f74bd
commit e8c04c8
Show file tree

Hide file tree

Showing 7 changed files with 100 additions and 91 deletions.
diff --git a/include/deal.II/distributed/tria.h b/include/deal.II/distributed/tria.h
@@ -77,23 +77,6 @@ namespace parallel
     class TemporarilyMatchRefineFlags;
   }
 } // namespace parallel
-
-namespace internal
-{
-  namespace parallel
-  {
-    namespace distributed
-    {
-      namespace TriangulationImplementation
-      {
-        template <int dim, int spacedim>
-        void
-        exchange_refinement_flags(
-          dealii::parallel::distributed::Triangulation<dim, spacedim> &);
-      }
-    } // namespace distributed
-  }   // namespace parallel
-} // namespace internal
 #  endif
 
 namespace parallel

diff --git a/include/deal.II/distributed/tria_base.h b/include/deal.II/distributed/tria_base.h
@@ -35,6 +35,34 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+// Forward declarations
+#ifndef DOXYGEN
+
+namespace parallel
+{
+  template <int dim, int spacedim>
+  DEAL_II_CXX20_REQUIRES((concepts::is_valid_dim_spacedim<dim, spacedim>))
+  class DistributedTriangulationBase;
+}
+
+namespace internal
+{
+  namespace parallel
+  {
+    namespace TriangulationImplementation
+    {
+      template <int dim, int spacedim>
+      void
+      exchange_refinement_flags(
+        dealii::parallel::DistributedTriangulationBase<dim, spacedim> &);
+    }
+  } // namespace parallel
+} // namespace internal
+
+#endif
+
+
+
 namespace parallel
 {
   /**

diff --git a/source/distributed/tria.cc b/source/distributed/tria.cc
@@ -1685,59 +1685,6 @@ namespace
 
 
 
-namespace internal
-{
-  namespace parallel
-  {
-    namespace distributed
-    {
-      namespace TriangulationImplementation
-      {
-        /**
-         * Communicate refinement flags on ghost cells from the owner of the
-         * cell.
-         *
-         * This is necessary to get consistent refinement, as mesh smoothing
-         * would undo some of the requested coarsening/refinement.
-         */
-        template <int dim, int spacedim>
-        void
-        exchange_refinement_flags(
-          dealii::parallel::distributed::Triangulation<dim, spacedim> &tria)
-        {
-          auto pack =
-            [](const typename Triangulation<dim, spacedim>::active_cell_iterator
-                 &cell) -> std::uint8_t {
-            if (cell->refine_flag_set())
-              return 1;
-            if (cell->coarsen_flag_set())
-              return 2;
-            return 0;
-          };
-
-          auto unpack =
-            [](const typename Triangulation<dim, spacedim>::active_cell_iterator
-                                  &cell,
-               const std::uint8_t &flag) -> void {
-            cell->clear_coarsen_flag();
-            cell->clear_refine_flag();
-            if (flag == 1)
-              cell->set_refine_flag();
-            else if (flag == 2)
-              cell->set_coarsen_flag();
-          };
-
-          GridTools::exchange_cell_data_to_ghosts<std::uint8_t>(tria,
-                                                                pack,
-                                                                unpack);
-        }
-      } // namespace TriangulationImplementation
-    }   // namespace distributed
-  }     // namespace parallel
-} // namespace internal
-
-
-
 namespace parallel
 {
   namespace distributed
@@ -2795,7 +2742,7 @@ namespace parallel
       // First exchange coarsen/refinement flags on ghost cells. After this
       // collective communication call all flags on ghost cells match the
       // flags set by the user on the owning rank.
-      dealii::internal::parallel::distributed::TriangulationImplementation::
+      dealii::internal::parallel::TriangulationImplementation::
         exchange_refinement_flags(*this);
 
       // Now we can call the sequential version to apply mesh smoothing and

diff --git a/source/distributed/tria.inst.in b/source/distributed/tria.inst.in
@@ -29,23 +29,4 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
 #endif
       \}
     \}
-
-    namespace internal
-    \{
-      namespace parallel
-      \{
-        namespace distributed
-        \{
-          namespace TriangulationImplementation
-          \{
-#if deal_II_dimension <= deal_II_space_dimension
-            template void
-            exchange_refinement_flags(
-              dealii::parallel::distributed::
-                Triangulation<deal_II_dimension, deal_II_space_dimension> &);
-#endif
-          \}
-        \}
-      \}
-    \}
   }
diff --git a/source/distributed/tria_base.cc b/source/distributed/tria_base.cc
@@ -40,6 +40,56 @@
 
 DEAL_II_NAMESPACE_OPEN
 
+namespace internal
+{
+  namespace parallel
+  {
+    namespace TriangulationImplementation
+    {
+      /**
+       * Communicate refinement flags on ghost cells from the owner of the
+       * cell.
+       *
+       * This is necessary to get consistent refinement, as mesh smoothing
+       * would undo some of the requested coarsening/refinement.
+       */
+      template <int dim, int spacedim>
+      void
+      exchange_refinement_flags(
+        dealii::parallel::DistributedTriangulationBase<dim, spacedim> &tria)
+      {
+        auto pack =
+          [](const typename Triangulation<dim, spacedim>::active_cell_iterator
+               &cell) -> std::uint8_t {
+          if (cell->refine_flag_set())
+            return 1;
+          if (cell->coarsen_flag_set())
+            return 2;
+          return 0;
+        };
+
+        auto unpack =
+          [](const typename Triangulation<dim, spacedim>::active_cell_iterator
+                                &cell,
+             const std::uint8_t &flag) -> void {
+          cell->clear_coarsen_flag();
+          cell->clear_refine_flag();
+          if (flag == 1)
+            cell->set_refine_flag();
+          else if (flag == 2)
+            cell->set_coarsen_flag();
+        };
+
+        GridTools::exchange_cell_data_to_ghosts<std::uint8_t>(tria,
+                                                              pack,
+                                                              unpack);
+      }
+    } // namespace TriangulationImplementation
+  }   // namespace parallel
+} // namespace internal
+
+
+
 namespace parallel
 {
   template <int dim, int spacedim>

diff --git a/source/distributed/tria_base.inst.in b/source/distributed/tria_base.inst.in
@@ -39,3 +39,23 @@ for (deal_II_dimension : DIMENSIONS)
 #endif
     \}
   }
+
+for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
+  {
+    namespace internal
+    \{
+      namespace parallel
+      \{
+        namespace TriangulationImplementation
+        \{
+#if deal_II_dimension <= deal_II_space_dimension
+          template void
+          exchange_refinement_flags(
+            dealii::parallel::DistributedTriangulationBase<
+              deal_II_dimension,
+              deal_II_space_dimension> &);
+#endif
+        \}
+      \}
+    \}
+  }
diff --git a/source/hp/refinement.cc b/source/hp/refinement.cc
@@ -714,7 +714,7 @@ namespace hp
               const_cast<dealii::Triangulation<dim, spacedim> *>(
                 &dof_handler.get_triangulation())))
         {
-          dealii::internal::parallel::distributed::TriangulationImplementation::
+          dealii::internal::parallel::TriangulationImplementation::
             exchange_refinement_flags(*tria);
         }