Changeset 545 for XIOS/trunk/src/interface/fortran/ixios.F90

Timestamp:

12/17/14 11:14:05 (9 years ago)

Author:

rlacroix

Message:

Expose the calendar operations through the Fortran interface.

• Add arithmetic operations on the xios_duration and xios_date types:
  • xios_duration + xios_duration = xios_duration
  • xios_duration - xios_duration = xios_duration
  • scalar * xios_duration = xios_duration * scalar = xios_duration
  • - xios_duration = xios_duration
  • xios_date + xios_duration = xios_date
  • xios_date - xios_duration = xios_date
  • xios_date - xios_date = xios_duration
• Add comparison operations on the xios_duration and xios_date types:
  • xios_duration: ==, /=
  • xios_date: ==, /=, <, <=, >, >=
• Add a new function "xios_date_convert_to_seconds" to convert a date into the number of seconds since the time origin of the calendar
• Define some constant durations "xios_second", "xios_minute", "xios_hour", "xios_day", "xios_month", "xios_year" et "xios_timestep" to ease the definition of new durations (for example, 10h is just 10 * xios_hour)
• Add a new function "xios_set_calendar" so that one can manually create the calendar attached to the current context and thus use the calendar operations before calling "xios_close_context_definition". This function can accept optional parameters so that the calendar attributes (calendar_type, start_date, time_origin and timestep) can be easily overwritten. Note that you cannot define a new calendar after one was already created (either because "xios_set_calendar" or "xios_close_context_definition" was used)
• Readd the function "xios_set_timestep" as a simplified alias of "xios_set_context_attr(context, timestep)" for the current context

File:

• XIOS/trunk/src/interface/fortran/ixios.F90 (modified) (4 diffs)

XIOS/trunk/src/interface/fortran/ixios.F90

@@ -3 +3 @@
 MODULE XIOS
 
+USE icalendar, ONLY : xios(set_calendar), xios(set_timestep), xios(update_calendar)
 
 USE icontext, ONLY : txios(context), xios(get_context_handle), xios(set_current_context),    &
@@ -19 +20 @@
                   xios(setVar_logic), xios(setVar_char)
 
-USE idate, ONLY : txios(date), txios(duration), xios(update_calendar)
+USE idate, ONLY : txios(date), &
+                  xios(date_convert_to_seconds), &
+                  xios(date_add_duration), xios(date_sub_duration), xios(date_sub), &
+                  xios(date_eq), xios(date_neq), xios(date_lt), xios(date_le), xios(date_gt), xios(date_ge), &
+                  OPERATOR(+), OPERATOR(-), &
+                  OPERATOR(==), OPERATOR(/=), OPERATOR(<), OPERATOR(<=), OPERATOR(>), OPERATOR(>=)
 
 USE idomain, ONLY : txios(domain), txios(domaingroup), xios(get_domain_handle),  &
@@ -32 +38 @@
                               xios(get_domaingroup_attr), xios(get_domaingroup_attr_hdl), &
                               xios(is_defined_domaingroup_attr), xios(is_defined_domaingroup_attr_hdl)
+
+USE iduration, ONLY: txios(duration), &
+                     xios(year), xios(month), xios(day), xios(hour), xios(minute), xios(second), xios(timestep), &
+                     xios(duration_add), xios(duration_sub), xios(duration_mult), xios(duration_neg), &
+                     xios(duration_eq), xios(duration_neq), &
+                     OPERATOR(+), OPERATOR(-), OPERATOR(*)
 
 USE ifield, ONLY : txios(field), txios(fieldgroup), xios(get_field_handle),  &
@@ -184 +196 @@
 
  PUBLIC :: xios(set_current_context)
- PUBLIC :: xios(update_calendar)
  PUBLIC :: xios(initialize), xios(init_server), xios(finalize), xios(context_initialize),xios(context_is_initialized), &
            xios(solve_inheritance), xios(close_context_definition), xios(context_finalize), xios(send_field),          &
            xios(field_is_active)
 
+ PUBLIC :: xios(set_calendar), xios(set_timestep), xios(update_calendar)
+
+ PUBLIC :: xios(year), xios(month), xios(day), xios(hour), xios(minute), xios(second), xios(timestep), &
+           xios(duration_add), xios(duration_sub), xios(duration_mult), xios(duration_neg), &
+           xios(duration_eq), xios(duration_neq)
+
+ PUBLIC :: xios(date_convert_to_seconds), &
+           xios(date_add_duration), xios(date_sub_duration), xios(date_sub), &
+           xios(date_eq), xios(date_neq), xios(date_lt), xios(date_le), xios(date_gt), xios(date_ge)
+
+ PUBLIC :: OPERATOR(+), OPERATOR(-), OPERATOR(*), &
+           OPERATOR(==), OPERATOR(/=), OPERATOR(<), OPERATOR(<=), OPERATOR(>), OPERATOR(>=)
+
  PUBLIC :: xios(getVar)
  PUBLIC :: xios(setVar)