Changeset 1201 for XIOS/dev/dev_olga/src/node/file.cpp

Timestamp:

07/07/17 18:17:49 (7 years ago)

Author:

oabramkina

Message:

Two server levels: merging trunk r1200 (except for non-contiguous zoom) into dev. Tested on Curie. Todo: non-contiguous zoom.

File:

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

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

@@ -425 +425 @@
          if (!split_freq.isEmpty())
          {
-           CDate splitEnd = lastSplit + split_freq - 1 * Second;
+           CDate split_start ;
+           CDate splitEnd ;
+           if (!split_start_offset.isEmpty()) split_start=lastSplit + split_start_offset ;
+           else split_start=lastSplit ;
+
+           splitEnd = lastSplit + split_freq ;
+           if (!split_last_date.isEmpty())
+           {
+             CDate splitLastDate=CDate::FromString(split_last_date,*CContext::getCurrent()->getCalendar()) ;
+             if( splitLastDate < splitEnd)  splitEnd=splitLastDate ;
+           }
+            
+           if (!split_end_offset.isEmpty()) splitEnd = splitEnd + split_end_offset;
+           else splitEnd = splitEnd - 1 * Second;
 
            string splitFormat;
@@ -440 +453 @@
 
            oss << firstPart ;
-           if (hasStartDate) oss << lastSplit.getStr(splitFormat) ;
+           if (hasStartDate) oss << split_start.getStr(splitFormat) ;
            oss << middlePart ;
            if (hasEndDate) oss << splitEnd.getStr(splitFormat);