Add Tolerances to 2D Search and begin 3D Search Implementation

src/pcms/adapter/omega_h/omega_h_field.h

@@ -154,13 +154,13 @@ class OmegaHField
   void ConstructSearch(int nx, int ny)
   {
     PCMS_FUNCTION_TIMER;
-    search_ = GridPointSearch(mesh_, nx, ny);
+    search_ = std::make_unique<GridPointSearch2D>(mesh_, nx, ny);
   }
   // pass through to search function
   [[nodiscard]] auto Search(Kokkos::View<Real* [2]> points) const
   {
     PCMS_FUNCTION_TIMER;
-    PCMS_ALWAYS_ASSERT(search_.has_value() &&
+    PCMS_ALWAYS_ASSERT(search_ != nullptr &&
                        "search data structure must be constructed before use");
     return (*search_)(points);
   }
@@ -220,9 +220,8 @@ class OmegaHField
 private:
   std::string name_;
   Omega_h::Mesh& mesh_;
-  // TODO make this a pointer and introduce base class to Search for alternative
-  // search methods
-  std::optional<GridPointSearch> search_;
+  // TODO: introduce base class to Search for alternative search methods
+  std::unique_ptr<PointLocalizationSearch2D> search_;
   // bitmask array that specifies a filter on the field
   Omega_h::Read<LO> mask_;
   LO size_;

src/pcms/adapter/omega_h/omega_h_field2.cpp

@@ -97,11 +97,11 @@ struct ComputeOffsetsFunctor
 struct CountPointsPerElementFunctor
 {
   Kokkos::View<LO*> elem_counts_;
-  Kokkos::View<GridPointSearch::Result*> search_results_;
+  Kokkos::View<GridPointSearch2D::Result*> search_results_;
 
   CountPointsPerElementFunctor(
     Kokkos::View<LO*> elem_counts,
-    Kokkos::View<GridPointSearch::Result*> search_results)
+    Kokkos::View<GridPointSearch2D::Result*> search_results)
     : elem_counts_(elem_counts), search_results_(search_results)
   {
   }
@@ -121,14 +121,14 @@ struct FillCoordinatesAndIndicesFunctor
   Kokkos::View<LO*> offsets_;
   Kokkos::View<Real**> coordinates_;
   Kokkos::View<LO*> indices_;
-  Kokkos::View<GridPointSearch::Result*> search_results_;
+  Kokkos::View<GridPointSearch2D::Result*> search_results_;
   Omega_h::Int dim_;
 
   FillCoordinatesAndIndicesFunctor(
     Omega_h::Mesh& mesh, Kokkos::View<LO*> elem_counts,
     Kokkos::View<LO*> offsets, Kokkos::View<Real**> coordinates,
     Kokkos::View<LO*> indices,
-    Kokkos::View<GridPointSearch::Result*> search_results)
+    Kokkos::View<GridPointSearch2D::Result*> search_results)
     : mesh_(mesh),
       elem_counts_(elem_counts),
       offsets_(offsets),
@@ -161,7 +161,7 @@ struct OmegaHField2LocalizationHint
 {
   OmegaHField2LocalizationHint(
     Omega_h::Mesh& mesh,
-    Kokkos::View<GridPointSearch::Result*, HostMemorySpace> search_results)
+    Kokkos::View<GridPointSearch2D::Result*, HostMemorySpace> search_results)
     : offsets_("", mesh.nelems() + 1),
       coordinates_("", search_results.size(), mesh.dim() + 1),
       indices_("", search_results.size())
@@ -302,7 +302,7 @@ LocalizationHint OmegaHField2::GetLocalizationHint(
     coordinates.data_handle(), coordinates.extent(0), coordinates.extent(1));
   deep_copy_mismatch_layouts(coords, coordinates_host);
   auto results = search_(coords);
-  Kokkos::View<GridPointSearch::Result*, HostMemorySpace> results_h(
+  Kokkos::View<GridPointSearch2D::Result*, HostMemorySpace> results_h(
     "results_h", results.size());
   Kokkos::deep_copy(results_h, results);
   auto hint = std::make_shared<OmegaHField2LocalizationHint>(mesh_, results_h);

src/pcms/adapter/omega_h/omega_h_field2.h

@@ -60,7 +60,7 @@ class OmegaHField2 : public FieldT<Real>
   const OmegaHFieldLayout& layout_;
   Omega_h::Mesh& mesh_;
   std::unique_ptr<MeshFieldBackend> mesh_field_;
-  GridPointSearch search_;
+  GridPointSearch2D search_;
   Kokkos::View<Real*, HostMemorySpace> dof_holder_data_;
 };
 

src/pcms/interpolator/adj_search.hpp

@@ -26,14 +26,14 @@ Omega_h::Real calculateDistance(const Omega_h::Real* p1,
 }
 
 inline void checkTargetPoints(
-  const Kokkos::View<pcms::GridPointSearch::Result*>& results)
+  const Kokkos::View<pcms::GridPointSearch2D::Result*>& results)
 {
   Kokkos::fence();
   pcms::printInfo("INFO: Checking target points...\n");
   auto check_target_points = OMEGA_H_LAMBDA(Omega_h::LO i)
   {
-    if (results(i).tri_id < 0) {
-      OMEGA_H_CHECK_PRINTF(results(i).tri_id >= 0,
+    if (results(i).element_id < 0) {
+      OMEGA_H_CHECK_PRINTF(results(i).element_id >= 0,
                            "ERROR: Source cell id not found for target %d\n",
                            i);
       printf("%d, ", i);
@@ -119,7 +119,7 @@ inline void FindSupports::adjBasedSearch(
     });
   Kokkos::fence();
 
-  pcms::GridPointSearch search_cell(source_mesh, 10, 10);
+  pcms::GridPointSearch2D search_cell(source_mesh, 10, 10);
   auto results = search_cell(target_points);
   checkTargetPoints(results);
 
@@ -130,7 +130,7 @@ inline void FindSupports::adjBasedSearch(
       Track visited;
       Omega_h::Real cutoffDistance = radii2[id];
 
-      Omega_h::LO source_cell_id = results(id).tri_id;
+      Omega_h::LO source_cell_id = results(id).element_id;
       OMEGA_H_CHECK_PRINTF(
         source_cell_id >= 0,
         "ERROR: Source cell id not found for target %d (%f,%f)\n", id,