Changeset 702

Timestamp:

09/22/15 10:09:54 (9 years ago)

Author:

rlacroix

Message:

Allow restarting a simulation in append mode with file splitting enabled.

Make use of the new registry to save the start and end dates of the last output file.

File:

• XIOS/trunk/src/node/file.cpp (modified) (3 diffs)

XIOS/trunk/src/node/file.cpp

@@ -220 +220 @@
       lastSync  = currentDate;
       lastSplit = currentDate;
+      if (!split_freq.isEmpty())
+      {
+        if (context->registryIn->foundKey("splitStart") && context->registryIn->foundKey("splitEnd"))
+        {
+          CDate savedSplitStart(*context->getCalendar()), savedSplitEnd(*context->getCalendar());
+          context->registryIn->getKey("splitStart", savedSplitStart);
+          context->registryIn->getKey("splitEnd",   savedSplitEnd);
+
+          if (savedSplitStart <= lastSplit && lastSplit <= savedSplitEnd)
+            lastSplit = savedSplitStart;
+        }
+      }
       isOpen = false;
 
@@ -336 +348 @@
          if (!split_freq.isEmpty())
          {
+           CDate splitEnd = lastSplit + split_freq - 1 * Second;
+
            string splitFormat;
            if (split_freq_format.isEmpty())
@@ -347 +361 @@
            }
            else splitFormat = split_freq_format;
-           oss << "_" << lastSplit.getStr(splitFormat)
-               << "-" << (lastSplit + split_freq.getValue() - 1 * Second).getStr(splitFormat);
+
+           oss << "_" << lastSplit.getStr(splitFormat) << "-" << splitEnd.getStr(splitFormat);
+
+           context->registryOut->setKey("splitStart", lastSplit);
+           context->registryOut->setKey("splitEnd",   splitEnd);
          }