Changeset 1322 for XIOS/dev/XIOS_DEV_CMIP6

Timestamp:

10/30/17 18:16:37 (6 years ago)

Author:

rlacroix

Message:

Fix r1321 so that it makes some sense...

Polling a constant variable multiple times won't make its value change. If the data was received late but before the timeout, XIOS would throw an error anyway.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/field.cpp (modified) (1 diff)

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

@@ -569 +569 @@
     {
       CTimer timer("CField::checkForLateDataFromServer");
-      const CDate nextDataDue = wasDataAlreadyReceivedFromServer ? (lastDataReceivedFromServer + file->output_freq) : context->getCalendar()->getInitDate();
-
-      bool isDataLate = nextDataDue < currentDate;
-      while (isDataLate && timer.getCumulatedTime() < CXios::recvFieldTimeout)
+
+      bool isDataLate;
+      do
       {
-        timer.resume();
-
-        context->checkBuffersAndListen();
-
-        timer.suspend();
-
+        const CDate nextDataDue = wasDataAlreadyReceivedFromServer ? (lastDataReceivedFromServer + file->output_freq) : context->getCalendar()->getInitDate();
         isDataLate = nextDataDue < currentDate;
-      }
+
+        if (isDataLate)
+        {
+          timer.resume();
+
+          context->checkBuffersAndListen();
+
+          timer.suspend();
+        }
+      }
+      while (isDataLate && timer.getCumulatedTime() < CXios::recvFieldTimeout);
 
       if (isDataLate)