Skip to content

EB: use a finite marker instead of NaN for edges with no intercept #5668

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

Merged
WeiqunZhang merged 2 commits into from
Sep 12, 2026
Merged

EB: use a finite marker instead of NaN for edges with no intercept #5668

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
363128b
EB: use a finite marker instead of NaN for edges with no intercept
WeiqunZhang Sep 3, 2026
339b326
Merge branch 'development' into eb_intercept_sentinel
WeiqunZhang Sep 12, 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
24 changes: 12 additions & 12 deletions Src/EB/AMReX_EB2_GeometryShop.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,7 +434,7 @@ public:
problo[2]+amrex::Clamp(ivhi[2],blo.z,bhi.z)*dx[2])},
idim, f);
} else {
inter(i,j,k) = std::numeric_limits<Real>::quiet_NaN();
inter(i,j,k) = no_intercept;
}
});
}
Expand Down Expand Up @@ -503,7 +503,7 @@ public:
problo[2]+amrex::Clamp(ivhi[2],blo.z,bhi.z)*dx[2])},
idim, m_f);
} else {
inter(i,j,k) = std::numeric_limits<Real>::quiet_NaN();
inter(i,j,k) = no_intercept;
}
});
}
Expand All @@ -529,40 +529,40 @@ public:
AMREX_HOST_DEVICE_PARALLEL_FOR_3D (bx, i, j, k,
{
if (type(i,j,k) == Type::irregular) {
bool is_nan = amrex::isnan(inter(i,j,k));
bool no_inter = (inter(i,j,k) == no_intercept);
if (idim == 0) {
if (lst(i,j,k) == Real(0.0) ||
(lst(i,j,k) > Real(0.0) && is_nan))
(lst(i,j,k) > Real(0.0) && no_inter))
{
// interp might still be quiet_nan because lst that
// was set to zero has been changed by FillBoundary
// at periodic boundaries.
// The edge can still be without an intercept because
// lst that was set to zero has been changed by
// FillBoundary at periodic boundaries.
inter(i,j,k) = problo[0] + i*dx[0];
}
else if (lst(i+1,j,k) == Real(0.0) ||
(lst(i+1,j,k) > Real(0.0) && is_nan))
(lst(i+1,j,k) > Real(0.0) && no_inter))
{
inter(i,j,k) = problo[0] + (i+1)*dx[0];
}
} else if (idim == 1) {
if (lst(i,j,k) == Real(0.0) ||
(lst(i,j,k) > Real(0.0) && is_nan))
(lst(i,j,k) > Real(0.0) && no_inter))
{
inter(i,j,k) = problo[1] + j*dx[1];
}
else if (lst(i,j+1,k) == Real(0.0) ||
(lst(i,j+1,k) > Real(0.0) && is_nan))
(lst(i,j+1,k) > Real(0.0) && no_inter))
{
inter(i,j,k) = problo[1] + (j+1)*dx[1];
}
} else {
if (lst(i,j,k) == Real(0.0) ||
(lst(i,j,k) > Real(0.0) && is_nan))
(lst(i,j,k) > Real(0.0) && no_inter))
{
inter(i,j,k) = problo[2] + k*dx[2];
}
else if (lst(i,j,k+1) == Real(0.0) ||
(lst(i,j,k+1) > Real(0.0) && is_nan))
(lst(i,j,k+1) > Real(0.0) && no_inter))
{
inter(i,j,k) = problo[2] + (k+1)*dx[2];
}
Expand Down
4 changes: 4 additions & 0 deletions Src/EB/AMReX_EB2_Graph.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <unordered_map>
#include <utility>
#include <cstdint>
#include <limits>

/**
* \file AMReX_EB2_Graph.H
Expand Down Expand Up @@ -52,6 +53,9 @@ namespace Type {
static constexpr Type_t unknown=0x3;
}

//! \brief Marker stored in an edge intercept array when the edge has no intercept.
static constexpr Real no_intercept = std::numeric_limits<Real>::max();

//! Packed neighbor structure that tracks the neighbor type in every direction.
struct Neighbor
{
Expand Down
22 changes: 11 additions & 11 deletions Src/EB/AMReX_EB_STL_utils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1117,7 +1117,7 @@ STLtools::getIntercept (Array<Array4<Real>,AMREX_SPACEDIM> const& inter_arr,
#ifdef AMREX_USE_CUDA
amrex::ignore_unused(num_triangles,tri_pts,tri_norm,lst,bvh_root);
#endif
Real r = std::numeric_limits<Real>::quiet_NaN();
Real r = EB2::no_intercept;
if (type(i,j,k) == EB2::Type::irregular) {
XDim3 p1{.x = plo[0]+static_cast<Real>(i)*dx[0],
.y = plo[1]+static_cast<Real>(j)*dx[1],
Expand Down Expand Up @@ -1280,40 +1280,40 @@ STLtools::updateIntercept (Array<Array4<Real>,AMREX_SPACEDIM> const& inter_arr,
amrex::ParallelFor(bx, [=] AMREX_GPU_DEVICE (int i, int j, int k)
{
if (type(i,j,k) == EB2::Type::irregular) {
bool is_nan = amrex::isnan(inter(i,j,k));
bool no_inter = (inter(i,j,k) == EB2::no_intercept);
if (idim == 0) {
if (lst(i,j,k) == Real(0.0) ||
(lst(i,j,k) > Real(0.0) && is_nan))
(lst(i,j,k) > Real(0.0) && no_inter))
{
// interp might still be quiet_nan because lst that
// was set to zero has been changed by FillBoundary
// at periodic boundaries.
// The edge can still be without an intercept because
// lst that was set to zero has been changed by
// FillBoundary at periodic boundaries.
inter(i,j,k) = problo[0] + static_cast<Real>(i)*dx[0];
}
else if (lst(i+1,j,k) == Real(0.0) ||
(lst(i+1,j,k) > Real(0.0) && is_nan))
(lst(i+1,j,k) > Real(0.0) && no_inter))
{
inter(i,j,k) = problo[0] + static_cast<Real>(i+1)*dx[0];
}
} else if (idim == 1) {
if (lst(i,j,k) == Real(0.0) ||
(lst(i,j,k) > Real(0.0) && is_nan))
(lst(i,j,k) > Real(0.0) && no_inter))
{
inter(i,j,k) = problo[1] + static_cast<Real>(j)*dx[1];
}
else if (lst(i,j+1,k) == Real(0.0) ||
(lst(i,j+1,k) > Real(0.0) && is_nan))
(lst(i,j+1,k) > Real(0.0) && no_inter))
{
inter(i,j,k) = problo[1] + static_cast<Real>(j+1)*dx[1];
}
} else {
if (lst(i,j,k) == Real(0.0) ||
(lst(i,j,k) > Real(0.0) && is_nan))
(lst(i,j,k) > Real(0.0) && no_inter))
{
inter(i,j,k) = problo[2] + static_cast<Real>(k)*dx[2];
}
else if (lst(i,j,k+1) == Real(0.0) ||
(lst(i,j,k+1) > Real(0.0) && is_nan))
(lst(i,j,k+1) > Real(0.0) && no_inter))
{
inter(i,j,k) = problo[2] + static_cast<Real>(k+1)*dx[2];
}
Expand Down
Loading