Changeset 545 for XIOS/trunk/src/interface/fortran/context_interface.f90

Timestamp:

12/17/14 11:14:05 (10 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/context_interface.f90 (modified) (3 diffs)

XIOS/trunk/src/interface/fortran/context_interface.f90

@@ -1 +1 @@
 MODULE CONTEXT_INTERFACE
    USE, INTRINSIC :: ISO_C_BINDING
-     
+
    INTERFACE ! Ne pas appeler directement/Interface FORTRAN 2003 <-> C99
-     
+
       SUBROUTINE cxios_context_handle_create(ret, idt, idt_size) BIND(C)
          import C_CHAR, C_INTPTR_T, C_INT
@@ -10 +10 @@
          INTEGER  (kind = C_INT)     , VALUE        :: idt_size
       END SUBROUTINE cxios_context_handle_create
-      
+
+      SUBROUTINE cxios_context_get_current(context) BIND(C)
+         import C_INTPTR_T
+         INTEGER (kind = C_INTPTR_T) :: context
+      END SUBROUTINE cxios_context_get_current
+
       SUBROUTINE cxios_context_set_current(context, withswap) BIND(C)
          import C_BOOL, C_INT, C_INTPTR_T
@@ -25 +30 @@
 
    END INTERFACE
-     
+
 END MODULE CONTEXT_INTERFACE