Changeset 1164 for XIOS/dev/branch_yushan_merged/src

Timestamp:

06/08/17 17:31:50 (7 years ago)

Author:

yushan

Message:

Bug fixed in MPI_(All)Gatherv with displs

Location:

XIOS/dev/branch_yushan_merged/src

Files:

• client.cpp (modified) (1 diff)
• client.hpp (modified) (1 diff)
• client_client_dht_template_impl.hpp (modified) (4 diffs)
• log.cpp (modified) (1 diff)
• log.hpp (modified) (3 diffs)
• node/field.cpp (modified) (1 diff)

XIOS/dev/branch_yushan_merged/src/client.cpp

@@ -28 +28 @@
     StdOFStream CClient::m_errorStream;
 
-    StdOFStream CClient::array_infoStream[10];
+    StdOFStream CClient::array_infoStream[16];
 
     void CClient::initialize(const string& codeId, MPI_Comm& localComm, MPI_Comm& returnComm)

XIOS/dev/branch_yushan_merged/src/client.hpp

@@ -58 +58 @@
         #pragma omp threadprivate(m_errorStream)
 
-        static StdOFStream array_infoStream[10];
+        static StdOFStream array_infoStream[16];
 
         static void openStream(const StdString& fileName, const StdString& ext, std::filebuf* fb);

XIOS/dev/branch_yushan_merged/src/client_client_dht_template_impl.hpp

@@ -710 +710 @@
   std::vector<ep_lib::MPI_Status> requestStatus(sendBuffSize+recvBuffSize);
 
+  int my_rank;
+  MPI_Comm_rank(this->internalComm_, &my_rank);
+  
   int nRequest = 0;
   for (int idx = 0; idx < recvBuffSize; ++idx)
@@ -715 +718 @@
     MPI_Irecv(&recvBuff[0]+2*idx, 2, MPI_INT,
               recvRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
+    printf("proc %d recv from proc %d with tag %d\n", my_rank, recvRank[idx], MPI_DHT_INDEX_0);          
     ++nRequest;
   }
@@ -724 +728 @@
     sendBuff[idx*2+1] = sendNbElements[offSet];
   }
+  
+  
 
   for (int idx = 0; idx < sendBuffSize; ++idx)
@@ -729 +735 @@
     MPI_Isend(&sendBuff[idx*2], 2, MPI_INT,
               sendRank[idx], MPI_DHT_INDEX_0, this->internalComm_, &request[nRequest]);
+    printf("proc %d send to proc %d with tag %d\n", my_rank, sendRank[idx], MPI_DHT_INDEX_0);
     ++nRequest;
   }

XIOS/dev/branch_yushan_merged/src/log.cpp

@@ -7 +7 @@
 {
 
-  std::filebuf* info_FB[10];
+  std::filebuf* info_FB[16];
 
 

XIOS/dev/branch_yushan_merged/src/log.hpp

@@ -19 +19 @@
     {
       omp_init_lock( &mutex );
-      for(int i=0; i<10; i++)
+      for(int i=0; i<16; i++)
         strBuf_array[i] = sBuff;
     }
@@ -61 +61 @@
     string name ;
     std::streambuf* strBuf_;
-    std::streambuf* strBuf_array[10];
+    std::streambuf* strBuf_array[16];
     omp_lock_t mutex;
   };
@@ -70 +70 @@
 
 
-  extern std::filebuf* info_FB[10];
+  extern std::filebuf* info_FB[16];
 
 

XIOS/dev/branch_yushan_merged/src/node/field.cpp

@@ -715 +715 @@
      if (context->hasClient)
      {
-       //MPI_Barrier(context->client->intraComm);
-       //printf("Proc %d enters function\n", myRank);
        solveTransformedGrid();
-       //MPI_Barrier(context->client->intraComm);
-       //printf("Proc %d exits function\n", myRank);
      }