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

Timestamp:

01/26/15 14:39:26 (9 years ago)

Author:

rlacroix

Message:

Revised calendar functionalities:

• the calendar is now configured from a specific calendar child node of the context in the XML configuration file. Example: <calendar type="Gregorian" start_date="2012-03-01 15:00:00" time_origin="2012-02-29 15:00:00" timestep="1h" />
• the calendar type should now be configured when defining the start time and/or the time origin.
• the start time and the time origin are now optional, 0000-01-01 00:00:00 will be used by default. It is also possible to define them partially. For example, 2015 and 2014-12 are valid dates corresponding respectively to 2015-01-01 00:00:00 and 2014-12-01 00:00:00.
• an optional duration offset can be added to the start date and time origin. For example, it's possible to define the date 2015-01-12 12:00:00 as 2015-01-11 + 36h or 2015-01-11 12:00:00 + 1d. The duration format is the same as the time step. Being that the date is optional, it is possible to only use a duration (for example + 42s is the same as 0000-01-01 00:00:00 + 42s). An error will be raised if a duration based on the time step is used before the time step was configured. For example, the following would cause an error: <calendar type="Gregorian" start_date="+ 1ts" /> but <calendar type="Gregorian" start_date="+ 1ts" timestep="0.5h" /> would not.
• new Fortran interface to define the calendar:
  • xios_define_calendar(type[, timestep, start_date, time_origin]) will create a calendar when none had previously been defined. Only the type argument is mandatory, the rest is optional. Calendar operations on dates and durations are possible as soon as the calendar is created (either using this procedure or directly from the XML configuration file).
  • the following getter and setter procedures are available: xios_set_timestep, xios_set_start_date, xios_set_time_origin, xios_get_calendar_type, xios_get_timestep, xios_get_start_date, xios_get_time_origin.
• new Fortran interface to interact with the calendar: xios_update_calendar, xios_get_current_date, xios_get_year_length_in_seconds, xios_get_day_length_in_seconds.
• new Fortran interface for date conversion: xios_date_get_second_of_year, xios_date_get_day_of_year, xios_date_get_fraction_of_year, xios_date_get_second_of_day, xios_date_get_fraction_of_day.
• two new placeholders are available to format the file name when splitting the output (split_freq_format attribute):
  • %S the number of seconds since the time origin
  • %D the integral number of days since the time origin

File:

• XIOS/trunk/src/interface/c_attr/iccontext_attr.cpp (modified) (2 diffs)

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

@@ -17 +17 @@
 {
   typedef xios::CContext*  context_Ptr;
-  
-  void cxios_set_context_calendar_type(context_Ptr context_hdl, const char * calendar_type, int calendar_type_size)
-  {
-    std::string calendar_type_str;
-    if(!cstr2string(calendar_type, calendar_type_size, calendar_type_str)) return;
-     CTimer::get("XIOS").resume();
-    context_hdl->calendar_type.fromString(calendar_type_str);
-     CTimer::get("XIOS").suspend();
-  }
-  
-  void cxios_get_context_calendar_type(context_Ptr context_hdl, char * calendar_type, int calendar_type_size)
-  {
-     CTimer::get("XIOS").resume();
-    if(!string_copy(context_hdl->calendar_type.getInheritedStringValue(),calendar_type , calendar_type_size))
-      ERROR("void cxios_get_context_calendar_type(context_Ptr context_hdl, char * calendar_type, int calendar_type_size)", <<"Input string is to short");
-     CTimer::get("XIOS").suspend();
-  }
-  
-  bool cxios_is_defined_context_calendar_type(context_Ptr context_hdl )
-  {
-     CTimer::get("XIOS").resume();
-    return context_hdl->calendar_type.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
-  }
-  
-  
   
   void cxios_set_context_output_dir(context_Ptr context_hdl, const char * output_dir, int output_dir_size)
@@ -70 +44 @@
   
   
-  void cxios_set_context_start_date(context_Ptr context_hdl, cxios_date start_date_c)
-  {
-    CTimer::get("XIOS").resume();
-    context_hdl->start_date.allocate();
-    CDate& start_date = context_hdl->start_date.get();
-    start_date.setDate(start_date_c.year,
-                           start_date_c.month,
-                           start_date_c.day,
-                           start_date_c.hour,
-                           start_date_c.minute,
-                           start_date_c.second);
-    if (start_date.hasRelCalendar())
-      start_date.checkDate();
-    CTimer::get("XIOS").suspend();
-  }
-  
-  void cxios_get_context_start_date(context_Ptr context_hdl, cxios_date* start_date_c)
-  {
-    CTimer::get("XIOS").resume();
-    CDate start_date = context_hdl->start_date.getInheritedValue();
-    start_date_c->year = start_date.getYear();
-    start_date_c->month = start_date.getMonth();
-    start_date_c->day = start_date.getDay();
-    start_date_c->hour = start_date.getHour();
-    start_date_c->minute = start_date.getMinute();
-    start_date_c->second = start_date.getSecond();
-    CTimer::get("XIOS").suspend();
-  }
-  
-  bool cxios_is_defined_context_start_date(context_Ptr context_hdl )
-  {
-     CTimer::get("XIOS").resume();
-    return context_hdl->start_date.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
-  }
-  
-  
-  
-  void cxios_set_context_time_origin(context_Ptr context_hdl, cxios_date time_origin_c)
-  {
-    CTimer::get("XIOS").resume();
-    context_hdl->time_origin.allocate();
-    CDate& time_origin = context_hdl->time_origin.get();
-    time_origin.setDate(time_origin_c.year,
-                           time_origin_c.month,
-                           time_origin_c.day,
-                           time_origin_c.hour,
-                           time_origin_c.minute,
-                           time_origin_c.second);
-    if (time_origin.hasRelCalendar())
-      time_origin.checkDate();
-    CTimer::get("XIOS").suspend();
-  }
-  
-  void cxios_get_context_time_origin(context_Ptr context_hdl, cxios_date* time_origin_c)
-  {
-    CTimer::get("XIOS").resume();
-    CDate time_origin = context_hdl->time_origin.getInheritedValue();
-    time_origin_c->year = time_origin.getYear();
-    time_origin_c->month = time_origin.getMonth();
-    time_origin_c->day = time_origin.getDay();
-    time_origin_c->hour = time_origin.getHour();
-    time_origin_c->minute = time_origin.getMinute();
-    time_origin_c->second = time_origin.getSecond();
-    CTimer::get("XIOS").suspend();
-  }
-  
-  bool cxios_is_defined_context_time_origin(context_Ptr context_hdl )
-  {
-     CTimer::get("XIOS").resume();
-    return context_hdl->time_origin.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
-  }
-  
-  
-  
-  void cxios_set_context_timestep(context_Ptr context_hdl, cxios_duration timestep_c)
-  {
-    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, cxios_duration* timestep_c)
-  {
-    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();
-  }
-  
-  bool cxios_is_defined_context_timestep(context_Ptr context_hdl )
-  {
-     CTimer::get("XIOS").resume();
-    return context_hdl->timestep.hasInheritedValue();
-     CTimer::get("XIOS").suspend();
-  }
-  
-  
-  
   
 }