diff options
| author |  Maxence Thevenet <mthevenet@lbl.gov>
| 2019-10-10 19:31:59 -0400 |
|---|---|---|
| committer | Maxence Thevenet <mthevenet@lbl.gov>
| 2019-10-10 19:31:59 -0400 |
| commit | afd397c38c8e79dbb5939a67438af5a519866f11 (patch) | |
| tree | 1888d1e1b5de34ed0ac5f056157e7599f32a3e44 | |
| parent | 47067b56cc8a43a76bcf6e01a41f5ce3a2fa27d5 (diff) | |
| download | WarpX-afd397c38c8e79dbb5939a67438af5a519866f11.tar.gz WarpX-afd397c38c8e79dbb5939a67438af5a519866f11.tar.zst WarpX-afd397c38c8e79dbb5939a67438af5a519866f11.zip | |
get pointer so that it compiles on GPU. That's ugly :/
| -rw-r--r-- | Source/Particles/ParticleCreation/ElementaryProcess.H | 7 | ||||
| -rw-r--r-- | Source/Particles/ParticleCreation/TransformParticle.H | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/Source/Particles/ParticleCreation/ElementaryProcess.H b/Source/Particles/ParticleCreation/ElementaryProcess.H index d6c1fdaa6..4c47b7f52 100644 --- a/Source/Particles/ParticleCreation/ElementaryProcess.H +++ b/Source/Particles/ParticleCreation/ElementaryProcess.H @@ -125,7 +125,7 @@ public: // amrex::Vector<copyParticle> v_copy_functor(nproducts); amrex::Vector<copyParticle> v_copy_functor; amrex::Vector<int> v_pid_product(nproducts); - amrex::Vector<WarpXParticleContainer::ParticleType*> v_particles_product(nproducts); + amrex::Gpu::ManagedDeviceVector<WarpXParticleContainer::ParticleType*> v_particles_product(nproducts); for (int iproduct=0; iproduct<nproducts; iproduct++){ WarpXParticleContainer*& pc_product = v_pc_product[iproduct]; // Get product particle data @@ -206,13 +206,14 @@ public: amrex::Gpu::ManagedDeviceVector<int>& i_product, int np_source, const amrex::Vector<int> v_pid_product, - const amrex::Vector<WarpXParticleContainer::ParticleType*> v_particles_product, + const amrex::Gpu::ManagedDeviceVector<WarpXParticleContainer::ParticleType*> v_particles_product, WarpXParticleContainer::ParticleType* particles_source, const amrex::Vector<copyParticle>& v_copy_functor, amrex::GpuArray<int*,1> runtime_iattribs_source) { int const * const AMREX_RESTRICT p_is_flagged = is_flagged.dataPtr(); int const * const AMREX_RESTRICT p_i_product = i_product.dataPtr(); + WarpXParticleContainer::ParticleType* const * const AMREX_RESTRICT p_particles_product = v_particles_product.dataPtr(); // Loop over all source particles. If is_flagged, copy particle data // to corresponding product particle. amrex::For( @@ -237,7 +238,7 @@ public: // Transform product particles. The loop over product // species is done inside the function to allow for // more flexibility. - transformProductParticle<ProcessT>(ip, v_particles_product); + transformProductParticle<ProcessT>(ip, p_particles_product); } } ); diff --git a/Source/Particles/ParticleCreation/TransformParticle.H b/Source/Particles/ParticleCreation/TransformParticle.H index 1e5385d76..c202cb6d7 100644 --- a/Source/Particles/ParticleCreation/TransformParticle.H +++ b/Source/Particles/ParticleCreation/TransformParticle.H @@ -27,7 +27,7 @@ template < elementaryProcessType ProcessT > AMREX_GPU_HOST_DEVICE AMREX_FORCE_INLINE void transformProductParticle( int i, - amrex::Vector<WarpXParticleContainer::ParticleType*> v_particle){} + WarpXParticleContainer::ParticleType* const * const v_particle){} // For ionization, increase ionization level of source particle template <> |