Changeset 800 for XIOS/branchs/xios-1.0/src/node/file.cpp

Timestamp:

11/27/15 09:55:06 (8 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/branchs/xios-1.0/src/node/file.cpp (modified) (3 diffs)

XIOS/branchs/xios-1.0/src/node/file.cpp

@@ -180 +180 @@
       lastSync=new CDate(currentDate) ;
       lastSplit=new CDate(currentDate) ;
+      if (!split_freq.isEmpty())
+      {
+        if (context->registryIn->foundKey("splitStart") && context->registryIn->foundKey("splitEnd"))
+        {
+          string savedSplitStartStr, savedSplitEndStr;
+          context->registryIn->getKey("splitStart", savedSplitStartStr);
+          context->registryIn->getKey("splitEnd",   savedSplitEndStr);
+
+          CDate savedSplitStart = CDate::FromString(savedSplitStartStr, *context->getCalendar());
+          CDate savedSplitEnd = CDate::FromString(savedSplitEndStr, *context->getCalendar());
+          if (savedSplitStart <= *lastSplit && *lastSplit <= savedSplitEnd)
+            *lastSplit = savedSplitStart;
+        }
+      }
       isOpen=false ;
 
@@ -263 +277 @@
          if (!split_freq.isEmpty())
          {
+           CDate splitEnd = *lastSplit + splitFreq - 1 * Second;
+
            string splitFormat ;
            if (split_freq_format.isEmpty())
@@ -274 +290 @@
            }
            else splitFormat=split_freq_format ;
-           oss<<"_"<<lastSplit->getStr(splitFormat)<<"-"<< (*lastSplit + splitFreq - 1 * Second).getStr(splitFormat);
+           oss<<"_"<<lastSplit->getStr(splitFormat)<<"-"<< splitEnd.getStr(splitFormat);
+
+           string lastSplitStr = lastSplit->toString(), splitEndStr = splitEnd.toString();
+           context->registryOut->setKey("splitStart", lastSplitStr);
+           context->registryOut->setKey("splitEnd",   splitEndStr);
          }