Ignore:
Timestamp:
12/11/14 14:32:37 (10 years ago)
Author:
rlacroix
Message:

Add a new attribute type for durations and use it for the context's timestep.

Note that the "xios_time" type and the "xios_set_timestep" procedure have been removed from the Fortran interface. Instead, the "xios_duration" type and the "xios_get_context_attr"/"xios_set_context_attr" procedures should now be used to get/set the timestep.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r532 r537  
    2121      TYPE(txios(date))  , OPTIONAL, INTENT(IN) :: start_date 
    2222      TYPE(txios(date))  , OPTIONAL, INTENT(IN) :: time_origin 
    23       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timestep 
     23      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: timestep 
    2424       
    2525      CALL xios(get_context_handle)(context_id,context_hdl) 
    … …  
    3838      TYPE(txios(date))  , OPTIONAL, INTENT(IN) :: start_date 
    3939      TYPE(txios(date))  , OPTIONAL, INTENT(IN) :: time_origin 
    40       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timestep 
     40      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: timestep 
    4141       
    4242      CALL xios(set_context_attr_hdl_)  & 
    … …  
    5454      TYPE(txios(date))  , OPTIONAL, INTENT(IN) :: start_date_ 
    5555      TYPE(txios(date))  , OPTIONAL, INTENT(IN) :: time_origin_ 
    56       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: timestep_ 
     56      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: timestep_ 
    5757       
    5858      IF (PRESENT(calendar_type_)) THEN 
    … …  
    7373       
    7474      IF (PRESENT(timestep_)) THEN 
    75         CALL cxios_set_context_timestep(context_hdl%daddr, timestep_, len(timestep_)) 
     75        CALL cxios_set_context_timestep(context_hdl%daddr, timestep_) 
    7676      ENDIF 
    7777       
    … …  
    9090      TYPE(txios(date))  , OPTIONAL, INTENT(OUT) :: start_date 
    9191      TYPE(txios(date))  , OPTIONAL, INTENT(OUT) :: time_origin 
    92       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timestep 
     92      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: timestep 
    9393       
    9494      CALL xios(get_context_handle)(context_id,context_hdl) 
    … …  
    107107      TYPE(txios(date))  , OPTIONAL, INTENT(OUT) :: start_date 
    108108      TYPE(txios(date))  , OPTIONAL, INTENT(OUT) :: time_origin 
    109       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timestep 
     109      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: timestep 
    110110       
    111111      CALL xios(get_context_attr_hdl_)  & 
    … …  
    123123      TYPE(txios(date))  , OPTIONAL, INTENT(OUT) :: start_date_ 
    124124      TYPE(txios(date))  , OPTIONAL, INTENT(OUT) :: time_origin_ 
    125       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: timestep_ 
     125      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: timestep_ 
    126126       
    127127      IF (PRESENT(calendar_type_)) THEN 
    … …  
    142142       
    143143      IF (PRESENT(timestep_)) THEN 
    144         CALL cxios_get_context_timestep(context_hdl%daddr, timestep_, len(timestep_)) 
     144        CALL cxios_get_context_timestep(context_hdl%daddr, timestep_) 
    145145      ENDIF 
    146146       
Note: See TracChangeset for help on using the changeset viewer.