Skip to content

cosmetic cleanup #6828

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 2 commits into from
Apr 30, 2026
Merged

cosmetic cleanup #6828

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
00a49ae
cosmetic cleanup
JustinRayAngus Apr 30, 2026
b4b4d8e
remove namespace amrex
JustinRayAngus Apr 30, 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
30 changes: 15 additions & 15 deletions Source/FieldSolver/WarpXPushFieldsEM.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1400,8 +1400,8 @@ void
WarpX::ApplyInverseVolumeScalingToCurrentDensity (MultiFab* Jx, MultiFab* Jy, MultiFab* Jz, int lev) const
{
const amrex::IntVect ngJ = Jx->nGrowVect();
Comment thread
JustinRayAngus marked this conversation as resolved.
const std::array<Real,3>& dx = CellSize(lev);
const Real dr = dx[0];
const std::array<amrex::Real,3>& dx = CellSize(lev);
const amrex::Real dr = dx[0];

constexpr int NODE = amrex::IndexType::NODE;

Expand All @@ -1410,27 +1410,27 @@ WarpX::ApplyInverseVolumeScalingToCurrentDensity (MultiFab* Jx, MultiFab* Jy, Mu
const amrex::Real axis_volume_factor = (m_verboncoeur_axis_correction ? 1._rt/3._rt : 1._rt/4._rt);
#endif

for ( MFIter mfi(*Jx, TilingIfNotGPU()); mfi.isValid(); ++mfi )
for ( amrex::MFIter mfi(*Jx, TilingIfNotGPU()); mfi.isValid(); ++mfi )
{

Array4<Real> const& Jr_arr = Jx->array(mfi);
Array4<Real> const& Jt_arr = Jy->array(mfi);
Array4<Real> const& Jz_arr = Jz->array(mfi);
amrex::Array4<amrex::Real> const& Jr_arr = Jx->array(mfi);
amrex::Array4<amrex::Real> const& Jt_arr = Jy->array(mfi);
amrex::Array4<amrex::Real> const& Jz_arr = Jz->array(mfi);

Box const & tilebox = mfi.tilebox();
Box tbr = convert( tilebox, Jx->ixType().toIntVect() );
Box tbt = convert( tilebox, Jy->ixType().toIntVect() );
Box tbz = convert( tilebox, Jz->ixType().toIntVect() );
amrex::Box const & tilebox = mfi.tilebox();
amrex::Box tbr = convert( tilebox, Jx->ixType().toIntVect() );
amrex::Box tbt = convert( tilebox, Jy->ixType().toIntVect() );
amrex::Box tbz = convert( tilebox, Jz->ixType().toIntVect() );

// Lower corner of tile box physical domain
// Note that this is done before the tilebox.grow so that
// these do not include the guard cells.
const amrex::XDim3 xyzmin = WarpX::LowerCorner(tilebox, lev, 0._rt);
const Real rmin = xyzmin.x;
const Real rminr = xyzmin.x + (tbr.type(0) == NODE ? 0._rt : 0.5_rt*dx[0]);
const Real rmint = xyzmin.x + (tbt.type(0) == NODE ? 0._rt : 0.5_rt*dx[0]);
const Real rminz = xyzmin.x + (tbz.type(0) == NODE ? 0._rt : 0.5_rt*dx[0]);
const Dim3 lo = lbound(tilebox);
const amrex::Real rmin = xyzmin.x;
const amrex::Real rminr = xyzmin.x + (tbr.type(0) == NODE ? 0._rt : 0.5_rt*dx[0]);
const amrex::Real rmint = xyzmin.x + (tbt.type(0) == NODE ? 0._rt : 0.5_rt*dx[0]);
const amrex::Real rminz = xyzmin.x + (tbz.type(0) == NODE ? 0._rt : 0.5_rt*dx[0]);
const amrex::Dim3 lo = lbound(tilebox);
const int irmin = lo.x;

// For ishift, 1 means cell centered, 0 means node centered
Expand Down
Loading
Loading