Changeset 1318 for XIOS/dev/XIOS_DEV_CMIP6/src/node/context.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/context.cpp (modified) (2 diffs)

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

@@ -783 +783 @@
    }
 
-   void CContext::checkPrefetchingOfEnabledReadModeFiles()
+   void CContext::doPostTimestepOperationsForEnabledReadModeFiles()
    {
      int size = enabledReadModeFiles.size();
      for (int i = 0; i < size; ++i)
      {
-        enabledReadModeFiles[i]->prefetchEnabledReadModeFieldsIfNeeded();
+        enabledReadModeFiles[i]->doPostTimestepOperationsForEnabledReadModeFields();
      }
    }
@@ -1709 +1709 @@
       if (hasClient && !hasServer) // For now we only use server level 1 to read data
       {
-        checkPrefetchingOfEnabledReadModeFiles();
+        doPostTimestepOperationsForEnabledReadModeFiles();
         garbageCollector.invalidate(calendar->getCurrentDate());
       }