From 92e92d8fbecb248d2043af2514dbd60c1f8be898 Mon Sep 17 00:00:00 2001
From: Peter Munch <peterrmuench@gmail.com>
Date: Thu, 6 Jan 2022 13:47:27 +0100
Subject: [PATCH] RemotePointEvalution: pass marked_vertices

---
 .../deal.II/base/mpi_remote_point_evaluation.h   | 16 +++++++++++++---
 include/deal.II/grid/grid_tools.h                |  1 +
 source/base/mpi_remote_point_evaluation.cc       |  9 ++++++---
 source/grid/grid_tools.cc                        |  4 ++--
 source/grid/grid_tools.inst.in                   |  1 +
 5 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/include/deal.II/base/mpi_remote_point_evaluation.h b/include/deal.II/base/mpi_remote_point_evaluation.h
index 4734b19bd0..f79eda5a12 100644
--- a/include/deal.II/base/mpi_remote_point_evaluation.h
+++ b/include/deal.II/base/mpi_remote_point_evaluation.h
@@ -56,10 +56,14 @@ namespace Utilities
        * @param enforce_unique_mapping Enforce unique mapping, i.e.,
        *   (one-to-one) relation of points and cells.
        * @param rtree_level RTree level to be used during the construction of the bounding boxes.
+       * @param marked_vertices Function that marks relevant vertices to make search
+       *   of active cells around point more efficient.
        */
-      RemotePointEvaluation(const double       tolerance              = 1e-6,
-                            const bool         enforce_unique_mapping = false,
-                            const unsigned int rtree_level            = 0);
+      RemotePointEvaluation(
+        const double       tolerance                              = 1e-6,
+        const bool         enforce_unique_mapping                 = false,
+        const unsigned int rtree_level                            = 0,
+        const std::function<std::vector<bool>()> &marked_vertices = {});
 
       /**
        * Destructor.
@@ -193,6 +197,12 @@ namespace Utilities
        */
       const unsigned int rtree_level;
 
+      /**
+       * Function that marks relevant vertices to make search of active cells
+       * around point more efficient.
+       */
+      const std::function<std::vector<bool>()> marked_vertices;
+
       /**
        * Storage for the status of the triangulation signal.
        */
diff --git a/include/deal.II/grid/grid_tools.h b/include/deal.II/grid/grid_tools.h
index f78bfce162..ea340ebe04 100644
--- a/include/deal.II/grid/grid_tools.h
+++ b/include/deal.II/grid/grid_tools.h
@@ -1160,6 +1160,7 @@ namespace GridTools
       const GridTools::Cache<dim, spacedim> &                cache,
       const std::vector<Point<spacedim>> &                   points,
       const std::vector<std::vector<BoundingBox<spacedim>>> &global_bboxes,
+      const std::vector<bool> &                              marked_vertices,
       const double                                           tolerance,
       const bool                                             perform_handshake,
       const bool enforce_unique_mapping = false);
diff --git a/source/base/mpi_remote_point_evaluation.cc b/source/base/mpi_remote_point_evaluation.cc
index 5caf30a611..404f15e6b0 100644
--- a/source/base/mpi_remote_point_evaluation.cc
+++ b/source/base/mpi_remote_point_evaluation.cc
@@ -38,12 +38,14 @@ namespace Utilities
   {
     template <int dim, int spacedim>
     RemotePointEvaluation<dim, spacedim>::RemotePointEvaluation(
-      const double       tolerance,
-      const bool         enforce_unique_mapping,
-      const unsigned int rtree_level)
+      const double                              tolerance,
+      const bool                                enforce_unique_mapping,
+      const unsigned int                        rtree_level,
+      const std::function<std::vector<bool>()> &marked_vertices)
       : tolerance(tolerance)
       , enforce_unique_mapping(enforce_unique_mapping)
       , rtree_level(rtree_level)
+      , marked_vertices(marked_vertices)
       , ready_flag(false)
     {}
 
@@ -103,6 +105,7 @@ namespace Utilities
           cache,
           points,
           global_bboxes,
+          marked_vertices ? marked_vertices() : std::vector<bool>(),
           tolerance,
           true,
           enforce_unique_mapping);
diff --git a/source/grid/grid_tools.cc b/source/grid/grid_tools.cc
index b60c4cdab8..9523f71252 100644
--- a/source/grid/grid_tools.cc
+++ b/source/grid/grid_tools.cc
@@ -5695,7 +5695,7 @@ namespace GridTools
   {
     // run internal function ...
     const auto all = internal::distributed_compute_point_locations(
-                       cache, points, global_bboxes, tolerance, false, true)
+                       cache, points, global_bboxes, {}, tolerance, false, true)
                        .send_components;
 
     // ... and reshuffle the data
@@ -5881,6 +5881,7 @@ namespace GridTools
       const GridTools::Cache<dim, spacedim> &                cache,
       const std::vector<Point<spacedim>> &                   points,
       const std::vector<std::vector<BoundingBox<spacedim>>> &global_bboxes,
+      const std::vector<bool> &                              marked_vertices,
       const double                                           tolerance,
       const bool                                             perform_handshake,
       const bool enforce_unique_mapping)
@@ -5901,7 +5902,6 @@ namespace GridTools
       const auto &potential_owners_ptrs    = std::get<1>(potential_owners);
       const auto &potential_owners_indices = std::get<2>(potential_owners);
 
-      const std::vector<bool> marked_vertices;
       auto cell_hint = cache.get_triangulation().begin_active();
 
       const auto translate = [&](const unsigned int other_rank) {
diff --git a/source/grid/grid_tools.inst.in b/source/grid/grid_tools.inst.in
index 170164eae3..7b01f27fe7 100644
--- a/source/grid/grid_tools.inst.in
+++ b/source/grid/grid_tools.inst.in
@@ -146,6 +146,7 @@ for (deal_II_dimension : DIMENSIONS; deal_II_space_dimension : SPACE_DIMENSIONS)
         const Cache<deal_II_dimension, deal_II_space_dimension> &,
         const std::vector<Point<deal_II_space_dimension>> &,
         const std::vector<std::vector<BoundingBox<deal_II_space_dimension>>> &,
+        const std::vector<bool> &marked_vertices,
         const double,
         const bool,
         const bool);
-- 
2.39.5