Changeset 1358 for XIOS/dev/XIOS_DEV_CMIP6/src/node/field.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/field.cpp (modified) (5 diffs)

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

@@ -42 +42 @@
       , wasDataRequestedFromServer(false)
       , wasDataAlreadyReceivedFromServer(false)
+      , mustAutoTrigger(false)
       , isEOF(false), nstepMaxRead(false)
    { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); }
@@ -58 +59 @@
       , wasDataRequestedFromServer(false)
       , wasDataAlreadyReceivedFromServer(false)
+      , mustAutoTrigger(false)
       , isEOF(false), nstepMaxRead(false)
    { setVirtualVariableGroup(CVariableGroup::create(getId() + "_virtual_variable_group")); }
@@ -569 +571 @@
 
     // Check if data previously requested has been received as expected
-    if (wasDataRequestedFromServer && (!isEOF || currentDate <= dateEOF))
+    if (wasDataRequestedFromServer && !isEOF)
     {
       CTimer timer("CField::checkForLateDataFromServer");
@@ -577 +579 @@
       {
         const CDate nextDataDue = wasDataAlreadyReceivedFromServer ? (lastDataReceivedFromServer + file->output_freq) : context->getCalendar()->getInitDate();
-        isDataLate = nextDataDue < currentDate;
+        isDataLate = (nextDataDue <= currentDate);
 
         if (isDataLate)
@@ -594 +596 @@
               << "Late data at timestep = " << currentDate);
     }
+  }
+
+  void CField::checkIfMustAutoTrigger(void)
+  {
+    mustAutoTrigger = serverSourceFilter ? serverSourceFilter->mustAutoTrigger() : false;
+  }
+
+  void CField::autoTriggerIfNeeded(void)
+  {
+    if (mustAutoTrigger)
+      serverSourceFilter->trigger(CContext::getCurrent()->getCalendar()->getCurrentDate());
   }