Changeset 1881 for XIOS/dev/dev_ym/XIOS_COUPLING/src/node/field.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/field.cpp (modified) (2 diffs)

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 ;