diff options
author | 2019-08-05 09:08:14 -0700 | |
---|---|---|
committer | 2019-08-05 09:08:14 -0700 | |
commit | 3edf359a72e4f6fb2add1192ea8036cfd81ebbc2 (patch) | |
tree | 9d492d34c23ef6de1d5ccb046d80bfb4b0bad8cf /Source/Particles/RigidInjectedParticleContainer.cpp | |
parent | 1b4088ea5585e75d7845f5e2a72afa57444927fd (diff) | |
parent | 2dbc3149dde9aa792b9eda3a8fc01607077f471d (diff) | |
download | WarpX-3edf359a72e4f6fb2add1192ea8036cfd81ebbc2.tar.gz WarpX-3edf359a72e4f6fb2add1192ea8036cfd81ebbc2.tar.zst WarpX-3edf359a72e4f6fb2add1192ea8036cfd81ebbc2.zip |
Merge branch 'dev' into convert_RZ
Diffstat (limited to 'Source/Particles/RigidInjectedParticleContainer.cpp')
-rw-r--r-- | Source/Particles/RigidInjectedParticleContainer.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp index 84c14dd7c..83556e69f 100644 --- a/Source/Particles/RigidInjectedParticleContainer.cpp +++ b/Source/Particles/RigidInjectedParticleContainer.cpp @@ -421,6 +421,7 @@ RigidInjectedParticleContainer::PushP (int lev, Real dt, // pti.GetPosition(m_xp[thread_num], m_yp[thread_num], m_zp[thread_num]); +#ifdef WARPX_RZ const std::array<Real,3>& xyzmin_grid = WarpX::LowerCorner(box, lev); const int* ixyzmin_grid = box.loVect(); @@ -446,6 +447,12 @@ RigidInjectedParticleContainer::PushP (int lev, Real dt, BL_TO_FORTRAN_ANYD(bzfab), &ll4symtry, &WarpX::l_lower_order_in_v, &WarpX::do_nodal, &lvect_fieldgathe, &WarpX::field_gathering_algo); +#else + int e_is_nodal = Ex.is_nodal() and Ey.is_nodal() and Ez.is_nodal(); + FieldGather(pti, Exp, Eyp, Ezp, Bxp, Byp, Bzp, + &exfab, &eyfab, &ezfab, &bxfab, &byfab, &bzfab, + Ex.nGrow(), e_is_nodal, 0, np, thread_num, lev, lev); +#endif // Save the position and momenta, making copies auto uxp_save = uxp; |