Skip to content

#2534: Don't access position vector values beyond the configured dimension #2536

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
merged 5 commits into from
Nov 10, 2021
Merged

#2534: Don't access position vector values beyond the configured dimension #2536

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
986d2be
#2534: Don't access position vector values beyond the configured dime…
PhilMiller Nov 9, 2021
d5fd7c5
Fix particle position component used in XZ configuration
PhilMiller Nov 9, 2021
fea74f0
Handle 1D case
PhilMiller Nov 9, 2021
cd17240
Move values only used in scraping function into inside-boundary condi…
PhilMiller Nov 9, 2021
8c5be5c
Error out if scraping from EB in RZ
PhilMiller Nov 9, 2021
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: 16 additions & 8 deletions Source/EmbeddedBoundary/ParticleScraper.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,17 +168,25 @@ scrapeParticles (PC& pc, const amrex::Vector<const amrex::MultiFab*>& distance_t
compute_weights_nodal(xp, yp, zp, plo, dxi, i, j, k, W);

amrex::Real phi_value = interp_field_nodal(i, j, k, W, phi);
amrex::RealVect normal = DistanceToEB::interp_normal(i, j, k, W, phi, dxi);

// the closest point on the surface to pos is pos - grad phi(pos) * phi(pos)
amrex::RealVect pos;
pos[0] = xp - normal[0]*phi_value;
pos[1] = yp - normal[1]*phi_value;
pos[2] = zp - normal[2]*phi_value;
if (phi_value < 0.0)
{
amrex::RealVect normal = DistanceToEB::interp_normal(i, j, k, W, phi, dxi);

DistanceToEB::normalize(normal);
// the closest point on the surface to pos is pos - grad phi(pos) * phi(pos)
amrex::RealVect pos;
#if (defined WARPX_DIM_3D)
pos[0] = xp - normal[0]*phi_value;
pos[1] = yp - normal[1]*phi_value;
pos[2] = zp - normal[2]*phi_value;
#elif (defined WARPX_DIM_XZ)
pos[0] = xp - normal[0]*phi_value;
pos[1] = zp - normal[1]*phi_value;
#elif defined(WARPX_DIM_1D_Z)
pos[0] = zp - normal[0]*phi_value;
#endif
DistanceToEB::normalize(normal);

if (phi_value < 0.0) {
f(ptd, ip, pos, normal, engine);
}
});
Expand Down