diff options
| author |  MaxThevenet <mthevenet@lbl.gov>
| 2019-05-02 11:21:13 -0700 |
|---|---|---|
| committer | MaxThevenet <mthevenet@lbl.gov>
| 2019-05-02 11:21:13 -0700 |
| commit | 4f3003521c4f2fe8c8a64b33cc4d56ebb1c5db7c (patch) | |
| tree | 723c529f1b7a24f86c606fa30479cd43708aedac /Source/Particles/PhysicalParticleContainer.H | |
| parent | 5c8e911b1569d5015b2153fba05fbd2d798cc392 (diff) | |
| parent | 341cd1b2af8ae96f261f7979c1dcf126f424cf60 (diff) | |
| download | WarpX-4f3003521c4f2fe8c8a64b33cc4d56ebb1c5db7c.tar.gz WarpX-4f3003521c4f2fe8c8a64b33cc4d56ebb1c5db7c.tar.zst WarpX-4f3003521c4f2fe8c8a64b33cc4d56ebb1c5db7c.zip | |
fix conflicts
Diffstat (limited to 'Source/Particles/PhysicalParticleContainer.H')
| -rw-r--r-- | Source/Particles/PhysicalParticleContainer.H | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/Particles/PhysicalParticleContainer.H b/Source/Particles/PhysicalParticleContainer.H index 5847a6359..362683879 100644 --- a/Source/Particles/PhysicalParticleContainer.H +++ b/Source/Particles/PhysicalParticleContainer.H @@ -64,10 +64,10 @@ public: amrex::Real dt) override; virtual void PushPX(WarpXParIter& pti, - amrex::Cuda::DeviceVector<amrex::Real>& xp, - amrex::Cuda::DeviceVector<amrex::Real>& yp, - amrex::Cuda::DeviceVector<amrex::Real>& zp, - amrex::Cuda::DeviceVector<amrex::Real>& giv, + amrex::Cuda::ManagedDeviceVector<amrex::Real>& xp, + amrex::Cuda::ManagedDeviceVector<amrex::Real>& yp, + amrex::Cuda::ManagedDeviceVector<amrex::Real>& zp, + amrex::Cuda::ManagedDeviceVector<amrex::Real>& giv, amrex::Real dt); virtual void PushP (int lev, amrex::Real dt, |