diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-09-05 09:05:43 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-09-05 09:05:43 -0700 |
| commit | 921aabfc512c68faea6d1cce363f1e4ae1452cd2 (patch) | |
| tree | 01e750cad2a9e3ba7218424e65c175830af88a1c /Source/Particles/RigidInjectedParticleContainer.cpp | |
| parent | d55fd6f190470cb56cfcbf3435d8b14a3ef597b8 (diff) | |
| parent | b93dce4d62b9a3014641f0df551fd7de453126ba (diff) | |
| download | WarpX-921aabfc512c68faea6d1cce363f1e4ae1452cd2.tar.gz WarpX-921aabfc512c68faea6d1cce363f1e4ae1452cd2.tar.zst WarpX-921aabfc512c68faea6d1cce363f1e4ae1452cd2.zip | |
fix merge conflicts
Diffstat (limited to 'Source/Particles/RigidInjectedParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/RigidInjectedParticleContainer.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp index 0c94d1e33..4893b3294 100644 --- a/Source/Particles/RigidInjectedParticleContainer.cpp +++ b/Source/Particles/RigidInjectedParticleContainer.cpp @@ -409,7 +409,8 @@ RigidInjectedParticleContainer::PushP (int lev, Real dt, 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); + Ex.nGrow(), e_is_nodal, + 0, np, thread_num, lev, lev); // Save the position and momenta, making copies auto uxp_save = uxp; |