diff options
author | 2020-01-10 10:57:40 -0800 | |
---|---|---|
committer | 2020-01-10 10:57:40 -0800 | |
commit | db2ae73960360105170e225ef409a66f2964f44f (patch) | |
tree | 69f946406a3a47abe577d080f0bde549c5f4b254 /Source/Particles/PhysicalParticleContainer.cpp | |
parent | d5b6e8fd7f157e4b9c899086baa0a0a276780b67 (diff) | |
parent | 160d752af70ec454c7b220705378c42e0df9b29a (diff) | |
download | WarpX-db2ae73960360105170e225ef409a66f2964f44f.tar.gz WarpX-db2ae73960360105170e225ef409a66f2964f44f.tar.zst WarpX-db2ae73960360105170e225ef409a66f2964f44f.zip |
Merge branch 'dev' of https://github.com/ECP-WarpX/WarpX into ParticlesEBParser
Diffstat (limited to 'Source/Particles/PhysicalParticleContainer.cpp')
-rw-r--r-- | Source/Particles/PhysicalParticleContainer.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/Particles/PhysicalParticleContainer.cpp b/Source/Particles/PhysicalParticleContainer.cpp index ebb2b4082..eae1b2964 100644 --- a/Source/Particles/PhysicalParticleContainer.cpp +++ b/Source/Particles/PhysicalParticleContainer.cpp @@ -450,7 +450,8 @@ PhysicalParticleContainer::AddPlasma (int lev, RealBox part_realbox) overlap_box.setBig( dir, int( std::round((overlap_realbox.hi(dir)-overlap_realbox.lo(dir)) /dx[dir] )) - 1); - shifted[dir] = std::round((overlap_realbox.lo(dir)-problo[dir])/dx[dir]); + shifted[dir] = + static_cast<int>(std::round((overlap_realbox.lo(dir)-problo[dir])/dx[dir])); // shifted is exact in non-moving-window direction. That's all we care. } if (no_overlap == 1) { @@ -580,7 +581,8 @@ PhysicalParticleContainer::AddPlasma (int lev, RealBox part_realbox) IntVect iv = overlap_box.atOffset(cellid); - const XDim3 r = inj_pos->getPositionUnitBox(i_part, fac); + const XDim3 r = + inj_pos->getPositionUnitBox(i_part, static_cast<int>(fac)); #if (AMREX_SPACEDIM == 3) Real x = overlap_corner[0] + (iv[0]+r.x)*dx[0]; Real y = overlap_corner[1] + (iv[1]+r.y)*dx[1]; @@ -1671,10 +1673,9 @@ PhysicalParticleContainer::PushPX(WarpXParIter& pti, #ifdef WARPX_QED - auto t_chi_max = m_shr_p_qs_engine->get_ref_ctrl().chi_part_min; - if(do_classical_radiation_reaction){ if(m_do_qed_quantum_sync){ + const auto t_chi_max = m_shr_p_qs_engine->get_ref_ctrl().chi_part_min; amrex::ParallelFor( pti.numParticles(), [=] AMREX_GPU_DEVICE (long i) { |