Changeset 537 for XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp

Timestamp:

12/11/14 14:32:37 (10 years ago)

Author:

rlacroix

Message:

Add a new attribute type for durations and use it for the context's timestep.

Note that the "xios_time" type and the "xios_set_timestep" procedure have been removed from the Fortran interface. Instead, the "xios_duration" type and the "xios_get_context_attr"/"xios_set_context_attr" procedures should now be used to get/set the timestep.

File:

• XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp (modified) (1 diff)

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

@@ -146 +146 @@
   
   
-  void cxios_set_context_timestep(context_Ptr context_hdl, const char * timestep, int timestep_size)
+  void cxios_set_context_timestep(context_Ptr context_hdl, cxios_duration timestep_c)
   {
-    std::string timestep_str;
-    if(!cstr2string(timestep, timestep_size, timestep_str)) return;
-     CTimer::get("XIOS").resume();
-    context_hdl->timestep.setValue(timestep_str);
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    context_hdl->timestep.allocate();
+    CDuration& timestep = context_hdl->timestep.get();
+    timestep.year = timestep_c.year;
+    timestep.month = timestep_c.month;
+    timestep.day = timestep_c.day;
+    timestep.hour = timestep_c.hour;
+    timestep.minute = timestep_c.minute;
+    timestep.second = timestep_c.second;
+    timestep.timestep = timestep_c.timestep;
+    CTimer::get("XIOS").suspend();
   }
   
-  void cxios_get_context_timestep(context_Ptr context_hdl, char * timestep, int timestep_size)
+  void cxios_get_context_timestep(context_Ptr context_hdl, cxios_duration* timestep_c)
   {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(context_hdl->timestep.getInheritedValue(),timestep , timestep_size))
-      ERROR("void cxios_get_context_timestep(context_Ptr context_hdl, char * timestep, int timestep_size)", <<"Input string is to short");
-     CTimer::get("XIOS").suspend();
+    CTimer::get("XIOS").resume();
+    CDuration timestep = context_hdl->timestep.getInheritedValue();
+    timestep_c->year = timestep.year;
+    timestep_c->month = timestep.month;
+    timestep_c->day = timestep.day;
+    timestep_c->hour = timestep.hour;
+    timestep_c->minute = timestep.minute;
+    timestep_c->second = timestep.second;
+    timestep_c->timestep = timestep.timestep;
+    CTimer::get("XIOS").suspend();
   }