Changeset 1516

Timestamp:

05/31/18 17:53:06 (7 years ago)

Author:

oabramkina

Message:

Bugfix for cases of split_freq defined in ts.

File:

• XIOS/dev/XIOS_DEV_CMIP6/src/node/file.cpp (modified) (2 diffs)

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

@@ -479 +479 @@
            if (split_freq_format.isEmpty())
            {
-             if (split_freq.getValue().second != 0) splitFormat = "%y%mo%d%h%mi%s";
-             else if (split_freq.getValue().minute != 0) splitFormat = "%y%mo%d%h%mi";
-             else if (split_freq.getValue().hour != 0) splitFormat = "%y%mo%d%h";
-             else if (split_freq.getValue().day != 0) splitFormat = "%y%mo%d";
-             else if (split_freq.getValue().month != 0) splitFormat = "%y%mo";
+             CDuration splitFreq = split_freq.getValue();
+             splitFreq.solveTimeStep(*CContext::getCurrent()->getCalendar());
+             if (splitFreq.second != 0) splitFormat = "%y%mo%d%h%mi%s";
+             else if (splitFreq.minute != 0) splitFormat = "%y%mo%d%h%mi";
+             else if (splitFreq.hour != 0) splitFormat = "%y%mo%d%h";
+             else if (splitFreq.day != 0) splitFormat = "%y%mo%d";
+             else if (splitFreq.month != 0) splitFormat = "%y%mo";
              else splitFormat = "%y";
            }
@@ -613 +615 @@
         if (split_freq_format.isEmpty())
         {
-          if (split_freq.getValue().second != 0) splitFormat = "%y%mo%d%h%mi%s";
-          else if (split_freq.getValue().minute != 0) splitFormat = "%y%mo%d%h%mi";
-          else if (split_freq.getValue().hour != 0) splitFormat = "%y%mo%d%h";
-          else if (split_freq.getValue().day != 0) splitFormat = "%y%mo%d";
-          else if (split_freq.getValue().month != 0) splitFormat = "%y%mo";
+          CDuration splitFreq = split_freq.getValue();
+          splitFreq.solveTimeStep(*CContext::getCurrent()->getCalendar());
+          if (splitFreq.second != 0) splitFormat = "%y%mo%d%h%mi%s";
+          else if (splitFreq.minute != 0) splitFormat = "%y%mo%d%h%mi";
+          else if (splitFreq.hour != 0) splitFormat = "%y%mo%d%h";
+          else if (splitFreq.day != 0) splitFormat = "%y%mo%d";
+          else if (splitFreq.month != 0) splitFormat = "%y%mo";
           else splitFormat = "%y";
         }