Skip to content

Fix RSPHERE Cartesian particle position conversion #7194

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
JustinRayAngus merged 3 commits into from
Aug 28, 2026
Merged

Fix RSPHERE Cartesian particle position conversion #7194

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e3a0e6
Fix RSPHERE Cartesian particle position conversion
tomzhu0225 Aug 26, 2026
3d29089
Particles: use computed radial coordinate for RCYLINDER and RSPHERE
tomzhu0225 Aug 27, 2026
40cd017
Tests: remove standalone integration test as requested
tomzhu0225 Aug 27, 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
4 changes: 2 additions & 2 deletions Source/Particles/WarpXParticleContainer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ WarpXParticleContainer::AddNParticles (int /*lev*/, long n,
r[i-ibegin] = std::sqrt(x[i]*x[i] + y[i]*y[i] + z[i]*z[i]);
theta[i-ibegin] = std::atan2(y[i], x[i]);
const amrex::ParticleReal rxy = std::sqrt(x[i]*x[i] + y[i]*y[i]);
phi[i-ibegin] = std::atan2(rxy, r[i-ibegin]);
phi[i-ibegin] = std::atan2(z[i], rxy);
#endif
}

Expand All @@ -274,7 +274,7 @@ WarpXParticleContainer::AddNParticles (int /*lev*/, long n,
amrex::ignore_unused(x,y);
pinned_tile.push_back_real(PIdx::z, z.data() + ibegin, z.data() + iend);
#elif defined(WARPX_DIM_RCYLINDER) || defined(WARPX_DIM_RSPHERE)

@dpgrote dpgrote Aug 26, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This section should be:

#elif defined(WARPX_DIM_RCYLINDER) || defined(WARPX_DIM_RSPHERE)
    pinned_tile.push_back_real(PIdx::r, r.data(), r.data() + np);
    amrex::ignore_unused(y,z);
#endif

The same line works for both sphere and cylinder.

@tomzhu0225 tomzhu0225 Aug 27, 2026

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, thanks! Updated to use the computed radial coordinate r for both RCYLINDER and RSPHERE.

pinned_tile.push_back_real(PIdx::r, x.data() + ibegin, x.data() + iend);
pinned_tile.push_back_real(PIdx::r, r.data(), r.data() + np);
amrex::ignore_unused(y,z);
#endif

Expand Down
Loading