diff options
author | 2019-11-12 14:51:21 -0800 | |
---|---|---|
committer | 2019-11-12 14:57:28 -0800 | |
commit | dac82e176df18b074725260dfc75ece142ddd7a9 (patch) | |
tree | ab751e57f2293f9f095016741e4f70022f6bb242 /Source/Particles/Sorting/SortingUtils.H | |
parent | aea192d6ff5aabfedf09c9f139e831fb5d7bbdd6 (diff) | |
parent | 484c04d3d6d473e46cda3021e4895c73bbc16bb7 (diff) | |
download | WarpX-dac82e176df18b074725260dfc75ece142ddd7a9.tar.gz WarpX-dac82e176df18b074725260dfc75ece142ddd7a9.tar.zst WarpX-dac82e176df18b074725260dfc75ece142ddd7a9.zip |
Merge branch 'dev' into poisson
Diffstat (limited to 'Source/Particles/Sorting/SortingUtils.H')
-rw-r--r-- | Source/Particles/Sorting/SortingUtils.H | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/Particles/Sorting/SortingUtils.H b/Source/Particles/Sorting/SortingUtils.H index 28a1b73b7..80eaaf9cb 100644 --- a/Source/Particles/Sorting/SortingUtils.H +++ b/Source/Particles/Sorting/SortingUtils.H @@ -2,7 +2,6 @@ #define WARPX_PARTICLES_SORTING_SORTINGUTILS_H_ #include <WarpXParticleContainer.H> -#include <AMReX_CudaContainers.H> #include <AMReX_Gpu.H> #ifdef AMREX_USE_GPU #include <thrust/partition.h> @@ -43,7 +42,7 @@ ForwardIterator stablePartition(ForwardIterator const index_begin, // On GPU: Use thrust int const* AMREX_RESTRICT predicate_ptr = predicate.dataPtr(); ForwardIterator const sep = thrust::stable_partition( - thrust::cuda::par(amrex::Cuda::The_ThrustCachedAllocator()), + thrust::cuda::par(amrex::Gpu::The_ThrustCachedAllocator()), index_begin, index_end, [predicate_ptr] AMREX_GPU_DEVICE (long i) { return predicate_ptr[i]; } ); |