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

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

@@ -185 +185 @@
   
   
-  void cxios_set_file_output_freq(file_Ptr file_hdl, const char * output_freq, int output_freq_size)
-  {
-    std::string output_freq_str;
-    if(!cstr2string(output_freq, output_freq_size, output_freq_str)) return;
-     CTimer::get("XIOS").resume();
-    file_hdl->output_freq.setValue(output_freq_str);
-     CTimer::get("XIOS").suspend();
-  }
-  
-  void cxios_get_file_output_freq(file_Ptr file_hdl, char * output_freq, int output_freq_size)
-  {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(file_hdl->output_freq.getInheritedValue(),output_freq , output_freq_size))
-      ERROR("void cxios_get_file_output_freq(file_Ptr file_hdl, char * output_freq, int output_freq_size)", <<"Input string is to short");
-     CTimer::get("XIOS").suspend();
+  void cxios_set_file_output_freq(file_Ptr file_hdl, cxios_duration output_freq_c)
+  {
+    CTimer::get("XIOS").resume();
+    file_hdl->output_freq.allocate();
+    CDuration& output_freq = file_hdl->output_freq.get();
+    output_freq.year = output_freq_c.year;
+    output_freq.month = output_freq_c.month;
+    output_freq.day = output_freq_c.day;
+    output_freq.hour = output_freq_c.hour;
+    output_freq.minute = output_freq_c.minute;
+    output_freq.second = output_freq_c.second;
+    output_freq.timestep = output_freq_c.timestep;
+    CTimer::get("XIOS").suspend();
+  }
+  
+  void cxios_get_file_output_freq(file_Ptr file_hdl, cxios_duration* output_freq_c)
+  {
+    CTimer::get("XIOS").resume();
+    CDuration output_freq = file_hdl->output_freq.getInheritedValue();
+    output_freq_c->year = output_freq.year;
+    output_freq_c->month = output_freq.month;
+    output_freq_c->day = output_freq.day;
+    output_freq_c->hour = output_freq.hour;
+    output_freq_c->minute = output_freq.minute;
+    output_freq_c->second = output_freq.second;
+    output_freq_c->timestep = output_freq.timestep;
+    CTimer::get("XIOS").suspend();
   }
   
@@ -258 +270 @@
   
   
-  void cxios_set_file_split_freq(file_Ptr file_hdl, const char * split_freq, int split_freq_size)
-  {
-    std::string split_freq_str;
-    if(!cstr2string(split_freq, split_freq_size, split_freq_str)) return;
-     CTimer::get("XIOS").resume();
-    file_hdl->split_freq.setValue(split_freq_str);
-     CTimer::get("XIOS").suspend();
-  }
-  
-  void cxios_get_file_split_freq(file_Ptr file_hdl, char * split_freq, int split_freq_size)
-  {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(file_hdl->split_freq.getInheritedValue(),split_freq , split_freq_size))
-      ERROR("void cxios_get_file_split_freq(file_Ptr file_hdl, char * split_freq, int split_freq_size)", <<"Input string is to short");
-     CTimer::get("XIOS").suspend();
+  void cxios_set_file_split_freq(file_Ptr file_hdl, cxios_duration split_freq_c)
+  {
+    CTimer::get("XIOS").resume();
+    file_hdl->split_freq.allocate();
+    CDuration& split_freq = file_hdl->split_freq.get();
+    split_freq.year = split_freq_c.year;
+    split_freq.month = split_freq_c.month;
+    split_freq.day = split_freq_c.day;
+    split_freq.hour = split_freq_c.hour;
+    split_freq.minute = split_freq_c.minute;
+    split_freq.second = split_freq_c.second;
+    split_freq.timestep = split_freq_c.timestep;
+    CTimer::get("XIOS").suspend();
+  }
+  
+  void cxios_get_file_split_freq(file_Ptr file_hdl, cxios_duration* split_freq_c)
+  {
+    CTimer::get("XIOS").resume();
+    CDuration split_freq = file_hdl->split_freq.getInheritedValue();
+    split_freq_c->year = split_freq.year;
+    split_freq_c->month = split_freq.month;
+    split_freq_c->day = split_freq.day;
+    split_freq_c->hour = split_freq.hour;
+    split_freq_c->minute = split_freq.minute;
+    split_freq_c->second = split_freq.second;
+    split_freq_c->timestep = split_freq.timestep;
+    CTimer::get("XIOS").suspend();
   }
   
@@ -310 +334 @@
   
   
-  void cxios_set_file_sync_freq(file_Ptr file_hdl, const char * sync_freq, int sync_freq_size)
-  {
-    std::string sync_freq_str;
-    if(!cstr2string(sync_freq, sync_freq_size, sync_freq_str)) return;
-     CTimer::get("XIOS").resume();
-    file_hdl->sync_freq.setValue(sync_freq_str);
-     CTimer::get("XIOS").suspend();
-  }
-  
-  void cxios_get_file_sync_freq(file_Ptr file_hdl, char * sync_freq, int sync_freq_size)
-  {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(file_hdl->sync_freq.getInheritedValue(),sync_freq , sync_freq_size))
-      ERROR("void cxios_get_file_sync_freq(file_Ptr file_hdl, char * sync_freq, int sync_freq_size)", <<"Input string is to short");
-     CTimer::get("XIOS").suspend();
+  void cxios_set_file_sync_freq(file_Ptr file_hdl, cxios_duration sync_freq_c)
+  {
+    CTimer::get("XIOS").resume();
+    file_hdl->sync_freq.allocate();
+    CDuration& sync_freq = file_hdl->sync_freq.get();
+    sync_freq.year = sync_freq_c.year;
+    sync_freq.month = sync_freq_c.month;
+    sync_freq.day = sync_freq_c.day;
+    sync_freq.hour = sync_freq_c.hour;
+    sync_freq.minute = sync_freq_c.minute;
+    sync_freq.second = sync_freq_c.second;
+    sync_freq.timestep = sync_freq_c.timestep;
+    CTimer::get("XIOS").suspend();
+  }
+  
+  void cxios_get_file_sync_freq(file_Ptr file_hdl, cxios_duration* sync_freq_c)
+  {
+    CTimer::get("XIOS").resume();
+    CDuration sync_freq = file_hdl->sync_freq.getInheritedValue();
+    sync_freq_c->year = sync_freq.year;
+    sync_freq_c->month = sync_freq.month;
+    sync_freq_c->day = sync_freq.day;
+    sync_freq_c->hour = sync_freq.hour;
+    sync_freq_c->minute = sync_freq.minute;
+    sync_freq_c->second = sync_freq.second;
+    sync_freq_c->timestep = sync_freq.timestep;
+    CTimer::get("XIOS").suspend();
   }