diff options
| author |  Dave Grote <grote1@llnl.gov>
| 2019-04-18 11:26:51 -0700 |
|---|---|---|
| committer | Dave Grote <grote1@llnl.gov>
| 2019-04-18 11:26:51 -0700 |
| commit | 5ed1a16ace5ed9d32e18e25b23ef87996679b4dc (patch) | |
| tree | 110be73bd454bf2a673e2aa73b26b16cea29865c /Source/Particles/RigidInjectedParticleContainer.cpp | |
| parent | be0cbe26c1914f14e059be84b546934a3933ab85 (diff) | |
| parent | ae239587668bbadc742ce5992afc6d6f814c5a3c (diff) | |
| download | WarpX-5ed1a16ace5ed9d32e18e25b23ef87996679b4dc.tar.gz WarpX-5ed1a16ace5ed9d32e18e25b23ef87996679b4dc.tar.zst WarpX-5ed1a16ace5ed9d32e18e25b23ef87996679b4dc.zip | |
Merge branch 'dev' into RZgeometry
Diffstat (limited to 'Source/Particles/RigidInjectedParticleContainer.cpp')
| -rw-r--r-- | Source/Particles/RigidInjectedParticleContainer.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/Particles/RigidInjectedParticleContainer.cpp b/Source/Particles/RigidInjectedParticleContainer.cpp index db3623705..3ee4d87e5 100644 --- a/Source/Particles/RigidInjectedParticleContainer.cpp +++ b/Source/Particles/RigidInjectedParticleContainer.cpp @@ -73,7 +73,7 @@ RigidInjectedParticleContainer::RemapParticles() // Note that the particles are already in the boosted frame. // This value is saved to advance the particles not injected yet - Cuda::DeviceVector<Real> xp, yp, zp; + Cuda::ManagedDeviceVector<Real> xp, yp, zp; for (WarpXParIter pti(*this, lev); pti.isValid(); ++pti) { @@ -134,7 +134,7 @@ RigidInjectedParticleContainer::BoostandRemapParticles() #pragma omp parallel #endif { - Cuda::DeviceVector<Real> xp, yp, zp; + Cuda::ManagedDeviceVector<Real> xp, yp, zp; for (WarpXParIter pti(*this, 0); pti.isValid(); ++pti) { @@ -205,10 +205,10 @@ RigidInjectedParticleContainer::BoostandRemapParticles() void RigidInjectedParticleContainer::PushPX(WarpXParIter& pti, - Cuda::DeviceVector<Real>& xp, - Cuda::DeviceVector<Real>& yp, - Cuda::DeviceVector<Real>& zp, - Cuda::DeviceVector<Real>& giv, + Cuda::ManagedDeviceVector<Real>& xp, + Cuda::ManagedDeviceVector<Real>& yp, + Cuda::ManagedDeviceVector<Real>& zp, + Cuda::ManagedDeviceVector<Real>& giv, Real dt) { @@ -241,7 +241,7 @@ RigidInjectedParticleContainer::PushPX(WarpXParIter& pti, #endif // Save the position and momenta, making copies - Cuda::DeviceVector<Real> xp_save, yp_save, zp_save; + Cuda::ManagedDeviceVector<Real> xp_save, yp_save, zp_save; RealVector uxp_save, uyp_save, uzp_save; if (!done_injecting_lev) { @@ -362,7 +362,7 @@ RigidInjectedParticleContainer::PushP (int lev, Real dt, #pragma omp parallel #endif { - Cuda::DeviceVector<Real> xp, yp, zp, giv; + Cuda::ManagedDeviceVector<Real> xp, yp, zp, giv; for (WarpXParIter pti(*this, lev); pti.isValid(); ++pti) { |