Ignore:
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
Location:
XIOS/trunk/src/interface/fortran_attr
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • XIOS/trunk/src/interface/fortran_attr/context_interface_attr.F90

    r537 r545  
    9696    SUBROUTINE cxios_set_context_timestep(context_hdl, timestep) BIND(C) 
    9797      USE ISO_C_BINDING 
    98       USE IDATE 
     98      USE IDURATION 
    9999      INTEGER (kind = C_INTPTR_T), VALUE :: context_hdl 
    100100      TYPE(txios(duration)), VALUE :: timestep 
    … …  
    103103    SUBROUTINE cxios_get_context_timestep(context_hdl, timestep) BIND(C) 
    104104      USE ISO_C_BINDING 
    105       USE IDATE 
     105      USE IDURATION 
    106106      INTEGER (kind = C_INTPTR_T), VALUE :: context_hdl 
    107107      TYPE(txios(duration)) :: timestep 

  • XIOS/trunk/src/interface/fortran_attr/field_interface_attr.F90

    r538 r545  
    151151    SUBROUTINE cxios_set_field_freq_offset(field_hdl, freq_offset) BIND(C) 
    152152      USE ISO_C_BINDING 
    153       USE IDATE 
     153      USE IDURATION 
    154154      INTEGER (kind = C_INTPTR_T), VALUE :: field_hdl 
    155155      TYPE(txios(duration)), VALUE :: freq_offset 
    … …  
    158158    SUBROUTINE cxios_get_field_freq_offset(field_hdl, freq_offset) BIND(C) 
    159159      USE ISO_C_BINDING 
    160       USE IDATE 
     160      USE IDURATION 
    161161      INTEGER (kind = C_INTPTR_T), VALUE :: field_hdl 
    162162      TYPE(txios(duration)) :: freq_offset 
    … …  
    172172    SUBROUTINE cxios_set_field_freq_op(field_hdl, freq_op) BIND(C) 
    173173      USE ISO_C_BINDING 
    174       USE IDATE 
     174      USE IDURATION 
    175175      INTEGER (kind = C_INTPTR_T), VALUE :: field_hdl 
    176176      TYPE(txios(duration)), VALUE :: freq_op 
    … …  
    179179    SUBROUTINE cxios_get_field_freq_op(field_hdl, freq_op) BIND(C) 
    180180      USE ISO_C_BINDING 
    181       USE IDATE 
     181      USE IDURATION 
    182182      INTEGER (kind = C_INTPTR_T), VALUE :: field_hdl 
    183183      TYPE(txios(duration)) :: freq_op 

  • XIOS/trunk/src/interface/fortran_attr/fieldgroup_interface_attr.F90

    r538 r545  
    151151    SUBROUTINE cxios_set_fieldgroup_freq_offset(fieldgroup_hdl, freq_offset) BIND(C) 
    152152      USE ISO_C_BINDING 
    153       USE IDATE 
     153      USE IDURATION 
    154154      INTEGER (kind = C_INTPTR_T), VALUE :: fieldgroup_hdl 
    155155      TYPE(txios(duration)), VALUE :: freq_offset 
    … …  
    158158    SUBROUTINE cxios_get_fieldgroup_freq_offset(fieldgroup_hdl, freq_offset) BIND(C) 
    159159      USE ISO_C_BINDING 
    160       USE IDATE 
     160      USE IDURATION 
    161161      INTEGER (kind = C_INTPTR_T), VALUE :: fieldgroup_hdl 
    162162      TYPE(txios(duration)) :: freq_offset 
    … …  
    172172    SUBROUTINE cxios_set_fieldgroup_freq_op(fieldgroup_hdl, freq_op) BIND(C) 
    173173      USE ISO_C_BINDING 
    174       USE IDATE 
     174      USE IDURATION 
    175175      INTEGER (kind = C_INTPTR_T), VALUE :: fieldgroup_hdl 
    176176      TYPE(txios(duration)), VALUE :: freq_op 
    … …  
    179179    SUBROUTINE cxios_get_fieldgroup_freq_op(fieldgroup_hdl, freq_op) BIND(C) 
    180180      USE ISO_C_BINDING 
    181       USE IDATE 
     181      USE IDURATION 
    182182      INTEGER (kind = C_INTPTR_T), VALUE :: fieldgroup_hdl 
    183183      TYPE(txios(duration)) :: freq_op 

  • XIOS/trunk/src/interface/fortran_attr/file_interface_attr.F90

    r538 r545  
    153153    SUBROUTINE cxios_set_file_output_freq(file_hdl, output_freq) BIND(C) 
    154154      USE ISO_C_BINDING 
    155       USE IDATE 
     155      USE IDURATION 
    156156      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
    157157      TYPE(txios(duration)), VALUE :: output_freq 
    … …  
    160160    SUBROUTINE cxios_get_file_output_freq(file_hdl, output_freq) BIND(C) 
    161161      USE ISO_C_BINDING 
    162       USE IDATE 
     162      USE IDURATION 
    163163      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
    164164      TYPE(txios(duration)) :: output_freq 
    … …  
    214214    SUBROUTINE cxios_set_file_split_freq(file_hdl, split_freq) BIND(C) 
    215215      USE ISO_C_BINDING 
    216       USE IDATE 
     216      USE IDURATION 
    217217      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
    218218      TYPE(txios(duration)), VALUE :: split_freq 
    … …  
    221221    SUBROUTINE cxios_get_file_split_freq(file_hdl, split_freq) BIND(C) 
    222222      USE ISO_C_BINDING 
    223       USE IDATE 
     223      USE IDURATION 
    224224      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
    225225      TYPE(txios(duration)) :: split_freq 
    … …  
    256256    SUBROUTINE cxios_set_file_sync_freq(file_hdl, sync_freq) BIND(C) 
    257257      USE ISO_C_BINDING 
    258       USE IDATE 
     258      USE IDURATION 
    259259      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
    260260      TYPE(txios(duration)), VALUE :: sync_freq 
    … …  
    263263    SUBROUTINE cxios_get_file_sync_freq(file_hdl, sync_freq) BIND(C) 
    264264      USE ISO_C_BINDING 
    265       USE IDATE 
     265      USE IDURATION 
    266266      INTEGER (kind = C_INTPTR_T), VALUE :: file_hdl 
    267267      TYPE(txios(duration)) :: sync_freq 

  • XIOS/trunk/src/interface/fortran_attr/filegroup_interface_attr.F90

    r538 r545  
    174174    SUBROUTINE cxios_set_filegroup_output_freq(filegroup_hdl, output_freq) BIND(C) 
    175175      USE ISO_C_BINDING 
    176       USE IDATE 
     176      USE IDURATION 
    177177      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
    178178      TYPE(txios(duration)), VALUE :: output_freq 
    … …  
    181181    SUBROUTINE cxios_get_filegroup_output_freq(filegroup_hdl, output_freq) BIND(C) 
    182182      USE ISO_C_BINDING 
    183       USE IDATE 
     183      USE IDURATION 
    184184      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
    185185      TYPE(txios(duration)) :: output_freq 
    … …  
    235235    SUBROUTINE cxios_set_filegroup_split_freq(filegroup_hdl, split_freq) BIND(C) 
    236236      USE ISO_C_BINDING 
    237       USE IDATE 
     237      USE IDURATION 
    238238      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
    239239      TYPE(txios(duration)), VALUE :: split_freq 
    … …  
    242242    SUBROUTINE cxios_get_filegroup_split_freq(filegroup_hdl, split_freq) BIND(C) 
    243243      USE ISO_C_BINDING 
    244       USE IDATE 
     244      USE IDURATION 
    245245      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
    246246      TYPE(txios(duration)) :: split_freq 
    … …  
    277277    SUBROUTINE cxios_set_filegroup_sync_freq(filegroup_hdl, sync_freq) BIND(C) 
    278278      USE ISO_C_BINDING 
    279       USE IDATE 
     279      USE IDURATION 
    280280      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
    281281      TYPE(txios(duration)), VALUE :: sync_freq 
    … …  
    284284    SUBROUTINE cxios_get_filegroup_sync_freq(filegroup_hdl, sync_freq) BIND(C) 
    285285      USE ISO_C_BINDING 
    286       USE IDATE 
     286      USE IDURATION 
    287287      INTEGER (kind = C_INTPTR_T), VALUE :: filegroup_hdl 
    288288      TYPE(txios(duration)) :: sync_freq 
Note: See TracChangeset for help on using the changeset viewer.