Different message tag for each mpi exchanger

Author: glesur

src/macros.hpp

@@ -25,7 +25,6 @@
 #if COMPONENTS == 3
   #define EXPAND(a,b,c) a b c
   #define SELECT(a,b,c) c
-
 #endif
 
 #if DIMENSIONS == 1

src/mpi/exchanger.cpp

@@ -12,6 +12,8 @@
 #include "grid.hpp"
 #include "arrays.hpp"
 
+int Exchanger::nInstances = 0;
+
 void Exchanger::Init(
               Grid *grid,
               int direction,
@@ -27,6 +29,9 @@ void Exchanger::Init(
   this->mapNVars = inputMap.size();
   this->haveVs = inputHaveVs;
 
+  // increase the number of instances
+  this->thisInstance = nInstances;
+
   // Compute indices of arrays we will be working with
   for(int dir = 0 ; dir < 3 ; dir++) {
     this->nghost[dir] = nghost[dir];
@@ -119,28 +124,29 @@ void Exchanger::Init(
   // We receive from procRecv, and we send to procSend
 
   MPI_Send_init(BufferSend[faceRight].data(), bufferSize[faceRight], realMPI,
-            procSend[faceRight], thisInstance*100+10*direction,
+            procSend[faceRight], thisInstance*2,
             grid->CartComm, &sendRequest[faceRight]);
 
   MPI_Recv_init(BufferRecv[faceLeft].data(), bufferSize[faceRight], realMPI,
-            procRecv[faceLeft],thisInstance*100+10*direction,
+            procRecv[faceLeft],thisInstance*2,
             grid->CartComm, &recvRequest[faceLeft]);
 
   // Send to the left
   // We receive from procRecv, and we send to procSend
 
   MPI_Send_init(BufferSend[faceLeft].data(), bufferSize[faceLeft], realMPI,
-            procSend[faceLeft],thisInstance*100+10*direction+1,
+            procSend[faceLeft],thisInstance*2+1,
             grid->CartComm, &sendRequest[faceLeft]);
 
   MPI_Recv_init(BufferRecvX1[faceRight].data(), bufferSizeX1[faceLeft], realMPI,
-            procRecv[faceRight], thisInstance*100+10*direction+1,
+            procRecv[faceRight], thisInstance*2+1,
             grid->CartComm, &recvRequest[faceRight]);
 
   #endif // MPI_PERSISTENT
 
   // say this instance is initialized.
   isInitialized = true;
+  nInstances++;
 
   idfx::popRegion();
 }

src/mpi/exchanger.hpp

@@ -34,6 +34,8 @@ class Exchanger {
   void Exchange(IdefixArray4D<real> Vc, IdefixArray4D<real> Vs);
   ~Exchanger();
 
+  static int nInstances;     // total number of mpi instances in the code
+  int thisInstance;          // unique number of the current instance
   bool isInitialized{false};
 
   // MPI throughput timer specific to this object