diff options
author | 2019-10-18 10:06:29 +0200 | |
---|---|---|
committer | 2019-10-18 10:06:29 +0200 | |
commit | 01af04e7b605db24c17d44f90b1ffaebec68af40 (patch) | |
tree | c5bb14eea335e7af0b320cb9fd9efc6f45e25063 /Source/Particles/Sorting/Partition.cpp | |
parent | 9528e74bcb855176b82ce3b435a97891f3bb49d4 (diff) | |
parent | ab5f29617d543523435c8c36821fcc305666e390 (diff) | |
download | WarpX-01af04e7b605db24c17d44f90b1ffaebec68af40.tar.gz WarpX-01af04e7b605db24c17d44f90b1ffaebec68af40.tar.zst WarpX-01af04e7b605db24c17d44f90b1ffaebec68af40.zip |
Merge remote-tracking branch 'upstream/dev' into qed_bw_add_table
Diffstat (limited to 'Source/Particles/Sorting/Partition.cpp')
-rw-r--r-- | Source/Particles/Sorting/Partition.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Source/Particles/Sorting/Partition.cpp b/Source/Particles/Sorting/Partition.cpp index d1455249a..e88af017f 100644 --- a/Source/Particles/Sorting/Partition.cpp +++ b/Source/Particles/Sorting/Partition.cpp @@ -56,7 +56,7 @@ PhysicalParticleContainer::PartitionParticlesInBuffers( gather_masks : current_masks; // - For each particle, find whether it is in the larger buffer, // by looking up the mask. Store the answer in `inexflag`. - amrex::ParallelFor( np, fillBufferFlag(pti, bmasks, inexflag, Geom(lev), 0) ); + amrex::ParallelFor( np, fillBufferFlag(pti, bmasks, inexflag, Geom(lev)) ); // - Find the indices that reorder particles so that the last particles // are in the larger buffer fillWithConsecutiveIntegers( pid ); @@ -93,7 +93,7 @@ PhysicalParticleContainer::PartitionParticlesInBuffers( // - For each particle in the large buffer, find whether it is in // the smaller buffer, by looking up the mask. Store the answer in `inexflag`. amrex::ParallelFor( np - n_fine, - fillBufferFlag(pti, bmasks, inexflag, Geom(lev), n_fine) ); + fillBufferFlagRemainingParticles(pti, bmasks, inexflag, Geom(lev), pid, n_fine) ); auto const sep2 = stablePartition( sep, pid.end(), inexflag ); if (bmasks == gather_masks) { |