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

Timestamp:

12/11/14 16:07:42 (10 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/field.cpp (modified) (6 diffs)

XIOS/trunk/src/node/field.cpp

@@ -518 +518 @@
       CContext* context = CContext::getCurrent();
 
-      if (freq_op.isEmpty()) freq_op=string("1ts") ;
+      if (freq_op.isEmpty()) freq_op.setValue(TimeStep);
 
       if (operation.isEmpty() )
@@ -527 +527 @@
       }
 
-      CDuration freq_offset_ = NoneDu;
-      if (!freq_offset.isEmpty())
-      {
-         freq_offset_ = CDuration::FromString(freq_offset.getValue());
-      }
-      else
-      {
-         freq_offset.setValue(NoneDu.toString());
-      }
+      if (freq_offset.isEmpty())
+        freq_offset.setValue(NoneDu);
 
 //      if (CXIOSManager::GetStatus() == CXIOSManager::LOC_SERVER)
@@ -542 +535 @@
          if (hasOutputFile)
          {
-           this->freq_operation_srv =CDuration::FromString(this->file->output_freq.getValue());
-           this->freq_write_srv = CDuration::FromString(this->file->output_freq.getValue());
+           this->freq_operation_srv = this->file->output_freq.getValue();
+           this->freq_write_srv = this->file->output_freq.getValue();
          }
-         this->lastlast_Write_srv     = boost::shared_ptr<CDate>
+         this->lastlast_Write_srv = boost::shared_ptr<CDate>
                         (new CDate(context->getCalendar()->getInitDate()));
          this->last_Write_srv     = boost::shared_ptr<CDate>
@@ -556 +549 @@
          if (hasOutputFile)
          {
-           const CDuration toffset = this->freq_operation_srv - freq_offset_ - context->getCalendar()->getTimeStep();
+           const CDuration toffset = this->freq_operation_srv - freq_offset.getValue() - context->getCalendar()->getTimeStep();
            *this->last_operation_srv   = *this->last_operation_srv - toffset;
          }
@@ -563 +556 @@
 //      if (context->hasClient)
 //      {
-         this->freq_operation = CDuration::FromString(freq_op.getValue());
-         if (hasOutputFile) this->freq_write     = CDuration::FromString(this->file->output_freq.getValue());
+         this->freq_operation = freq_op.getValue();
+         if (hasOutputFile) this->freq_write = this->file->output_freq.getValue();
          if (hasFieldOut)
          {
-           this->freq_write = CDuration::FromString(this->fieldOut->freq_op.getValue());
+           this->freq_write = this->fieldOut->freq_op.getValue();
          }
          this->last_Write     = boost::shared_ptr<CDate>
@@ -574 +567 @@
                         (new CDate(context->getCalendar()->getInitDate()));
 
-         const CDuration toffset = this->freq_operation - freq_offset_ - context->getCalendar()->getTimeStep();
+         const CDuration toffset = this->freq_operation - freq_offset.getValue() - context->getCalendar()->getTimeStep();
          *this->last_operation   = *this->last_operation - toffset;