Merge pull request #651 from PhilipDeegan/revert

updater: revert #643

Author: nicolasaunai

src/core/numerics/ion_updater/ion_updater.hpp

@@ -160,14 +160,14 @@ void IonUpdater<Ions, Electromag, GridLayout>::updateAndDepositDomain_(Ions& ion
             outRange = makeRange(outputArray);
 
             auto firstGhostOut = pusher_->move(inRange, outRange, em, pop.mass(), interpolator_,
-                                               inGhostBox, inDomainBox, layout);
+                                               inGhostBox, inGhostLayer, layout);
 
-            auto inDomain = makeRange(std::begin(outputArray), firstGhostOut);
+            auto endInDomain = std::partition(firstGhostOut, std::end(outputArray), inDomainBox);
 
-            interpolator_(inDomain.begin(), inDomain.end(), pop.density(), pop.flux(), layout);
+            interpolator_(firstGhostOut, endInDomain, pop.density(), pop.flux(), layout);
 
             if (copyInDomain)
-                std::copy(inDomain.begin(), inDomain.end(), std::back_inserter(domain));
+                std::copy(firstGhostOut, endInDomain, std::back_inserter(domain));
         };
 
         // After this function is done domain particles overlaping ghost layers of neighbor patches
@@ -229,10 +229,10 @@ void IonUpdater<Ions, Electromag, GridLayout>::updateAndDepositAll_(Ions& ions,
         auto pushAndCopyInDomain = [&](auto& particleArray) {
             auto range            = makeRange(particleArray);
             auto firstOutGhostBox = pusher_->move(range, range, em, pop.mass(), interpolator_,
-                                                  inGhostBox, inDomainSelector, layout);
+                                                  inGhostBox, inGhostLayer, layout);
 
-            auto inDomain = makeRange(std::begin(particleArray), firstOutGhostBox);
-            std::copy(inDomain.begin(), inDomain.end(), std::back_inserter(domainParticles));
+            std::copy_if(firstOutGhostBox, std::end(particleArray),
+                         std::back_inserter(domainParticles), inDomainSelector);
 
             particleArray.erase(firstOutGhostBox, std::end(particleArray));
         };