use find_point_to_point_mapping instead of find_point_permutation

Author: majosm

meshmode/discretization/connection/direct.py

@@ -422,12 +422,17 @@ def _resample_point_pick_indices(self, to_group_index: int, ibatch_index: int,
         ibatch = self.groups[to_group_index].batches[ibatch_index]
         from_grp = self.from_discr.groups[ibatch.from_group_index]
 
-        from meshmode.mesh.tools import find_point_permutation
-        return find_point_permutation(
-                    targets=ibatch.result_unit_nodes,
-                    permutees=from_grp.unit_nodes,
+        from meshmode.mesh.tools import find_point_to_point_mapping
+        src_idx_to_tgt_idx = find_point_to_point_mapping(
+                    src_points=ibatch.result_unit_nodes,
+                    tgt_points=from_grp.unit_nodes,
                     tol_multiplier=tol_multiplier)
 
+        return (
+            src_idx_to_tgt_idx
+            if np.all(src_idx_to_tgt_idx >= 0)
+            else None)
+
     @keyed_memoize_method(lambda actx, to_group_index, ibatch_index,
             tol_multiplier=None: (to_group_index, ibatch_index, tol_multiplier))
     def _frozen_resample_point_pick_indices(self, actx: ArrayContext,

meshmode/mesh/processing.py

@@ -46,7 +46,7 @@
     _FaceIDs,
     make_mesh,
 )
-from meshmode.mesh.tools import AffineMap, find_point_permutation
+from meshmode.mesh.tools import AffineMap, find_point_to_point_mapping
 
 
 __doc__ = """
@@ -589,18 +589,18 @@ def evec(i: int) -> np.ndarray:
         result[i] = 1
         return result
 
-    def unpack_single(ary: np.ndarray | None) -> np.ndarray:
+    def unpack_single(ary: np.ndarray | None) -> int:
         assert ary is not None
         item, = ary
         return item
 
-    base_vertex_index = unpack_single(find_point_permutation(
-             targets=-np.ones(grp.dim),
-             permutees=grp.vertex_unit_coordinates().T))
+    base_vertex_index = unpack_single(find_point_to_point_mapping(
+             src_points=-np.ones(grp.dim).reshape(-1, 1),
+             tgt_points=grp.vertex_unit_coordinates().T))
     spanning_vertex_indices = [
-        unpack_single(find_point_permutation(
-                     targets=-np.ones(grp.dim) + 2 * evec(i),
-                     permutees=grp.vertex_unit_coordinates().T))
+        unpack_single(find_point_to_point_mapping(
+                     src_points=(-np.ones(grp.dim) + 2 * evec(i)).reshape(-1, 1),
+                     tgt_points=grp.vertex_unit_coordinates().T))
         for i in range(grp.dim)
     ]
 
@@ -748,11 +748,10 @@ def _get_tensor_product_element_flip_matrix_and_vertex_permutation(
                  unit_flip_matrix,
                  grp.vertex_unit_coordinates().T)
 
-    vertex_permutation_to = find_point_permutation(
-        targets=flipped_vertices,
-        permutees=grp.vertex_unit_coordinates().T,
-    )
-    if vertex_permutation_to is None:
+    vertex_permutation_to = find_point_to_point_mapping(
+        src_points=flipped_vertices,
+        tgt_points=grp.vertex_unit_coordinates().T)
+    if np.any(vertex_permutation_to < 0):
         raise RuntimeError("flip permutation was not found")
 
     flipped_unit_nodes = np.einsum("ij,jn->in", unit_flip_matrix, grp.unit_nodes)
@@ -1140,7 +1139,6 @@ def _match_boundary_faces(
     bdry_m_vertices = mesh.vertices[:, bdry_m_vertex_indices]
     bdry_n_vertices = mesh.vertices[:, bdry_n_vertex_indices]
 
-    from meshmode.mesh.tools import find_point_to_point_mapping
     m_idx_to_n_idx = find_point_to_point_mapping(
         bdry_pair_mapping.aff_map(bdry_m_vertices),
         bdry_n_vertices)

test/test_mesh.py

@@ -931,7 +931,7 @@ def test_point_matching():
             # Perturbed too far
             unmatchable_point = points[:, 0] + 2*tol
             unmatchable_point_to_point = find_point_to_point_mapping(
-                src_points=unmatchable_point,
+                src_points=unmatchable_point.reshape(-1, 1),
                 tgt_points=points,
                 tol=tol)