Ignore:
Timestamp:
06/05/15 15:42:02 (9 years ago)
Author:
rlacroix
Message:

Add the Fortran interface for the "compression_level" attribute.

It had been forgotten in r606.

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r598 r608  
    1212 
    1313  SUBROUTINE xios(set_file_attr)  & 
    14     ( file_id, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    15     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     14    ( file_id, append, compression_level, description, enabled, format, min_digits, mode, name, name_suffix  & 
     15    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
    1616 
    1717    IMPLICIT NONE 
    … …  
    2020      LOGICAL  , OPTIONAL, INTENT(IN) :: append 
    2121      LOGICAL (KIND=C_BOOL) :: append_tmp 
     22      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    2223      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    2324      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled 
    … …  
    3839      CALL xios(get_file_handle)(file_id,file_hdl) 
    3940      CALL xios(set_file_attr_hdl_)   & 
    40       ( file_hdl, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    41       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     41      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
     42      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
     43      , type ) 
    4244 
    4345  END SUBROUTINE xios(set_file_attr) 
    4446 
    4547  SUBROUTINE xios(set_file_attr_hdl)  & 
    46     ( file_hdl, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    47     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     48    ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
     49    , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
     50    , type ) 
    4851 
    4952    IMPLICIT NONE 
    … …  
    5154      LOGICAL  , OPTIONAL, INTENT(IN) :: append 
    5255      LOGICAL (KIND=C_BOOL) :: append_tmp 
     56      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level 
    5357      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description 
    5458      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled 
    … …  
    6872 
    6973      CALL xios(set_file_attr_hdl_)  & 
    70       ( file_hdl, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    71       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     74      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
     75      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
     76      , type ) 
    7277 
    7378  END SUBROUTINE xios(set_file_attr_hdl) 
    7479 
    7580  SUBROUTINE xios(set_file_attr_hdl_)   & 
    76     ( file_hdl, append_, description_, enabled_, format_, min_digits_, mode_, name_, name_suffix_  & 
    77     , output_freq_, output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_, type_  & 
    78     ) 
     81    ( file_hdl, append_, compression_level_, description_, enabled_, format_, min_digits_, mode_  & 
     82    , name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
     83    , sync_freq_, type_ ) 
    7984 
    8085    IMPLICIT NONE 
    … …  
    8287      LOGICAL  , OPTIONAL, INTENT(IN) :: append_ 
    8388      LOGICAL (KIND=C_BOOL) :: append__tmp 
     89      INTEGER  , OPTIONAL, INTENT(IN) :: compression_level_ 
    8490      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: description_ 
    8591      LOGICAL  , OPTIONAL, INTENT(IN) :: enabled_ 
    … …  
    103109      ENDIF 
    104110 
     111      IF (PRESENT(compression_level_)) THEN 
     112        CALL cxios_set_file_compression_level(file_hdl%daddr, compression_level_) 
     113      ENDIF 
     114 
    105115      IF (PRESENT(description_)) THEN 
    106116        CALL cxios_set_file_description(file_hdl%daddr, description_, len(description_)) 
    … …  
    163173 
    164174  SUBROUTINE xios(get_file_attr)  & 
    165     ( file_id, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    166     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     175    ( file_id, append, compression_level, description, enabled, format, min_digits, mode, name, name_suffix  & 
     176    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
    167177 
    168178    IMPLICIT NONE 
    … …  
    171181      LOGICAL  , OPTIONAL, INTENT(OUT) :: append 
    172182      LOGICAL (KIND=C_BOOL) :: append_tmp 
     183      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    173184      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    174185      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled 
    … …  
    189200      CALL xios(get_file_handle)(file_id,file_hdl) 
    190201      CALL xios(get_file_attr_hdl_)   & 
    191       ( file_hdl, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    192       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     202      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
     203      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
     204      , type ) 
    193205 
    194206  END SUBROUTINE xios(get_file_attr) 
    195207 
    196208  SUBROUTINE xios(get_file_attr_hdl)  & 
    197     ( file_hdl, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    198     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     209    ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
     210    , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
     211    , type ) 
    199212 
    200213    IMPLICIT NONE 
    … …  
    202215      LOGICAL  , OPTIONAL, INTENT(OUT) :: append 
    203216      LOGICAL (KIND=C_BOOL) :: append_tmp 
     217      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level 
    204218      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description 
    205219      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled 
    … …  
    219233 
    220234      CALL xios(get_file_attr_hdl_)  & 
    221       ( file_hdl, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    222       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     235      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
     236      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
     237      , type ) 
    223238 
    224239  END SUBROUTINE xios(get_file_attr_hdl) 
    225240 
    226241  SUBROUTINE xios(get_file_attr_hdl_)   & 
    227     ( file_hdl, append_, description_, enabled_, format_, min_digits_, mode_, name_, name_suffix_  & 
    228     , output_freq_, output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_, type_  & 
    229     ) 
     242    ( file_hdl, append_, compression_level_, description_, enabled_, format_, min_digits_, mode_  & 
     243    , name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
     244    , sync_freq_, type_ ) 
    230245 
    231246    IMPLICIT NONE 
    … …  
    233248      LOGICAL  , OPTIONAL, INTENT(OUT) :: append_ 
    234249      LOGICAL (KIND=C_BOOL) :: append__tmp 
     250      INTEGER  , OPTIONAL, INTENT(OUT) :: compression_level_ 
    235251      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: description_ 
    236252      LOGICAL  , OPTIONAL, INTENT(OUT) :: enabled_ 
    … …  
    254270      ENDIF 
    255271 
     272      IF (PRESENT(compression_level_)) THEN 
     273        CALL cxios_get_file_compression_level(file_hdl%daddr, compression_level_) 
     274      ENDIF 
     275 
    256276      IF (PRESENT(description_)) THEN 
    257277        CALL cxios_get_file_description(file_hdl%daddr, description_, len(description_)) 
    … …  
    314334 
    315335  SUBROUTINE xios(is_defined_file_attr)  & 
    316     ( file_id, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    317     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     336    ( file_id, append, compression_level, description, enabled, format, min_digits, mode, name, name_suffix  & 
     337    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
    318338 
    319339    IMPLICIT NONE 
    … …  
    322342      LOGICAL, OPTIONAL, INTENT(OUT) :: append 
    323343      LOGICAL(KIND=C_BOOL) :: append_tmp 
     344      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level 
     345      LOGICAL(KIND=C_BOOL) :: compression_level_tmp 
    324346      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    325347      LOGICAL(KIND=C_BOOL) :: description_tmp 
    … …  
    353375      CALL xios(get_file_handle)(file_id,file_hdl) 
    354376      CALL xios(is_defined_file_attr_hdl_)   & 
    355       ( file_hdl, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    356       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     377      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
     378      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
     379      , type ) 
    357380 
    358381  END SUBROUTINE xios(is_defined_file_attr) 
    359382 
    360383  SUBROUTINE xios(is_defined_file_attr_hdl)  & 
    361     ( file_hdl, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    362     , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     384    ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
     385    , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
     386    , type ) 
    363387 
    364388    IMPLICIT NONE 
    … …  
    366390      LOGICAL, OPTIONAL, INTENT(OUT) :: append 
    367391      LOGICAL(KIND=C_BOOL) :: append_tmp 
     392      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level 
     393      LOGICAL(KIND=C_BOOL) :: compression_level_tmp 
    368394      LOGICAL, OPTIONAL, INTENT(OUT) :: description 
    369395      LOGICAL(KIND=C_BOOL) :: description_tmp 
    … …  
    396422 
    397423      CALL xios(is_defined_file_attr_hdl_)  & 
    398       ( file_hdl, append, description, enabled, format, min_digits, mode, name, name_suffix, output_freq  & 
    399       , output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     424      ( file_hdl, append, compression_level, description, enabled, format, min_digits, mode, name  & 
     425      , name_suffix, output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq  & 
     426      , type ) 
    400427 
    401428  END SUBROUTINE xios(is_defined_file_attr_hdl) 
    402429 
    403430  SUBROUTINE xios(is_defined_file_attr_hdl_)   & 
    404     ( file_hdl, append_, description_, enabled_, format_, min_digits_, mode_, name_, name_suffix_  & 
    405     , output_freq_, output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_, type_  & 
    406     ) 
     431    ( file_hdl, append_, compression_level_, description_, enabled_, format_, min_digits_, mode_  & 
     432    , name_, name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_  & 
     433    , sync_freq_, type_ ) 
    407434 
    408435    IMPLICIT NONE 
    … …  
    410437      LOGICAL, OPTIONAL, INTENT(OUT) :: append_ 
    411438      LOGICAL(KIND=C_BOOL) :: append__tmp 
     439      LOGICAL, OPTIONAL, INTENT(OUT) :: compression_level_ 
     440      LOGICAL(KIND=C_BOOL) :: compression_level__tmp 
    412441      LOGICAL, OPTIONAL, INTENT(OUT) :: description_ 
    413442      LOGICAL(KIND=C_BOOL) :: description__tmp 
    … …  
    444473      ENDIF 
    445474 
     475      IF (PRESENT(compression_level_)) THEN 
     476        compression_level__tmp = cxios_is_defined_file_compression_level(file_hdl%daddr) 
     477        compression_level_ = compression_level__tmp 
     478      ENDIF 
     479 
    446480      IF (PRESENT(description_)) THEN 
    447481        description__tmp = cxios_is_defined_file_description(file_hdl%daddr) 
Note: See TracChangeset for help on using the changeset viewer.