Changeset 545 for XIOS/trunk/src/generate_interface_impl.hpp

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/generate_interface_impl.hpp (modified) (2 diffs)

XIOS/trunk/src/generate_interface_impl.hpp

@@ -362 +362 @@
     oss << "SUBROUTINE cxios_set_" << className << "_" << name << "(" << className << "_hdl, " << name << ") BIND(C)" << iendl;
     oss << "  USE ISO_C_BINDING" << iendl;
-    oss << "  USE IDATE" << iendl;
+    oss << "  USE IDURATION" << iendl;
     oss << "  INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl;
     oss << "  TYPE(txios(duration)), VALUE :: " << name << iendl;
@@ -369 +369 @@
     oss << "SUBROUTINE cxios_get_" << className << "_" << name << "(" << className << "_hdl, " << name << ") BIND(C)" << iendl;
     oss << "  USE ISO_C_BINDING" << iendl;
-    oss << "  USE IDATE" << iendl;
+    oss << "  USE IDURATION" << iendl;
     oss << "  INTEGER (kind = C_INTPTR_T), VALUE :: " << className << "_hdl" << iendl;
     oss << "  TYPE(txios(duration)) :: " << name << iendl;