Changeset 1358 for XIOS/dev/XIOS_DEV_CMIP6/src/node/context.cpp

Timestamp:

12/06/17 08:34:41 (6 years ago)

Author:

rlacroix

Message:

Support reentrant workflows and workflows with temporal integration for fields read from files.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/context.cpp (modified) (4 diffs)

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

@@ -665 +665 @@
     {
       buildFilterGraphOfFieldsWithReadAccess();
+      postProcessFilterGraph();
     }
     
@@ -782 +783 @@
    }
 
+   void CContext::postProcessFilterGraph()
+   {
+     int size = enabledFiles.size();
+     for (int i = 0; i < size; ++i)
+     {
+        enabledFiles[i]->postProcessFilterGraph();
+     }
+   }
+
    void CContext::startPrefetchingOfEnabledReadModeFiles()
    {
@@ -788 +798 @@
      {
         enabledReadModeFiles[i]->prefetchEnabledReadModeFields();
+     }
+   }
+
+   void CContext::doPreTimestepOperationsForEnabledReadModeFiles()
+   {
+     int size = enabledReadModeFiles.size();
+     for (int i = 0; i < size; ++i)
+     {
+        enabledReadModeFiles[i]->doPreTimestepOperationsForEnabledReadModeFields();
      }
    }
@@ -1837 +1856 @@
       if (prevStep < step)
       {
+        if (hasClient && !hasServer) // For now we only use server level 1 to read data
+        {
+          doPreTimestepOperationsForEnabledReadModeFiles();
+        }
+
         info(50) << "updateCalendar : before : " << calendar->getCurrentDate() << endl;
         calendar->update(step);