diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-09-20 08:31:15 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-09-20 08:31:15 -0700 |
| commit | e6f4766746f2cf5954babea96252cea010cffae4 (patch) | |
| tree | b9ee6e4fa52769bf46bc092b3fa7114af141d9b8 /Source/Particles/PhysicalParticleContainer.cpp | |
| parent | 81ba2d8fd0d5ed8e045014126590e510057dee57 (diff) | |
| parent | 9d739e1779281296c9a8c17b022b4e88b052feb8 (diff) | |
| download | WarpX-e6f4766746f2cf5954babea96252cea010cffae4.tar.gz WarpX-e6f4766746f2cf5954babea96252cea010cffae4.tar.zst WarpX-e6f4766746f2cf5954babea96252cea010cffae4.zip | |
Merge branch 'dev' into physics_constants
Diffstat (limited to 'Source/Particles/PhysicalParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index 4bc0ee16e..8a30b3acb 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -942,7 +942,7 @@ PhysicalParticleContainer::Evolve (int lev, MultiFab* rho, MultiFab* crho, const MultiFab* cEx, const MultiFab* cEy, const MultiFab* cEz, const MultiFab* cBx, const MultiFab* cBy, const MultiFab* cBz, - Real t, Real dt) + Real t, Real dt, DtType a_dt_type) { BL_PROFILE("PPC::Evolve()"); BL_PROFILE_VAR_NS("PPC::Evolve::Copy", blp_copy); @@ -1301,7 +1301,7 @@ PhysicalParticleContainer::Evolve (int lev, // Particle Push // BL_PROFILE_VAR_START(blp_ppc_pp); - PushPX(pti, m_xp[thread_num], m_yp[thread_num], m_zp[thread_num], dt); + PushPX(pti, m_xp[thread_num], m_yp[thread_num], m_zp[thread_num], dt, a_dt_type); BL_PROFILE_VAR_STOP(blp_ppc_pp); // @@ -1526,7 +1526,7 @@ PhysicalParticleContainer::PushPX(WarpXParIter& pti, Cuda::ManagedDeviceVector<Real>& xp, Cuda::ManagedDeviceVector<Real>& yp, Cuda::ManagedDeviceVector<Real>& zp, - Real dt) + Real dt, DtType a_dt_type) { // This wraps the momentum and position advance so that inheritors can modify the call. @@ -1545,7 +1545,7 @@ PhysicalParticleContainer::PushPX(WarpXParIter& pti, const Real* const AMREX_RESTRICT By = attribs[PIdx::By].dataPtr(); const Real* const AMREX_RESTRICT Bz = attribs[PIdx::Bz].dataPtr(); - if (WarpX::do_boosted_frame_diagnostic && do_boosted_frame_diags) + if (WarpX::do_boosted_frame_diagnostic && do_boosted_frame_diags && (a_dt_type!=DtType::SecondHalf)) { copy_attribs(pti, x, y, z); } |