Skip to content

Remove fuzz from Point Search, Return Face ID alongside Element ID #308

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
matthew-mccall wants to merge 7 commits into
base: develop
Choose a base branch
from
+374 −173
Draft

Remove fuzz from Point Search, Return Face ID alongside Element ID #308

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
bd5ee19
Remove `fuzz` parameter from 2D and 3D grid point search methods and …
matthew-mccall Mar 12, 2026
a57bbf8
Add `distance_to_closest_edge_from_barycentric` function and correspo…
matthew-mccall Apr 2, 2026
8afd7d5
Remove inflation radius logic from 2D/3D intersection map constructio…
matthew-mccall Apr 2, 2026
fc1e29b
Merge branch 'develop' into remove-fuzz
matthew-mccall Apr 2, 2026
6f71531
Remove unused `bbox_verts_within_triangle` function and refactor `bbo…
matthew-mccall Apr 2, 2026
a92d0a8
Apply consistent formatting to `test_point_search.cpp` by adjusting l…
matthew-mccall Apr 2, 2026
7a0dd51
Apply minor formatting fixes in `adj_search.hpp` and `mesh_fields_ada…
matthew-mccall Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/pcms/adapter/meshfields/mesh_fields_adapter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,11 +347,11 @@ auto evaluate(const MeshFieldsAdapter<T>& field, Lagrange<1> /* method */,

Kokkos::parallel_for(
results.size(), KOKKOS_LAMBDA(LO i) {
auto [dim, elem_idx, coord] = results(i);
// TODO deal with case for elem_idx < 0 (point outside of mesh)
KOKKOS_ASSERT(elem_idx >= 0);
auto [dim, elem_idx, face_idx, coord] = results(i);
// TODO deal with case for face_idx < 0 (point outside of mesh)
KOKKOS_ASSERT(face_idx >= 0);
const auto elem_tri2verts =
Omega_h::gather_verts<3>(tris2verts, elem_idx);
Omega_h::gather_verts<3>(tris2verts, face_idx);
Real val = 0;
for (int j = 0; j < 3; ++j) {
val += field_values[elem_tri2verts[j]] * coord[j];
Expand Down Expand Up @@ -385,11 +385,11 @@ auto evaluate(const MeshFieldsAdapter<T>& field, NearestNeighbor /* method */,

Kokkos::parallel_for(
results.size(), KOKKOS_LAMBDA(LO i) {
auto [dim, elem_idx, coord] = results(i);
// TODO deal with case for elem_idx < 0 (point outside of mesh)
KOKKOS_ASSERT(elem_idx >= 0);
auto [dim, elem_idx, face_idx, coord] = results(i);
// TODO deal with case for face_idx < 0 (point outside of mesh)
KOKKOS_ASSERT(face_idx >= 0);
const auto elem_tri2verts =
Omega_h::gather_verts<3>(tris2verts, elem_idx);
Omega_h::gather_verts<3>(tris2verts, face_idx);
// value is closest to point has the largest coordinate
int vert = 0;
auto max_val = coord[0];
Expand Down
40 changes: 22 additions & 18 deletions src/pcms/adapter/meshfields/mesh_fields_adapter2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,8 @@ struct CountPointsPerElementFunctor
KOKKOS_INLINE_FUNCTION
void operator()(LO i) const
{
auto [dim, elem_idx, coord] = search_results_(i);
Kokkos::atomic_add(&elem_counts_(elem_idx), 1);
auto [dim, elem_idx, face_idx, coord] = search_results_(i);
Kokkos::atomic_add(&elem_counts_(face_idx), 1);
}
};

Expand Down Expand Up @@ -166,14 +166,14 @@ struct FillCoordinatesAndIndicesFunctor
KOKKOS_INLINE_FUNCTION
void operator()(LO i) const
{
auto [dim, elem_idx, coord] = search_results_(i);
auto [dim, elem_idx, face_idx, coord] = search_results_(i);
// disable the host assertion macro for device code
// currently don't handle case where point is on a boundary
// PCMS_ALWAYS_ASSERT(static_cast<int>(dim) == mesh_.dim());
// element should be inside the domain (positive)
// PCMS_ALWAYS_ASSERT(elem_idx >= 0 && elem_idx < mesh_.nelems());
LO count = Kokkos::atomic_sub_fetch(&elem_counts_(elem_idx), 1);
LO index = offsets_(elem_idx) + count - 1;
// face should be inside the domain (positive)
// PCMS_ALWAYS_ASSERT(face_idx >= 0 && face_idx < mesh_.nelems());
LO count = Kokkos::atomic_sub_fetch(&elem_counts_(face_idx), 1);
LO index = offsets_(face_idx) + count - 1;
for (int j = 0; j < (dim_ + 1); ++j) {
coordinates_(index, j) = coord[j];
}
Expand All @@ -196,18 +196,20 @@ struct MeshFieldsAdapter2LocalizationHint
if (mode_ == OutOfBoundsMode::ERROR) {
// Error mode - throw error immediately if any point is out of bounds
for (size_t i = 0; i < search_results.size(); ++i) {
auto [dim, elem_idx, coord] = search_results(i);
bool is_missing =
(static_cast<int>(dim) != mesh.dim()) || (elem_idx < 0);
auto [dim, elem_idx, face_idx, coord] = search_results(i);
(void)dim;
(void)coord;
bool is_missing = (elem_idx < 0) || (face_idx < 0);
PCMS_ALWAYS_ASSERT(!is_missing && "Points found outside mesh domain");
valid_point_indices.push_back(i);
}
} else {
// Other modes - collect valid and missing points separately
for (size_t i = 0; i < search_results.size(); ++i) {
auto [dim, elem_idx, coord] = search_results(i);
bool is_missing =
(static_cast<int>(dim) != mesh.dim()) || (elem_idx < 0);
auto [dim, elem_idx, face_idx, coord] = search_results(i);
(void)dim;
(void)coord;
bool is_missing = (elem_idx < 0) || (face_idx < 0);
if (is_missing) {
missing_point_indices.push_back(i);
} else {
Expand Down Expand Up @@ -242,9 +244,11 @@ struct MeshFieldsAdapter2LocalizationHint
// Count points per element (valid points only)
Kokkos::View<LO*, HostMemorySpace> elem_counts("elem_counts",
mesh.nelems());
Kokkos::deep_copy(elem_counts, 0);
for (size_t i = 0; i < num_valid_; ++i) {
auto [dim, elem_idx, coord] = search_results(valid_point_indices[i]);
elem_counts[elem_idx] += 1;
auto [dim, elem_idx, face_idx, coord] =
search_results(valid_point_indices[i]);
elem_counts[face_idx] += 1;
}

// Compute offsets
Expand All @@ -259,9 +263,9 @@ struct MeshFieldsAdapter2LocalizationHint
// Fill coordinates and indices for valid points
for (size_t i = 0; i < num_valid_; ++i) {
size_t orig_idx = valid_point_indices[i];
auto [dim, elem_idx, coord] = search_results(orig_idx);
elem_counts(elem_idx) -= 1;
LO index = offsets_(elem_idx) + elem_counts(elem_idx);
auto [dim, elem_idx, face_idx, coord] = search_results(orig_idx);
elem_counts(face_idx) -= 1;
LO index = offsets_(face_idx) + elem_counts(face_idx);
for (int j = 0; j < (mesh.dim() + 1); ++j) {
coordinates_(index, j) = coord[j];
}
Expand Down
Loading
Loading