Changeset 1358 for XIOS/trunk/src/node/file.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/trunk/src/node/file.cpp (modified) (3 diffs)

XIOS/trunk/src/node/file.cpp

@@ -770 +770 @@
 
    /*!
+    * Post-process the filter graph for each active field.
+    */
+   void CFile::postProcessFilterGraph()
+   {
+     int size = this->enabledFields.size();
+     for (int i = 0; i < size; ++i)
+     {
+       this->enabledFields[i]->checkIfMustAutoTrigger();
+     }
+   }
+
+   /*!
      Prefetching the data for enabled fields read from file.
    */
@@ -783 +795 @@
 
    /*!
-     Do all post timestep operations for enabled fields in read mode:
-      - Prefetch the data read from file when needed
+     Do all pre timestep operations for enabled fields in read mode:
       - Check that the data excepted from server has been received
-   */
-   void CFile::doPostTimestepOperationsForEnabledReadModeFields(void)
+      - Check if some filters must auto-trigger
+   */
+   void CFile::doPreTimestepOperationsForEnabledReadModeFields(void)
    {
      if (mode.isEmpty() || mode.getValue() != mode_attr::read)
@@ -796 +808 @@
      {
        this->enabledFields[i]->checkForLateDataFromServer();
+       this->enabledFields[i]->autoTriggerIfNeeded();
+     }
+   }
+
+   /*!
+     Do all post timestep operations for enabled fields in read mode:
+      - Prefetch the data read from file when needed
+   */
+   void CFile::doPostTimestepOperationsForEnabledReadModeFields(void)
+   {
+     if (mode.isEmpty() || mode.getValue() != mode_attr::read)
+       return;
+
+     int size = this->enabledFields.size();
+     for (int i = 0; i < size; ++i)
+     {
        this->enabledFields[i]->sendReadDataRequestIfNeeded();
      }