Changeset 1318 for XIOS/dev/XIOS_DEV_CMIP6/src/node/file.cpp

Timestamp:

10/26/17 10:23:17 (7 years ago)

Author:

rlacroix

Message:

Fix: Handle end-of-file correctly for files in read mode.

Previously desynchronizations between clients could occur, leading to invalid events being received by the server(s).

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/file.cpp (modified) (2 diffs)

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

@@ -867 +867 @@
 
    /*!
-     Prefetching the data for enabled fields read from file whose data is out-of-date.
-   */
-   void CFile::prefetchEnabledReadModeFieldsIfNeeded(void)
+     Do all post timestep operations for enabled fields in read mode:
+      - Prefetch the data read from file when needed
+      - Check that the data excepted from server has been received
+   */
+   void CFile::doPostTimestepOperationsForEnabledReadModeFields(void)
    {
      if (mode.isEmpty() || mode.getValue() != mode_attr::read)
@@ -876 +878 @@
      int size = this->enabledFields.size();
      for (int i = 0; i < size; ++i)
+     {
+       this->enabledFields[i]->checkForLateDataFromServer();
        this->enabledFields[i]->sendReadDataRequestIfNeeded();
+     }
    }