Changeset 1881 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

Timestamp:

05/15/20 16:42:10 (4 years ago)

Author:

ymipsl

Message:

XIOS coupling Branch

• fix timestamp problem when receiving field from other coupling context
• fix deadlock : when receiving index from coupling context, a collective communication was involved which is forbiden

YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp (modified) (1 diff)

XIOS/dev/dev_ym/XIOS_COUPLING/src/node/grid.cpp

@@ -1682 +1682 @@
       connectedDataSizeRead_[rank] = outIndex.numElements();
     }
-
+    // ym : displaced to avoid collective call at message reception
+/* 
     nbReadSenders_[client] = CClientServerMappingDistributed::computeConnectedClients(client->serverSize, client->clientSize,
-                                                                                      client->intraComm, ranks);
+                                                                                     client->intraComm, ranks);
+*/
   }
   CATCH_DUMP_ATTR
   
-
+  
+  /*!
+   * Compute the number of connected client for a given contextClient and insert it in the nbReadSenders map.
+   * /param[in] client : the given contextClient
+   */
+  void CGrid::computeNbReadSenders(CContextClient* client) 
+  TRY
+  
+  { 
+    nbReadSenders_[client] = CClientServerMappingDistributed::computeConnectedClients(client->serverSize, client->clientSize, client->intraComm, connectedServerRankRead_);
+  }
+  CATCH_DUMP_ATTR
+  
   void CGrid::computeServerDistribution(void)
   TRY