aboutsummaryrefslogtreecommitdiff
path: root/Source/Particles/WarpXParticleContainer.cpp
diff options
context:
space:
mode:
authorGravatar Andrew Myers <atmyers2@gmail.com> 2020-01-29 12:54:42 -0800
committerGravatar Andrew Myers <atmyers2@gmail.com> 2020-01-29 12:54:42 -0800
commit1b3a5b73df4937559ee76fbbb189f88c661df54e (patch)
tree6a486ec1e753fb9126ed572e6750397bd7b12cff /Source/Particles/WarpXParticleContainer.cpp
parent4f2cbd2f3525d9f97aeeb00d0a205ab271135235 (diff)
downloadWarpX-1b3a5b73df4937559ee76fbbb189f88c661df54e.tar.gz
WarpX-1b3a5b73df4937559ee76fbbb189f88c661df54e.tar.zst
WarpX-1b3a5b73df4937559ee76fbbb189f88c661df54e.zip
rename get/set particle position functors
Diffstat (limited to 'Source/Particles/WarpXParticleContainer.cpp')
-rw-r--r--Source/Particles/WarpXParticleContainer.cpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp
index 581565a5f..a45b764eb 100644
--- a/Source/Particles/WarpXParticleContainer.cpp
+++ b/Source/Particles/WarpXParticleContainer.cpp
@@ -286,7 +286,7 @@ WarpXParticleContainer::DepositCurrent(WarpXParIter& pti,
// CPU, tiling: deposit into local_jx
// (same for jx and jz)
- const auto get_position = GetPosition(pti, offset);
+ const auto GetPosition = GetParticlePosition(pti, offset);
// Lower corner of tile box physical domain
// Note that this includes guard cells since it is after tilebox.ngrow
@@ -297,19 +297,19 @@ WarpXParticleContainer::DepositCurrent(WarpXParIter& pti,
if (WarpX::current_deposition_algo == CurrentDepositionAlgo::Esirkepov) {
if (WarpX::nox == 1){
doEsirkepovDepositionShapeN<1>(
- get_position, wp.dataPtr() + offset, uxp.dataPtr() + offset,
+ GetPosition, wp.dataPtr() + offset, uxp.dataPtr() + offset,
uyp.dataPtr() + offset, uzp.dataPtr() + offset, ion_lev,
jx_arr, jy_arr, jz_arr, np_to_depose, dt, dx, xyzmin, lo, q,
WarpX::n_rz_azimuthal_modes);
} else if (WarpX::nox == 2){
doEsirkepovDepositionShapeN<2>(
- get_position, wp.dataPtr() + offset, uxp.dataPtr() + offset,
+ GetPosition, wp.dataPtr() + offset, uxp.dataPtr() + offset,
uyp.dataPtr() + offset, uzp.dataPtr() + offset, ion_lev,
jx_arr, jy_arr, jz_arr, np_to_depose, dt, dx, xyzmin, lo, q,
WarpX::n_rz_azimuthal_modes);
} else if (WarpX::nox == 3){
doEsirkepovDepositionShapeN<3>(
- get_position, wp.dataPtr() + offset, uxp.dataPtr() + offset,
+ GetPosition, wp.dataPtr() + offset, uxp.dataPtr() + offset,
uyp.dataPtr() + offset, uzp.dataPtr() + offset, ion_lev,
jx_arr, jy_arr, jz_arr, np_to_depose, dt, dx, xyzmin, lo, q,
WarpX::n_rz_azimuthal_modes);
@@ -317,19 +317,19 @@ WarpXParticleContainer::DepositCurrent(WarpXParIter& pti,
} else {
if (WarpX::nox == 1){
doDepositionShapeN<1>(
- get_position, wp.dataPtr() + offset, uxp.dataPtr() + offset,
+ GetPosition, wp.dataPtr() + offset, uxp.dataPtr() + offset,
uyp.dataPtr() + offset, uzp.dataPtr() + offset, ion_lev,
jx_fab, jy_fab, jz_fab, np_to_depose, dt, dx,
xyzmin, lo, q);
} else if (WarpX::nox == 2){
doDepositionShapeN<2>(
- get_position, wp.dataPtr() + offset, uxp.dataPtr() + offset,
+ GetPosition, wp.dataPtr() + offset, uxp.dataPtr() + offset,
uyp.dataPtr() + offset, uzp.dataPtr() + offset, ion_lev,
jx_fab, jy_fab, jz_fab, np_to_depose, dt, dx,
xyzmin, lo, q);
} else if (WarpX::nox == 3){
doDepositionShapeN<3>(
- get_position, wp.dataPtr() + offset, uxp.dataPtr() + offset,
+ GetPosition, wp.dataPtr() + offset, uxp.dataPtr() + offset,
uyp.dataPtr() + offset, uzp.dataPtr() + offset, ion_lev,
jx_fab, jy_fab, jz_fab, np_to_depose, dt, dx,
xyzmin, lo, q);
@@ -423,7 +423,7 @@ WarpXParticleContainer::DepositCharge (WarpXParIter& pti, RealVector& wp,
// GPU, no tiling: deposit directly in rho
// CPU, tiling: deposit into local_rho
- const auto get_position = GetPosition(pti, offset);
+ const auto GetPosition = GetParticlePosition(pti, offset);
// Lower corner of tile box physical domain
// Note that this includes guard cells since it is after tilebox.ngrow
@@ -433,13 +433,13 @@ WarpXParticleContainer::DepositCharge (WarpXParIter& pti, RealVector& wp,
BL_PROFILE_VAR_START(blp_ppc_chd);
if (WarpX::nox == 1){
- doChargeDepositionShapeN<1>(get_position, wp.dataPtr()+offset, ion_lev,
+ doChargeDepositionShapeN<1>(GetPosition, wp.dataPtr()+offset, ion_lev,
rho_arr, np_to_depose, dx, xyzmin, lo, q);
} else if (WarpX::nox == 2){
- doChargeDepositionShapeN<2>(get_position, wp.dataPtr()+offset, ion_lev,
+ doChargeDepositionShapeN<2>(GetPosition, wp.dataPtr()+offset, ion_lev,
rho_arr, np_to_depose, dx, xyzmin, lo, q);
} else if (WarpX::nox == 3){
- doChargeDepositionShapeN<3>(get_position, wp.dataPtr()+offset, ion_lev,
+ doChargeDepositionShapeN<3>(GetPosition, wp.dataPtr()+offset, ion_lev,
rho_arr, np_to_depose, dx, xyzmin, lo, q);
}
BL_PROFILE_VAR_STOP(blp_ppc_chd);
@@ -733,8 +733,8 @@ WarpXParticleContainer::PushX (int lev, amrex::Real dt)
// Particle Push
//
- const auto get_position = GetPosition(pti);
- auto set_position = SetPosition(pti);
+ const auto GetPosition = GetParticlePosition(pti);
+ auto SetPosition = SetParticlePosition(pti);
// - momenta are stored as a struct of array, in `attribs`
auto& attribs = pti.GetAttribs();
@@ -750,9 +750,9 @@ WarpXParticleContainer::PushX (int lev, amrex::Real dt)
amrex::ParallelFor( pti.numParticles(),
[=] AMREX_GPU_DEVICE (long i) {
ParticleReal x, y, z;
- get_position(i, x, y, z);
+ GetPosition(i, x, y, z);
UpdatePosition(x, y, z, ux[i], uy[i], uz[i], dt);
- set_position(i, x, y, z);
+ SetPosition(i, x, y, z);
}
);