Changeset 1881

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

Location:

XIOS/dev/dev_ym/XIOS_COUPLING/src/node

Files:

• field.cpp (modified) (2 diffs)
• grid.cpp (modified) (1 diff)
• grid.hpp (modified) (1 diff)

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

@@ -472 +472 @@
         }
 
-        event.push(it->first, grid_->nbReadSenders_[client][it->first], msg);
+        event.push(it->first, grid_->getNbReadSenders(client)[it->first], msg);
       }
       client->sendEvent(event);
@@ -659 +659 @@
     do
     {
-      if (wasDataAlreadyReceivedFromServer) isDataLate = lastDataReceivedFromServer + freq_offset < currentDate ;
+      if (wasDataAlreadyReceivedFromServer) isDataLate = lastDataReceivedFromServer + freq_offset + freq_op <= currentDate ;
       else isDataLate = context->getCalendar()->getInitDate()+freq_offset <= currentDate ;
 

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

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

@@ -372 +372 @@
          std::map<int, std::map<int,int> > nbSenders_;
 
-
+      private:
 /** Maps storing the number of participating servers for data sent a specific client for a given contextClient.
   * Symetric of nbSenders_, but for server side which want to send data to client.
   * nbReadSender_[context_client_size] -> map the number of server sender by connected rank of clients
-  * nbReadSender_[context_client_size] [rank_client] -> the number of serverq participating to a send message for a client of rank "rank_client" 
+  * nbReadSender_[context_client_size] [rank_client] -> the number of server participating to a send message for a client of rank "rank_client" 
   * Usefull to indicate in a message the number of participant needed by the transfer protocol */
          std::map<CContextClient*, std::map<int,int> > nbReadSenders_;
-
+      public:
+         std::map<int,int>& getNbReadSenders(CContextClient* client) 
+         { if (nbReadSenders_.count(client)==0) computeNbReadSenders(client) ; return nbReadSenders_[client] ;}
+      private:
+         void computeNbReadSenders(CContextClient* client) ;
+     
 
 // Manh Ha's comment: " A client receives global index from other clients (via recvIndex)