Ignore:
Timestamp:
09/22/15 14:01:30 (9 years ago)
Author:
rlacroix
Message:

XIOS 1.0: Add the Fortran interface for the new "time_counter" file attribute.

I forgot that the change had been made in XIOS 1.0 too...

File:
1 edited

Legend:

Unmodified
Added
Removed

  • XIOS/branchs/xios-1.0/src/interface/fortran_attr/ifilegroup_attr.F90

    r608 r703  
    1313  SUBROUTINE xios(set_filegroup_attr)  & 
    1414    ( filegroup_id, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    15     , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     15    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     16    , type ) 
    1617     
    1718    IMPLICIT NONE 
    … …  
    3233      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    3334      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: sync_freq 
     35      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    3436      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
    3537       
    … …  
    3739      CALL xios(set_filegroup_attr_hdl_)   & 
    3840      ( filegroup_hdl, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    39       , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     41      , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     42      , type ) 
    4043     
    4144  END SUBROUTINE xios(set_filegroup_attr) 
    … …  
    4346  SUBROUTINE xios(set_filegroup_attr_hdl)  & 
    4447    ( filegroup_hdl, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    45     , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     48    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     49    , type ) 
    4650     
    4751    IMPLICIT NONE 
    … …  
    6165      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format 
    6266      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: sync_freq 
     67      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter 
    6368      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type 
    6469       
    6570      CALL xios(set_filegroup_attr_hdl_)  & 
    6671      ( filegroup_hdl, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    67       , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     72      , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     73      , type ) 
    6874     
    6975  END SUBROUTINE xios(set_filegroup_attr_hdl) 
    … …  
    7278    ( filegroup_hdl, compression_level_, description_, enabled_, group_ref_, min_digits_, name_  & 
    7379    , name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_  & 
    74     , type_ ) 
     80    , time_counter_, type_ ) 
    7581     
    7682    IMPLICIT NONE 
    … …  
    9096      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: split_freq_format_ 
    9197      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: sync_freq_ 
     98      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: time_counter_ 
    9299      CHARACTER(len = *) , OPTIONAL, INTENT(IN) :: type_ 
    93100       
    … …  
    145152      ENDIF 
    146153       
     154      IF (PRESENT(time_counter_)) THEN 
     155        CALL cxios_set_filegroup_time_counter(filegroup_hdl%daddr, time_counter_, len(time_counter_)) 
     156      ENDIF 
     157       
    147158      IF (PRESENT(type_)) THEN 
    148159        CALL cxios_set_filegroup_type(filegroup_hdl%daddr, type_, len(type_)) 
    … …  
    155166  SUBROUTINE xios(get_filegroup_attr)  & 
    156167    ( filegroup_id, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    157     , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     168    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     169    , type ) 
    158170     
    159171    IMPLICIT NONE 
    … …  
    174186      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    175187      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: sync_freq 
     188      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    176189      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
    177190       
    … …  
    179192      CALL xios(get_filegroup_attr_hdl_)   & 
    180193      ( filegroup_hdl, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    181       , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     194      , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     195      , type ) 
    182196     
    183197  END SUBROUTINE xios(get_filegroup_attr) 
    … …  
    185199  SUBROUTINE xios(get_filegroup_attr_hdl)  & 
    186200    ( filegroup_hdl, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    187     , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     201    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     202    , type ) 
    188203     
    189204    IMPLICIT NONE 
    … …  
    203218      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format 
    204219      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: sync_freq 
     220      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter 
    205221      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type 
    206222       
    207223      CALL xios(get_filegroup_attr_hdl_)  & 
    208224      ( filegroup_hdl, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    209       , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     225      , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     226      , type ) 
    210227     
    211228  END SUBROUTINE xios(get_filegroup_attr_hdl) 
    … …  
    214231    ( filegroup_hdl, compression_level_, description_, enabled_, group_ref_, min_digits_, name_  & 
    215232    , name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_  & 
    216     , type_ ) 
     233    , time_counter_, type_ ) 
    217234     
    218235    IMPLICIT NONE 
    … …  
    232249      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: split_freq_format_ 
    233250      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: sync_freq_ 
     251      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: time_counter_ 
    234252      CHARACTER(len = *) , OPTIONAL, INTENT(OUT) :: type_ 
    235253       
    … …  
    287305      ENDIF 
    288306       
     307      IF (PRESENT(time_counter_)) THEN 
     308        CALL cxios_get_filegroup_time_counter(filegroup_hdl%daddr, time_counter_, len(time_counter_)) 
     309      ENDIF 
     310       
    289311      IF (PRESENT(type_)) THEN 
    290312        CALL cxios_get_filegroup_type(filegroup_hdl%daddr, type_, len(type_)) 
    … …  
    297319  SUBROUTINE xios(is_defined_filegroup_attr)  & 
    298320    ( filegroup_id, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    299     , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     321    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     322    , type ) 
    300323     
    301324    IMPLICIT NONE 
    … …  
    328351      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq 
    329352      LOGICAL(KIND=C_BOOL) :: sync_freq_tmp 
     353      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter 
     354      LOGICAL(KIND=C_BOOL) :: time_counter_tmp 
    330355      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    331356      LOGICAL(KIND=C_BOOL) :: type_tmp 
    … …  
    334359      CALL xios(is_defined_filegroup_attr_hdl_)   & 
    335360      ( filegroup_hdl, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    336       , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     361      , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     362      , type ) 
    337363     
    338364  END SUBROUTINE xios(is_defined_filegroup_attr) 
    … …  
    340366  SUBROUTINE xios(is_defined_filegroup_attr_hdl)  & 
    341367    ( filegroup_hdl, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    342     , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     368    , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     369    , type ) 
    343370     
    344371    IMPLICIT NONE 
    … …  
    370397      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq 
    371398      LOGICAL(KIND=C_BOOL) :: sync_freq_tmp 
     399      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter 
     400      LOGICAL(KIND=C_BOOL) :: time_counter_tmp 
    372401      LOGICAL, OPTIONAL, INTENT(OUT) :: type 
    373402      LOGICAL(KIND=C_BOOL) :: type_tmp 
    … …  
    375404      CALL xios(is_defined_filegroup_attr_hdl_)  & 
    376405      ( filegroup_hdl, compression_level, description, enabled, group_ref, min_digits, name, name_suffix  & 
    377       , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, type ) 
     406      , output_freq, output_level, par_access, split_freq, split_freq_format, sync_freq, time_counter  & 
     407      , type ) 
    378408     
    379409  END SUBROUTINE xios(is_defined_filegroup_attr_hdl) 
    … …  
    382412    ( filegroup_hdl, compression_level_, description_, enabled_, group_ref_, min_digits_, name_  & 
    383413    , name_suffix_, output_freq_, output_level_, par_access_, split_freq_, split_freq_format_, sync_freq_  & 
    384     , type_ ) 
     414    , time_counter_, type_ ) 
    385415     
    386416    IMPLICIT NONE 
    … …  
    412442      LOGICAL, OPTIONAL, INTENT(OUT) :: sync_freq_ 
    413443      LOGICAL(KIND=C_BOOL) :: sync_freq__tmp 
     444      LOGICAL, OPTIONAL, INTENT(OUT) :: time_counter_ 
     445      LOGICAL(KIND=C_BOOL) :: time_counter__tmp 
    414446      LOGICAL, OPTIONAL, INTENT(OUT) :: type_ 
    415447      LOGICAL(KIND=C_BOOL) :: type__tmp 
    … …  
    480512      ENDIF 
    481513       
     514      IF (PRESENT(time_counter_)) THEN 
     515        time_counter__tmp=cxios_is_defined_filegroup_time_counter(filegroup_hdl%daddr) 
     516        time_counter_=time_counter__tmp 
     517      ENDIF 
     518       
    482519      IF (PRESENT(type_)) THEN 
    483520        type__tmp=cxios_is_defined_filegroup_type(filegroup_hdl%daddr) 
Note: See TracChangeset for help on using the changeset viewer.