Changeset 545 for XIOS/trunk/src/interface/fortran/icontext.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/icontext.F90 (modified) (4 diffs)

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

@@ -4 +4 @@
    USE, INTRINSIC :: ISO_C_BINDING
    USE CONTEXT_INTERFACE
+   USE IDATE
+   USE IDURATION
 !   USE icontext_attr
-   USE IDATE
 
-    
+
    TYPE txios(context)
       INTEGER(kind = C_INTPTR_T) :: daddr
    END TYPE txios(context)
-      
-   
+
+
    CONTAINS ! Fonctions disponibles pour les utilisateurs.
-   
+
    SUBROUTINE xios(get_context_handle)(idt,ret)
       IMPLICIT NONE
-      CHARACTER(len = *)  , INTENT(IN)  :: idt      
+      CHARACTER(len = *)  , INTENT(IN)  :: idt
       TYPE(txios(context)), INTENT(OUT):: ret
 
-      CALL cxios_context_handle_create(ret%daddr, idt, len(idt))            
+      CALL cxios_context_handle_create(ret%daddr, idt, len(idt))
    END SUBROUTINE xios(get_context_handle)
-   
+
+   SUBROUTINE xios(get_current_context)(context)
+      IMPLICIT NONE
+
+      TYPE(txios(context)), INTENT(IN) :: context
+
+      CALL cxios_context_get_current(context%daddr)
+
+   END SUBROUTINE xios(get_current_context)
+
    SUBROUTINE xios(set_current_context)(context, withswap)
       IMPLICIT NONE
@@ -28 +38 @@
       TYPE(txios(context))          , INTENT(IN) :: context
       LOGICAL             , OPTIONAL, INTENT(IN) :: withswap
-      LOGICAL (kind = 1)                       :: wswap
+      LOGICAL (kind = 1)                         :: wswap
 
       IF (PRESENT(withswap)) THEN
@@ -38 +48 @@
 
    END SUBROUTINE xios(set_current_context)
- 
+
    LOGICAL FUNCTION xios(is_valid_context)(idt)
       IMPLICIT NONE
@@ -49 +59 @@
    END FUNCTION  xios(is_valid_context)
 
-   
+
 END MODULE ICONTEXT