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/ifield_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      INTEGER  , OPTIONAL, INTENT(IN) :: level 
    … …  
    6666      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
    6767      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref 
    68       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: freq_offset 
    69       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: freq_op 
     68      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: freq_offset 
     69      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: freq_op 
    7070      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: grid_ref 
    7171      INTEGER  , OPTIONAL, INTENT(IN) :: level 
    … …  
    103103      LOGICAL (KIND=C_BOOL) :: enabled__tmp 
    104104      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: field_ref_ 
    105       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: freq_offset_ 
    106       CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: freq_op_ 
     105      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: freq_offset_ 
     106      TYPE(txios(duration)) , OPTIONAL, INTENT(IN) :: freq_op_ 
    107107      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: grid_ref_ 
    108108      INTEGER  , OPTIONAL, INTENT(IN) :: level_ 
    … …  
    148148       
    149149      IF (PRESENT(freq_offset_)) THEN 
    150         CALL cxios_set_field_freq_offset(field_hdl%daddr, freq_offset_, len(freq_offset_)) 
     150        CALL cxios_set_field_freq_offset(field_hdl%daddr, freq_offset_) 
    151151      ENDIF 
    152152       
    153153      IF (PRESENT(freq_op_)) THEN 
    154         CALL cxios_set_field_freq_op(field_hdl%daddr, freq_op_, len(freq_op_)) 
     154        CALL cxios_set_field_freq_op(field_hdl%daddr, freq_op_) 
    155155      ENDIF 
    156156       
    … …  
    220220      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
    221221      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref 
    222       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_offset 
    223       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_op 
     222      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_offset 
     223      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_op 
    224224      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: grid_ref 
    225225      INTEGER  , OPTIONAL, INTENT(OUT) :: level 
    … …  
    258258      LOGICAL (KIND=C_BOOL) :: enabled_tmp 
    259259      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref 
    260       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_offset 
    261       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_op 
     260      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_offset 
     261      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_op 
    262262      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: grid_ref 
    263263      INTEGER  , OPTIONAL, INTENT(OUT) :: level 
    … …  
    295295      LOGICAL (KIND=C_BOOL) :: enabled__tmp 
    296296      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: field_ref_ 
    297       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_offset_ 
    298       CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: freq_op_ 
     297      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_offset_ 
     298      TYPE(txios(duration)) , OPTIONAL, INTENT(OUT) :: freq_op_ 
    299299      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: grid_ref_ 
    300300      INTEGER  , OPTIONAL, INTENT(OUT) :: level_ 
    … …  
    340340       
    341341      IF (PRESENT(freq_offset_)) THEN 
    342         CALL cxios_get_field_freq_offset(field_hdl%daddr, freq_offset_, len(freq_offset_)) 
     342        CALL cxios_get_field_freq_offset(field_hdl%daddr, freq_offset_) 
    343343      ENDIF 
    344344       
    345345      IF (PRESENT(freq_op_)) THEN 
    346         CALL cxios_get_field_freq_op(field_hdl%daddr, freq_op_, len(freq_op_)) 
     346        CALL cxios_get_field_freq_op(field_hdl%daddr, freq_op_) 
    347347      ENDIF 
    348348       
Note: See TracChangeset for help on using the changeset viewer.