diff options
author | 2019-10-11 19:53:11 -0700 | |
---|---|---|
committer | 2019-10-11 19:53:11 -0700 | |
commit | ded6dd2cb05a76e1df9ab8561148f00d5e0bd365 (patch) | |
tree | dc813a3ba2cc5eafb925cbf31498fadd0b26a275 /Source/Particles/Sorting/Partition.cpp | |
parent | 358a8aa9fc550709e0f24a202f06a696be31ae93 (diff) | |
parent | d0b0c0940205a71534b96c4649aeffd983c4f9cf (diff) | |
download | WarpX-ded6dd2cb05a76e1df9ab8561148f00d5e0bd365.tar.gz WarpX-ded6dd2cb05a76e1df9ab8561148f00d5e0bd365.tar.zst WarpX-ded6dd2cb05a76e1df9ab8561148f00d5e0bd365.zip |
Merge branch 'fix_particle_sorting' into nodal_aux_3
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) { |