Fixed locate particles

alpine/LandauDamping.cpp

@@ -48,7 +48,9 @@ int main(int argc, char* argv[]) {
         Inform msg2all(TestName, INFORM_ALL_NODES);
 
         static IpplTimings::TimerRef mainTimer = IpplTimings::getTimer("total");
+        static IpplTimings::TimerRef initializeTimer = IpplTimings::getTimer("initialize");
         IpplTimings::startTimer(mainTimer);
+        IpplTimings::startTimer(initializeTimer);
 
         // Read input parameters, assign them to the corresponding memebers of manager
         int arg = 1;
@@ -79,6 +81,8 @@ int main(int argc, char* argv[]) {
         // Perform pre-run operations, including creating mesh, particles,...
         manager.pre_run();
 
+        IpplTimings::stopTimer(initializeTimer);
+
         manager.setTime(0.0);
 
         msg << "Starting iterations ..." << endl;

alpine/LoadBalancer.hpp

@@ -109,7 +109,7 @@ class LoadBalancer {
     }
 
     bool balance(size_type totalP, const unsigned int nstep) {
-        if (ippl::Comm->size() < 2) {
+        if (ippl::Comm->size() < 2 && loadbalancethreshold_m != 1.0) {
             return false;
         }
         if (std::strcmp(TestName, "UniformPlasmaTest") == 0) {

src/Particle/ParticleSpatialLayout.h

@@ -1,3 +1,4 @@
+
 //
 // Class ParticleSpatialLayout
 //   Particle layout based on spatial decomposition.
@@ -29,6 +30,9 @@
 #include "Particle/ParticleLayout.h"
 #include "Region/RegionLayout.h"
 
+#include "Communicate/Window.h"
+#include <vector>
+
 namespace ippl {
 
     /*!
@@ -76,8 +80,14 @@ namespace ippl {
         RegionLayout_t rlayout_m;
 
         //! The FieldLayout containing information on nearest neighbors
-        FieldLayout_t flayout_m;
-
+        FieldLayout_t& flayout_m;
+
+        // MPI RMA window for one-sided communication
+        mpi::rma::Window<mpi::rma::Active> window_m;
+
+        // Vector keeping track of the recieves from all ranks
+        std::vector<size_type> nRecvs_m;
+
         //! Type of the Kokkos view containing the local regions.
         using region_view_type = typename RegionLayout_t::view_type;
         //! Type of a single Region object.
@@ -89,6 +99,14 @@ namespace ippl {
         KOKKOS_INLINE_FUNCTION constexpr static bool positionInRegion(
             const std::index_sequence<Idx...>&, const vector_type& pos, const region_type& region);
 
+        /*!
+         * Evaluates the total number of MPI ranks sharing the spatial nearest neighbors.
+         * @param neighbors structure containing, for every spatial direction, a list of
+         * MPI ranks IDs corresponding to the nearest neighbors of the current local domain section.
+         * @return The total number of the ranks.
+         */
+        size_type getNeighborSize(const neighbor_list& neighbors) const;
+
     public:
         /*!
          * For each particle in the bunch, determine the rank on which it should
@@ -101,8 +119,8 @@ namespace ippl {
          * @return The total number of invalidated particles
          */
         template <typename ParticleContainer>
-        size_type locateParticles(const ParticleContainer& pc, locate_type& ranks,
-                                  bool_type& invalid) const;
+        std::pair<size_type,size_type> locateParticles(const ParticleContainer& pc, locate_type& ranks,
+                                  bool_type& invalid, locate_type& nSends_dview, locate_type& sends_dview) const;
 
         /*!
          * @param rank we sent to
@@ -122,3 +140,4 @@ namespace ippl {
 #include "Particle/ParticleSpatialLayout.hpp"
 
 #endif
+