Changeset 538 for XIOS/trunk/src/interface/c_attr/icfield_attr.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/interface/c_attr/icfield_attr.cpp (modified) (2 diffs)

XIOS/trunk/src/interface/c_attr/icfield_attr.cpp

@@ -180 +180 @@
   
   
-  void cxios_set_field_freq_offset(field_Ptr field_hdl, const char * freq_offset, int freq_offset_size)
-  {
-    std::string freq_offset_str;
-    if(!cstr2string(freq_offset, freq_offset_size, freq_offset_str)) return;
-     CTimer::get("XIOS").resume();
-    field_hdl->freq_offset.setValue(freq_offset_str);
-     CTimer::get("XIOS").suspend();
-  }
-  
-  void cxios_get_field_freq_offset(field_Ptr field_hdl, char * freq_offset, int freq_offset_size)
-  {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->freq_offset.getInheritedValue(),freq_offset , freq_offset_size))
-      ERROR("void cxios_get_field_freq_offset(field_Ptr field_hdl, char * freq_offset, int freq_offset_size)", <<"Input string is to short");
-     CTimer::get("XIOS").suspend();
+  void cxios_set_field_freq_offset(field_Ptr field_hdl, cxios_duration freq_offset_c)
+  {
+    CTimer::get("XIOS").resume();
+    field_hdl->freq_offset.allocate();
+    CDuration& freq_offset = field_hdl->freq_offset.get();
+    freq_offset.year = freq_offset_c.year;
+    freq_offset.month = freq_offset_c.month;
+    freq_offset.day = freq_offset_c.day;
+    freq_offset.hour = freq_offset_c.hour;
+    freq_offset.minute = freq_offset_c.minute;
+    freq_offset.second = freq_offset_c.second;
+    freq_offset.timestep = freq_offset_c.timestep;
+    CTimer::get("XIOS").suspend();
+  }
+  
+  void cxios_get_field_freq_offset(field_Ptr field_hdl, cxios_duration* freq_offset_c)
+  {
+    CTimer::get("XIOS").resume();
+    CDuration freq_offset = field_hdl->freq_offset.getInheritedValue();
+    freq_offset_c->year = freq_offset.year;
+    freq_offset_c->month = freq_offset.month;
+    freq_offset_c->day = freq_offset.day;
+    freq_offset_c->hour = freq_offset.hour;
+    freq_offset_c->minute = freq_offset.minute;
+    freq_offset_c->second = freq_offset.second;
+    freq_offset_c->timestep = freq_offset.timestep;
+    CTimer::get("XIOS").suspend();
   }
   
@@ -206 +218 @@
   
   
-  void cxios_set_field_freq_op(field_Ptr field_hdl, const char * freq_op, int freq_op_size)
-  {
-    std::string freq_op_str;
-    if(!cstr2string(freq_op, freq_op_size, freq_op_str)) return;
-     CTimer::get("XIOS").resume();
-    field_hdl->freq_op.setValue(freq_op_str);
-     CTimer::get("XIOS").suspend();
-  }
-  
-  void cxios_get_field_freq_op(field_Ptr field_hdl, char * freq_op, int freq_op_size)
-  {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(field_hdl->freq_op.getInheritedValue(),freq_op , freq_op_size))
-      ERROR("void cxios_get_field_freq_op(field_Ptr field_hdl, char * freq_op, int freq_op_size)", <<"Input string is to short");
-     CTimer::get("XIOS").suspend();
+  void cxios_set_field_freq_op(field_Ptr field_hdl, cxios_duration freq_op_c)
+  {
+    CTimer::get("XIOS").resume();
+    field_hdl->freq_op.allocate();
+    CDuration& freq_op = field_hdl->freq_op.get();
+    freq_op.year = freq_op_c.year;
+    freq_op.month = freq_op_c.month;
+    freq_op.day = freq_op_c.day;
+    freq_op.hour = freq_op_c.hour;
+    freq_op.minute = freq_op_c.minute;
+    freq_op.second = freq_op_c.second;
+    freq_op.timestep = freq_op_c.timestep;
+    CTimer::get("XIOS").suspend();
+  }
+  
+  void cxios_get_field_freq_op(field_Ptr field_hdl, cxios_duration* freq_op_c)
+  {
+    CTimer::get("XIOS").resume();
+    CDuration freq_op = field_hdl->freq_op.getInheritedValue();
+    freq_op_c->year = freq_op.year;
+    freq_op_c->month = freq_op.month;
+    freq_op_c->day = freq_op.day;
+    freq_op_c->hour = freq_op.hour;
+    freq_op_c->minute = freq_op.minute;
+    freq_op_c->second = freq_op.second;
+    freq_op_c->timestep = freq_op.timestep;
+    CTimer::get("XIOS").suspend();
   }