Changeset 1321

Timestamp:

10/30/17 14:41:06 (7 years ago)

Author:

rlacroix

Message:

Improve the check for late data added in r1318.

Avoid waiting for data at the beginning of timestep 0 of the user calls "xios_update_calendar(0)". Data expected at timestep 0 is late only if it still has not been received with switching from timestep 0 to timestep 1.

Location:

XIOS

Files:

• dev/XIOS_DEV_CMIP6/src/node/field.cpp (modified) (2 diffs)
• trunk/src/node/field.cpp (modified) (2 diffs)

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

@@ -566 +566 @@
 
     // Check if data previously requested has been received as expected
-    if (wasDataRequestedFromServer && (!isEOF || context->getCalendar()->getCurrentDate() <= dateEOF))
+    if (wasDataRequestedFromServer && (!isEOF || currentDate <= dateEOF))
     {
       CTimer timer("CField::checkForLateDataFromServer");
-
-      bool isDataLate = !wasDataAlreadyReceivedFromServer || lastDataReceivedFromServer + file->output_freq < currentDate;
+      const CDate nextDataDue = wasDataAlreadyReceivedFromServer ? (lastDataReceivedFromServer + file->output_freq) : context->getCalendar()->getInitDate();
+
+      bool isDataLate = nextDataDue < currentDate;
       while (isDataLate && timer.getCumulatedTime() < CXios::recvFieldTimeout)
       {
@@ -579 +580 @@
         timer.suspend();
 
-        isDataLate = !wasDataAlreadyReceivedFromServer || lastDataReceivedFromServer + file->output_freq < currentDate;
+        isDataLate = nextDataDue < currentDate;
       }
 

XIOS/trunk/src/node/field.cpp

@@ -479 +479 @@
 
     // Check if data previously requested has been received as expected
-    if (wasDataRequestedFromServer && (!isEOF || context->getCalendar()->getCurrentDate() <= dateEOF))
+    if (wasDataRequestedFromServer && (!isEOF || currentDate <= dateEOF))
     {
       CTimer timer("CField::checkForLateDataFromServer");
-
-      bool isDataLate = !wasDataAlreadyReceivedFromServer || lastDataReceivedFromServer + file->output_freq < currentDate;
+      const CDate nextDataDue = wasDataAlreadyReceivedFromServer ? (lastDataReceivedFromServer + file->output_freq) : context->getCalendar()->getInitDate();
+
+      bool isDataLate = nextDataDue < currentDate;
       while (isDataLate && timer.getCumulatedTime() < CXios::recvFieldTimeout)
       {
@@ -492 +493 @@
         timer.suspend();
 
-        isDataLate = !wasDataAlreadyReceivedFromServer || lastDataReceivedFromServer + file->output_freq < currentDate;
+        isDataLate = nextDataDue < currentDate;
       }