Ignore:
Timestamp:
12/11/14 16:07:42 (10 years ago)
Author:
rlacroix
Message:

Convert more attributes to use the new duration type:

  • field: freq_op and freq_offset
  • file: output_freq, sync_freq and split_freq.

Remember that you now have to use the "xios_duration" type instead of strings to get/set those attributes through the Fortran interface.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r501 r538  
    2828      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
    2929      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref 
    30       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: freq_offset 
    31       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: freq_op 
     30      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: freq_offset 
     31      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: freq_op 
    3232      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: grid_ref 
    3333      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    … …  
    6767      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
    6868      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref 
    69       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: freq_offset 
    70       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: freq_op 
     69      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: freq_offset 
     70      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: freq_op 
    7171      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: grid_ref 
    7272      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref 
    … …  
    105105      LOGICAL (KIND=C_BOOL) :: enabled__tmp 
    106106      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref_ 
    107       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: freq_offset_ 
    108       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: freq_op_ 
     107      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: freq_offset_ 
     108      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: freq_op_ 
    109109      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: grid_ref_ 
    110110      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: group_ref_ 
    … …  
    151151       
    152152      IF (PRESENT(freq_offset_)) THEN 
    153         CALL cxios_set_fieldgroup_freq_offset(fieldgroup_hdl%daddr, freq_offset_, len(freq_offset_)) 
     153        CALL cxios_set_fieldgroup_freq_offset(fieldgroup_hdl%daddr, freq_offset_) 
    154154      ENDIF 
    155155       
    156156      IF (PRESENT(freq_op_)) THEN 
    157         CALL cxios_set_fieldgroup_freq_op(fieldgroup_hdl%daddr, freq_op_, len(freq_op_)) 
     157        CALL cxios_set_fieldgroup_freq_op(fieldgroup_hdl%daddr, freq_op_) 
    158158      ENDIF 
    159159       
    … …  
    227227      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
    228228      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref 
    229       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_offset 
    230       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_op 
     229      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_offset 
     230      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_op 
    231231      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: grid_ref 
    232232      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    … …  
    266266      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
    267267      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref 
    268       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_offset 
    269       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_op 
     268      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_offset 
     269      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_op 
    270270      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: grid_ref 
    271271      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref 
    … …  
    304304      LOGICAL (KIND=C_BOOL) :: enabled__tmp 
    305305      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref_ 
    306       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_offset_ 
    307       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_op_ 
     306      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_offset_ 
     307      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_op_ 
    308308      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: grid_ref_ 
    309309      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: group_ref_ 
    … …  
    350350       
    351351      IF (PRESENT(freq_offset_)) THEN 
    352         CALL cxios_get_fieldgroup_freq_offset(fieldgroup_hdl%daddr, freq_offset_, len(freq_offset_)) 
     352        CALL cxios_get_fieldgroup_freq_offset(fieldgroup_hdl%daddr, freq_offset_) 
    353353      ENDIF 
    354354       
    355355      IF (PRESENT(freq_op_)) THEN 
    356         CALL cxios_get_fieldgroup_freq_op(fieldgroup_hdl%daddr, freq_op_, len(freq_op_)) 
     356        CALL cxios_get_fieldgroup_freq_op(fieldgroup_hdl%daddr, freq_op_) 
    357357      ENDIF 
    358358       
Note: See TracChangeset for help on using the changeset viewer.