Changeset 538 for XIOS/trunk/src/node/file.cpp

Timestamp:

12/11/14 16:07:42 (9 years ago)

Author:

rlacroix

Message:

Convert more attributes to use the new duration type:

• field: freq_op and freq_offset
• file: output_freq, sync_freq and split_freq.

Remember that you now have to use the "xios_duration" type instead of strings to get/set those attributes through the Fortran interface.

File:

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

XIOS/trunk/src/node/file.cpp

@@ -189 +189 @@
      CContext* context = CContext::getCurrent() ;
      CDate& currentDate=context->calendar->getCurrentDate() ;
-     if (! sync_freq.isEmpty())
+     if (!sync_freq.isEmpty())
      {
-       if (*lastSync+syncFreq < currentDate)
+       if (*lastSync + sync_freq.getValue() < currentDate)
        {
          *lastSync=currentDate ;
@@ -207 +207 @@
       CContextServer* server=context->server ;
 
-      if (! sync_freq.isEmpty()) syncFreq = CDuration::FromString(sync_freq.getValue());
-      if (! split_freq.isEmpty()) splitFreq = CDuration::FromString(split_freq.getValue());
-      if (! output_freq.isEmpty()) outputFreq = CDuration::FromString(output_freq.getValue());
       lastSync=new CDate(currentDate) ;
       lastSplit=new CDate(currentDate) ;
@@ -253 +250 @@
      CContext* context = CContext::getCurrent() ;
      CDate& currentDate=context->calendar->getCurrentDate() ;
-     if (! sync_freq.isEmpty())
+     if (!sync_freq.isEmpty())
      {
-       if (*lastSync+syncFreq <= currentDate)
+       if (*lastSync + sync_freq.getValue() <= currentDate)
        {
          *lastSync=currentDate ;
@@ -275 +272 @@
       CContext* context = CContext::getCurrent() ;
       CDate& currentDate=context->calendar->getCurrentDate() ;
-      if (! split_freq.isEmpty())
+      if (!split_freq.isEmpty())
       {
-        if (currentDate > *lastSplit+splitFreq)
+        if (currentDate > *lastSplit + split_freq.getValue())
         {
-          *lastSplit=*lastSplit+splitFreq ;
+          *lastSplit = *lastSplit + split_freq.getValue();
           std::vector<CField*>::iterator it, end = this->enabledFields.end();
           for (it = this->enabledFields.begin() ;it != end; it++)  (*it)->resetNStep() ;
@@ -304 +301 @@
          oss << filename;
          if (!name_suffix.isEmpty()) oss << name_suffix.getValue();
-//         if (!split_freq.isEmpty()) oss<<"_"<<lastSplit->getStryyyymmdd()<<"-"<< (*lastSplit+(splitFreq-1*Second)).getStryyyymmdd();
-//         if (!split_freq.isEmpty()) oss<<"_"<<lastSplit->getStr("%y_%mo_%d")<<"-"<< (*lastSplit+(splitFreq-1*Second)).getStr("%y_%mo_%d");
+
          if (!split_freq.isEmpty())
          {
@@ -311 +307 @@
            if (split_freq_format.isEmpty())
            {
-             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";
+             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";
+             else splitFormat = "%y";
            }
            else splitFormat=split_freq_format ;
-           oss<<"_"<<lastSplit->getStr(splitFormat)<<"-"<< (*lastSplit+(splitFreq-1*Second)).getStr(splitFormat);
+           oss << "_" << lastSplit->getStr(splitFormat)
+               << "-" << (*lastSplit + (split_freq.getValue() - 1 * Second)).getStr(splitFormat);
          }