]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Un-guard two p4est declarations. 18386/head
authorWolfgang Bangerth <bangerth@colostate.edu>
Fri, 25 Apr 2025 00:51:48 +0000 (18:51 -0600)
committerWolfgang Bangerth <bangerth@colostate.edu>
Fri, 25 Apr 2025 00:52:10 +0000 (18:52 -0600)
include/deal.II/distributed/p4est_wrappers.h
source/distributed/p4est_wrappers.cc

index 44e9b95665b3fbf5dcaa07b8e7caad7cd7f9d863..b703377b0341019020eaa688201a206b02f259dd 100644 (file)
@@ -83,39 +83,35 @@ namespace internal
     template <>
     struct types<2>
     {
-      using connectivity     = p4est_connectivity_t;
-      using forest           = p4est_t;
-      using tree             = p4est_tree_t;
-      using quadrant         = p4est_quadrant_t;
-      using quadrant_coord   = p4est_qcoord_t;
-      using topidx           = p4est_topidx_t;
-      using locidx           = p4est_locidx_t;
-      using gloidx           = p4est_gloidx_t;
-      using balance_type     = p4est_connect_type_t;
-      using ghost            = p4est_ghost_t;
-      using transfer_context = p4est_transfer_context_t;
-#  ifdef P4EST_SEARCH_LOCAL
+      using connectivity              = p4est_connectivity_t;
+      using forest                    = p4est_t;
+      using tree                      = p4est_tree_t;
+      using quadrant                  = p4est_quadrant_t;
+      using quadrant_coord            = p4est_qcoord_t;
+      using topidx                    = p4est_topidx_t;
+      using locidx                    = p4est_locidx_t;
+      using gloidx                    = p4est_gloidx_t;
+      using balance_type              = p4est_connect_type_t;
+      using ghost                     = p4est_ghost_t;
+      using transfer_context          = p4est_transfer_context_t;
       using search_partition_callback = p4est_search_partition_t;
-#  endif
     };
 
     template <>
     struct types<3>
     {
-      using connectivity     = p8est_connectivity_t;
-      using forest           = p8est_t;
-      using tree             = p8est_tree_t;
-      using quadrant         = p8est_quadrant_t;
-      using quadrant_coord   = p4est_qcoord_t;
-      using topidx           = p4est_topidx_t;
-      using locidx           = p4est_locidx_t;
-      using gloidx           = p4est_gloidx_t;
-      using balance_type     = p8est_connect_type_t;
-      using ghost            = p8est_ghost_t;
-      using transfer_context = p8est_transfer_context_t;
-#  ifdef P4EST_SEARCH_LOCAL
+      using connectivity              = p8est_connectivity_t;
+      using forest                    = p8est_t;
+      using tree                      = p8est_tree_t;
+      using quadrant                  = p8est_quadrant_t;
+      using quadrant_coord            = p4est_qcoord_t;
+      using topidx                    = p4est_topidx_t;
+      using locidx                    = p4est_locidx_t;
+      using gloidx                    = p4est_gloidx_t;
+      using balance_type              = p8est_connect_type_t;
+      using ghost                     = p8est_ghost_t;
+      using transfer_context          = p8est_transfer_context_t;
       using search_partition_callback = p8est_search_partition_t;
-#  endif
     };
 
 
@@ -315,14 +311,12 @@ namespace internal
 
       static void (&transfer_custom_end)(types<2>::transfer_context *tc);
 
-#  ifdef P4EST_SEARCH_LOCAL
       static void (&search_partition)(
         types<2>::forest                   *forest,
         int                                 call_post,
         types<2>::search_partition_callback quadrant_fn,
         types<2>::search_partition_callback point_fn,
         sc_array_t                         *points);
-#  endif
 
       static void (&quadrant_coord_to_vertex)(
         types<2>::connectivity  *connectivity,
@@ -515,14 +509,12 @@ namespace internal
 
       static void (&transfer_custom_end)(types<3>::transfer_context *tc);
 
-#  ifdef P4EST_SEARCH_LOCAL
       static void (&search_partition)(
         types<3>::forest                   *forest,
         int                                 call_post,
         types<3>::search_partition_callback quadrant_fn,
         types<3>::search_partition_callback point_fn,
         sc_array_t                         *points);
-#  endif
 
       static void (&quadrant_coord_to_vertex)(
         types<3>::connectivity  *connectivity,
index 49e128803ae8c013259fb0f1f8b0e4633070f60a..471e1ac6effdb83297043ece06954ff4bbfc93ba 100644 (file)
@@ -534,14 +534,12 @@ namespace internal
     void (&functions<2>::transfer_custom_end)(types<2>::transfer_context *tc) =
       p4est_transfer_custom_end;
 
-#  ifdef P4EST_SEARCH_LOCAL
     void (&functions<2>::search_partition)(
       types<2>::forest                   *p4est,
       int                                 call_post,
       types<2>::search_partition_callback quadrant_fn,
       types<2>::search_partition_callback point_fn,
       sc_array_t                         *points) = p4est_search_partition;
-#  endif
 
     void (&functions<2>::quadrant_coord_to_vertex)(
       types<2>::connectivity  *connectivity,
@@ -756,14 +754,12 @@ namespace internal
     void (&functions<3>::transfer_custom_end)(types<3>::transfer_context *tc) =
       p8est_transfer_custom_end;
 
-#  ifdef P4EST_SEARCH_LOCAL
     void (&functions<3>::search_partition)(
       types<3>::forest                   *p4est,
       int                                 call_post,
       types<3>::search_partition_callback quadrant_fn,
       types<3>::search_partition_callback point_fn,
       sc_array_t                         *points) = p8est_search_partition;
-#  endif
 
     void (&functions<3>::quadrant_coord_to_vertex)(
       types<3>::connectivity  *connectivity,

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.